Remove unnecessary includes from wiretap folder

Change-Id: I10d3057801673bc1c8ea78f144215869cc4b1851
Reviewed-on: https://code.wireshark.org/review/6217
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>

wiretap/5views.c

@@ -21,11 +21,9 @@
 #include "config.h"
 #include <errno.h>
 #include <string.h>
-#include <time.h>
 
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include <wsutil/buffer.h>
 #include "5views.h"
 
 

wiretap/aethra.c

@@ -23,7 +23,6 @@
 #include <string.h>
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include <wsutil/buffer.h>
 #include "aethra.h"
 
 /* Magic number in Aethra PC108 files. */

wiretap/ascendtext.c

@@ -20,11 +20,9 @@
 
 #include "config.h"
 #include "wtap-int.h"
-#include <wsutil/buffer.h>
 #include "ascendtext.h"
 #include "ascend-int.h"
 #include "file_wrappers.h"
-#include <wsutil/file_util.h>
 
 #include <errno.h>
 

wiretap/btsnoop.c

@@ -23,8 +23,6 @@
 #include <string.h>
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include <wsutil/buffer.h>
-#include "atm.h"
 #include "btsnoop.h"
 
 /*

wiretap/camins.c

@@ -60,11 +60,8 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib.h>
-#include <wtap.h>
 #include <wtap-int.h>
 #include <file_wrappers.h>
-#include <wsutil/buffer.h>
 
 #include "camins.h"
 

wiretap/capsa.c

@@ -23,7 +23,6 @@
 #include <string.h>
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include <wsutil/buffer.h>
 #include "capsa.h"
 
 /*

wiretap/catapult_dct2000.c

@@ -25,7 +25,6 @@
 
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include <wsutil/buffer.h>
 
 #include "catapult_dct2000.h"
 

wiretap/commview.c

@@ -30,15 +30,11 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
 
-#include "wtap.h"
 #include "wtap-int.h"
-#include <wsutil/buffer.h>
 #include "file_wrappers.h"
 #include "commview.h"
 

wiretap/cosine.c

@@ -23,11 +23,9 @@
 
 #include "config.h"
 #include "wtap-int.h"
-#include <wsutil/buffer.h>
 #include "cosine.h"
 #include "file_wrappers.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

wiretap/csids.c

@@ -20,11 +20,9 @@
 
 #include "config.h"
 #include "wtap-int.h"
-#include <wsutil/buffer.h>
 #include "csids.h"
 #include "file_wrappers.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

wiretap/daintree-sna.c

@@ -46,15 +46,11 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
 
-#include "wtap.h"
 #include "wtap-int.h"
-#include <wsutil/buffer.h>
 #include "file_wrappers.h"
 #include "daintree-sna.h"
 

wiretap/dbs-etherwatch.c

@@ -20,11 +20,9 @@
 
 #include "config.h"
 #include "wtap-int.h"
-#include <wsutil/buffer.h>
 #include "dbs-etherwatch.h"
 #include "file_wrappers.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

wiretap/dct3trace.c

@@ -26,11 +26,9 @@
 
 #include "config.h"
 #include "wtap-int.h"
-#include <wsutil/buffer.h>
 #include "dct3trace.h"
 #include "file_wrappers.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

wiretap/erf.c

@@ -52,9 +52,7 @@
 
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include <wsutil/buffer.h>
 #include "pcap-encap.h"
-#include "atm.h"
 #include "erf.h"
 
 static gboolean erf_read_header(FILE_T fh,

wiretap/eyesdn.c

@@ -20,11 +20,9 @@
 
 #include "config.h"
 #include "wtap-int.h"
-#include <wsutil/buffer.h>
 #include "eyesdn.h"
 #include "file_wrappers.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>

wiretap/file_access.c

@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 

wiretap/hcidump.c

@@ -21,7 +21,6 @@
 
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include <wsutil/buffer.h>
 #include "hcidump.h"
 
 struct dump_hdr {

wiretap/i4btrace.c

@@ -25,7 +25,6 @@
 #include <string.h>
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include <wsutil/buffer.h>
 #include "i4b_trace.h"
 #include "i4btrace.h"
 

wiretap/ipfix.c

@@ -65,10 +65,6 @@
 #include <errno.h>
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include <wsutil/buffer.h>
-#include "libpcap.h"
-#include "pcap-common.h"
-#include "pcap-encap.h"
 #include "ipfix.h"
 
 #if 0

wiretap/iptrace.c

@@ -24,7 +24,6 @@
 #include <string.h>
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include <wsutil/buffer.h>
 #include "atm.h"
 #include "iptrace.h"
 

wiretap/iseries.c

@@ -150,11 +150,9 @@ Number  S/R  Length    Timer                        MAC Address   MAC Address
 
 #include "config.h"
 #include "wtap-int.h"
-#include <wsutil/buffer.h>
 #include "iseries.h"
 #include "file_wrappers.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>

wiretap/k12.c

@@ -29,9 +29,7 @@
 #include <errno.h>
 
 #include "wtap-int.h"
-#include "wtap.h"
 #include "file_wrappers.h"
-#include <wsutil/buffer.h>
 #include "k12.h"
 
 #include <wsutil/str_util.h>

wiretap/lanalyzer.c

@@ -23,7 +23,6 @@
 #include <errno.h>
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include <wsutil/buffer.h>
 #include "lanalyzer.h"
 
 /* The LANalyzer format is documented (at least in part) in Novell document

wiretap/libpcap.c

@@ -25,7 +25,6 @@
 #include <errno.h>
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include <wsutil/buffer.h>
 #include "pcap-common.h"
 #include "pcap-encap.h"
 #include "libpcap.h"

wiretap/logcat.c

@@ -20,11 +20,9 @@
 #include "config.h"
 
 #include <string.h>
-#include <time.h>
 
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include <wsutil/buffer.h>
 
 #include "logcat.h"
 

wiretap/logcat_text.c

@@ -21,11 +21,9 @@
 #include "config.h"
 
 #include <string.h>
-#include <time.h>
 
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include "wsutil/buffer.h"
 
 #include "logcat_text.h"
 #include "logcat.h"

wiretap/merge.c

@@ -26,9 +26,7 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <stdlib.h>
-#include <glib.h>
 #include <errno.h>
 
 #ifdef HAVE_UNISTD_H

wiretap/netmon.c

@@ -23,7 +23,6 @@
 #include <string.h>
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include <wsutil/buffer.h>
 #include "atm.h"
 #include "pcap-encap.h"
 #include "netmon.h"

wiretap/netscaler.c

@@ -23,7 +23,6 @@
 #include <string.h>
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include <wsutil/buffer.h>
 #include "netscaler.h"
 
 /* Defines imported from netscaler code: nsperfrc.h */

