Move a pile of protocol-related headers from the top-level source

directory to the epan directory.  Some of them should perhaps ultimately
be moved to epan/dissectors, if they pertain only to stuff exported by a
particular dissector.

Fix Gerald's e-mail address in files we're moving.

svn path=/trunk/; revision=15844

Makefile.common

@@ -23,29 +23,17 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-# Header files for dissector helpers
-# XXX - these should be moved to epan/dissectors
+#
+# XXX - this is used by dissectors and by other parts of Ethereal.
+# Ultimately, we need to handle strings "right", so that we can handle
+# strings in protocols that are in various encodings, and figure out
+# properly whether a given character can be {displayed in the GUI,
+# printed to a printout, written to a file} internally to the routines
+# handling that, with a scheme more sophisticated than "if it ain't
+# ASCII it ain't ....".
+#
 DISSECTOR_SUPPORT_INCLUDES =	\
-	aftypes.h	\
-	arcnet_pids.h	\
-	bridged_pids.h	\
-	chdlctypes.h	\
-	etypes.h	\
-	format-oid.h	\
-	greproto.h	\
-	iax2_codec_type.h	\
-	ip_opts.h	\
-	isprint.h	\
-	lapd_sapi.h	\
-	llcsaps.h	\
-	nlpid.h	\
-	oui.h	\
-	ppptypes.h	\
-	rpc_defrag.h	\
-	rtp_pt.h	\
-	sctpppids.h	\
-	smb.h	\
-	x264_prt_id.h
+	isprint.h
 
 # "BUILT_SOURCES" are built before any "make all" or "make check" targets.
 BUILT_HEADER_FILES =	\

asn1/h248/packet-h248-template.c

@@ -40,7 +40,7 @@
 #include "packet-isup.h"
 #include "packet-q931.h"
 
-#include "sctpppids.h"
+#include <epan/sctpppids.h>
 #define PNAME  "H.248 MEGACO"
 #define PSNAME "H248"
 #define PFNAME "h248"

configure.in

@@ -1,6 +1,6 @@
 # $Id$
 #
-AC_INIT(etypes.h)
+AC_INIT(cfile.h)
 
 AC_PREREQ(2.52)
 

epan/Makefile.common

@@ -92,12 +92,16 @@ LIBETHEREAL_INCLUDES = 		\
 	address.h		\
 	adler32.h		\
 	afn.h			\
+	aftypes.h		\
+	arcnet_pids.h		\
 	arptypes.h		\
 	asn1.h			\
 	atalk-utils.h		\
 	base64.h		\
 	bitswap.h		\
+	bridged_pids.h		\
 	charsets.h		\
+	chdlctypes.h		\
 	circuit.h		\
 	column.h		\
 	column_info.h		\
@@ -115,24 +119,34 @@ LIBETHEREAL_INCLUDES = 		\
 	emem.h			\
 	epan.h			\
 	epan_dissect.h		\
+	etypes.h		\
 	except.h		\
 	exceptions.h		\
 	expert.h		\
 	filesystem.h		\
 	follow.h		\
+	format-oid.h		\
 	frame_data.h		\
 	gnuc_format_check.h	\
+	greproto.h		\
 	h225-persistentdata.h	\
+	iax2_codec_type.h	\
 	in_cksum.h		\
+	ip_opts.h		\
 	ipproto.h		\
 	ipv4.h			\
 	ipv6-utils.h		\
+	lapd_sapi.h		\
+	llcsaps.h		\
+	nlpid.h			\
 	nstime.h		\
 	osi-utils.h		\
+	oui.h			\
 	packet.h		\
 	packet_info.h		\
 	pint.h			\
 	plugins.h		\
+	ppptypes.h		\
 	prefs.h			\
 	prefs-int.h		\
 	proto.h			\
@@ -141,10 +155,14 @@ LIBETHEREAL_INCLUDES = 		\
 	reassemble.h		\
 	report_err.h		\
 	req_resp_hdrs.h		\
+	rpc_defrag.h		\
+	rtp_pt.h		\
+	sctpppids.h		\
 	sha1.h			\
 	sigcomp_state_hdlr.h	\
 	sigcomp-udvm.h		\
 	slab.h			\
