aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.common7
-rw-r--r--epan/Makefile.common21
-rw-r--r--epan/asn1.c (renamed from asn1.c)2
-rw-r--r--epan/asn1.h (renamed from asn1.h)0
-rwxr-xr-xepan/dissectors/ncp2222.py2
-rw-r--r--epan/dissectors/packet-acse.c2
-rw-r--r--epan/dissectors/packet-ansi_map.c2
-rw-r--r--epan/dissectors/packet-atalk.c2
-rw-r--r--epan/dissectors/packet-clnp.c2
-rw-r--r--epan/dissectors/packet-cops.c2
-rw-r--r--epan/dissectors/packet-dcerpc.c2
-rw-r--r--epan/dissectors/packet-diameter.c2
-rw-r--r--epan/dissectors/packet-dnp.c2
-rw-r--r--epan/dissectors/packet-eap.c2
-rw-r--r--epan/dissectors/packet-fc.c2
-rw-r--r--epan/dissectors/packet-ftam.c2
-rw-r--r--epan/dissectors/packet-gsm_a.c2
-rw-r--r--epan/dissectors/packet-gsm_sms_ud.c2
-rw-r--r--epan/dissectors/packet-gsm_ss.c2
-rw-r--r--epan/dissectors/packet-gssapi.c2
-rw-r--r--epan/dissectors/packet-ieee80211.c2
-rw-r--r--epan/dissectors/packet-inap.c2
-rw-r--r--epan/dissectors/packet-ip.c2
-rw-r--r--epan/dissectors/packet-ipv6.c2
-rw-r--r--epan/dissectors/packet-kerberos.c2
-rw-r--r--epan/dissectors/packet-ldap.c2
-rw-r--r--epan/dissectors/packet-lwapp.c2
-rw-r--r--epan/dissectors/packet-mq.c2
-rw-r--r--epan/dissectors/packet-mysql.c2
-rw-r--r--epan/dissectors/packet-ncp.c2
-rw-r--r--epan/dissectors/packet-ndmp.c2
-rw-r--r--epan/dissectors/packet-ndps.c2
-rw-r--r--epan/dissectors/packet-netbios.c2
-rw-r--r--epan/dissectors/packet-ntlmssp.c2
-rw-r--r--epan/dissectors/packet-pgsql.c2
-rw-r--r--epan/dissectors/packet-pres.c2
-rw-r--r--epan/dissectors/packet-q931.c2
-rw-r--r--epan/dissectors/packet-rpc.c2
-rw-r--r--epan/dissectors/packet-smb-pipe.c2
-rw-r--r--epan/dissectors/packet-smb.c2
-rw-r--r--epan/dissectors/packet-sna.c2
-rw-r--r--epan/dissectors/packet-sndcp.c2
-rw-r--r--epan/dissectors/packet-snmp.c2
-rw-r--r--epan/dissectors/packet-spnego.c2
-rw-r--r--epan/dissectors/packet-srvloc.c2
-rw-r--r--epan/dissectors/packet-ssh.c2
-rw-r--r--epan/dissectors/packet-tcap.c2
-rw-r--r--epan/dissectors/packet-tcp.c4
-rw-r--r--epan/dissectors/packet-tds.c2
-rw-r--r--epan/dissectors/packet-wtp.c2
-rw-r--r--epan/dissectors/packet-x25.c2
-rw-r--r--epan/follow.c (renamed from follow.c)0
-rw-r--r--epan/follow.h (renamed from follow.h)0
-rw-r--r--epan/packet.c2
-rw-r--r--epan/plugins.c4
-rw-r--r--epan/ptvcursor.c (renamed from ptvcursor.c)0
-rw-r--r--epan/ptvcursor.h (renamed from ptvcursor.h)0
-rw-r--r--epan/reassemble.c (renamed from reassemble.c)2
-rw-r--r--epan/reassemble.h (renamed from reassemble.h)0
-rw-r--r--epan/xmlstub.c (renamed from xmlstub.c)0
-rw-r--r--epan/xmlstub.h (renamed from xmlstub.h)0
-rw-r--r--gtk/follow_dlg.c2
-rw-r--r--plugins/asn1/packet-asn1.c2
-rw-r--r--plugins/plugin_api.h4
-rw-r--r--plugins/plugin_api_list.c4
65 files changed, 73 insertions, 73 deletions
diff --git a/Makefile.common b/Makefile.common
index 4adc7dfa7a..d47c72d02d 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -28,11 +28,9 @@
DISSECTOR_SUPPORT_INCLUDES = \
aftypes.h \
arcnet_pids.h \
- asn1.h \
bridged_pids.h \
chdlctypes.h \
etypes.h \
- follow.h \
format-oid.h \
greproto.h \
iax2_codec_type.h \
@@ -43,14 +41,11 @@ DISSECTOR_SUPPORT_INCLUDES = \
nlpid.h \
oui.h \
ppptypes.h \
- ptvcursor.h \
- reassemble.h \
rpc_defrag.h \
rtp_pt.h \
sctpppids.h \
smb.h \
- x264_prt_id.h \
- xmlstub.h
+ x264_prt_id.h
# "BUILT_SOURCES" are built before any "make all" or "make check" targets.
BUILT_SOURCES = \
diff --git a/epan/Makefile.common b/epan/Makefile.common
index f6d7e22526..4002bd54b2 100644
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -28,6 +28,7 @@ LIBETHEREAL_SRC = \
addr_resolv.c \
adler32.c \
afn.c \
+ asn1.c \
atalk-utils.c \
base64.c \
bitswap.c \
@@ -45,6 +46,7 @@ LIBETHEREAL_SRC = \
epan.c \
except.c \
filesystem.c \
+ follow.c \
frame_data.c \
h225-persistentdata.c \
in_cksum.c \
@@ -55,7 +57,9 @@ LIBETHEREAL_SRC = \
plugins.c \
prefs.c \
proto.c \
+ ptvcursor.c \
range.c \
+ reassemble.c \
req_resp_hdrs.c \
sha1.c \
sigcomp_state_hdlr.c \
@@ -69,7 +73,8 @@ LIBETHEREAL_SRC = \
to_str.c \
tvbuff.c \
value_string.c \
- xdlc.c
+ xdlc.c \
+ xmlstub.c
LIBETHEREAL_INCLUDES = \
addr_and_mask.h \
@@ -78,6 +83,7 @@ LIBETHEREAL_INCLUDES = \
adler32.h \
afn.h \
arptypes.h \
+ asn1.h \
atalk-utils.h \
base64.h \
bitswap.h \
@@ -98,6 +104,7 @@ LIBETHEREAL_INCLUDES = \
except.h \
exceptions.h \
filesystem.h \
+ follow.h \
frame_data.h \
gdebug.h \
h225-persistentdata.h \
@@ -114,7 +121,9 @@ LIBETHEREAL_INCLUDES = \
prefs.h \
prefs-int.h \
proto.h \
+ ptvcursor.h \
range.h \
+ reassemble.h \
report_err.h \
req_resp_hdrs.h \
sha1.h \
@@ -130,13 +139,9 @@ LIBETHEREAL_INCLUDES = \
to_str.h \
tvbuff.h \
value_string.h \
- xdlc.h
+ xdlc.h \
+ xmlstub.h
# dissector helpers (needed from the dissectors, but not a dissector itself)
-DISSECTOR_SUPPORT_SRC = \
- ../asn1.c \
- ../follow.c \
- ../ptvcursor.c \
- ../reassemble.c \
- ../xmlstub.c
+DISSECTOR_SUPPORT_SRC =
diff --git a/asn1.c b/epan/asn1.c
index 8edd59bcb8..f9ff91f85c 100644
--- a/asn1.c
+++ b/epan/asn1.c
@@ -71,7 +71,7 @@
#endif
#include <epan/tvbuff.h>
-#include "asn1.h"
+#include <epan/asn1.h>
/*
* NAME: asn1_open [API]
diff --git a/asn1.h b/epan/asn1.h
index 5d751ff7fd..5d751ff7fd 100644
--- a/asn1.h
+++ b/epan/asn1.h
diff --git a/epan/dissectors/ncp2222.py b/epan/dissectors/ncp2222.py
index b341510745..5e156ccf62 100755
--- a/epan/dissectors/ncp2222.py
+++ b/epan/dissectors/ncp2222.py
@@ -5559,7 +5559,7 @@ def produce_code():
#include <glib.h>
#include <epan/packet.h>
#include <epan/conversation.h>
-#include "ptvcursor.h"
+#include <epan/ptvcursor.h>
#include "packet-ncp-int.h"
#include "packet-ncp-nmas.h"
#include <epan/strutil.h>
diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c
index 1ba1eb52ea..778c6f2695 100644
--- a/epan/dissectors/packet-acse.c
+++ b/epan/dissectors/packet-acse.c
@@ -41,7 +41,7 @@
#include <epan/strutil.h>
-#include "asn1.h"
+#include <epan/asn1.h>
#include "format-oid.h"
#include "packet-ses.h"
diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c
index ad5928a32e..3b9dd942f1 100644
--- a/epan/dissectors/packet-ansi_map.c
+++ b/epan/dissectors/packet-ansi_map.c
@@ -110,7 +110,7 @@
#include <string.h>
#include "epan/packet.h"
-#include "asn1.h"
+#include <epan/asn1.h>
#include <epan/tap.h>
#include "packet-ansi_a.h"
diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c
index 3204e7e79a..7f48b4e346 100644
--- a/epan/dissectors/packet-atalk.c
+++ b/epan/dissectors/packet-atalk.c
@@ -41,7 +41,7 @@
#include <epan/conversation.h>
#include <epan/prefs.h>
-#include "reassemble.h"
+#include <epan/reassemble.h>
#include "packet-afp.h"
diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c
index e1dbb4a3e7..95da85266f 100644
--- a/epan/dissectors/packet-clnp.c
+++ b/epan/dissectors/packet-clnp.c
@@ -33,7 +33,7 @@
#include <glib.h>
#include <epan/prefs.h>
#include <epan/packet.h>
-#include "reassemble.h"
+#include <epan/reassemble.h>
#include "packet-osi.h"
#include "packet-osi-options.h"
#include "packet-isis.h"
diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c
index f69dc05a59..5b42d14293 100644
--- a/epan/dissectors/packet-cops.c
+++ b/epan/dissectors/packet-cops.c
@@ -84,7 +84,7 @@
#endif /* HAVE_NET_SNMP */
#endif /* HAVE_SOME_SNMP */
-#include "asn1.h"
+#include <epan/asn1.h>
#include "format-oid.h"
#include <epan/prefs.h>
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index 0dde4abb9f..4c762c6826 100644
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -40,7 +40,7 @@
#include <epan/dissectors/packet-dcerpc.h>
#include <epan/conversation.h>
#include <epan/prefs.h>
-#include "reassemble.h"
+#include <epan/reassemble.h>
#include <epan/tap.h>
#include <epan/dissectors/packet-frame.h>
#include <epan/dissectors/packet-dcerpc-nt.h>
diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c
index 1c7d096c60..1a33176b5a 100644
--- a/epan/dissectors/packet-diameter.c
+++ b/epan/dissectors/packet-diameter.c
@@ -48,7 +48,7 @@
#include <time.h>
#include <glib.h>
#include <epan/filesystem.h>
-#include "xmlstub.h"
+#include <epan/xmlstub.h>
#include <epan/packet.h>
#include <epan/addr_resolv.h>
#include <epan/report_err.h>
diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c
index 1c69ff1f35..7d3dda725d 100644
--- a/epan/dissectors/packet-dnp.c
+++ b/epan/dissectors/packet-dnp.c
@@ -40,7 +40,7 @@
#include <epan/packet.h>
#include <epan/prefs.h>
-#include "reassemble.h"
+#include <epan/reassemble.h>
/*
* See
diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c
index 72389f65b9..570a212400 100644
--- a/epan/dissectors/packet-eap.c
+++ b/epan/dissectors/packet-eap.c
@@ -31,7 +31,7 @@
#include <epan/packet.h>
#include <epan/conversation.h>
#include "ppptypes.h"
-#include "reassemble.h"
+#include <epan/reassemble.h>
static int proto_eap = -1;
static int hf_eap_code = -1;
diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c
index 73acfb07e2..85810905d4 100644
--- a/epan/dissectors/packet-fc.c
+++ b/epan/dissectors/packet-fc.c
@@ -50,7 +50,7 @@
#include <epan/packet.h>
#include <epan/prefs.h>
-#include "reassemble.h"
+#include <epan/reassemble.h>
#include <epan/conversation.h>
#include "etypes.h"
#include "packet-fc.h"
diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c
index ebec9ad767..90eaa400eb 100644
--- a/epan/dissectors/packet-ftam.c
+++ b/epan/dissectors/packet-ftam.c
@@ -42,7 +42,7 @@
#include <epan/strutil.h>
-#include "asn1.h"
+#include <epan/asn1.h>
#include "format-oid.h"
#include "packet-ses.h"
diff --git a/epan/dissectors/packet-gsm_a.c b/epan/dissectors/packet-gsm_a.c
index a5c7428026..8b93c4e6ae 100644
--- a/epan/dissectors/packet-gsm_a.c
+++ b/epan/dissectors/packet-gsm_a.c
@@ -84,7 +84,7 @@
#include <epan/prefs.h>
#include <epan/ipv6-utils.h>
#include <epan/tap.h>
-#include "asn1.h"
+#include <epan/asn1.h>
#include "packet-tcap.h"
#include "packet-bssap.h"
diff --git a/epan/dissectors/packet-gsm_sms_ud.c b/epan/dissectors/packet-gsm_sms_ud.c
index 542207d213..005cae0a11 100644
--- a/epan/dissectors/packet-gsm_sms_ud.c
+++ b/epan/dissectors/packet-gsm_sms_ud.c
@@ -70,7 +70,7 @@
#include <epan/packet.h>
#include <epan/prefs.h>
-#include "reassemble.h"
+#include <epan/reassemble.h>
static void dissect_gsm_sms_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
diff --git a/epan/dissectors/packet-gsm_ss.c b/epan/dissectors/packet-gsm_ss.c
index 2be9f7aef5..f91bf761d1 100644
--- a/epan/dissectors/packet-gsm_ss.c
+++ b/epan/dissectors/packet-gsm_ss.c
@@ -56,7 +56,7 @@
#include "epan/packet.h"
#include <epan/tap.h>
-#include "asn1.h"
+#include <epan/asn1.h>
#include "packet-tcap.h"
#include "packet-gsm_sms.h"
diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c
index 5356ba024c..ac3ad4bb95 100644
--- a/epan/dissectors/packet-gssapi.c
+++ b/epan/dissectors/packet-gssapi.c
@@ -38,7 +38,7 @@
#include <glib.h>
#include <epan/packet.h>
-#include "asn1.h"
+#include <epan/asn1.h>
#include "format-oid.h"
#include <epan/dissectors/packet-dcerpc.h>
#include <epan/dissectors/packet-gssapi.h>
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index 5805a4f720..330d1338b1 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -62,7 +62,7 @@
#include <epan/addr_resolv.h>
#include <epan/strutil.h>
#include <epan/prefs.h>
-#include "reassemble.h"
+#include <epan/reassemble.h>
#include "packet-ipx.h"
#include "packet-llc.h"
#include "packet-ieee80211.h"
diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c
index b062dd0800..8c5bfb3814 100644
--- a/epan/dissectors/packet-inap.c
+++ b/epan/dissectors/packet-inap.c
@@ -11,7 +11,7 @@
* Copyright 2004, Tim Endean <endeant@hotmail.com>
* Built from the gsm-map dissector Copyright 2004, Anders Broman <anders.broman@ericsson.com>
*
- * $Id:$
+ * $Id$
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c
index 646a822a9d..7e5f6e8a43 100644
--- a/epan/dissectors/packet-ip.c
+++ b/epan/dissectors/packet-ip.c
@@ -39,7 +39,7 @@
#include <epan/ipproto.h>
#include "ip_opts.h"
#include <epan/prefs.h>
-#include "reassemble.h"
+#include <epan/reassemble.h>
#include "etypes.h"
#include "greproto.h"
#include "ppptypes.h"
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c
index dce5de93fb..9b4bf99e0c 100644
--- a/epan/dissectors/packet-ipv6.c
+++ b/epan/dissectors/packet-ipv6.c
@@ -37,7 +37,7 @@
#include "ip_opts.h"
#include <epan/addr_resolv.h>
#include <epan/prefs.h>
-#include "reassemble.h"
+#include <epan/reassemble.h>
#include <epan/ipproto.h>
#include "etypes.h"
#include "ppptypes.h"
diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c
index afa3dfe7d4..bab8577bd7 100644
--- a/epan/dissectors/packet-kerberos.c
+++ b/epan/dissectors/packet-kerberos.c
@@ -94,7 +94,7 @@
#include <epan/dissectors/packet-dcerpc-netlogon.h>
#include <epan/dissectors/packet-dcerpc.h>
-#include "asn1.h" /* for "subid_t" */
+#include <epan/asn1.h> /* for "subid_t" */
#include <epan/dissectors/packet-gssapi.h>
#define UDP_PORT_KERBEROS 88
diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c
index 19eb208d18..5ffd40d666 100644
--- a/epan/dissectors/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
@@ -79,7 +79,7 @@
#include <epan/packet.h>
-#include "asn1.h"
+#include <epan/asn1.h>
#include <epan/prefs.h>
#include <epan/conversation.h>
#include "packet-frame.h"
diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c
index cdba063454..b3aa845a76 100644
--- a/epan/dissectors/packet-lwapp.c
+++ b/epan/dissectors/packet-lwapp.c
@@ -37,7 +37,7 @@
#include <time.h>
#include <glib.h>
#include <epan/filesystem.h>
-#include "xmlstub.h"
+#include <epan/xmlstub.h>
#include <epan/packet.h>
#include <epan/addr_resolv.h>
#include <epan/prefs.h>
diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c
index fdea9d0121..a1f7aabe64 100644
--- a/epan/dissectors/packet-mq.c
+++ b/epan/dissectors/packet-mq.c
@@ -71,7 +71,7 @@
#include <glib.h>
#include <epan/packet.h>
#include <epan/conversation.h>
-#include "reassemble.h"
+#include <epan/reassemble.h>
#include <epan/prefs.h>
#include "packet-tcp.h"
#include "packet-mq.h"
diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c
index 73f45389bf..46fb2f74ef 100644
--- a/epan/dissectors/packet-mysql.c
+++ b/epan/dissectors/packet-mysql.c
@@ -40,7 +40,7 @@
#include <epan/conversation.h>
#include "packet-tcp.h"
-#include "reassemble.h"
+#include <epan/reassemble.h>
#include <epan/prefs.h>
/* Capabilities */
diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c
index e3d453b9fd..7d4035a65d 100644
--- a/epan/dissectors/packet-ncp.c
+++ b/epan/dissectors/packet-ncp.c
@@ -49,7 +49,7 @@
#include "packet-ipx.h"
#include "packet-tcp.h"
#include "packet-ncp-int.h"
-#include "reassemble.h"
+#include <epan/reassemble.h>
#include <epan/conversation.h>
int proto_ncp = -1;
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c
index 535b9d11ec..002178d56b 100644
--- a/epan/dissectors/packet-ndmp.c
+++ b/epan/dissectors/packet-ndmp.c
@@ -42,7 +42,7 @@
#include "packet-scsi.h"
#include "packet-frame.h"
#include <epan/prefs.h>
-#include "reassemble.h"
+#include <epan/reassemble.h>
#include "rpc_defrag.h"
#define TCP_PORT_NDMP 10000
diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c
index a35961ebbf..6ea84aba9b 100644
--- a/epan/dissectors/packet-ndps.c
+++ b/epan/dissectors/packet-ndps.c
@@ -36,7 +36,7 @@
#include "packet-tcp.h"
#include <epan/conversation.h>
#include "packet-ndps.h"
-#include "reassemble.h"
+#include <epan/reassemble.h>
#define NDPS_PACKET_INIT_COUNT 200
diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c
index 364ca9faa5..1d3b29289f 100644
--- a/epan/dissectors/packet-netbios.c
+++ b/epan/dissectors/packet-netbios.c
@@ -36,7 +36,7 @@
#include <epan/packet.h>
#include "llcsaps.h"
-#include "reassemble.h"
+#include <epan/reassemble.h>
#include <epan/prefs.h>
#include "packet-netbios.h"
diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c
index 1b5790c412..707e90c4ff 100644
--- a/epan/dissectors/packet-ntlmssp.c
+++ b/epan/dissectors/packet-ntlmssp.c
@@ -36,7 +36,7 @@
#include "packet-windows-common.h"
#include "packet-smb-common.h"
-#include "asn1.h" /* XXX - needed for subid_t */
+#include <epan/asn1.h> /* XXX - needed for subid_t */
#include "packet-gssapi.h"
#include "packet-frame.h"
#include <epan/prefs.h>
diff --git a/epan/dissectors/packet-pgsql.c b/epan/dissectors/packet-pgsql.c
index ee3727e291..34371d0a10 100644
--- a/epan/dissectors/packet-pgsql.c
+++ b/epan/dissectors/packet-pgsql.c
@@ -34,7 +34,7 @@
#include <epan/prefs.h>
#include "packet-tcp.h"
-#include "reassemble.h"
+#include <epan/reassemble.h>
static int proto_pgsql = -1;
diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c
index b692101ae7..b988fb9b97 100644
--- a/epan/dissectors/packet-pres.c
+++ b/epan/dissectors/packet-pres.c
@@ -41,7 +41,7 @@
#include <epan/strutil.h>
-#include "asn1.h"
+#include <epan/asn1.h>
#include "format-oid.h"
#include "packet-ses.h"
diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c
index 4e2f40000b..96189169cf 100644
--- a/epan/dissectors/packet-q931.c
+++ b/epan/dissectors/packet-q931.c
@@ -39,7 +39,7 @@
#include "packet-q931.h"
#include "packet-e164.h"
#include <epan/prefs.h>
-#include "reassemble.h"
+#include <epan/reassemble.h>
#include "lapd_sapi.h"
#include "packet-tpkt.h"
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index c6c56d0d50..933561b36d 100644
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -39,7 +39,7 @@
#include "packet-frame.h"
#include "packet-tcp.h"
#include <epan/prefs.h>
-#include "reassemble.h"
+#include <epan/reassemble.h>
#include "rpc_defrag.h"
#include "packet-nfs.h"
#include <epan/tap.h>
diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c
index e2bb58e518..8d7ca90ee3 100644
--- a/epan/dissectors/packet-smb-pipe.c
+++ b/epan/dissectors/packet-smb-pipe.c
@@ -48,7 +48,7 @@ XXX Fixme : shouldnt show [malformed frame] for long packets
#include "packet-smb-common.h"
#include "packet-windows-common.h"
#include "packet-dcerpc.h"
-#include "reassemble.h"
+#include <epan/reassemble.h>
static int proto_smb_pipe = -1;
static int hf_pipe_function = -1;
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c
index a9e60e1d49..d2ea3ab4b2 100644
--- a/epan/dissectors/packet-smb.c
+++ b/epan/dissectors/packet-smb.c
@@ -41,7 +41,7 @@
#include "smb.h"
#include <epan/strutil.h>
#include <epan/prefs.h>
-#include "reassemble.h"
+#include <epan/reassemble.h>
#include <epan/tap.h>
#include "packet-ipx.h"
diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c
index 9fc9603edb..70e8ef4337 100644
--- a/epan/dissectors/packet-sna.c
+++ b/epan/dissectors/packet-sna.c
@@ -35,7 +35,7 @@
#include <epan/sna-utils.h>
#include <epan/charsets.h>
#include <epan/prefs.h>
-#include "reassemble.h"
+#include <epan/reassemble.h>
/*
* http://www.wanresources.com/snacell.html
diff --git a/epan/dissectors/packet-sndcp.c b/epan/dissectors/packet-sndcp.c
index b6123b3310..f46da753d7 100644
--- a/epan/dissectors/packet-sndcp.c
+++ b/epan/dissectors/packet-sndcp.c
@@ -38,7 +38,7 @@
#endif
#include <epan/packet.h>
-#include "reassemble.h"
+#include <epan/reassemble.h>
/* Bitmasks for the bits in the address field
*/
diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c
index e63a930abd..18c2fcc753 100644
--- a/epan/dissectors/packet-snmp.c
+++ b/epan/dissectors/packet-snmp.c
@@ -105,7 +105,7 @@
#endif /* HAVE_SOME_SNMP */
-#include "asn1.h"
+#include <epan/asn1.h>
#include "packet-snmp.h"
#include "format-oid.h"
diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c
index 28255daa0c..6ad56b9656 100644
--- a/epan/dissectors/packet-spnego.c
+++ b/epan/dissectors/packet-spnego.c
@@ -37,7 +37,7 @@
#include <glib.h>
#include <epan/packet.h>
-#include "asn1.h"
+#include <epan/asn1.h>
#include "format-oid.h"
#include "packet-gssapi.h"
#include "packet-kerberos.h"
diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c
index 7a5a0c1b62..5105f36da1 100644
--- a/epan/dissectors/packet-srvloc.c
+++ b/epan/dissectors/packet-srvloc.c
@@ -49,7 +49,7 @@
#include <epan/strutil.h>
#include <epan/prefs.h>
#include "packet-tcp.h"
-#include "reassemble.h"
+#include <epan/reassemble.h>
static gboolean srvloc_desegment = TRUE;
static int proto_srvloc = -1;
diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c
index 9de167baa0..d6cc21821b 100644
--- a/epan/dissectors/packet-ssh.c
+++ b/epan/dissectors/packet-ssh.c
@@ -39,7 +39,7 @@
#include <epan/conversation.h>
#include "packet-tcp.h"
-#include "reassemble.h"
+#include <epan/reassemble.h>
#include <epan/prefs.h>
/* get from openssh ssh2.h */
diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c
index ce8865d7b6..1c8bf2f178 100644
--- a/epan/dissectors/packet-tcap.c
+++ b/epan/dissectors/packet-tcap.c
@@ -61,7 +61,7 @@
#include <epan/packet.h>
#include <epan/prefs.h>
-#include "asn1.h"
+#include <epan/asn1.h>
#include "packet-tcap.h"
#include "packet-ber.h"
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index b7065674ed..c64d74d691 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -35,14 +35,14 @@
#include <epan/addr_resolv.h>
#include <epan/ipproto.h>
#include "ip_opts.h"
-#include "follow.h"
+#include <epan/follow.h>
#include <epan/prefs.h>
#include "packet-tcp.h"
#include "packet-ip.h"
#include "packet-frame.h"
#include <epan/conversation.h>
#include <epan/strutil.h>
-#include "reassemble.h"
+#include <epan/reassemble.h>
#include <epan/tap.h>
static int tcp_tap = -1;
diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c
index 7cb1124d26..511eeba062 100644
--- a/epan/dissectors/packet-tds.c
+++ b/epan/dissectors/packet-tds.c
@@ -157,7 +157,7 @@
#include <epan/strutil.h>
#include "packet-frame.h"
-#include "reassemble.h"
+#include <epan/reassemble.h>
#include <epan/prefs.h>
#define TDS_QUERY_PKT 1
diff --git a/epan/dissectors/packet-wtp.c b/epan/dissectors/packet-wtp.c
index f9082b2780..36649ead4c 100644
--- a/epan/dissectors/packet-wtp.c
+++ b/epan/dissectors/packet-wtp.c
@@ -41,7 +41,7 @@
#include <string.h>
#include <glib.h>
#include <epan/packet.h>
-#include "reassemble.h"
+#include <epan/reassemble.h>
#include "packet-wap.h"
#include "packet-wtp.h"
#include "packet-wsp.h"
diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c
index b7f2d4d69f..aba61af789 100644
--- a/epan/dissectors/packet-x25.c
+++ b/epan/dissectors/packet-x25.c
@@ -34,7 +34,7 @@
#include "llcsaps.h"
#include <epan/packet.h>
#include <epan/circuit.h>
-#include "reassemble.h"
+#include <epan/reassemble.h>
#include <epan/prefs.h>
#include "nlpid.h"
#include "x264_prt_id.h"
diff --git a/follow.c b/epan/follow.c
index 19e14303b2..19e14303b2 100644
--- a/follow.c
+++ b/epan/follow.c
diff --git a/follow.h b/epan/follow.h
index 013519d43e..013519d43e 100644
--- a/follow.h
+++ b/epan/follow.h
diff --git a/epan/packet.c b/epan/packet.c
index 671eacbef7..b7528983c1 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -53,7 +53,7 @@
#include "plugins.h"
#include "epan_dissect.h"
-#include "../reassemble.h"
+#include <epan/reassemble.h>
static gint proto_malformed = -1;
static dissector_handle_t frame_handle = NULL;
diff --git a/epan/plugins.c b/epan/plugins.c
index 72a41e8853..b880fe7963 100644
--- a/epan/plugins.c
+++ b/epan/plugins.c
@@ -60,14 +60,14 @@
#ifdef PLUGINS_NEED_ADDRESS_TABLE
#include "conversation.h"
-#include "reassemble.h"
+#include <epan/reassemble.h>
#include <epan/prefs.h>
#include <epan/dissectors/packet-giop.h>
#include <epan/dissectors/packet-tpkt.h>
#include <epan/dissectors/packet-tcp.h>
#include <epan/dissectors/packet-rpc.h>
#include <epan/tap.h>
-#include "asn1.h"
+#include <epan/asn1.h>
#include <epan/dissectors/packet-per.h>
#include <epan/dissectors/packet-ber.h>
#include <epan/dissectors/packet-rtp.h>
diff --git a/ptvcursor.c b/epan/ptvcursor.c
index cde56022f0..cde56022f0 100644
--- a/ptvcursor.c
+++ b/epan/ptvcursor.c
diff --git a/ptvcursor.h b/epan/ptvcursor.h
index 6467bcdea9..6467bcdea9 100644
--- a/ptvcursor.h
+++ b/epan/ptvcursor.h
diff --git a/reassemble.c b/epan/reassemble.c
index 4d968a95d0..9622d390e2 100644
--- a/reassemble.c
+++ b/epan/reassemble.c
@@ -30,7 +30,7 @@
#include <epan/packet.h>
-#include "reassemble.h"
+#include <epan/reassemble.h>
#include <epan/dissectors/packet-dcerpc.h>
diff --git a/reassemble.h b/epan/reassemble.h
index 85c66942c9..85c66942c9 100644
--- a/reassemble.h
+++ b/epan/reassemble.h
diff --git a/xmlstub.c b/epan/xmlstub.c
index 6ceb9c32be..6ceb9c32be 100644
--- a/xmlstub.c
+++ b/epan/xmlstub.c
diff --git a/xmlstub.h b/epan/xmlstub.h
index 47a6d0a0ef..47a6d0a0ef 100644
--- a/xmlstub.h
+++ b/epan/xmlstub.h
diff --git a/gtk/follow_dlg.c b/gtk/follow_dlg.c
index 3c37663678..7055e31201 100644
--- a/gtk/follow_dlg.c
+++ b/gtk/follow_dlg.c
@@ -46,7 +46,7 @@
#include "colors.h"
#include "file.h"
#include "follow_dlg.h"
-#include "follow.h"
+#include <epan/follow.h>
#include "dlg_utils.h"
#include "keys.h"
#include "globals.h"
diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c
index 9f78479d52..0d94a87cb6 100644
--- a/plugins/asn1/packet-asn1.c
+++ b/plugins/asn1/packet-asn1.c
@@ -84,7 +84,7 @@
#include <epan/filesystem.h>
#include <epan/report_err.h>
#include <epan/dissectors/packet-tcp.h>
-#include "asn1.h"
+#include <epan/asn1.h>
#include "plugins/plugin_api_defs.h"
diff --git a/plugins/plugin_api.h b/plugins/plugin_api.h
index 238fa6bb2a..d99d5ff627 100644
--- a/plugins/plugin_api.h
+++ b/plugins/plugin_api.h
@@ -45,13 +45,13 @@
#include <epan/conversation.h>
#include <epan/report_err.h>
#include <epan/prefs.h>
-#include "reassemble.h"
+#include <epan/reassemble.h>
#include <epan/dissectors/packet-giop.h>
#include <epan/dissectors/packet-tpkt.h>
#include <epan/dissectors/packet-tcp.h>
#include <epan/dissectors/packet-rpc.h>
#include <epan/tap.h>
-#include "asn1.h"
+#include <epan/asn1.h>
#include <epan/dissectors/packet-per.h>
#include <epan/dissectors/packet-ber.h>
#include <epan/dissectors/packet-rtp.h>
diff --git a/plugins/plugin_api_list.c b/plugins/plugin_api_list.c
index f88993af66..4a2aef7760 100644
--- a/plugins/plugin_api_list.c
+++ b/plugins/plugin_api_list.c
@@ -32,7 +32,7 @@
#include <epan/report_err.h>
#include <epan/except.h>
#include <epan/prefs.h>
-#include "reassemble.h"
+#include <epan/reassemble.h>
#include <epan/dissectors/packet-dcerpc.h>
#include <epan/dissectors/packet-giop.h>
#include <epan/dissectors/packet-per.h>
@@ -43,7 +43,7 @@
#include <epan/dissectors/packet-rtp.h>
#include <epan/dissectors/packet-rtcp.h>
#include <epan/tap.h>
-#include "asn1.h"
+#include <epan/asn1.h>
#include <epan/xdlc.h>
#include <epan/crc16.h>