wiretap/netscreen.c

@@ -24,11 +24,9 @@
 
 #include "config.h"
 #include "wtap-int.h"
-#include <wsutil/buffer.h>
 #include "netscreen.h"
 #include "file_wrappers.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

wiretap/nettl.c

@@ -28,7 +28,6 @@
 #include <string.h>
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include <wsutil/buffer.h>
 #include "nettl.h"
 
 /* HP nettl file header */

wiretap/network_instruments.c

@@ -22,7 +22,6 @@
 #include <string.h>
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include <wsutil/buffer.h>
 #include "network_instruments.h"
 
 static const char network_instruments_magic[] = {"ObserverPktBufferVersion=15.00"};

wiretap/netxray.c

@@ -25,7 +25,6 @@
 #include "wtap-int.h"
 #include "file_wrappers.h"
 #include "netxray.h"
-#include <wsutil/buffer.h>
 #include "atm.h"
 
 /* Capture file header, *including* magic number, is padded to 128 bytes. */

wiretap/ngsniffer.c

@@ -58,8 +58,6 @@
 #include <string.h>
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include <wsutil/buffer.h>
-#include "atm.h"
 #include "ngsniffer.h"
 
 /* Magic number in Sniffer files. */

wiretap/packetlogger.c

@@ -27,15 +27,11 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
 
-#include "wtap.h"
 #include "wtap-int.h"
-#include <wsutil/buffer.h>
 #include "file_wrappers.h"
 #include "packetlogger.h"
 

wiretap/pcapng.c

@@ -37,8 +37,6 @@
 #include "wtap-int.h"
 #include <epan/addr_resolv.h>
 #include "file_wrappers.h"
-#include <wsutil/buffer.h>
-#include "libpcap.h"
 #include "pcap-common.h"
 #include "pcap-encap.h"
 #include "pcapng.h"

wiretap/peekclassic.c

@@ -38,7 +38,6 @@
 #include <string.h>
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include <wsutil/buffer.h>
 #include "peekclassic.h"
 /* CREDITS
  *

wiretap/peektagged.c

@@ -36,7 +36,6 @@
 #include <stdlib.h>
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include <wsutil/buffer.h>
 #include "peektagged.h"
 
 /* CREDITS

wiretap/pppdump.c

@@ -19,12 +19,9 @@
 
 #include "config.h"
 #include "wtap-int.h"
-#include <wsutil/buffer.h>
 #include "pppdump.h"
 #include "file_wrappers.h"
 
-#include <glib.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>

wiretap/radcom.c

@@ -24,7 +24,6 @@
 #include <string.h>
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include <wsutil/buffer.h>
 #include "radcom.h"
 
 struct frame_date {

wiretap/snoop.c

@@ -23,7 +23,6 @@
 #include <string.h>
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include <wsutil/buffer.h>
 #include "atm.h"
 #include "snoop.h"
 /* See RFC 1761 for a description of the "snoop" file format. */

wiretap/stanag4607.c

@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <errno.h>
 
 #ifdef HAVE_SYS_STAT_H

wiretap/toshiba.c

@@ -20,11 +20,9 @@
 
 #include "config.h"
 #include "wtap-int.h"
-#include <wsutil/buffer.h>
 #include "toshiba.h"
 #include "file_wrappers.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

wiretap/visual.c

@@ -25,7 +25,6 @@
 #include <string.h>
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include <wsutil/buffer.h>
 #include "visual.h"
 
 /*

wiretap/vms.c

@@ -27,11 +27,9 @@
  */
 #include "config.h"
 #include "wtap-int.h"
-#include <wsutil/buffer.h>
 #include "vms.h"
 #include "file_wrappers.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

wiretap/vwr.c

@@ -26,7 +26,6 @@
 
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include <wsutil/buffer.h>
 #include "vwr.h"