+	smb.h			\
 	sminmpec.h		\
 	sna-utils.h		\
 	stat_cmd_args.h		\
@@ -158,6 +176,7 @@ LIBETHEREAL_INCLUDES = 		\
 	tvbparse.h		\
 	tvbuff.h		\
 	value_string.h		\
+	x264_prt_id.h		\
 	xdlc.h			\
 	xmlstub.h
 

epan/aftypes.h

@@ -4,7 +4,7 @@
  * $Id$
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  *
  * This file created and by Mike Hall <mlh@io.com>
  * Copyright 1998

epan/bridged_pids.h

@@ -5,10 +5,9 @@
  * $Id$
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 - 2000 Gerald Combs
  *
- *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2

epan/dissectors/packet-3com-xns.c

@@ -29,7 +29,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 
 static int proto_3com_xns = -1;
 

epan/dissectors/packet-aarp.c

@@ -33,7 +33,7 @@
 #include <epan/packet.h>
 #include <epan/strutil.h>
 #include <epan/emem.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 
 static int proto_aarp = -1;
 static int hf_aarp_hard_type = -1;

epan/dissectors/packet-ap1394.c

@@ -32,7 +32,7 @@
 #include <epan/strutil.h>
 
 #include "packet-ap1394.h"
-#include "etypes.h"
+#include <epan/etypes.h>
 
 static int proto_ap1394 = -1;
 static int hf_ap1394_dst = -1;

epan/dissectors/packet-arcnet.c

@@ -35,7 +35,7 @@
 
 #include <epan/packet.h>
 #include "packet-arcnet.h"
-#include "arcnet_pids.h"
+#include <epan/arcnet_pids.h>
 #include "packet-ip.h"
 
 /* Initialize the protocol and registered fields */

epan/dissectors/packet-arp.c

@@ -34,8 +34,8 @@
 #include <epan/addr_resolv.h>
 #include <epan/emem.h>
 #include "packet-arp.h"
-#include "etypes.h"
-#include "arcnet_pids.h"
+#include <epan/etypes.h>
+#include <epan/arcnet_pids.h>
 
 static int proto_arp = -1;
 static int hf_arp_hard_type = -1;

epan/dissectors/packet-asap.c

@@ -41,7 +41,7 @@
 #endif
 
 #include <epan/packet.h>
-#include "sctpppids.h"
+#include <epan/sctpppids.h>
 
 /* Initialize the protocol and registered fields */
 static int proto_asap = -1;

epan/dissectors/packet-atalk.c

@@ -33,10 +33,10 @@
 #include <epan/packet.h>
 #include <string.h>
 
-#include "etypes.h"
-#include "ppptypes.h"
-#include "aftypes.h"
-#include "arcnet_pids.h"
+#include <epan/etypes.h>
+#include <epan/ppptypes.h>
+#include <epan/aftypes.h>
+#include <epan/arcnet_pids.h>
 #include <epan/atalk-utils.h>
 #include <epan/conversation.h>
 

epan/dissectors/packet-atm.c

@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include "oui.h"
+#include <epan/oui.h>
 #include <epan/addr_resolv.h>
 
 #include "packet-atm.h"

epan/dissectors/packet-bacnet.c

@@ -38,7 +38,7 @@
 
 #include <epan/packet.h>
 
-#include "llcsaps.h"
+#include <epan/llcsaps.h>
 
 static dissector_handle_t bacapp_handle;
 static dissector_handle_t data_handle;

epan/dissectors/packet-bpdu.c

@@ -32,9 +32,9 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include "llcsaps.h"
-#include "ppptypes.h"
-#include "chdlctypes.h"
+#include <epan/llcsaps.h>
+#include <epan/ppptypes.h>
+#include <epan/chdlctypes.h>
 #include <epan/addr_resolv.h>
 
 /* Offsets of fields within a BPDU */

epan/dissectors/packet-brdwlk.c

@@ -42,7 +42,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 
 #define BRDWLK_MAX_PACKET_CNT  0xFFFF
 #define BRDWLK_TRUNCATED_BIT   0x8

