aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/5views.h2
-rw-r--r--wiretap/airopeek9.h1
-rw-r--r--wiretap/ascend-int.h6
-rw-r--r--wiretap/ascendtext.h1
-rw-r--r--wiretap/atm.h1
-rw-r--r--wiretap/ber.h1
-rw-r--r--wiretap/btsnoop.h1
-rw-r--r--wiretap/buffer.h1
-rw-r--r--wiretap/catapult_dct2000.h7
-rw-r--r--wiretap/commview.h1
-rw-r--r--wiretap/cosine.h2
-rw-r--r--wiretap/csids.h2
-rw-r--r--wiretap/daintree-sna.h2
-rw-r--r--wiretap/dbs-etherwatch.h2
-rw-r--r--wiretap/dct3trace.h2
-rw-r--r--wiretap/erf.h3
-rw-r--r--wiretap/etherpeek.h3
-rw-r--r--wiretap/eyesdn.h3
-rw-r--r--wiretap/file_wrappers.h4
-rw-r--r--wiretap/hcidump.h3
-rw-r--r--wiretap/i4b_trace.h2
-rw-r--r--wiretap/i4btrace.h3
-rw-r--r--wiretap/ipfix.h3
-rw-r--r--wiretap/iptrace.h3
-rw-r--r--wiretap/iseries.h3
-rw-r--r--wiretap/jpeg_jfif.h3
-rw-r--r--wiretap/k12.h9
-rw-r--r--wiretap/lanalyzer.h3
-rw-r--r--wiretap/libpcap.h3
-rw-r--r--wiretap/mpeg.h3
-rw-r--r--wiretap/netmon.h3
-rw-r--r--wiretap/netscaler.h3
-rw-r--r--wiretap/netscreen.h3
-rw-r--r--wiretap/nettl.h3
-rw-r--r--wiretap/network_instruments.h3
-rw-r--r--wiretap/netxray.h3
-rw-r--r--wiretap/ngsniffer.h3
-rw-r--r--wiretap/packetlogger.h3
-rw-r--r--wiretap/pcap-common.h8
-rw-r--r--wiretap/pcap-encap.h8
-rw-r--r--wiretap/pcapng.h3
-rw-r--r--wiretap/pppdump.h3
-rw-r--r--wiretap/radcom.h3
-rw-r--r--wiretap/snoop.h3
-rw-r--r--wiretap/tnef.h3
-rw-r--r--wiretap/toshiba.h3
-rw-r--r--wiretap/visual.h3
-rw-r--r--wiretap/vms.h3
-rw-r--r--wiretap/wtap-int.h2
-rw-r--r--wiretap/wtap.h2
50 files changed, 147 insertions, 4 deletions
diff --git a/wiretap/5views.h b/wiretap/5views.h
index f51aa30e0a..860092e9c6 100644
--- a/wiretap/5views.h
+++ b/wiretap/5views.h
@@ -22,6 +22,8 @@
#ifndef __5VIEWS_H__
#define __5VIEWS_H__
+#include <glib.h>
+#include <wtap.h>
int _5views_open(wtap *wth, int *err, gchar **err_info);
gboolean _5views_dump_open(wtap_dumper *wdh, int *err);
diff --git a/wiretap/airopeek9.h b/wiretap/airopeek9.h
index 7726537d03..332a494295 100644
--- a/wiretap/airopeek9.h
+++ b/wiretap/airopeek9.h
@@ -23,6 +23,7 @@
#ifndef __W_AIROPEEK9_H__
#define __W_AIROPEEK9_H__
+#include <glib.h>
int airopeek9_open(wtap *wth, int *err, gchar **err_info);
diff --git a/wiretap/ascend-int.h b/wiretap/ascend-int.h
index f4a3509c8a..b323e905e2 100644
--- a/wiretap/ascend-int.h
+++ b/wiretap/ascend-int.h
@@ -26,6 +26,12 @@
#ifndef __ASCEND_INT_H__
#define __ASCEND_INT_H__
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+#include <glib.h>
+
typedef struct {
time_t start_time;
time_t secs;
diff --git a/wiretap/ascendtext.h b/wiretap/ascendtext.h
index f2bcd7fb43..8957e4e4e3 100644
--- a/wiretap/ascendtext.h
+++ b/wiretap/ascendtext.h
@@ -23,6 +23,7 @@
#ifndef __ASCENDTEXT_H__
#define __ASCENDTEXT_H__
+#include <glib.h>
#define ASCEND_MAX_DATA_ROWS 8
#define ASCEND_MAX_DATA_COLS 16
diff --git a/wiretap/atm.h b/wiretap/atm.h
index a74eb4245a..95f0706355 100644
--- a/wiretap/atm.h
+++ b/wiretap/atm.h
@@ -22,6 +22,7 @@
#ifndef __ATM_H__
#define __ATM_H__
+#include <glib.h>
/*
* Routines to use with ATM capture file types that don't include information
diff --git a/wiretap/ber.h b/wiretap/ber.h
index 3863ad4105..f9c58dd256 100644
--- a/wiretap/ber.h
+++ b/wiretap/ber.h
@@ -22,6 +22,7 @@
#ifndef __BER_H__
#define __BER_H__
+#include <glib.h>
int ber_open(wtap *wth, int *err, gchar **err_info);
diff --git a/wiretap/btsnoop.h b/wiretap/btsnoop.h
index e141d42486..622632fc7e 100644
--- a/wiretap/btsnoop.h
+++ b/wiretap/btsnoop.h
@@ -22,6 +22,7 @@
#ifndef __W_BTSNOOP_H__
#define __W_BTSNOOP_H__
+#include <glib.h>
int btsnoop_open(wtap *wth, int *err, gchar **err_info);
gboolean btsnoop_dump_open_h1(wtap_dumper *wdh, int *err);
diff --git a/wiretap/buffer.h b/wiretap/buffer.h
index 364088c881..77c4f836ad 100644
--- a/wiretap/buffer.h
+++ b/wiretap/buffer.h
@@ -23,6 +23,7 @@
#ifndef __W_BUFFER_H__
#define __W_BUFFER_H__
+#include <glib.h>
#define SOME_FUNCTIONS_ARE_DEFINES
diff --git a/wiretap/catapult_dct2000.h b/wiretap/catapult_dct2000.h
index 4b8773a69a..2fda9f48a7 100644
--- a/wiretap/catapult_dct2000.h
+++ b/wiretap/catapult_dct2000.h
@@ -20,6 +20,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __W_CAT_DCT2K_H__
+#define __W_CAT_DCT2K_H__
+
+#include <glib.h>
int catapult_dct2000_open(wtap *wth, int *err, gchar **err_info);
gboolean catapult_dct2000_dump_open(wtap_dumper *wdh, int *err);
int catapult_dct2000_dump_can_write_encap(int encap);
@@ -28,3 +32,6 @@ int catapult_dct2000_dump_can_write_encap(int encap);
#define DCT2000_ENCAP_SSCOP 101
#define DCT2000_ENCAP_MTP2 102
#define DCT2000_ENCAP_NBAP 103
+
+#endif
+
diff --git a/wiretap/commview.h b/wiretap/commview.h
index f7220de250..b0b7a80333 100644
--- a/wiretap/commview.h
+++ b/wiretap/commview.h
@@ -24,6 +24,7 @@
#ifndef __COMMVIEW_H__
#define __COMMVIEW_H__
+#include <glib.h>
int commview_open(wtap *wth, int *err, gchar **err_info _U_);
int commview_dump_can_write_encap(int encap);
diff --git a/wiretap/cosine.h b/wiretap/cosine.h
index 877ebccae9..b8d2012a6e 100644
--- a/wiretap/cosine.h
+++ b/wiretap/cosine.h
@@ -26,6 +26,8 @@
#ifndef __W_COSINE_H__
#define __W_COSINE_H__
+#include <glib.h>
+#include <wtap.h>
int cosine_open(wtap *wth, int *err, gchar **err_info);
diff --git a/wiretap/csids.h b/wiretap/csids.h
index ddd7cf9e60..3b7e5a9de9 100644
--- a/wiretap/csids.h
+++ b/wiretap/csids.h
@@ -23,6 +23,8 @@
#ifndef __CSIDS_H__
#define __CSIDS_H__
+#include <glib.h>
+#include <wtap.h>
int csids_open(wtap *wth, int *err, gchar **err_info);
diff --git a/wiretap/daintree-sna.h b/wiretap/daintree-sna.h
index 3a7b0f33c9..d47384a9e6 100644
--- a/wiretap/daintree-sna.h
+++ b/wiretap/daintree-sna.h
@@ -25,6 +25,8 @@
#ifndef __DAINTREE_SNA_H__
#define __DAINTREE_SNA_H__
+#include <glib.h>
+#include <wtap.h>
int daintree_sna_open(wtap *wth, int *err, gchar **err_info _U_);
diff --git a/wiretap/dbs-etherwatch.h b/wiretap/dbs-etherwatch.h
index ba122efd87..bb59258d23 100644
--- a/wiretap/dbs-etherwatch.h
+++ b/wiretap/dbs-etherwatch.h
@@ -23,6 +23,8 @@
#ifndef __W_DBS_ETHERWATCH_H__
#define __W_DBS_ETHERWATCH_H__
+#include <glib.h>
+#include <wtap.h>
int dbs_etherwatch_open(wtap *wth, int *err, gchar **err_info);
diff --git a/wiretap/dct3trace.h b/wiretap/dct3trace.h
index 184d00394e..ca9cd35a19 100644
--- a/wiretap/dct3trace.h
+++ b/wiretap/dct3trace.h
@@ -22,6 +22,8 @@
#ifndef __W_DCT3TRACE_H__
#define __W_DCT3TRACE_H__
+#include <glib.h>
+#include <wtap.h>
int dct3trace_open(wtap *wth, int *err, gchar **err_info);
diff --git a/wiretap/erf.h b/wiretap/erf.h
index 39e353b1a5..4b31e2a65f 100644
--- a/wiretap/erf.h
+++ b/wiretap/erf.h
@@ -38,6 +38,9 @@
#ifndef __W_ERF_H__
#define __W_ERF_H__
+#include <glib.h>
+#include <wiretap/wtap.h>
+
/* Record type defines */
#define ERF_TYPE_LEGACY 0
#define ERF_TYPE_HDLC_POS 1
diff --git a/wiretap/etherpeek.h b/wiretap/etherpeek.h
index 02cf750df2..86768d370f 100644
--- a/wiretap/etherpeek.h
+++ b/wiretap/etherpeek.h
@@ -24,6 +24,9 @@
#ifndef __W_ETHERPEEK_H__
#define __W_ETHERPEEK_H__
+#include <glib.h>
+#include <wtap.h>
+
int etherpeek_open(wtap *wth, int *err, gchar **err_info);
#endif
diff --git a/wiretap/eyesdn.h b/wiretap/eyesdn.h
index 3f64e947cb..1052c9e0eb 100644
--- a/wiretap/eyesdn.h
+++ b/wiretap/eyesdn.h
@@ -24,6 +24,9 @@
#ifndef __W_EYESDN_H__
#define __W_EYESDN_H__
+#include <glib.h>
+#include <wtap.h>
+
int eyesdn_open(wtap *wth, int *err, gchar **err_info);
enum EyeSDN_TYPES {
diff --git a/wiretap/file_wrappers.h b/wiretap/file_wrappers.h
index cf223f4332..5ae970ef6b 100644
--- a/wiretap/file_wrappers.h
+++ b/wiretap/file_wrappers.h
@@ -23,6 +23,10 @@
#ifndef __FILE_H__
#define __FILE_H__
+#include <glib.h>
+#include <wtap.h>
+#include <wsutil/file_util.h>
+
extern gint64 file_seek(FILE_T stream, gint64 offset, int whence, int *err);
extern gint64 file_tell(FILE_T stream);
extern gint64 file_tell_raw(FILE_T stream);
diff --git a/wiretap/hcidump.h b/wiretap/hcidump.h
index fa187cba1a..978495402e 100644
--- a/wiretap/hcidump.h
+++ b/wiretap/hcidump.h
@@ -23,6 +23,9 @@
#ifndef __HCIDUMP_H__
#define __HCIDUMP_H__
+#include <glib.h>
+#include <wtap.h>
+
int hcidump_open(wtap *wth, int *err, gchar **err_info);
#endif
diff --git a/wiretap/i4b_trace.h b/wiretap/i4b_trace.h
index 2cd4e1b0d2..0281b82a10 100644
--- a/wiretap/i4b_trace.h
+++ b/wiretap/i4b_trace.h
@@ -36,6 +36,8 @@
#ifndef _I4B_TRACE_H_
#define _I4B_TRACE_H_
+#include <glib.h>
+
/*---------------------------------------------------------------------------*
* structure of the header at the beginning of every trace mbuf
*---------------------------------------------------------------------------*/
diff --git a/wiretap/i4btrace.h b/wiretap/i4btrace.h
index 6bbc32eeb5..4143a06f57 100644
--- a/wiretap/i4btrace.h
+++ b/wiretap/i4btrace.h
@@ -24,6 +24,9 @@
#ifndef __I4BTRACE_H__
#define __I4BTRACE_H__
+#include <glib.h>
+#include <wtap.h>
+
int i4btrace_open(wtap *wth, int *err, gchar **err_info);
#endif
diff --git a/wiretap/ipfix.h b/wiretap/ipfix.h
index 681a0d451f..022b010a17 100644
--- a/wiretap/ipfix.h
+++ b/wiretap/ipfix.h
@@ -23,6 +23,9 @@
#ifndef __W_IPFIX_H__
#define __W_IPFIX_H__
+#include <glib.h>
+#include <wtap.h>
+
int ipfix_open(wtap *wth, int *err, gchar **err_info);
#endif
diff --git a/wiretap/iptrace.h b/wiretap/iptrace.h
index 519917edd3..11895fc515 100644
--- a/wiretap/iptrace.h
+++ b/wiretap/iptrace.h
@@ -24,6 +24,9 @@
#ifndef __IPTRACE_H__
#define __IPTRACE_H__
+#include <glib.h>
+#include <wtap.h>
+
int iptrace_open(wtap *wth, int *err, gchar **err_info);
#endif
diff --git a/wiretap/iseries.h b/wiretap/iseries.h
index f469e52cec..9ee07c6ed6 100644
--- a/wiretap/iseries.h
+++ b/wiretap/iseries.h
@@ -23,6 +23,9 @@
#ifndef __W_ISERIES_H__
#define __W_ISERIES_H__
+#include <glib.h>
+#include <wtap.h>
+
int iseries_open(wtap *wth, int *err, gchar **err_info);
#endif
diff --git a/wiretap/jpeg_jfif.h b/wiretap/jpeg_jfif.h
index aeaca497e6..ebb9ccb996 100644
--- a/wiretap/jpeg_jfif.h
+++ b/wiretap/jpeg_jfif.h
@@ -25,7 +25,8 @@
#ifndef __W_JPEG_JFIF_H__
#define __W_JPEG_JFIF_H__
-#include "wtap-int.h"
+#include <glib.h>
+#include <wtap.h>
int jpeg_jfif_open(wtap *wth, int *err, gchar **err_info);
diff --git a/wiretap/k12.h b/wiretap/k12.h
index 29bb716328..65ee238acf 100644
--- a/wiretap/k12.h
+++ b/wiretap/k12.h
@@ -20,9 +20,18 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __W_K12_H__
+#define __W_K12_H__
+
+#include <glib.h>
+#include <wtap.h>
+
int k12_open(wtap *wth, int *err, gchar **err_info);
int k12_dump_can_write_encap(int encap);
gboolean k12_dump_open(wtap_dumper *wdh, int *err);
int k12text_open(wtap *wth, int *err, gchar **err_info _U_);
int k12text_dump_can_write_encap(int encap);
gboolean k12text_dump_open(wtap_dumper *wdh, int *err);
+
+#endif
+
diff --git a/wiretap/lanalyzer.h b/wiretap/lanalyzer.h
index 6c54a0c024..b65d3f7afc 100644
--- a/wiretap/lanalyzer.h
+++ b/wiretap/lanalyzer.h
@@ -24,6 +24,9 @@
#ifndef __LANALYZER_H__
#define __LANALYZER_H__
+#include <glib.h>
+#include <wtap.h>
+
/* Record type codes: */
#define RT_HeaderRegular 0x1001
diff --git a/wiretap/libpcap.h b/wiretap/libpcap.h
index 69be8cb2c7..dca1b08581 100644
--- a/wiretap/libpcap.h
+++ b/wiretap/libpcap.h
@@ -23,6 +23,9 @@
#ifndef __W_LIBPCAP_H__
#define __W_LIBPCAP_H__
+#include <glib.h>
+#include <wtap.h>
+
/* Magic numbers in "libpcap" files.
"libpcap" file records are written in the byte order of the host that
diff --git a/wiretap/mpeg.h b/wiretap/mpeg.h
index 7322a2186d..09aa385c73 100644
--- a/wiretap/mpeg.h
+++ b/wiretap/mpeg.h
@@ -25,7 +25,8 @@
#ifndef __W_MPEG_H__
#define __W_MPEG_H__
-#include "wtap-int.h"
+#include <glib.h>
+#include <wtap.h>
int mpeg_open(wtap *wth, int *err, gchar **err_info);
diff --git a/wiretap/netmon.h b/wiretap/netmon.h
index 599a4e2fd2..935740a298 100644
--- a/wiretap/netmon.h
+++ b/wiretap/netmon.h
@@ -23,6 +23,9 @@
#ifndef __NETMON_H__
#define __NETMON_H__
+#include <glib.h>
+#include <wtap.h>
+
int netmon_open(wtap *wth, int *err, gchar **err_info);
gboolean netmon_dump_open(wtap_dumper *wdh, int *err);
int netmon_dump_can_write_encap(int encap);
diff --git a/wiretap/netscaler.h b/wiretap/netscaler.h
index 0b40fac305..bc32869cad 100644
--- a/wiretap/netscaler.h
+++ b/wiretap/netscaler.h
@@ -23,6 +23,9 @@
#ifndef _NETSCALER_H
#define _NETSCALER_H
+#include <glib.h>
+#include <wiretap/wtap.h>
+
/* Physical Device full packet trace */
#define NSPR_PDPKTRACEFULLTX_V10 0x0310 /* Transmitted */
#define NSPR_PDPKTRACEFULLTX_V20 0xC0 /* Transmitted */
diff --git a/wiretap/netscreen.h b/wiretap/netscreen.h
index 9b614f8a53..431f3ddc05 100644
--- a/wiretap/netscreen.h
+++ b/wiretap/netscreen.h
@@ -28,6 +28,9 @@
#ifndef __W_NETSCREEN_H__
#define __W_NETSCREEN_H__
+#include <glib.h>
+#include <wtap.h>
+
/* Magic text to check for NetScreen snoop output */
#define NETSCREEN_HDR_MAGIC_STR1 "(i) len="
#define NETSCREEN_HDR_MAGIC_STR2 "(o) len="
diff --git a/wiretap/nettl.h b/wiretap/nettl.h
index 6fca41f44b..3e5227a91d 100644
--- a/wiretap/nettl.h
+++ b/wiretap/nettl.h
@@ -26,6 +26,9 @@
#ifndef __NETTL_H__
#define __NETTL_H__
+#include <glib.h>
+#include <wiretap/wtap.h>
+
/* nettl subsystems are defined in /etc/nettlgen.conf */
#define NETTL_SUBSYS_NS_LS_LOGGING 0
diff --git a/wiretap/network_instruments.h b/wiretap/network_instruments.h
index 8cab14ae37..5a06f1b11c 100644
--- a/wiretap/network_instruments.h
+++ b/wiretap/network_instruments.h
@@ -22,6 +22,9 @@
#ifndef __NETWORK_INSTRUMENTS_H__
#define __NETWORK_INSTRUMENTS_H__
+#include <glib.h>
+#include <wtap.h>
+
int network_instruments_open(wtap *wth, int *err, gchar **err_info);
int network_instruments_dump_can_write_encap(int encap);
gboolean network_instruments_dump_open(wtap_dumper *wdh, int *err);
diff --git a/wiretap/netxray.h b/wiretap/netxray.h
index 56054d12e1..dd542d66c8 100644
--- a/wiretap/netxray.h
+++ b/wiretap/netxray.h
@@ -23,6 +23,9 @@
#ifndef __NETXRAY_H__
#define __NETXRAY_H__
+#include <glib.h>
+#include <wtap.h>
+
int netxray_open(wtap *wth, int *err, gchar **err_info);
int netxray_dump_can_write_encap_1_1(int encap);
gboolean netxray_dump_open_1_1(wtap_dumper *wdh, int *err);
diff --git a/wiretap/ngsniffer.h b/wiretap/ngsniffer.h
index afbc4993a0..2cd625472b 100644
--- a/wiretap/ngsniffer.h
+++ b/wiretap/ngsniffer.h
@@ -23,6 +23,9 @@
#ifndef __NGSNIFFER_H__
#define __NGSNIFFER_H__
+#include <glib.h>
+#include <wtap.h>
+
int ngsniffer_open(wtap *wth, int *err, gchar **err_info);
gboolean ngsniffer_dump_open(wtap_dumper *wdh, int *err);
int ngsniffer_dump_can_write_encap(int encap);
diff --git a/wiretap/packetlogger.h b/wiretap/packetlogger.h
index 6a34def720..a150c9ecf6 100644
--- a/wiretap/packetlogger.h
+++ b/wiretap/packetlogger.h
@@ -26,6 +26,9 @@
#ifndef __PACKETLOGGER_H__
#define __PACKETLOGGER_H__
+#include <glib.h>
+#include <wtap.h>
+
int packetlogger_open(wtap *wth, int *err, gchar **err_info _U_);
#endif /* __PACKETLOGGER_H__ */
diff --git a/wiretap/pcap-common.h b/wiretap/pcap-common.h
index 9477ad0ae4..c3102ee3f0 100644
--- a/wiretap/pcap-common.h
+++ b/wiretap/pcap-common.h
@@ -24,6 +24,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __W_PCAP_COMMON_H__
+#define __W_PCAP_COMMON_H__
+
+#include <glib.h>
+#include <wtap.h>
+
extern int pcap_process_pseudo_header(FILE_T fh, int file_type, int wtap_encap,
guint packet_size, gboolean check_packet_size, struct wtap_pkthdr *phdr,
union wtap_pseudo_header *pseudo_header, int *err, gchar **err_info);
@@ -36,3 +42,5 @@ extern int pcap_get_phdr_size(int encap,
extern gboolean pcap_write_phdr(wtap_dumper *wdh, int wtap_encap,
const union wtap_pseudo_header *pseudo_header, int *err);
+
+#endif
diff --git a/wiretap/pcap-encap.h b/wiretap/pcap-encap.h
index 97482ae7bc..7ca0699db5 100644
--- a/wiretap/pcap-encap.h
+++ b/wiretap/pcap-encap.h
@@ -24,5 +24,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef __W_PCAP_ENCAP_H__
+#define __W_PCAP_ENCAP_H__
+
+#include <glib.h>
+#include <wiretap/wtap.h>
+
extern int wtap_pcap_encap_to_wtap_encap(int encap);
extern int wtap_wtap_encap_to_pcap_encap(int encap);
+
+#endif
diff --git a/wiretap/pcapng.h b/wiretap/pcapng.h
index a65ee6ff70..170575d4f1 100644
--- a/wiretap/pcapng.h
+++ b/wiretap/pcapng.h
@@ -23,6 +23,9 @@
#ifndef __W_PCAPNG_H__
#define __W_PCAPNG_H__
+#include <glib.h>
+#include <wtap.h>
+
int pcapng_open(wtap *wth, int *err, gchar **err_info);
gboolean pcapng_dump_open(wtap_dumper *wdh, int *err);
int pcapng_dump_can_write_encap(int encap);
diff --git a/wiretap/pppdump.h b/wiretap/pppdump.h
index 9f98a9aaca..bc2a9cb85f 100644
--- a/wiretap/pppdump.h
+++ b/wiretap/pppdump.h
@@ -23,6 +23,9 @@
#ifndef __PPPDUMP_H__
#define __PPPDUMP_H__
+#include <glib.h>
+#include <wtap.h>
+
int pppdump_open(wtap *wth, int *err, gchar **err_info);
#endif
diff --git a/wiretap/radcom.h b/wiretap/radcom.h
index 35ee182b7f..229bdfc6fa 100644
--- a/wiretap/radcom.h
+++ b/wiretap/radcom.h
@@ -24,6 +24,9 @@
#ifndef __RADCOM_H__
#define __RADCOM_H__
+#include <glib.h>
+#include <wtap.h>
+
int radcom_open(wtap *wth, int *err, gchar **err_info);
#endif
diff --git a/wiretap/snoop.h b/wiretap/snoop.h
index 0cba84dadd..5f4198227c 100644
--- a/wiretap/snoop.h
+++ b/wiretap/snoop.h
@@ -23,6 +23,9 @@
#ifndef __W_SNOOP_H__
#define __W_SNOOP_H__
+#include <glib.h>
+#include <wtap.h>
+
int snoop_open(wtap *wth, int *err, gchar **err_info);
gboolean snoop_dump_open(wtap_dumper *wdh, int *err);
int snoop_dump_can_write_encap(int encap);
diff --git a/wiretap/tnef.h b/wiretap/tnef.h
index 35f47145b2..85cfa025de 100644
--- a/wiretap/tnef.h
+++ b/wiretap/tnef.h
@@ -23,6 +23,9 @@
#ifndef __TNEF_H__
#define __TNEF_H__
+#include <glib.h>
+#include <wiretap/wtap.h>
+
#define TNEF_SIGNATURE 0x223E9F78
int tnef_open(wtap *wth, int *err, gchar **err_info);
diff --git a/wiretap/toshiba.h b/wiretap/toshiba.h
index 314848b32b..df4a9cddc9 100644
--- a/wiretap/toshiba.h
+++ b/wiretap/toshiba.h
@@ -23,6 +23,9 @@
#ifndef __W_TOSHIBA_H__
#define __W_TOSHIBA_H__
+#include <glib.h>
+#include <wtap.h>
+
int toshiba_open(wtap *wth, int *err, gchar **err_info);
#endif
diff --git a/wiretap/visual.h b/wiretap/visual.h
index b028a78ca0..df9583946c 100644
--- a/wiretap/visual.h
+++ b/wiretap/visual.h
@@ -28,6 +28,9 @@
#ifndef __VISUAL_H__
#define __VISUAL_H__
+#include <glib.h>
+#include <wtap.h>
+
int visual_open(wtap *wth, int *err, gchar **err_info);
gboolean visual_dump_open(wtap_dumper *wdh, int *err);
int visual_dump_can_write_encap(int encap);
diff --git a/wiretap/vms.h b/wiretap/vms.h
index 66bbd68104..f5126840f8 100644
--- a/wiretap/vms.h
+++ b/wiretap/vms.h
@@ -24,6 +24,9 @@
#ifndef __W_VMS_H__
#define __W_VMS_H__
+#include <glib.h>
+#include <wtap.h>
+
int vms_open(wtap *wth, int *err, gchar **err_info);
#endif
diff --git a/wiretap/wtap-int.h b/wiretap/wtap-int.h
index b4ed66a350..dd4836c79c 100644
--- a/wiretap/wtap-int.h
+++ b/wiretap/wtap-int.h
@@ -41,8 +41,6 @@
#include <wsutil/file_util.h>
-typedef struct wtap_reader *FILE_T;
-
#include "wtap.h"
int wtap_fstat(wtap *wth, ws_statb64 *statb, int *err);
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index de8b5009a6..b65d714dcc 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -823,6 +823,8 @@ struct wtap_dumper;
typedef struct wtap wtap;
typedef struct wtap_dumper wtap_dumper;
+typedef struct wtap_reader *FILE_T;
+
struct file_type_info {
/* the file type name */
/* should be NULL for all "pseudo" types that are only internally used and not read/writeable */