diff --git a/capinfos.c b/capinfos.c
index 5e5c9530dd..5a3e2b3f56 100644
--- a/capinfos.c
+++ b/capinfos.c
@@ -73,6 +73,8 @@
 #include <zlib.h>     /* to get the libz version number */
 #endif
 
+#include <wiretap/wtap.h>
+
 #include <wsutil/crash_info.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/privileges.h>
@@ -83,7 +85,6 @@
 #include <wsutil/plugins.h>
 #endif
 
-#include "wtap.h"
 #include <wsutil/report_err.h>
 #include <wsutil/str_util.h>
 #include <wsutil/file_util.h>
diff --git a/captype.c b/captype.c
index 13b5673f9c..02094b4615 100644
--- a/captype.c
+++ b/captype.c
@@ -42,6 +42,8 @@
 
 #include <glib.h>
 
+#include <wiretap/wtap.h>
+
 #include <wsutil/crash_info.h>
 #include <wsutil/file_util.h>
 #include <wsutil/filesystem.h>
@@ -53,7 +55,6 @@
 #include <wsutil/plugins.h>
 #endif
 
-#include "wtap.h"
 #include <wsutil/report_err.h>
 #include <wsutil/str_util.h>
 
diff --git a/caputils/airpcap_loader.c b/caputils/airpcap_loader.c
index 98e4699b83..0c77b626c3 100644
--- a/caputils/airpcap_loader.c
+++ b/caputils/airpcap_loader.c
@@ -28,9 +28,9 @@
 #include <glib.h>
 #include <gmodule.h>
 
-
-#include <wtap.h>
 #include <pcap.h>
+
+#include <wiretap/wtap.h>
 #endif
 
 #include <epan/crypt/airpdcap_ws.h>
diff --git a/editcap.c b/editcap.c
index fc38be24f6..7e3d3e3137 100644
--- a/editcap.c
+++ b/editcap.c
@@ -58,7 +58,7 @@
 #include <zlib.h>     /* to get the libz version number */
 #endif
 
-#include "wtap.h"
+#include <wiretap/wtap.h>
 
 #ifndef HAVE_GETOPT_LONG
 #include "wsutil/wsgetopt.h"
diff --git a/mergecap.c b/mergecap.c
index ef167d0587..5c27447c0c 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -39,7 +39,8 @@
 #endif
 
 #include <string.h>
-#include "wtap.h"
+
+#include <wiretap/wtap.h>
 
 #ifndef HAVE_GETOPT_LONG
 #include <wsutil/wsgetopt.h>
diff --git a/reordercap.c b/reordercap.c
index 76bd66d68a..b96b214b1a 100644
--- a/reordercap.c
+++ b/reordercap.c
@@ -36,7 +36,7 @@
 #include <zlib.h>      /* to get the libz version number */
 #endif
 
-#include "wtap.h"
+#include <wiretap/wtap.h>
 
 #ifndef HAVE_GETOPT_LONG
 #include "wsutil/wsgetopt.h"
diff --git a/ui/qt/compiled_filter_output.cpp b/ui/qt/compiled_filter_output.cpp
index 00c5179cb1..7ccdb86988 100644
--- a/ui/qt/compiled_filter_output.cpp
+++ b/ui/qt/compiled_filter_output.cpp
@@ -23,9 +23,10 @@
 #include <ui_compiled_filter_output.h>
 #include "compiled_filter_output.h"
 
-#include "capture_opts.h"
-#include "wtap.h"
 #include <pcap.h>
+
+#include "capture_opts.h"
+#include <wiretap/wtap.h>
 #include "ui/capture_globals.h"
 
 #include "wireshark_application.h"
diff --git a/ui/text_import.h b/ui/text_import.h
index 9a92576f8e..2fb8b608d9 100644
--- a/ui/text_import.h
+++ b/ui/text_import.h
@@ -30,7 +30,8 @@
 #define __TEXT_IMPORT_H__
 
 #include <glib.h>
-#include "wtap.h"
+
+#include <wiretap/wtap.h>
 
 #ifdef __cplusplus
 extern "C" {