epan/dissectors/packet-cdp.c

@@ -32,8 +32,8 @@
 #include <epan/packet.h>
 #include <epan/strutil.h>
 
-#include "oui.h"
-#include "nlpid.h"
+#include <epan/oui.h>
+#include <epan/nlpid.h>
 
 
 /*

epan/dissectors/packet-chdlc.c

@@ -28,10 +28,10 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 #include <epan/prefs.h>
-#include "chdlctypes.h"
-#include "nlpid.h"
+#include <epan/chdlctypes.h>
+#include <epan/nlpid.h>
 #include <epan/addr_resolv.h>
 #include "packet-chdlc.h"
 #include "packet-ppp.h"

epan/dissectors/packet-cisco-oui.c

@@ -26,7 +26,7 @@
 
 #include <epan/packet.h>
 #include "packet-llc.h"
-#include "oui.h"
+#include <epan/oui.h>
 
 static int hf_llc_cisco_pid = -1;
 

epan/dissectors/packet-cisco-wireless.c

@@ -73,8 +73,8 @@
 #include <epan/packet.h>
 #include <epan/strutil.h>
 #include "packet-llc.h"
-#include "oui.h"
-#include "etypes.h"
+#include <epan/oui.h>
+#include <epan/etypes.h>
 
 static int hf_llc_ciscowl_pid = -1;
 

epan/dissectors/packet-clnp.c

@@ -39,7 +39,7 @@
 #include "packet-osi-options.h"
 #include "packet-isis.h"
 #include "packet-esis.h"
-#include "nlpid.h"
+#include <epan/nlpid.h>
 #include <epan/ipproto.h>
 #include <epan/expert.h>
 

epan/dissectors/packet-cops.c

@@ -85,7 +85,7 @@
 #endif /* HAVE_SOME_SNMP */
 
 #include <epan/asn1.h>
-#include "format-oid.h"
+#include <epan/format-oid.h>
 #include <epan/prefs.h>
 #include <epan/emem.h>
 

epan/dissectors/packet-dec-bpdu.c

@@ -33,8 +33,8 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
-#include "etypes.h"
-#include "ppptypes.h"
+#include <epan/etypes.h>
+#include <epan/ppptypes.h>
 
 /* Offsets of fields within a BPDU */
 

epan/dissectors/packet-dec-dnart.c

@@ -54,8 +54,8 @@
 #include <epan/packet.h>
 #include <epan/proto.h>
 #include <epan/dissectors/packet-tcp.h>
