diff --git a/epan/dissectors/packet-btmesh.c b/epan/dissectors/packet-btmesh.c
index 7d79a1de78..b19da6b7d0 100644
--- a/epan/dissectors/packet-btmesh.c
+++ b/epan/dissectors/packet-btmesh.c
@@ -12,11 +12,11 @@
  *
  * Ref: Mesh Profile v1.0
  */
+#include "config.h"
 
 #include "packet-bluetooth.h"
 #include "packet-btatt.h"
 #include "packet-btmesh.h"
-#include "config.h"
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-cfdp.c b/epan/dissectors/packet-cfdp.c
index d9d44b466f..b21705fda6 100644
--- a/epan/dissectors/packet-cfdp.c
+++ b/epan/dissectors/packet-cfdp.c
@@ -13,10 +13,10 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
+#include "config.h"
 
 #include <stdio.h>
 
-#include "config.h"
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include "packet-dtn.h"
diff --git a/epan/dissectors/packet-noe.c b/epan/dissectors/packet-noe.c
index 2c9477f30b..02313780eb 100644
--- a/epan/dissectors/packet-noe.c
+++ b/epan/dissectors/packet-noe.c
@@ -9,11 +9,10 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
+#include "config.h"
 
 #include <stdlib.h>
 
-#include "config.h"
-
 #include "epan/packet.h"
 void proto_register_noe(void);
 void proto_reg_handoff_noe(void);
diff --git a/epan/wslua/wslua_capture_info.c b/epan/wslua/wslua_capture_info.c
index 7108c48bf2..c0a69ca876 100644
--- a/epan/wslua/wslua_capture_info.c
+++ b/epan/wslua/wslua_capture_info.c
@@ -12,6 +12,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
+#include "config.h"
 
 #include "wslua_file_common.h"
 
diff --git a/epan/wslua/wslua_column.c b/epan/wslua/wslua_column.c
index defefb6f5a..bbf8d23b61 100644
--- a/epan/wslua/wslua_column.c
+++ b/epan/wslua/wslua_column.c
@@ -14,6 +14,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
+#include "config.h"
 
 #include "wslua_pinfo_common.h"
 
diff --git a/epan/wslua/wslua_file.c b/epan/wslua/wslua_file.c
index f85d472a2f..8f6ed00e3d 100644
--- a/epan/wslua/wslua_file.c
+++ b/epan/wslua/wslua_file.c
@@ -12,6 +12,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
+#include "config.h"
 
 #include "wslua_file_common.h"
 
diff --git a/epan/wslua/wslua_file_common.c b/epan/wslua/wslua_file_common.c
index 2854a2de1b..ab0f2a65ec 100644
--- a/epan/wslua/wslua_file_common.c
+++ b/epan/wslua/wslua_file_common.c
@@ -24,6 +24,7 @@
  * two files opened at the same time for the same Lua script (due to reload
  * and other such events), the script can't just have one file state.
  */
+#include "config.h"
 
 #include "wslua_file_common.h"
 
diff --git a/epan/wslua/wslua_file_common.h b/epan/wslua/wslua_file_common.h
index 30b85a719a..936fc518d3 100644
--- a/epan/wslua/wslua_file_common.h
+++ b/epan/wslua/wslua_file_common.h
@@ -16,8 +16,6 @@
 
 /* See wslua_file_common.c for details */
 
-#include "config.h"
-
 #include "wslua.h"
 #include <wiretap/wtap_opttypes.h>
 #include <wiretap/wtap-int.h>
diff --git a/epan/wslua/wslua_file_handler.c b/epan/wslua/wslua_file_handler.c
index 9507d004a4..0e2b8f6e82 100644
--- a/epan/wslua/wslua_file_handler.c
+++ b/epan/wslua/wslua_file_handler.c
@@ -12,6 +12,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
+#include "config.h"
 
 #include "wslua_file_common.h"
 
diff --git a/epan/wslua/wslua_frame_info.c b/epan/wslua/wslua_frame_info.c
index b67abf5710..8f8824311e 100644
--- a/epan/wslua/wslua_frame_info.c
+++ b/epan/wslua/wslua_frame_info.c
@@ -12,6 +12,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
+#include "config.h"
 
 #include "wslua_file_common.h"
 #include <lua.h>
diff --git a/epan/wslua/wslua_pinfo.c b/epan/wslua/wslua_pinfo.c
index 22ba30746e..bb3b99a2dc 100644
--- a/epan/wslua/wslua_pinfo.c
+++ b/epan/wslua/wslua_pinfo.c
@@ -13,6 +13,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
+#include "config.h"
 
 #include "wslua_pinfo_common.h"
 
diff --git a/epan/wslua/wslua_pinfo_common.h b/epan/wslua/wslua_pinfo_common.h
index 7421c73dc3..4d3392f512 100644
--- a/epan/wslua/wslua_pinfo_common.h
+++ b/epan/wslua/wslua_pinfo_common.h
@@ -15,7 +15,6 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
-#include "config.h"
 
 #include "wslua.h"
 
diff --git a/extcap.h b/extcap.h
index 8f05d0c661..54752e8b74 100644
--- a/extcap.h
+++ b/extcap.h
@@ -12,7 +12,6 @@
 #ifndef __EXTCAP_H__
 #define __EXTCAP_H__
 
-#include <config.h>
 
 #include <glib.h>
 
