Clean up more includes of wtap.h.

Change-Id: Ie53b64f7e5b39a50dffb62fc0b886da71e0a3bd2
Reviewed-on: https://code.wireshark.org/review/13066
Reviewed-by: Guy Harris <guy@alum.mit.edu>

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>

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>
 

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>

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"

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>

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"

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"

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" {