-#include "etypes.h"
-#include "ppptypes.h"
+#include <epan/etypes.h>
+#include <epan/ppptypes.h>
 
 typedef enum {
     RT_CTL_INITIALIZATION,

epan/dissectors/packet-dua.c

@@ -38,7 +38,7 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include "sctpppids.h"
+#include <epan/sctpppids.h>
 
 #define NETWORK_BYTE_ORDER          FALSE
 

epan/dissectors/packet-eap.c

@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include "ppptypes.h"
+#include <epan/ppptypes.h>
 #include <epan/reassemble.h>
 #include <epan/emem.h>
 

epan/dissectors/packet-eapol.c

@@ -31,7 +31,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-ieee80211.h"
-#include "etypes.h"
+#include <epan/etypes.h>
 
 static int proto_eapol = -1;
 static int hf_eapol_version = -1;

epan/dissectors/packet-enc.c

@@ -30,7 +30,7 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 #include <epan/addr_resolv.h>
 #include "packet-ip.h"
 #include "packet-ipv6.h"

epan/dissectors/packet-enrp.c

@@ -41,7 +41,7 @@
 #endif
 
 #include <epan/packet.h>
-#include "sctpppids.h"
+#include <epan/sctpppids.h>
 
 /* Initialize the protocol and registered fields */
 static int proto_enrp = -1;

epan/dissectors/packet-esis.c

@@ -32,7 +32,7 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include "nlpid.h"
+#include <epan/nlpid.h>
 #include "packet-osi.h"
 #include "packet-osi-options.h"
 #include "packet-esis.h"

epan/dissectors/packet-eth.c

@@ -29,7 +29,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 #include <epan/addr_resolv.h>
 #include "packet-eth.h"
 #include "packet-ieee8023.h"

epan/dissectors/packet-ethertype.c

@@ -37,8 +37,8 @@
 #include "packet-ipx.h"
 #include "packet-vlan.h"
 #include "packet-vines.h"
-#include "etypes.h"
-#include "ppptypes.h"
+#include <epan/etypes.h>
+#include <epan/ppptypes.h>
 
 static dissector_table_t ethertype_dissector_table;
 

epan/dissectors/packet-extreme.c

@@ -152,7 +152,7 @@ These are the structures you will see most often in EDP frames.
 #include <epan/strutil.h>
 #include <epan/in_cksum.h>
 #include "packet-llc.h"
-#include "oui.h"
+#include <epan/oui.h>
 
 static int hf_llc_extreme_pid = -1;
 

epan/dissectors/packet-fc.c

@@ -48,7 +48,7 @@
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
 #include <epan/conversation.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 #include "packet-fc.h"
 #include "packet-fclctl.h"
 #include "packet-fcbls.h"

epan/dissectors/packet-fcct.c

@@ -42,7 +42,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 #include "packet-fc.h"
 #include "packet-fcct.h"
 

epan/dissectors/packet-fcdns.c

@@ -50,7 +50,7 @@
 #include <epan/packet.h>
 #include <epan/emem.h>
 #include <epan/conversation.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 #include "packet-fc.h"
 #include "packet-fcct.h"
 #include "packet-fcdns.h"

epan/dissectors/packet-fcels.c

@@ -49,7 +49,7 @@
 #include <epan/packet.h>
 #include <epan/emem.h>
 #include <epan/conversation.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 #include "packet-fc.h"
 #include "packet-fcels.h"
 

epan/dissectors/packet-fcfcs.c

@@ -44,7 +44,7 @@
 #include <epan/packet.h>
 #include <epan/emem.h>
 #include <epan/conversation.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 #include "packet-fc.h"
 #include "packet-fcct.h"
 #include "packet-fcfcs.h"

epan/dissectors/packet-fcfzs.c

@@ -50,7 +50,7 @@
 #include <epan/packet.h>
 #include <epan/emem.h>
 #include <epan/conversation.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 #include "packet-fc.h"
 #include "packet-fcct.h"
 #include "packet-fcfzs.h"

epan/dissectors/packet-fclctl.c

@@ -42,7 +42,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 #include "packet-fc.h"
 #include "packet-fclctl.h"
 

epan/dissectors/packet-fcp.c

@@ -45,7 +45,7 @@
 #include <epan/emem.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 #include "packet-fc.h"
 #include "packet-fcp.h"
 #include "packet-scsi.h"

epan/dissectors/packet-fcsb3.c

@@ -51,7 +51,7 @@
 #include <epan/prefs.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 #include "packet-fc.h"
 #include "packet-fcsb3.h"
 

epan/dissectors/packet-fcsp.c

@@ -51,7 +51,7 @@
 #include <epan/prefs.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 #include "packet-fc.h"
 
 /* Message Codes */

epan/dissectors/packet-fcswils.c

@@ -44,7 +44,7 @@
 #include <epan/packet.h>
 #include <epan/emem.h>
 #include <epan/conversation.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 #include "packet-fc.h"
 #include "packet-fcswils.h"
 #include "packet-fcct.h"

epan/dissectors/packet-fr.c

@@ -54,10 +54,10 @@
 #include "packet-ppp.h"
 #include "packet-fr.h"
 #include <epan/xdlc.h>
-#include "etypes.h"
-#include "oui.h"
-#include "nlpid.h"
-#include "greproto.h"
+#include <epan/etypes.h>
+#include <epan/oui.h>
+#include <epan/nlpid.h>
+#include <epan/greproto.h>
 
 /*
  * Bits in the address field.

epan/dissectors/packet-fw1.c

@@ -92,7 +92,7 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/emem.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 
 /* Place FW1 summary in proto tree */
 static gboolean fw1_summary_in_tree = TRUE;

epan/dissectors/packet-g723.c

@@ -36,7 +36,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include "rtp_pt.h"
+#include <epan/rtp_pt.h>
 
 
 /* Initialize the protocol and registered fields */

epan/dissectors/packet-gmrp.c

@@ -37,7 +37,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include "llcsaps.h"
+#include <epan/llcsaps.h>
 
 /* Initialize the protocol and registered fields */
 static int proto_gmrp = -1;

epan/dissectors/packet-gre.c

@@ -31,10 +31,10 @@
 #include <epan/packet.h>
 #include "packet-wccp.h"
 #include <epan/in_cksum.h>
-#include "etypes.h"
-#include "greproto.h"
+#include <epan/etypes.h>
+#include <epan/greproto.h>
 #include <epan/ipproto.h>
-#include "llcsaps.h"
+#include <epan/llcsaps.h>
 
 /*
  * See RFC 1701 "Generic Routing Encapsulation (GRE)", RFC 1702

epan/dissectors/packet-gvrp.c

@@ -34,7 +34,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include "llcsaps.h"
+#include <epan/llcsaps.h>
 
 /* Initialize the protocol and registered fields */
 static int proto_gvrp = -1;

epan/dissectors/packet-h248.c

@@ -47,7 +47,7 @@
 #include "packet-isup.h"
 #include "packet-q931.h"
 
-#include "sctpppids.h"
+#include <epan/sctpppids.h>
 #define PNAME  "H.248 MEGACO"
 #define PSNAME "H248"
 #define PFNAME "h248"

epan/dissectors/packet-h261.c

@@ -42,7 +42,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "rtp_pt.h"
+#include <epan/rtp_pt.h>
 
 /* H.261 header fields             */
 static int proto_h261          = -1;

epan/dissectors/packet-h263.c

@@ -44,8 +44,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "rtp_pt.h"
-#include "iax2_codec_type.h"
+#include <epan/rtp_pt.h>
+#include <epan/iax2_codec_type.h>
 
 /* H.263 header fields             */
 static int proto_h263          = -1;

epan/dissectors/packet-hpext.c

@@ -30,8 +30,8 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/xdlc.h>
-#include "etypes.h"
-#include "llcsaps.h"
+#include <epan/etypes.h>
+#include <epan/llcsaps.h>
 #include "packet-hpext.h"
 
 static dissector_table_t subdissector_table;

epan/dissectors/packet-hpsw.c

@@ -29,7 +29,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 
 #include "packet-hpext.h"
 

epan/dissectors/packet-iapp.c

@@ -35,7 +35,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include "oui.h"
+#include <epan/oui.h>
 
 /* Initialize the protocol and registered fields */
 static int proto_iapp = -1;

epan/dissectors/packet-iax2.c

@@ -41,7 +41,7 @@
 #include <epan/emem.h>
 
 #include "packet-iax2.h"
-#include "iax2_codec_type.h"
+#include <epan/iax2_codec_type.h>
 
 #define IAX2_PORT		4569
 #define PROTO_TAG_IAX2		"IAX2"

epan/dissectors/packet-idp.c

@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-idp.h"
-#include "etypes.h"
+#include <epan/etypes.h>
 
 static int proto_idp = -1;
 static int hf_idp_checksum = -1;

epan/dissectors/packet-ieee80211.c

@@ -66,7 +66,7 @@
 #include "packet-ipx.h"
 #include "packet-llc.h"
 #include "packet-ieee80211.h"
-#include "etypes.h"
+#include <epan/etypes.h>
 #include <epan/crc32.h>
 #include <epan/tap.h>
 #include <epan/emem.h>

epan/dissectors/packet-ieee802a.c

@@ -28,8 +28,8 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include "oui.h"
-#include "etypes.h"
+#include <epan/oui.h>
+#include <epan/etypes.h>
 
 #include "packet-ieee802a.h"
 

epan/dissectors/packet-ip.c

@@ -39,19 +39,19 @@
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/ipproto.h>
-#include "ip_opts.h"
+#include <epan/ip_opts.h>
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
-#include "etypes.h"
-#include "greproto.h"
-#include "ppptypes.h"
-#include "llcsaps.h"
-#include "aftypes.h"
-#include "arcnet_pids.h"
+#include <epan/etypes.h>
+#include <epan/greproto.h>
+#include <epan/ppptypes.h>
+#include <epan/llcsaps.h>
+#include <epan/aftypes.h>
+#include <epan/arcnet_pids.h>
 #include "packet-ip.h"
 #include "packet-ipsec.h"
 #include <epan/in_cksum.h>
-#include "nlpid.h"
+#include <epan/nlpid.h>
 #include <epan/tap.h>
 #include <epan/emem.h>
 

epan/dissectors/packet-ipfc.c

@@ -37,7 +37,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 #include "packet-fc.h"
 #include "packet-ipfc.h"
 #include "packet-llc.h"

epan/dissectors/packet-ipv6.c

@@ -34,16 +34,16 @@
 #include <epan/packet.h>
 #include "packet-ipsec.h"
 #include "packet-ipv6.h"
-#include "ip_opts.h"
+#include <epan/ip_opts.h>
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
 #include <epan/ipproto.h>
-#include "etypes.h"
-#include "ppptypes.h"
-#include "aftypes.h"
-#include "nlpid.h"
-#include "arcnet_pids.h"
+#include <epan/etypes.h>
+#include <epan/ppptypes.h>
+#include <epan/aftypes.h>
+#include <epan/nlpid.h>
+#include <epan/arcnet_pids.h>
 
 /*
  * NOTE: ipv6.nxt is not very useful as we will have chained header.

epan/dissectors/packet-ipx.c

@@ -37,11 +37,11 @@
 #include <epan/packet.h>
 #include "packet-ipx.h"
 #include <epan/addr_resolv.h>
-#include "etypes.h"
-#include "ppptypes.h"
-#include "llcsaps.h"
-#include "aftypes.h"
-#include "arcnet_pids.h"
+#include <epan/etypes.h>
+#include <epan/ppptypes.h>
+#include <epan/llcsaps.h>
+#include <epan/aftypes.h>
+#include <epan/arcnet_pids.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>
 #include <epan/emem.h>

epan/dissectors/packet-isis-clv.c

@@ -36,7 +36,7 @@
 #include "packet-osi.h"
 #include "packet-isis.h"
 #include "packet-isis-clv.h"
-#include "nlpid.h"
+#include <epan/nlpid.h>
 
 /*
  * Name: isis_dissect_area_address_clv()

epan/dissectors/packet-isis.c

@@ -32,7 +32,7 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include "nlpid.h"
+#include <epan/nlpid.h>
 #include "packet-osi.h"
 #include "packet-isis.h"
 #include "packet-isis-lsp.h"

epan/dissectors/packet-isl.c

@@ -32,7 +32,7 @@
 #include "packet-eth.h"
 #include "packet-tr.h"
 #include "packet-frame.h"
-#include "etypes.h"
+#include <epan/etypes.h>
 
 /*
  * See

epan/dissectors/packet-ismp.c

@@ -36,7 +36,7 @@
 
 #include <epan/packet.h>
 #include <epan/strutil.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 
 
 /* Initialize the protocol and registered fields */

epan/dissectors/packet-isup.c

@@ -52,7 +52,7 @@
 #include "packet-q931.h"
 #include "packet-isup.h"
 #include "packet-e164.h"
-#include "sctpppids.h"
+#include <epan/sctpppids.h>
 #include <epan/emem.h>
 
 #define MTP3_ISUP_SERVICE_INDICATOR     5

epan/dissectors/packet-iua.c

@@ -37,7 +37,7 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include "sctpppids.h"
+#include <epan/sctpppids.h>
 
 #define NETWORK_BYTE_ORDER          FALSE
 

epan/dissectors/packet-juniper.c

@@ -29,13 +29,13 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 #include <epan/prefs.h>
 #include <epan/addr_resolv.h>
-#include "ppptypes.h"
+#include <epan/ppptypes.h>
 #include "packet-ppp.h"
 #include "packet-ip.h"
-#include "nlpid.h"
+#include <epan/nlpid.h>
 
 #define JUNIPER_FLAG_PKT_OUT        0x00     /* Outgoing packet */
 #define JUNIPER_FLAG_PKT_IN         0x01     /* Incoming packet */

epan/dissectors/packet-lapbether.c

@@ -32,7 +32,7 @@
 #include <glib.h>
 #include <string.h>
 #include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 
 static int proto_lapbether = -1;
 

epan/dissectors/packet-lapd.c

@@ -33,7 +33,7 @@
 #include <epan/packet.h>
 #include <epan/xdlc.h>
 
-#include "lapd_sapi.h"
+#include <epan/lapd_sapi.h>
 
 /* ISDN/LAPD references:
  *

epan/dissectors/packet-llc.c

@@ -29,13 +29,13 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include "oui.h"
+#include <epan/oui.h>
 #include <epan/xdlc.h>
-#include "etypes.h"
-#include "llcsaps.h"
-#include "bridged_pids.h"
-#include "ppptypes.h"
-#include "arcnet_pids.h"
+#include <epan/etypes.h>
+#include <epan/llcsaps.h>
+#include <epan/bridged_pids.h>
+#include <epan/ppptypes.h>
+#include <epan/arcnet_pids.h>
 #include "packet-fc.h"
 #include "packet-ip.h"
 #include "packet-ipx.h"

epan/dissectors/packet-lldp.c

@@ -39,8 +39,8 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/emem.h>
-#include "etypes.h"
-#include "oui.h"
+#include <epan/etypes.h>
+#include <epan/oui.h>
 
 /* TLV Types */
 #define END_OF_LLDPDU_TLV_TYPE		0x00	/* Mandatory */

epan/dissectors/packet-lmi.c

@@ -42,7 +42,7 @@
 #include <glib.h>
 #include <string.h>
 #include <epan/packet.h>
-#include "nlpid.h"
+#include <epan/nlpid.h>
 
 static int proto_lmi = -1;
 static int hf_lmi_call_ref = -1;

epan/dissectors/packet-lmp.c

@@ -53,7 +53,7 @@
 #include <epan/packet.h>
 #include <prefs.h>
 #include <epan/in_cksum.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 #include <epan/ipproto.h>
 
 #include "packet-ip.h"

epan/dissectors/packet-loop.c

@@ -32,7 +32,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 
 static int proto_loop = -1;
 static int hf_loop_skipcount = -1;

epan/dissectors/packet-m2pa.c

@@ -38,7 +38,7 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include "sctpppids.h"
+#include <epan/sctpppids.h>
 
 #define NETWORK_BYTE_ORDER          FALSE
 #define SCTP_PORT_M2PA              3565

epan/dissectors/packet-m2tp.c

@@ -36,7 +36,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include "sctpppids.h"
+#include <epan/sctpppids.h>
 
 #define SCTP_PORT_M2TP        9908  /* unassigned port number (not assigned by IANA) */
 

epan/dissectors/packet-m2ua.c

@@ -35,7 +35,7 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include "sctpppids.h"
+#include <epan/sctpppids.h>
 
 #define SCTP_PORT_M2UA                  2904
 #define NETWORK_BYTE_ORDER              FALSE

epan/dissectors/packet-m3ua.c

@@ -44,7 +44,7 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include "sctpppids.h"
+#include <epan/sctpppids.h>
 #include "packet-mtp3.h"
 
 #define SCTP_PORT_M3UA         2905

epan/dissectors/packet-maccontrol.c

@@ -30,7 +30,7 @@
 #include <epan/packet.h>
 #include "packet-ieee8023.h"
 #include "packet-llc.h"
-#include "etypes.h"
+#include <epan/etypes.h>
 
 static int proto_macctrl = -1;
 

epan/dissectors/packet-mip6.c

@@ -31,7 +31,7 @@
 #include <epan/packet.h>
 
 #include <epan/ipproto.h>
-#include "ip_opts.h"
+#include <epan/ip_opts.h>
 #include "packet-mip6.h"
 
 /* Initialize the protocol and registered header fields */

epan/dissectors/packet-mpeg1.c

@@ -41,7 +41,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "rtp_pt.h"
+#include <epan/rtp_pt.h>
 
 #define RTP_MPG_MBZ(word) ( word >> 11)
 #define RTP_MPG_T(word)   ( (word >> 10) & 1 )

epan/dissectors/packet-mpls.c

@@ -40,8 +40,8 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include "ppptypes.h"
-#include "etypes.h"
+#include <epan/ppptypes.h>
+#include <epan/etypes.h>
 #include <epan/prefs.h>
 #include "packet-ppp.h"
 #include "packet-mpls.h"

epan/dissectors/packet-ndmp.c

@@ -46,7 +46,7 @@
 #include "packet-frame.h"
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
-#include "rpc_defrag.h"
+#include <epan/rpc_defrag.h>
 
 #define TCP_PORT_NDMP 10000
 #define NDMP_RM_LASTFRAG 0x80000000

epan/dissectors/packet-netbios.c

@@ -35,7 +35,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include "llcsaps.h"
+#include <epan/llcsaps.h>
 #include <epan/reassemble.h>
 #include <epan/prefs.h>
 #include "packet-netbios.h"

epan/dissectors/packet-nt-oui.c

@@ -26,7 +26,7 @@
 
 #include <epan/packet.h>
 #include "packet-llc.h"
-#include "oui.h"
+#include <epan/oui.h>
 
 static int hf_llc_nortel_pid = -1;
 

epan/dissectors/packet-nt-sonmp.c

@@ -35,7 +35,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 /* #include "strutil.h" */
-#include "nlpid.h"
+#include <epan/nlpid.h>
 
 /* Although this protocol is propietary it is documented in the SynOptics MIB's
 * So I'm not giving anything away :-)

epan/dissectors/packet-null.c

@@ -40,8 +40,8 @@
 #include "packet-ipx.h"
 #include "packet-osi.h"
 #include "packet-ppp.h"
-#include "etypes.h"
-#include "aftypes.h"
+#include <epan/etypes.h>
+#include <epan/aftypes.h>
 
 static dissector_table_t null_dissector_table;
 

epan/dissectors/packet-osi-options.c

@@ -35,7 +35,7 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include "nlpid.h"
+#include <epan/nlpid.h>
 #include "packet-osi.h"
 #include "packet-isis.h"
 #include "packet-isis-clv.h"

epan/dissectors/packet-osi.c

@@ -34,11 +34,11 @@
 #include <ctype.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include "llcsaps.h"
-#include "aftypes.h"
-#include "nlpid.h"
-#include "ppptypes.h"
-#include "chdlctypes.h"
+#include <epan/llcsaps.h>
+#include <epan/aftypes.h>
+#include <epan/nlpid.h>
+#include <epan/ppptypes.h>
+#include <epan/chdlctypes.h>
 #include "packet-osi.h"
 #include "packet-isis.h"
 #include "packet-esis.h"

epan/dissectors/packet-pagp.c

@@ -34,9 +34,9 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include "etypes.h"
-#include "llcsaps.h"
-#include "ppptypes.h"
+#include <epan/etypes.h>
+#include <epan/llcsaps.h>
+#include <epan/ppptypes.h>
 #include <epan/address.h>
 #include <epan/addr_resolv.h>
 

epan/dissectors/packet-pflog.c

@@ -35,7 +35,7 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 #include <epan/addr_resolv.h>
 #include "packet-ip.h"
 #include "packet-ipv6.h"

epan/dissectors/packet-ppp.c

@@ -34,15 +34,15 @@
 #include <epan/prefs.h>
 #include <epan/packet.h>
 #include "packet-ppp.h"
-#include "ppptypes.h"
-#include "etypes.h"
-#include "ip_opts.h"
+#include <epan/ppptypes.h>
+#include <epan/etypes.h>
+#include <epan/ip_opts.h>
 #include <epan/atalk-utils.h>
 #include "packet-chdlc.h"
 #include "packet-ip.h"
 #include "packet-ipx.h"
 #include "packet-vines.h"
-#include "nlpid.h"
+#include <epan/nlpid.h>
 #include <epan/crc16.h>
 #include <epan/crc32.h>
 

epan/dissectors/packet-pppoe.c

@@ -29,7 +29,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/strutil.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 
 static int proto_pppoed = -1;