diff --git a/extcap/etw_message.c b/extcap/etw_message.c
index 97cc608f27..0a5a983b0e 100644
--- a/extcap/etw_message.c
+++ b/extcap/etw_message.c
@@ -8,6 +8,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
+#include "config.h"
 
 #include "etw_message.h"
 #include <wsutil/wslog.h>
diff --git a/extcap/etw_message.h b/extcap/etw_message.h
index b88e320233..87bfaa8027 100644
--- a/extcap/etw_message.h
+++ b/extcap/etw_message.h
@@ -13,7 +13,6 @@
 #define __W_ETW_MESSAGE_H__
 
 #include <glib.h>
-#include "config.h"
 
 #include <windows.h>
 #include <SDKDDKVer.h>
diff --git a/extcap/extcap-base.h b/extcap/extcap-base.h
index 5d3548fe06..bb7911ca38 100644
--- a/extcap/extcap-base.h
+++ b/extcap/extcap-base.h
@@ -12,7 +12,6 @@
 #ifndef __EXTCAP_BASE_H__
 #define __EXTCAP_BASE_H__
 
-#include "config.h"
 
 #include <glib.h>
 #include <glib/gprintf.h>
diff --git a/extcap_parser.h b/extcap_parser.h
index f188ae0ce5..e83553361f 100644
--- a/extcap_parser.h
+++ b/extcap_parser.h
@@ -14,7 +14,6 @@
 #include <glib.h>
 #include <string.h>
 
-#include <config.h>
 #include "ui/iface_toolbar.h"
 
 typedef enum {
diff --git a/plugins/epan/mate/mate.h b/plugins/epan/mate/mate.h
index fe2644db3b..0a8786005f 100644
--- a/plugins/epan/mate/mate.h
+++ b/plugins/epan/mate/mate.h
@@ -14,7 +14,6 @@
 #ifndef __MATE_H_
 #define __MATE_H_
 
-#include "config.h"
 #define WS_LOG_DOMAIN "MATE"
 
 #include <gmodule.h>
diff --git a/plugins/epan/mate/mate_runtime.c b/plugins/epan/mate/mate_runtime.c
index cb19da6e56..41d9c0de35 100644
--- a/plugins/epan/mate/mate_runtime.c
+++ b/plugins/epan/mate/mate_runtime.c
@@ -10,6 +10,8 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
+#include "config.h"
+
 #include "mate.h"
 #include <wsutil/ws_assert.h>
 
diff --git a/plugins/epan/mate/mate_setup.c b/plugins/epan/mate/mate_setup.c
index a49181e6ef..727b536bd7 100644
--- a/plugins/epan/mate/mate_setup.c
+++ b/plugins/epan/mate/mate_setup.c
@@ -10,6 +10,8 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
+#include "config.h"
+
 #include "mate.h"
 
 /* appends the formatted string to the current error log */
diff --git a/plugins/epan/mate/mate_util.c b/plugins/epan/mate/mate_util.c
index 30749b2fe7..6bc6f63f5d 100644
--- a/plugins/epan/mate/mate_util.c
+++ b/plugins/epan/mate/mate_util.c
@@ -11,6 +11,8 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
+#include "config.h"
+
 #include "mate.h"
 #include "mate_util.h"
 #include <wsutil/file_util.h>
diff --git a/plugins/epan/mate/packet-mate.c b/plugins/epan/mate/packet-mate.c
index ddce236600..97774cd1a9 100644
--- a/plugins/epan/mate/packet-mate.c
+++ b/plugins/epan/mate/packet-mate.c
@@ -16,6 +16,8 @@
  * It is intended for this to be just the user interface to the module. ***
  **************************************************************************/
 
+#include "config.h"
+
 #include "mate.h"
 #include <epan/expert.h>
 
diff --git a/plugins/epan/transum/decoders.h b/plugins/epan/transum/decoders.h
index 7d9da9cd30..6d95d20794 100644
--- a/plugins/epan/transum/decoders.h
+++ b/plugins/epan/transum/decoders.h
@@ -9,7 +9,6 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
-#include "config.h"
 
 int decode_syn(packet_info *pinfo, proto_tree *tree, PKT_INFO* pkt_info);
 int decode_dcerpc(packet_info *pinfo, proto_tree *tree, PKT_INFO* pkt_info);
diff --git a/plugins/epan/transum/extractors.h b/plugins/epan/transum/extractors.h
index e27509848d..5bf575792f 100644
--- a/plugins/epan/transum/extractors.h
+++ b/plugins/epan/transum/extractors.h
@@ -9,7 +9,6 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
-#include "config.h"
 #include <epan/prefs.h>
 #include <epan/packet.h>
 
diff --git a/plugins/epan/transum/preferences.h b/plugins/epan/transum/preferences.h
index 06ced7aedf..96eea06a18 100644
--- a/plugins/epan/transum/preferences.h
+++ b/plugins/epan/transum/preferences.h
@@ -9,7 +9,6 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
-#include "config.h"
 #include <epan/packet.h>
 #include <epan/prefs.h>
 
diff --git a/ui/iface_toolbar.h b/ui/iface_toolbar.h
index 3fd2613c70..6a48f97327 100644
--- a/ui/iface_toolbar.h
+++ b/ui/iface_toolbar.h
@@ -10,7 +10,6 @@
 #ifndef __IFACE_TOOLBAR_H__
 #define __IFACE_TOOLBAR_H__
 
-#include "config.h"
 
 #ifdef __cplusplus
 extern "C" {