diff --git a/epan/prefs.c b/epan/prefs.c
index 3564d15f95..b58d5aa756 100644
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -1152,7 +1152,7 @@ module_find_pref_cb(const void *key _U_, void *value, void *data)
 
 /* Tries to find a preference, setting containing_module to the (sub)module
  * holding this preference. */
-static struct preference *
+static pref_t *
 prefs_find_preference_with_submodule(module_t *module, const char *name,
         module_t **containing_module)
 {
@@ -1184,10 +1184,10 @@ prefs_find_preference_with_submodule(module_t *module, const char *name,
     if (containing_module)
         *containing_module = arg.submodule ? arg.submodule : module;
 
-    return (struct preference *) list_entry->data;
+    return (pref_t *) list_entry->data;
 }
 
-struct preference *
+pref_t *
 prefs_find_preference(module_t *module, const char *name)
 {
     return prefs_find_preference_with_submodule(module, name, NULL);
diff --git a/extcap.c b/extcap.c
index f2621fcbf6..d1e4cc1d43 100644
--- a/extcap.c
+++ b/extcap.c
@@ -829,10 +829,10 @@ void extcap_free_if_configuration(GList *list, bool free_args)
     g_list_free(list);
 }
 
-struct preference *
+pref_t *
 extcap_pref_for_argument(const char *ifname, struct _extcap_arg *arg)
 {
-    struct preference *pref = NULL;
+    pref_t *pref = NULL;
 
     extcap_ensure_all_interfaces_loaded();
 
@@ -840,14 +840,15 @@ extcap_pref_for_argument(const char *ifname, struct _extcap_arg *arg)
     GRegex *regex_ifname = g_regex_new("(?![a-zA-Z0-9_]).", G_REGEX_RAW, (GRegexMatchFlags) 0, NULL);
     if (regex_name && regex_ifname)
     {
-        if (prefs_find_module("extcap"))
+        module_t *extcap_module = prefs_find_module("extcap");
+        if (extcap_module)
         {
             char *pref_name = g_regex_replace(regex_name, arg->call, strlen(arg->call), 0, "", (GRegexMatchFlags) 0, NULL);
             char *ifname_underscore = g_regex_replace(regex_ifname, ifname, strlen(ifname), 0, "_", (GRegexMatchFlags) 0, NULL);
             char *ifname_lowercase = g_ascii_strdown(ifname_underscore, -1);
             char *pref_ifname = g_strconcat(ifname_lowercase, ".", pref_name, NULL);
 
-            pref = prefs_find_preference(prefs_find_module("extcap"), pref_ifname);
+            pref = prefs_find_preference(extcap_module, pref_ifname);
 
             g_free(pref_name);
             g_free(ifname_underscore);
diff --git a/extcap.h b/extcap.h
index 6848e481ff..5725bbc090 100644
--- a/extcap.h
+++ b/extcap.h
@@ -248,7 +248,7 @@ extcap_request_stop(capture_session *cap_session);
  * @param arg The command line argument to check.
  * @return The associated preference on success, NULL on failure.
  */
-struct preference *
+pref_t *
 extcap_pref_for_argument(const char *ifname, struct _extcap_arg * arg);
 
 /**
diff --git a/ui/qt/extcap_argument.cpp b/ui/qt/extcap_argument.cpp
index dc10c4a1a0..ffef0d7268 100644
--- a/ui/qt/extcap_argument.cpp
+++ b/ui/qt/extcap_argument.cpp
@@ -936,7 +936,7 @@ int ExtcapArgument::argNr() const
 
 QString ExtcapArgument::prefKey(const QString & device_name)
 {
-    struct preference * pref = NULL;
+    pref_t * pref = NULL;
 
     if (_argument == 0 || ! _argument->save)
         return QString();
diff --git a/ui/qt/packet_dialog.h b/ui/qt/packet_dialog.h
index f616690e96..b251f4c7cb 100644
--- a/ui/qt/packet_dialog.h
+++ b/ui/qt/packet_dialog.h
@@ -38,7 +38,7 @@ protected:
 
 signals:
     void showProtocolPreferences(const QString module_name);
-    void editProtocolPreference(struct preference *pref, struct pref_module *module);
+    void editProtocolPreference(pref_t *pref, struct pref_module *module);
 
 private slots:
     void on_buttonBox_helpRequested();
diff --git a/ui/qt/packet_list.h b/ui/qt/packet_list.h
index aa71453a95..6f6b4176ae 100644
--- a/ui/qt/packet_list.h
+++ b/ui/qt/packet_list.h
@@ -179,7 +179,7 @@ signals:
     void editColumn(int column);
     void packetListScrolled(bool at_end);
     void showProtocolPreferences(const QString module_name);
-    void editProtocolPreference(struct preference *pref, struct pref_module *module);
+    void editProtocolPreference(pref_t *pref, struct pref_module *module);
 
     void framesSelected(QList<int>);
     void fieldSelected(FieldInformation *);
diff --git a/ui/qt/proto_tree.h b/ui/qt/proto_tree.h
index bd27e84cbf..52a2acf19b 100644
--- a/ui/qt/proto_tree.h
+++ b/ui/qt/proto_tree.h
@@ -76,7 +76,7 @@ signals:
     void goToPacket(int);
     void relatedFrame(int, ft_framenum_type_t);
     void showProtocolPreferences(const QString module_name);
-    void editProtocolPreference(struct preference *pref, struct pref_module *module);
+    void editProtocolPreference(pref_t *pref, struct pref_module *module);
 
 public slots: