Move dissectors to epan/dissectors directory.

Also move ncp222.py, x11-fields, process-x11-fields.pl,
make-reg-dotc, and make-reg-dotc.py.

Adjust #include lines in files that include packet-*.h
files.

svn path=/trunk/; revision=11410

729 files changed, 989 insertions, 874 deletions

diff --git a/Makefile.common b/Makefile.common
index 9c6c9f1a2e..a3213da2dd 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -24,192 +24,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
-# corresponding headers
-DISSECTOR_INCLUDES =	\
-	packet-acse.h	\
-	packet-afp.h	\
-	packet-afs-defs.h	\
-	packet-afs-macros.h	\
-	packet-afs-register-info.h	\
-	packet-afs.h	\
-	packet-aim.h	\
-	packet-ansi_a.h	\
-	packet-ansi_map.h	\
-	packet-ap1394.h	\
-	packet-arcnet.h	\
-	packet-arp.h	\
-	packet-atalk.h	\
-	packet-atm.h	\
-	packet-ber.h	\
-	packet-bgp.h	\
-	packet-bootparams.h	\
-	packet-bssap.h	\
-	packet-chdlc.h	\
-	packet-clearcase.h	\
-	packet-clip.h	\
-	packet-data.h	\
-	packet-dccp.h	\
-	packet-dcerpc-atsvc.h	\
-	packet-dcerpc-browser.h	\
-	packet-dcerpc-dce122.h	\
-	packet-dcerpc-dcom.h	\
-	packet-dcerpc-dfs.h	\
-	packet-dcerpc-dnsserver.h	\
-	packet-dcerpc-drsuapi.h	\
-	packet-dcerpc-efs.h	\
-	packet-dcerpc-eventlog.h	\
-	packet-dcerpc-frsapi.h	\
-	packet-dcerpc-frsrpc.h	\
-	packet-dcerpc-initshutdown.h	\
-	packet-dcerpc-lsa.h	\
-	packet-dcerpc-mapi.h	\
-	packet-dcerpc-netlogon.h	\
-	packet-dcerpc-nt.h	\
-	packet-dcerpc-reg.h	\
-	packet-dcerpc-samr.h	\
-	packet-dcerpc-spoolss.h	\
-	packet-dcerpc-srvsvc.h	\
-	packet-dcerpc-svcctl.h	\
-	packet-dcerpc-tapi.h	\
-	packet-dcerpc-wkssvc.h	\
-	packet-dcerpc.h	\
-	packet-ddtp.h	\
-	packet-diameter-defs.h	\
-	packet-diffserv-mpls-common.h	\
-	packet-dns.h	\
-	packet-dvmrp.h	\
-	packet-e164.h   \
-	packet-edonkey.h	\
-	packet-esis.h	\
-	packet-eth.h	\
-	packet-fc.h	\
-	packet-fcbls.h	\
-	packet-fcct.h	\
-	packet-fcdns.h	\
-	packet-fcels.h	\
-	packet-fcfcs.h	\
-	packet-fcfzs.h	\
-	packet-fclctl.h	\
-	packet-fcp.h	\
-	packet-fcsb3.h	\
-	packet-fcsp.h	\
-	packet-fcswils.h	\
-	packet-fddi.h	\
-	packet-frame.h	\
-	packet-ftam.h	\
-	packet-giop.h	\
-	packet-gnutella.h	\
-	packet-gsm_a.h	\
-	packet-gsm_map.h	\
-	packet-gsm_sms.h	\
-	packet-gsm_ss.h	\
-	packet-gssapi.h	\
-	packet-gtp.h	\
-	packet-h225.h	\
-	packet-h235.h	\
-	packet-h245.h	\
-	packet-hclnfsd.h	\
-	packet-hpext.h	\
-	packet-http.h	\
-	packet-iax2.h	\
-	packet-ieee80211.h	\
-	packet-ieee8023.h	\
-	packet-igap.h	\
-	packet-igmp.h	\
-	packet-ip.h	\
-	packet-ipdc.h	\
-	packet-ipfc.h	\
-	packet-ipsec.h	\
-	packet-ipv6.h	\
-	packet-ipx.h	\
-	packet-isis-clv.h	\
-	packet-isis-hello.h	\
-	packet-isis-lsp.h	\
-	packet-isis-snp.h	\
-	packet-isis.h	\
-	packet-isl.h	\
-	packet-isup.h	\
-	packet-kerberos.h	\
-	packet-klm.h	\
-	packet-ldap.h	\
-	packet-ldp.h	\
-	packet-llc.h	\
-	packet-mip6.h	\
-	packet-mount.h	\
-	packet-mq.h	\
-	packet-mrdisc.h	\
-	packet-msnip.h	\
-	packet-mtp3.h	\
-	packet-ncp-int.h	\
-	packet-ncp-nmas.h	\
-	packet-ndps.h	\
-	packet-netbios.h	\
-	packet-nfs.h	\
-	packet-nisplus.h	\
-	packet-nlm.h	\
-	packet-ntp.h	\
-	packet-null.h	\
-	packet-osi-options.h	\
-	packet-osi.h	\
-	packet-pcnfsd.h	\
-	packet-per.h	\
-	packet-pflog.h	\
-	packet-pim.h	\
-	packet-pktc.h	\
-	packet-portmap.h	\
-	packet-ppp.h	\
-	packet-pres.h	\
-	packet-prism.h	\
-	packet-q931.h	\
-	packet-radiotap.h	\
-	packet-raw.h	\
-	packet-ripng.h	\
-	packet-rmi.h	\
-	packet-rpc.h	\
-	packet-rquota.h	\
-	packet-rsvp.h	\
-	packet-rtcp.h	\
-	packet-rtp.h	\
-	packet-rtps.h   \
-	packet-rtp-events.h	\
-	packet-rwall.h	\
-	packet-rx.h	\
-	packet-scsi.h	\
-	packet-sctp.h	\
-	packet-ses.h	\
-	packet-sip.h	\
-	packet-sll.h	\
-	packet-smb-browse.h	\
-	packet-smb-common.h	\
-	packet-smb-mailslot.h	\
-	packet-smb-pipe.h	\
-	packet-smb-sidsnooping.h	\
-	packet-sna.h	\
-	packet-snmp.h	\
-	packet-spray.h	\
-	packet-stat-notify.h	\
-	packet-stat.h	\
-	packet-tacacs.h	\
-	packet-tcap.h	\
-	packet-tcp.h	\
-	packet-tns.h	\
-	packet-tpkt.h	\
-	packet-tr.h	\
-	packet-udp.h	\
-	packet-vines.h	\
-	packet-vlan.h	\
-	packet-wap.h	\
-	packet-wccp.h	\
-	packet-wlancap.h	\
-	packet-wsp.h	\
-	packet-wtls.h	\
-	packet-wtp.h	\
-	packet-x11-keysym.h	\
-	packet-x11-keysymdef.h	\
-	packet-ypbind.h	\
-	packet-yppasswd.h	\
-	packet-ypserv.h	\
-	packet-ypxfr.h
 
 # corresponding headers
 DISSECTOR_SUPPORT_INCLUDES =	\
@@ -395,7 +209,6 @@ randpkt_SOURCES = \
 
 # this target needed for distribution only
 noinst_HEADERS =	\
-	$(DISSECTOR_INCLUDES) \
 	$(DISSECTOR_SUPPORT_INCLUDES) \
 	$(ETHEREAL_COMMON_INCLUDES) \
 	$(ethereal_INCLUDES) \
diff --git a/Makefile.nmake b/Makefile.nmake
index dd94a0926c..a008952640 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -32,15 +32,6 @@ include epan\Makefile.common
 BUILT_SOURCES =	$(BUILT_SOURCES) \
 	svnversion.h
 
-DISSECTOR_SRC = $(DISSECTOR_SRC:../=)
-DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
-
-DISSECTOR_SUPPORT_SRC = $(DISSECTOR_SUPPORT_SRC:../=)
-DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj)
-
-# remove register.obj from "DISSECTOR_SUPPORT_OBJECTS". 
-# creation and compilation of register.c has been moved to epan.  
-DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_OBJECTS:register.obj=)
 
 ethereal_OBJECTS = $(ethereal_SOURCES:.c=.obj)
 tethereal_OBJECTS = $(tethereal_SOURCES:.c=.obj)
@@ -60,7 +51,7 @@ ethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
 !IFDEF ENABLE_LIBETHEREAL
 	epan\libethereal.lib \
 !ELSE
-	dissectors.lib \
+	epan\dissectors\dissectors.lib \
 	epan\ethereal.lib \
 	epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \
 	$(ADNS_LIBS) \
@@ -76,7 +67,7 @@ tethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
 !IFDEF ENABLE_LIBETHEREAL
 	epan\libethereal.lib \
 !ELSE
-	dissectors.lib \
+	epan\dissectors\dissectors.lib \
 	epan\ethereal.lib \
 	epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \
 	$(ADNS_LIBS) \
@@ -99,7 +90,7 @@ dftest_LIBS=  wiretap\wiretap-$(WTAP_VERSION).lib \
 !IFDEF ENABLE_LIBETHEREAL
 	epan\libethereal.lib \
 !ELSE
-	dissectors.lib \
+	epan\dissectors\dissectors.lib \
 	epan\ethereal.lib \
 	epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \
 	$(ADNS_LIBS) \
@@ -144,7 +135,7 @@ wiretap\wiretap-$(WTAP_VERSION).lib: wiretap
 !IFNDEF GTK1_DIR
 ethereal.exe	: 
 !ELSE
-ethereal.exe	: config.h svnversion.h $(ethereal_OBJECTS) $(EXTRA_OBJECTS) epan gtk image\ethereal.res wiretap\wiretap-$(WTAP_VERSION).lib gtk\libui.lib dissectors.lib plugins
+ethereal.exe	: config.h svnversion.h $(ethereal_OBJECTS) $(EXTRA_OBJECTS) epan gtk image\ethereal.res wiretap\wiretap-$(WTAP_VERSION).lib gtk\libui.lib plugins
 	@echo Linking $@
 	$(LINK) @<<
 		/OUT:ethereal.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(ethereal_LIBS) $(GTK1_LIBS) gtk\libui.lib $(ethereal_OBJECTS) $(EXTRA_OBJECTS) image\ethereal.res
@@ -154,14 +145,14 @@ ethereal.exe	: config.h svnversion.h $(ethereal_OBJECTS) $(EXTRA_OBJECTS) epan g
 !IFNDEF GTK2_DIR
 ethereal-gtk2.exe	: 
 !ELSE
-ethereal-gtk2.exe	: config.h svnversion.h $(ethereal_OBJECTS) $(EXTRA_OBJECTS) epan gtk2 image\ethereal.res wiretap\wiretap-$(WTAP_VERSION).lib gtk2.tmp\libui.lib dissectors.lib plugins
+ethereal-gtk2.exe	: config.h svnversion.h $(ethereal_OBJECTS) $(EXTRA_OBJECTS) epan gtk2 image\ethereal.res wiretap\wiretap-$(WTAP_VERSION).lib gtk2.tmp\libui.lib plugins
 	@echo Linking $@
 	$(LINK) @<<
 		/OUT:ethereal-gtk2.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(ethereal_LIBS) $(GTK2_LIBS) gtk2.tmp\libui.lib $(ethereal_OBJECTS) $(EXTRA_OBJECTS) image\ethereal.res
 <<
 !ENDIF
 
-tethereal.exe	: config.h svnversion.h $(tethereal_OBJECTS) $(EXTRA_OBJECTS) epan image\tethereal.res wiretap\wiretap-$(WTAP_VERSION).lib dissectors.lib plugins
+tethereal.exe	: config.h svnversion.h $(tethereal_OBJECTS) $(EXTRA_OBJECTS) epan image\tethereal.res wiretap\wiretap-$(WTAP_VERSION).lib plugins
 	@echo Linking $@
 	$(LINK) @<<
 		/OUT:tethereal.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(tethereal_LIBS) $(tethereal_OBJECTS) $(EXTRA_OBJECTS) image\tethereal.res
@@ -185,7 +176,7 @@ text2pcap.exe	: config.h text2pcap.obj text2pcap-scanner.obj getopt.obj strptime
 		/OUT:text2pcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console text2pcap.obj text2pcap-scanner.obj getopt.obj strptime.obj image\text2pcap.res
 <<
 
-dftest.exe	: $(dftest_OBJECTS) $(EXTRA_OBJECTS) dissectors.lib
+dftest.exe	: $(dftest_OBJECTS) $(EXTRA_OBJECTS) epan
 	$(LINK) @<<
 		/OUT:dftest.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(dftest_LIBS) $(dftest_OBJECTS) $(EXTRA_OBJECTS)
 <<
@@ -195,9 +186,6 @@ randpkt.exe	: $(randpkt_OBJECTS) $(EXTRA_OBJECTS)
 		/OUT:randpkt.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(randpkt_LIBS) $(randpkt_OBJECTS)
 <<
 
-dissectors.lib: config.h $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) $(EXTRA_OBJECTS)
-	link /lib /out:dissectors.lib $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) $(EXTRA_OBJECTS)
-
 config.h	: config.h.win32 config.nmake
 	sed -e s/@VERSION@/$(VERSION)/ \
 	    -e "s/@HAVE_GNU_ADNS@/$(ADNS_CONFIG)/" \
@@ -280,7 +268,6 @@ gtk2_distclean:
 clean: gtk2_distclean
 	rm -f $(ethereal_OBJECTS) $(tethereal_OBJECTS) $(EXTRA_OBJECTS) \
 		$(EXECUTABLES) $(PDB_FILE) \
-		$(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) dissectors.lib\
 		editcap.obj mergecap.obj text2pcap.obj getopt.obj\
 		text2pcap-scanner.obj text2pcap-scanner.c rdps.obj \
 		rdps.pdb config.h ps.c AUTHORS-SHORT \
@@ -360,7 +347,7 @@ gtk2:: help config.h svnversion.h AUTHORS-SHORT
 	$(MAKE) /$(MAKEFLAGS) /f Makefile.nmake GTK_CFLAGS="$(GTK2_CFLAGS)" GTK_LIBS="$(GTK2_LIBS)" libui.lib
 	cd ..
 
-epan:: $(RESOURCES) packet-ncp2222.c x11-declarations.h x11-register-info.h dissectors.lib doxygen
+epan:: $(RESOURCES) packet-ncp2222.c x11-declarations.h x11-register-info.h doxygen
 	cd epan
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
 	cd ..
diff --git a/capture.c b/capture.c
index 7e02ee3b9c..4b6cf86e79 100644
--- a/capture.c
+++ b/capture.c
@@ -150,22 +150,22 @@
 #include "wiretap/wtap.h"
 #include "wiretap/wtap-capture.h"
 
-#include "packet-ap1394.h"
-#include "packet-atalk.h"
-#include "packet-atm.h"
-#include "packet-clip.h"
-#include "packet-eth.h"
-#include "packet-fddi.h"
-#include "packet-null.h"
-#include "packet-ppp.h"
-#include "packet-raw.h"
-#include "packet-sll.h"
-#include "packet-tr.h"
-#include "packet-ieee80211.h"
-#include "packet-chdlc.h"
-#include "packet-prism.h"
-#include "packet-ipfc.h"
-#include "packet-arcnet.h"
+#include <epan/dissectors/packet-ap1394.h>
+#include <epan/dissectors/packet-atalk.h>
+#include <epan/dissectors/packet-atm.h>
+#include <epan/dissectors/packet-clip.h>
+#include <epan/dissectors/packet-eth.h>
+#include <epan/dissectors/packet-fddi.h>
+#include <epan/dissectors/packet-null.h>
+#include <epan/dissectors/packet-ppp.h>
+#include <epan/dissectors/packet-raw.h>
+#include <epan/dissectors/packet-sll.h>
+#include <epan/dissectors/packet-tr.h>
+#include <epan/dissectors/packet-ieee80211.h>
+#include <epan/dissectors/packet-chdlc.h>
+#include <epan/dissectors/packet-prism.h>
+#include <epan/dissectors/packet-ipfc.h>
+#include <epan/dissectors/packet-arcnet.h>
 
 #ifdef _WIN32
 #include "capture-wpcap.h"
diff --git a/configure.in b/configure.in
index a712bf4b76..648f320af1 100644
--- a/configure.in
+++ b/configure.in
@@ -1142,6 +1142,7 @@ AC_OUTPUT(
   epan/Makefile
   epan/doxygen.cfg
   epan/dfilter/Makefile
+  epan/dissectors/Makefile
   epan/ftypes/Makefile
   gtk/Makefile
   gtk/doxygen.cfg
diff --git a/epan/Makefile.am b/epan/Makefile.am
index acee84de01..c058cc7c5c 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -22,7 +22,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-SUBDIRS = ftypes dfilter
+SUBDIRS = ftypes dfilter dissectors
 
 # EPAN will eventually be a shared library. While I move source code around,
 # however, it is an archive library.
@@ -124,75 +124,12 @@ MAINTAINERCLEANFILES =	\
 #
 # Add the object files for missing routines, if any.
 #
-libethereal_la_LIBADD = @INET_ATON_O@ @INET_PTON_O@ @INET_NTOP_O@ dfilter/libdfilter.la ftypes/libftypes.la
-libethereal_la_DEPENDENCIES = @INET_ATON_O@ @INET_PTON_O@ @INET_NTOP_O@ dfilter/libdfilter.la ftypes/libftypes.la
-
-../packet-ncp2222.c : $(srcdir)/../ncp2222.py
-	$(PYTHON) $(srcdir)/../ncp2222.py -o $@
+libethereal_la_LIBADD = @INET_ATON_O@ @INET_PTON_O@ @INET_NTOP_O@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la
+libethereal_la_DEPENDENCIES = @INET_ATON_O@ @INET_PTON_O@ @INET_NTOP_O@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la
 
 tvbtest: tvbtest.o tvbuff.o except.o strutil.o
 	$(LINK) -o tvbtest tvbtest.o tvbuff.o except.o strutil.o `glib-config --libs`
 
-#
-# Build "register.c", which contains a function "register_all_protocols()"
-# that calls the register routines for all protocols.
-#
-# We do this by grepping through sources.  If that turns out to be too slow,
-# maybe we could just require every .o file to have an register routine
-# of a given name (packet-aarp.o -> proto_register_aarp, etc.).
-#
-# Formatting conventions:  The name of the proto_register_* routines must
-# start in column zero, or must be preceded only by "void " starting in
-# column zero, and must not be inside #if.
-#
-# We assume that all dissector routines are in "packet-XXX.c" files.
-#
-# For some unknown reason, having a big "for" loop in the Makefile
-# to scan all the "packet-XXX.c" files doesn't work with some "make"s;
-# they seem to pass only the first few names in the list to the shell,
-# for some reason.
-#
-# Therefore, we have a script to generate the "register.c" file.
-#
-# The first argument is the name of the file to write.
-# The second argument is the directory in which the source files live.
-# All subsequent arguments are the files to scan.
-#
-# HACK : removing config.h is a hack and may be removed at the end of August 2004
-register.c: $(plugin_src) $(DISSECTOR_SRC) $(srcdir)/../make-reg-dotc
-	@rm -f config.h
-	@if test -n $(PYTHON); then \
-		echo Making register.c with python ; \
-		$(PYTHON) $(srcdir)/../make-reg-dotc.py $(srcdir) $(DISSECTOR_SRC) ; \
-	else \
-		echo Making register.c with shell script ; \
-		$(srcdir)/../make-reg-dotc register.c $(srcdir) \
-			$(plugin_src) $(DISSECTOR_SRC) ; \
-	fi
-
-#
-# Currently register.c can be included in the distribution because
-# we always build all protocol dissectors. We used to have to check
-# whether or not to build the snmp dissector. If we again need to
-# variably build something, making register.c non-portable, uncomment
-# the dist-hook line below.
-#
-# Oh, yuk.  We don't want to include "register.c" in the distribution, as
-# its contents depend on the configuration, and therefore we want it
-# to be built when the first "make" is done; however, Automake insists
-# on putting *all* source into the distribution.
-#
-# We work around this by having a "dist-hook" rule that deletes
-# "register.c", so that "dist" won't pick it up.
-#
-#dist-hook:
-#	@rm -f $(distdir)/register.c
-
-#
-# Build various header files for the X11 dissector.
-#
-x11-declarations.h x11-register-info.h: ../x11-fields ../process-x11-fields.pl
-	$(PERL) $(srcdir)/../process-x11-fields.pl <$(srcdir)/../x11-fields
 
 if HAVE_PLUGINS
 
diff --git a/epan/Makefile.common b/epan/Makefile.common
index 2e2c50532e..535790e56c 100644
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -24,481 +24,9 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
-# the dissector sources (without any helpers)
-DISSECTOR_SRC =	\
-	../packet-3g-a11.c	\
-	../packet-aarp.c	\
-	../packet-acap.c	\
-	../packet-acse.c	\
-	../packet-afp.c	\
-	../packet-afs.c	\
-	../packet-aim.c	\
-	../packet-aim-adverts.c	\
-	../packet-aim-admin.c \
-	../packet-aim-bos.c \
-	../packet-aim-buddylist.c	\
-	../packet-aim-chat.c	\
-	../packet-aim-chatnav.c \
-	../packet-aim-directory.c	\
-	../packet-aim-generic.c	\
-	../packet-aim-icq.c \
-	../packet-aim-invitation.c \
-	../packet-aim-location.c \
-	../packet-aim-messaging.c \
-	../packet-aim-oft.c \
-	../packet-aim-popup.c \
-	../packet-aim-signon.c \
-	../packet-aim-ssi.c \
-	../packet-aim-stats.c \
-	../packet-aim-translate.c \
-	../packet-aim-userlookup.c \
-	../packet-ajp13.c	\
-	../packet-alcap.c	\
-	../packet-ans.c	\
-	../packet-ansi_637.c	\
-	../packet-ansi_683.c	\
-	../packet-ansi_801.c	\
-	../packet-ansi_a.c	\
-	../packet-ansi_map.c	\
-	../packet-aodv.c	\
-	../packet-ap1394.c	\
-	../packet-arcnet.c	\
-	../packet-arp.c	\
-	../packet-asap.c	\
-	../packet-ascend.c	\
-	../packet-asf.c	\
-	../packet-atalk.c	\
-	../packet-atm.c	\
-	../packet-auto_rp.c	\
-	../packet-bacapp.c	\
-	../packet-bacnet.c	\
-	../packet-beep.c	\
-	../packet-ber.c	\
-	../packet-bfd.c	\
-	../packet-bgp.c	\
-	../packet-bofl.c	\
-	../packet-bootp.c	\
-	../packet-bootparams.c	\
-	../packet-bpdu.c	\
-	../packet-brdwlk.c	\
-	../packet-bssap.c	\
-	../packet-bssgp.c	\
-	../packet-bvlc.c	\
-	../packet-cast.c	\
-	../packet-ccsds.c	\
-	../packet-cdp.c	\
-	../packet-cgmp.c	\
-	../packet-chdlc.c	\
-	../packet-cisco-oui.c	\
-	../packet-clearcase.c	\
-	../packet-clip.c	\
-	../packet-clnp.c	\
-	../packet-cops.c	\
-	../packet-cosine.c	\
-	../packet-cpfi.c	\
-	../packet-cpha.c	\
-	../packet-cups.c	\
-	../packet-data.c	\
-	../packet-dccp.c	\
-	../packet-dcerpc-afs4int.c	\
-	../packet-dcerpc-atsvc.c	\
-	../packet-dcerpc-bossvr.c	\
-	../packet-dcerpc-browser.c	\
-	../packet-dcerpc-budb.c	\
-	../packet-dcerpc-butc.c	\
-	../packet-dcerpc-cds_clerkserver.c	\
-	../packet-dcerpc-cds_solicit.c	\
-	../packet-dcerpc-conv.c	\
-	../packet-dcerpc-cprpc_server.c	\
-	../packet-dcerpc-dce122.c	\
-	../packet-dcerpc-dfs.c	\
-	../packet-dcerpc-dnsserver.c	\
-	../packet-dcerpc-drsuapi.c	\
-	../packet-dcerpc-dtsprovider.c	\
-	../packet-dcerpc-dtsstime_req.c	\
-	../packet-dcerpc-efs.c	\
-	../packet-dcerpc-epm.c	\
-	../packet-dcerpc-epm4.c	\
-	../packet-dcerpc-eventlog.c	\
-	../packet-dcerpc-fldb.c	\
-	../packet-dcerpc-frsapi.c	\
-	../packet-dcerpc-frsrpc.c	\
-	../packet-dcerpc-ftserver.c	\
-	../packet-dcerpc-icl_rpc.c	\
-	../packet-dcerpc-initshutdown.c	\
-	../packet-dcerpc-krb5rpc.c	\
-	../packet-dcerpc-llb.c	\
-	../packet-dcerpc-lsa-ds.c	\
-	../packet-dcerpc-lsa.c	\
-	../packet-dcerpc-mapi.c	\
-	../packet-dcerpc-messenger.c	\
-	../packet-dcerpc-mgmt.c	\
-	../packet-dcerpc-ndr.c	\
-	../packet-dcerpc-netlogon.c	\
-	../packet-dcerpc-nspi.c	\
-	../packet-dcerpc-oxid.c	\
-	../packet-dcerpc-rdaclif.c	\
-	../packet-dcerpc-reg.c	\
-	../packet-dcerpc-remact.c	\
-	../packet-dcerpc-rep_proc.c	\
-	../packet-dcerpc-roverride.c	\
-	../packet-dcerpc-rpriv.c	\
-	../packet-dcerpc-rs_acct.c	\
-	../packet-dcerpc-rs_attr.c	\
-	../packet-dcerpc-rs_attr_schema.c	\
-	../packet-dcerpc-rs_bind.c	\
-	../packet-dcerpc-rs_misc.c	\
-	../packet-dcerpc-rs_pgo.c	\
-	../packet-dcerpc-rs_plcy.c	\
-	../packet-dcerpc-rs_prop_acct.c	\
-	../packet-dcerpc-rs_prop_acl.c	\
-	../packet-dcerpc-rs_prop_attr.c	\
-	../packet-dcerpc-rs_prop_pgo.c	\
-	../packet-dcerpc-rs_prop_plcy.c	\
-	../packet-dcerpc-rs_pwd_mgmt.c	\
-	../packet-dcerpc-rs_repadm.c	\
-	../packet-dcerpc-rs_replist.c	\
-	../packet-dcerpc-rs_repmgr.c	\
-	../packet-dcerpc-rs_unix.c	\
-	../packet-dcerpc-rsec_login.c	\
-	../packet-dcerpc-samr.c	\
-	../packet-dcerpc-secidmap.c	\
-	../packet-dcerpc-spoolss.c	\
-	../packet-dcerpc-srvsvc.c	\
-	../packet-dcerpc-svcctl.c	\
-	../packet-dcerpc-tapi.c	\
-	../packet-dcerpc-tkn4int.c	\
-	../packet-dcerpc-trksvr.c	\
-	../packet-dcerpc-ubikdisk.c	\
-	../packet-dcerpc-ubikvote.c	\
-	../packet-dcerpc-update.c	\
-	../packet-dcerpc-wkssvc.c	\
-	../packet-dcerpc.c	\
-	../packet-dcm.c		\
-	../packet-ddtp.c	\
-	../packet-dec-bpdu.c	\
-	../packet-dhcpv6.c	\
-	../packet-diameter.c	\
-	../packet-diffserv-mpls-common.c	\
-	../packet-distcc.c	\
-	../packet-dlsw.c	\
-	../packet-dnp.c	\
-	../packet-dns.c	\
-	../packet-dsi.c	\
-	../packet-dvmrp.c	\
-	../packet-e164.c	\
-	../packet-eap.c	\
-	../packet-eapol.c	\
-	../packet-echo.c	\
-	../packet-edonkey.c	\
-	../packet-eigrp.c	\
-	../packet-enc.c	\
-	../packet-enip.c	\
-	../packet-enrp.c	\
-	../packet-esis.c	\
-	../packet-eth.c	\
-	../packet-etherip.c	\
-	../packet-ethertype.c	\
-	../packet-fc.c	\
-	../packet-fcct.c	\
-	../packet-fcdns.c	\
-	../packet-fcels.c	\
-	../packet-fcfcs.c	\
-	../packet-fcfzs.c	\
-	../packet-fcip.c	\
-	../packet-fclctl.c	\
-	../packet-fcp.c	\
-	../packet-fcsb3.c	\
-	../packet-fcsp.c	\
-	../packet-fcswils.c	\
-	../packet-fddi.c	\
-	../packet-fix.c	\
-	../packet-fr.c	\
-	../packet-frame.c	\
-	../packet-ftam.c	\
-	../packet-ftp.c	\
-	../packet-fw1.c	\
-	../packet-gift.c	\
-	../packet-giop.c	\
-	../packet-gmrp.c	\
-	../packet-gnutella.c	\
-	../packet-gprs-llc.c	\
-	../packet-gprs-ns.c	\
-	../packet-gre.c	\
-	../packet-gsm_a.c	\
-	../packet-gsm_map.c	\
-	../packet-gsm_sms.c	\
-	../packet-gsm_sms_ud.c	\
-	../packet-gsm_ss.c	\
-	../packet-gssapi.c	\
-	../packet-gtp.c	\
-	../packet-gvrp.c	\
-	../packet-h1.c	\
-	../packet-h225.c	\
-	../packet-h235.c	\
-	../packet-h245.c	\
-	../packet-h261.c	\
-	../packet-h263.c	\
-	../packet-h450.c	\
-	../packet-hclnfsd.c	\
-	../packet-hpext.c	\
-	../packet-hsrp.c	\
-	../packet-http.c	\
-	../packet-hyperscsi.c	\
-	../packet-iapp.c	\
-	../packet-iax2.c	\
-	../packet-ib.c	\
-	../packet-icap.c	\
-	../packet-icmpv6.c	\
-	../packet-icp.c	\
-	../packet-icq.c	\
-	../packet-ieee80211.c	\
-	../packet-ieee8023.c	\
-	../packet-igap.c	\
-	../packet-igmp.c	\
-	../packet-igrp.c	\
-	../packet-image-gif.c	\
-	../packet-image-jfif.c	\
-	../packet-imap.c	\
-	../packet-ip.c	\
-	../packet-ipdc.c	\
-	../packet-ipfc.c	\
-	../packet-ipmi.c	\
-	../packet-ipp.c	\
-	../packet-ipsec-udp.c	\
-	../packet-ipsec.c	\
-	../packet-ipv6.c	\
-	../packet-ipvs-syncd.c	\
-	../packet-ipx.c	\
-	../packet-ipxwan.c	\
-	../packet-irc.c	\
-	../packet-isakmp.c	\
-	../packet-iscsi.c	\
-	../packet-isdn.c	\
-	../packet-isis-clv.c	\
-	../packet-isis-hello.c	\
-	../packet-isis-lsp.c	\
-	../packet-isis-snp.c	\
-	../packet-isis.c	\
-	../packet-isl.c	\
-	../packet-ismp.c	\
-	../packet-isns.c	\
-	../packet-isup.c	\
-	../packet-iua.c	\
-	../packet-jabber.c	\
-	../packet-kadm5.c	\
-	../packet-kerberos.c	\
-	../packet-klm.c	\
-	../packet-kpasswd.c	\
-	../packet-l2tp.c	\
-	../packet-lapb.c	\
-	../packet-lapbether.c	\
-	../packet-lapd.c	\
-	../packet-laplink.c	\
-	../packet-ldap.c	\
-	../packet-ldp.c	\
-	../packet-llc.c	\
-	../packet-lmi.c	\
-	../packet-lmp.c	\
-	../packet-lpd.c	\
-	../packet-lwapp.c	\
-	../packet-m2pa.c	\
-	../packet-m2tp.c	\
-	../packet-m2ua.c	\
-	../packet-m3ua.c	\
-	../packet-mbtcp.c	\
-	../packet-mdshdr.c	\
-	../packet-media.c	\
-	../packet-mip.c	\
-	../packet-mip6.c	\
-	../packet-mmse.c	\
-	../packet-mount.c	\
-	../packet-mpeg1.c	\
-	../packet-mpls.c	\
-	../packet-mpls-echo.c   \
-	../packet-mq.c		\
-	../packet-mq-pcf.c	\
-	../packet-mrdisc.c	\
-	../packet-msdp.c	\
-	../packet-msn-messenger.c	\
-	../packet-msnip.c	\
-	../packet-msproxy.c	\
-	../packet-mtp2.c	\
-	../packet-mtp3.c	\
-	../packet-mtp3mg.c	\
-	../packet-multipart.c	\
-	../packet-mysql.c	\
-	../packet-nbipx.c	\
-	../packet-nbns.c	\
-	../packet-ncp.c	\
-	../packet-ncp2222.c	\
-	../packet-ncp-nmas.c	\
-	../packet-ndmp.c	\
-	../packet-ndps.c	\
-	../packet-netbios.c	\
-	../packet-netflow.c	\
-	../packet-nfs.c	\
-	../packet-nfsacl.c	\
-	../packet-nfsauth.c	\
-	../packet-nisplus.c	\
-	../packet-nlm.c	\
-	../packet-nlsp.c	\
-	../packet-nntp.c	\
-	../packet-nt-oui.c	\
-	../packet-nt-sonmp.c	\
-	../packet-nt-tpcp.c	\
-	../packet-ntlmssp.c	\
-	../packet-ntp.c	\
-	../packet-null.c	\
-	../packet-olsr.c	\
-	../packet-osi-options.c	\
-	../packet-osi.c	\
-	../packet-ospf.c	\
-	../packet-pcnfsd.c	\
-	../packet-per.c	\
-	../packet-pflog.c	\
-	../packet-pgm.c	\
-	../packet-pim.c	\
-	../packet-pktc.c	\
-	../packet-pop.c	\
-	../packet-portmap.c	\
-	../packet-postgresql.c	\
-	../packet-ppp.c	\
-	../packet-pppoe.c	\
-	../packet-pptp.c	\
-	../packet-pres.c	\
-	../packet-prism.c	\
-	../packet-ptp.c		\
-	../packet-q2931.c	\
-	../packet-q931.c	\
-	../packet-q933.c	\
-	../packet-qllc.c	\
-	../packet-quake.c	\
-	../packet-quake2.c	\
-	../packet-quake3.c	\
-	../packet-quakeworld.c	\
-	../packet-radius.c	\
-	../packet-radiotap.c	\
-	../packet-ranap.c	\
-	../packet-raw.c	\
-	../packet-rip.c	\
-	../packet-ripng.c	\
-	../packet-rlogin.c	\
-	../packet-rmcp.c	\
-	../packet-rmi.c	\
-	../packet-rmp.c	\
-	../packet-rpc.c	\
-	../packet-rpl.c	\
-	../packet-rquota.c	\
-	../packet-rsh.c	\
-	../packet-rstat.c	\
-	../packet-rsvp.c	\
-	../packet-rsync.c	\
-	../packet-rtcp.c	\
-	../packet-rtp-events.c	\
-	../packet-rtp.c	\
-	../packet-rtps.c \
-	../packet-rtsp.c	\
-	../packet-rwall.c	\
-	../packet-rx.c	\
-	../packet-sadmind.c	\
-	../packet-sap.c	\
-	../packet-sccp.c	\
-	../packet-sccpmg.c	\
-	../packet-scsi.c	\
-	../packet-sctp.c	\
-	../packet-sdlc.c	\
-	../packet-sdp.c	\
-	../packet-sebek.c	\
-	../packet-ses.c	\
-	../packet-sflow.c	\
-	../packet-sip.c	\
-	../packet-sigcomp.c	\
-	../packet-sipfrag.c	\
-	../packet-skinny.c	\
-	../packet-slimp3.c	\
-	../packet-sll.c	\
-	../packet-slowprotocols.c	\
-	../packet-slsk.c	\
-	../packet-smb-browse.c	\
-	../packet-smb-common.c	\
-	../packet-smb-logon.c	\
-	../packet-smb-mailslot.c	\
-	../packet-smb-pipe.c	\
-	../packet-smb-sidsnooping.c	\
-	../packet-smb.c	\
-	../packet-smpp.c	\
-	../packet-smtp.c	\
-	../packet-sna.c	\
-	../packet-snaeth.c	\
-	../packet-sndcp.c	\
-	../packet-snmp.c	\
-	../packet-socks.c	\
-	../packet-spnego.c	\
-	../packet-spray.c	\
-	../packet-srvloc.c	\
-	../packet-sscop.c	\
-	../packet-ssh.c	\
-	../packet-ssl.c	\
-	../packet-stat-notify.c	\
-	../packet-stat.c	\
-	../packet-stun.c	\
-	../packet-sua.c	\
-	../packet-symantec.c	\
-	../packet-syslog.c	\
-	../packet-t38.c	\
-	../packet-tacacs.c	\
-	../packet-tcap.c	\
-	../packet-tcp.c	\
-	../packet-tds.c	\
-	../packet-teimanagement.c	\
-	../packet-telnet.c	\
-	../packet-teredo.c	\
-	../packet-text-media.c	\
-	../packet-tftp.c	\
-	../packet-time.c	\
-	../packet-tns.c	\
-	../packet-tpkt.c	\
-	../packet-tr.c	\
-	../packet-trmac.c	\
-	../packet-tsp.c	\
-	../packet-tuxedo.c	\
-	../packet-tzsp.c	\
-	../packet-ucp.c	\
-	../packet-udp.c	\
-	../packet-v120.c	\
-	../packet-vines.c	\
-	../packet-vj.c	\
-	../packet-vlan.c	\
-	../packet-vrrp.c	\
-	../packet-vtp.c	\
-	../packet-wap.c	\
-	../packet-wbxml.c	\
-	../packet-wccp.c	\
-	../packet-wcp.c	\
-	../packet-wfleet-hdlc.c	\
-	../packet-who.c	\
-	../packet-wlancap.c	\
-	../packet-wsp.c	\
-	../packet-wtls.c	\
-	../packet-wtp.c	\
-	../packet-x11.c	\
-	../packet-x25.c	\
-	../packet-x29.c	\
-	../packet-xdmcp.c	\
-	../packet-xot.c	\
-	../packet-xyplex.c	\
-	../packet-yhoo.c	\
-	../packet-ymsg.c	\
-	../packet-ypbind.c	\
-	../packet-yppasswd.c	\
-	../packet-ypserv.c	\
-	../packet-ypxfr.c	\
-	../packet-zebra.c
 
 # dissector helpers (needed from the dissectors, but not a dissector itself)
 DISSECTOR_SUPPORT_SRC =	\
-	register.c	\
 	../adler32.c	\
 	../afn.c	\
 	../asn1.c	\
@@ -513,7 +41,6 @@ DISSECTOR_SUPPORT_SRC =	\
 	../h225-persistentdata.c	\
 	../in_cksum.c	\
 	../ipproto.c	\
-	../packet-dcerpc-nt.c	\
 	../prefs.c	\
 	../print.c	\
 	../ps.c	\
@@ -526,9 +53,3 @@ DISSECTOR_SUPPORT_SRC =	\
 	../xdlc.c	\
 	../xmlstub.c
 
-# "BUILT_SOURCES" are built before any "make all" or "make check" targets.
-BUILT_SOURCES =		\
-	register.c	\
-	x11-declarations.h	\
-	x11-register-info.h
-
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index f76e3018f5..b6e52cf18c 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -25,7 +25,7 @@ libethereal_LIBS = \
 	$(NET_SNMP_DIR)\win32\lib\netsnmp.lib \
 	ftypes\ftypes.lib \
 	dfilter\dfilter.lib \
-	..\dissectors.lib
+	dissectors\dissectors.lib
 
 .c.obj::
 	$(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
@@ -59,16 +59,16 @@ OBJECTS=addr_and_mask.obj \
 	value_string.obj
 
 !IFDEF ENABLE_LIBETHEREAL
-all: ftypes dfilter libethereal.dll
+all: ftypes dfilter dissectors libethereal.dll
 !ELSE
-all: ftypes dfilter ethereal.lib
+all: ftypes dfilter dissectors ethereal.lib
 !ENDIF
 
 # For use when making libethereal.dll
 libethereal.lib: libethereal.dll
 libethereal.exp: libethereal.dll
 
-libethereal.dll: ..\config.h $(OBJECTS) libethereal.def ftypes dfilter doxygen ..\image\libethereal.res
+libethereal.dll: ..\config.h $(OBJECTS) libethereal.def ftypes dfilter dissectors doxygen ..\image\libethereal.res
 	$(link) $(dlllflags) $(conlibsdll) \
 		$(LOCAL_LDFLAGS) \
 		/DEF:libethereal.def /OUT:libethereal.dll \
@@ -91,6 +91,8 @@ clean:
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ../dfilter
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
+	cd ../dissectors
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ..
 
 distclean: clean
@@ -111,6 +113,11 @@ dfilter:: ..\config.h
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
 	cd ..
 
+dissectors:: ..\config.h
+	cd dissectors
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
+	cd ..
+
 doxygen.cfg: ..\config.nmake doxygen.cfg.in
 	sed -e s/@VERSION@/$(VERSION)/ \
 	    < doxygen.cfg.in > $@
diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am
new file mode 100644
index 0000000000..a105149c62
--- /dev/null
+++ b/epan/dissectors/Makefile.am
@@ -0,0 +1,117 @@
+# Makefile.am
+#
+# $Id$
+#
+# Ethereal - Network traffic analyzer
+# By Gerald Combs <gerald@zing.org>
+# Copyright 2004 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
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+noinst_LTLIBRARIES = libdissectors.la
+
+CLEANFILES = \
+	libdissectors.a		\
+	libdissectors.la	\
+	*~
+
+INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/..
+
+include Makefile.common
+
+libdissectors_la_SOURCES = \
+	$(DISSECTOR_SRC) \
+	$(DISSECTOR_SUPPORT_SRC)
+
+EXTRA_DIST = \
+	Makefile.nmake		
+
+packet-ncp2222.c : $(srcdir)/ncp2222.py
+	$(PYTHON) $< -o $@
+
+#
+# Build various header files for the X11 dissector.
+#
+PROC_X11_FIELDS := $(srcdir)/process-x11-fields.pl
+X11_FIELDS := $(srcdir)/x11-fields
+
+x11-declarations.h x11-register-info.h: $(PROC_X11_FIELDS) $(X11_FIELDS)
+	$(PERL) $(PROC_X11_FIELDS) < $(X11_FIELDS)
+
+#
+# Build "register.c", which contains a function "register_all_protocols()"
+# that calls the register routines for all protocols.
+#
+# We do this by grepping through sources.  If that turns out to be too slow,
+# maybe we could just require every .o file to have an register routine
+# of a given name (packet-aarp.o -> proto_register_aarp, etc.).
+#
+# Formatting conventions:  The name of the proto_register_* routines must
+# start in column zero, or must be preceded only by "void " starting in
+# column zero, and must not be inside #if.
+#
+# We assume that all dissector routines are in "packet-XXX.c" files.
+#
+# For some unknown reason, having a big "for" loop in the Makefile
+# to scan all the "packet-XXX.c" files doesn't work with some "make"s;
+# they seem to pass only the first few names in the list to the shell,
+# for some reason.
+#
+# Therefore, we have a script to generate the "register.c" file.
+#
+# The first argument is the name of the file to write.
+# The second argument is the directory in which the source files live.
+# All subsequent arguments are the files to scan.
+#
+register.c: $(plugin_src) $(DISSECTOR_SRC) $(srcdir)/make-reg-dotc $(srcdir)/make-reg-dotc.py
+	@if test -n $(PYTHON); then \
+		echo Making register.c with python ; \
+		$(PYTHON) $(srcdir)/make-reg-dotc.py $(srcdir) $(DISSECTOR_SRC) ; \
+	else \
+		echo Making register.c with shell script ; \
+		$(srcdir)/make-reg-dotc register.c $(srcdir) \
+			$(plugin_src) $(DISSECTOR_SRC) ; \
+	fi
+
+#
+# Currently register.c can be included in the distribution because
+# we always build all protocol dissectors. We used to have to check
+# whether or not to build the snmp dissector. If we again need to
+# variably build something, making register.c non-portable, uncomment
+# the dist-hook line below.
+#
+# Oh, yuk.  We don't want to include "register.c" in the distribution, as
+# its contents depend on the configuration, and therefore we want it
+# to be built when the first "make" is done; however, Automake insists
+# on putting *all* source into the distribution.
+#
+# We work around this by having a "dist-hook" rule that deletes
+# "register.c", so that "dist" won't pick it up.
+#
+#dist-hook:
+#	@rm -f $(distdir)/register.c
+
+
+MAINTAINERCLEANFILES =	\
+	register.c	\
+	packet-ncp2222.c
+
+CLEANFILES = \
+	libdissectors.a		\
+	libdissectors.la	\
+	x11-declarations.h	\
+	x11-register-info.h	\
+	*~
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
new file mode 100644
index 0000000000..7a614d1bdf
--- /dev/null
+++ b/epan/dissectors/Makefile.common
@@ -0,0 +1,699 @@
+# Makefile.common
+#     Contains the stuff from Makefile.am and Makefile.nmake that is
+#     a) common to both files and
+#     b) portable between both files
+#
+# $Id: Makefile.common 11400 2004-07-18 00:24:25Z guy $
+#
+# Ethereal - Network traffic analyzer
+# By Gerald Combs <gerald@ethereal.com>
+# Copyright 1998 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
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+# the dissector sources (without any helpers)
+DISSECTOR_SRC =	\
+	packet-3g-a11.c	\
+	packet-aarp.c	\
+	packet-acap.c	\
+	packet-acse.c	\
+	packet-afp.c	\
+	packet-afs.c	\
+	packet-aim.c	\
+	packet-aim-adverts.c	\
+	packet-aim-admin.c \
+	packet-aim-bos.c \
+	packet-aim-buddylist.c	\
+	packet-aim-chat.c	\
+	packet-aim-chatnav.c \
+	packet-aim-directory.c	\
+	packet-aim-generic.c	\
+	packet-aim-icq.c \
+	packet-aim-invitation.c \
+	packet-aim-location.c \
+	packet-aim-messaging.c \
+	packet-aim-oft.c \
+	packet-aim-popup.c \
+	packet-aim-signon.c \
+	packet-aim-ssi.c \
+	packet-aim-stats.c \
+	packet-aim-translate.c \
+	packet-aim-userlookup.c \
+	packet-ajp13.c	\
+	packet-alcap.c	\
+	packet-ans.c	\
+	packet-ansi_637.c	\
+	packet-ansi_683.c	\
+	packet-ansi_801.c	\
+	packet-ansi_a.c	\
+	packet-ansi_map.c	\
+	packet-aodv.c	\
+	packet-ap1394.c	\
+	packet-arcnet.c	\
+	packet-arp.c	\
+	packet-asap.c	\
+	packet-ascend.c	\
+	packet-asf.c	\
+	packet-atalk.c	\
+	packet-atm.c	\
+	packet-auto_rp.c	\
+	packet-bacapp.c	\
+	packet-bacnet.c	\
+	packet-beep.c	\
+	packet-ber.c	\
+	packet-bfd.c	\
+	packet-bgp.c	\
+	packet-bofl.c	\
+	packet-bootp.c	\
+	packet-bootparams.c	\
+	packet-bpdu.c	\
+	packet-brdwlk.c	\
+	packet-bssap.c	\
+	packet-bssgp.c	\
+	packet-bvlc.c	\
+	packet-cast.c	\
+	packet-ccsds.c	\
+	packet-cdp.c	\
+	packet-cgmp.c	\
+	packet-chdlc.c	\
+	packet-cisco-oui.c	\
+	packet-clearcase.c	\
+	packet-clip.c	\
+	packet-clnp.c	\
+	packet-cops.c	\
+	packet-cosine.c	\
+	packet-cpfi.c	\
+	packet-cpha.c	\
+	packet-cups.c	\
+	packet-data.c	\
+	packet-dccp.c	\
+	packet-dcerpc-afs4int.c	\
+	packet-dcerpc-atsvc.c	\
+	packet-dcerpc-bossvr.c	\
+	packet-dcerpc-browser.c	\
+	packet-dcerpc-budb.c	\
+	packet-dcerpc-butc.c	\
+	packet-dcerpc-cds_clerkserver.c	\
+	packet-dcerpc-cds_solicit.c	\
+	packet-dcerpc-conv.c	\
+	packet-dcerpc-cprpc_server.c	\
+	packet-dcerpc-dce122.c	\
+	packet-dcerpc-dfs.c	\
+	packet-dcerpc-dnsserver.c	\
+	packet-dcerpc-drsuapi.c	\
+	packet-dcerpc-dtsprovider.c	\
+	packet-dcerpc-dtsstime_req.c	\
+	packet-dcerpc-efs.c	\
+	packet-dcerpc-epm.c	\
+	packet-dcerpc-epm4.c	\
+	packet-dcerpc-eventlog.c	\
+	packet-dcerpc-fldb.c	\
+	packet-dcerpc-frsapi.c	\
+	packet-dcerpc-frsrpc.c	\
+	packet-dcerpc-ftserver.c	\
+	packet-dcerpc-icl_rpc.c	\
+	packet-dcerpc-initshutdown.c	\
+	packet-dcerpc-krb5rpc.c	\
+	packet-dcerpc-llb.c	\
+	packet-dcerpc-lsa-ds.c	\
+	packet-dcerpc-lsa.c	\
+	packet-dcerpc-mapi.c	\
+	packet-dcerpc-messenger.c	\
+	packet-dcerpc-mgmt.c	\
+	packet-dcerpc-ndr.c	\
+	packet-dcerpc-netlogon.c	\
+	packet-dcerpc-nspi.c	\
+	packet-dcerpc-oxid.c	\
+	packet-dcerpc-rdaclif.c	\
+	packet-dcerpc-reg.c	\
+	packet-dcerpc-remact.c	\
+	packet-dcerpc-rep_proc.c	\
+	packet-dcerpc-roverride.c	\
+	packet-dcerpc-rpriv.c	\
+	packet-dcerpc-rs_acct.c	\
+	packet-dcerpc-rs_attr.c	\
+	packet-dcerpc-rs_attr_schema.c	\
+	packet-dcerpc-rs_bind.c	\
+	packet-dcerpc-rs_misc.c	\
+	packet-dcerpc-rs_pgo.c	\
+	packet-dcerpc-rs_plcy.c	\
+	packet-dcerpc-rs_prop_acct.c	\
+	packet-dcerpc-rs_prop_acl.c	\
+	packet-dcerpc-rs_prop_attr.c	\
+	packet-dcerpc-rs_prop_pgo.c	\
+	packet-dcerpc-rs_prop_plcy.c	\
+	packet-dcerpc-rs_pwd_mgmt.c	\
+	packet-dcerpc-rs_repadm.c	\
+	packet-dcerpc-rs_replist.c	\
+	packet-dcerpc-rs_repmgr.c	\
+	packet-dcerpc-rs_unix.c	\
+	packet-dcerpc-rsec_login.c	\
+	packet-dcerpc-samr.c	\
+	packet-dcerpc-secidmap.c	\
+	packet-dcerpc-spoolss.c	\
+	packet-dcerpc-srvsvc.c	\
+	packet-dcerpc-svcctl.c	\
+	packet-dcerpc-tapi.c	\
+	packet-dcerpc-tkn4int.c	\
+	packet-dcerpc-trksvr.c	\
+	packet-dcerpc-ubikdisk.c	\
+	packet-dcerpc-ubikvote.c	\
+	packet-dcerpc-update.c	\
+	packet-dcerpc-wkssvc.c	\
+	packet-dcerpc.c	\
+	packet-dcm.c		\
+	packet-ddtp.c	\
+	packet-dec-bpdu.c	\
+	packet-dhcpv6.c	\
+	packet-diameter.c	\
+	packet-diffserv-mpls-common.c	\
+	packet-distcc.c	\
+	packet-dlsw.c	\
+	packet-dnp.c	\
+	packet-dns.c	\
+	packet-dsi.c	\
+	packet-dvmrp.c	\
+	packet-e164.c	\
+	packet-eap.c	\
+	packet-eapol.c	\
+	packet-echo.c	\
+	packet-edonkey.c	\
+	packet-eigrp.c	\
+	packet-enc.c	\
+	packet-enip.c	\
+	packet-enrp.c	\
+	packet-esis.c	\
+	packet-eth.c	\
+	packet-etherip.c	\
+	packet-ethertype.c	\
+	packet-fc.c	\
+	packet-fcct.c	\
+	packet-fcdns.c	\
+	packet-fcels.c	\
+	packet-fcfcs.c	\
+	packet-fcfzs.c	\
+	packet-fcip.c	\
+	packet-fclctl.c	\
+	packet-fcp.c	\
+	packet-fcsb3.c	\
+	packet-fcsp.c	\
+	packet-fcswils.c	\
+	packet-fddi.c	\
+	packet-fix.c	\
+	packet-fr.c	\
+	packet-frame.c	\
+	packet-ftam.c	\
+	packet-ftp.c	\
+	packet-fw1.c	\
+	packet-gift.c	\
+	packet-giop.c	\
+	packet-gmrp.c	\
+	packet-gnutella.c	\
+	packet-gprs-llc.c	\
+	packet-gprs-ns.c	\
+	packet-gre.c	\
+	packet-gsm_a.c	\
+	packet-gsm_map.c	\
+	packet-gsm_sms.c	\
+	packet-gsm_sms_ud.c	\
+	packet-gsm_ss.c	\
+	packet-gssapi.c	\
+	packet-gtp.c	\
+	packet-gvrp.c	\
+	packet-h1.c	\
+	packet-h225.c	\
+	packet-h235.c	\
+	packet-h245.c	\
+	packet-h261.c	\
+	packet-h263.c	\
+	packet-h450.c	\
+	packet-hclnfsd.c	\
+	packet-hpext.c	\
+	packet-hsrp.c	\
+	packet-http.c	\
+	packet-hyperscsi.c	\
+	packet-iapp.c	\
+	packet-iax2.c	\
+	packet-ib.c	\
+	packet-icap.c	\
+	packet-icmpv6.c	\
+	packet-icp.c	\
+	packet-icq.c	\
+	packet-ieee80211.c	\
+	packet-ieee8023.c	\
+	packet-igap.c	\
+	packet-igmp.c	\
+	packet-igrp.c	\
+	packet-image-gif.c	\
+	packet-image-jfif.c	\
+	packet-imap.c	\
+	packet-ip.c	\
+	packet-ipdc.c	\
+	packet-ipfc.c	\
+	packet-ipmi.c	\
+	packet-ipp.c	\
+	packet-ipsec-udp.c	\
+	packet-ipsec.c	\
+	packet-ipv6.c	\
+	packet-ipvs-syncd.c	\
+	packet-ipx.c	\
+	packet-ipxwan.c	\
+	packet-irc.c	\
+	packet-isakmp.c	\
+	packet-iscsi.c	\
+	packet-isdn.c	\
+	packet-isis-clv.c	\
+	packet-isis-hello.c	\
+	packet-isis-lsp.c	\
+	packet-isis-snp.c	\
+	packet-isis.c	\
+	packet-isl.c	\
+	packet-ismp.c	\
+	packet-isns.c	\
+	packet-isup.c	\
+	packet-iua.c	\
+	packet-jabber.c	\
+	packet-kadm5.c	\
+	packet-kerberos.c	\
+	packet-klm.c	\
+	packet-kpasswd.c	\
+	packet-l2tp.c	\
+	packet-lapb.c	\
+	packet-lapbether.c	\
+	packet-lapd.c	\
+	packet-laplink.c	\
+	packet-ldap.c	\
+	packet-ldp.c	\
+	packet-llc.c	\
+	packet-lmi.c	\
+	packet-lmp.c	\
+	packet-lpd.c	\
+	packet-lwapp.c	\
+	packet-m2pa.c	\
+	packet-m2tp.c	\
+	packet-m2ua.c	\
+	packet-m3ua.c	\
+	packet-mbtcp.c	\
+	packet-mdshdr.c	\
+	packet-media.c	\
+	packet-mip.c	\
+	packet-mip6.c	\
+	packet-mmse.c	\
+	packet-mount.c	\
+	packet-mpeg1.c	\
+	packet-mpls.c	\
+	packet-mpls-echo.c   \
+	packet-mq.c		\
+	packet-mq-pcf.c	\
+	packet-mrdisc.c	\
+	packet-msdp.c	\
+	packet-msn-messenger.c	\
+	packet-msnip.c	\
+	packet-msproxy.c	\
+	packet-mtp2.c	\
+	packet-mtp3.c	\
+	packet-mtp3mg.c	\
+	packet-multipart.c	\
+	packet-mysql.c	\
+	packet-nbipx.c	\
+	packet-nbns.c	\
+	packet-ncp.c	\
+	packet-ncp2222.c	\
+	packet-ncp-nmas.c	\
+	packet-ndmp.c	\
+	packet-ndps.c	\
+	packet-netbios.c	\
+	packet-netflow.c	\
+	packet-nfs.c	\
+	packet-nfsacl.c	\
+	packet-nfsauth.c	\
+	packet-nisplus.c	\
+	packet-nlm.c	\
+	packet-nlsp.c	\
+	packet-nntp.c	\
+	packet-nt-oui.c	\
+	packet-nt-sonmp.c	\
+	packet-nt-tpcp.c	\
+	packet-ntlmssp.c	\
+	packet-ntp.c	\
+	packet-null.c	\
+	packet-olsr.c	\
+	packet-osi-options.c	\
+	packet-osi.c	\
+	packet-ospf.c	\
+	packet-pcnfsd.c	\
+	packet-per.c	\
+	packet-pflog.c	\
+	packet-pgm.c	\
+	packet-pim.c	\
+	packet-pktc.c	\
+	packet-pop.c	\
+	packet-portmap.c	\
+	packet-postgresql.c	\
+	packet-ppp.c	\
+	packet-pppoe.c	\
+	packet-pptp.c	\
+	packet-pres.c	\
+	packet-prism.c	\
+	packet-ptp.c		\
+	packet-q2931.c	\
+	packet-q931.c	\
+	packet-q933.c	\
+	packet-qllc.c	\
+	packet-quake.c	\
+	packet-quake2.c	\
+	packet-quake3.c	\
+	packet-quakeworld.c	\
+	packet-radius.c	\
+	packet-radiotap.c	\
+	packet-ranap.c	\
+	packet-raw.c	\
+	packet-rip.c	\
+	packet-ripng.c	\
+	packet-rlogin.c	\
+	packet-rmcp.c	\
+	packet-rmi.c	\
+	packet-rmp.c	\
+	packet-rpc.c	\
+	packet-rpl.c	\
+	packet-rquota.c	\
+	packet-rsh.c	\
+	packet-rstat.c	\
+	packet-rsvp.c	\
+	packet-rsync.c	\
+	packet-rtcp.c	\
+	packet-rtp-events.c	\
+	packet-rtp.c	\
+	packet-rtps.c \
+	packet-rtsp.c	\
+	packet-rwall.c	\
+	packet-rx.c	\
+	packet-sadmind.c	\
+	packet-sap.c	\
+	packet-sccp.c	\
+	packet-sccpmg.c	\
+	packet-scsi.c	\
+	packet-sctp.c	\
+	packet-sdlc.c	\
+	packet-sdp.c	\
+	packet-sebek.c	\
+	packet-ses.c	\
+	packet-sflow.c	\
+	packet-sip.c	\
+	packet-sigcomp.c	\
+	packet-sipfrag.c	\
+	packet-skinny.c	\
+	packet-slimp3.c	\
+	packet-sll.c	\
+	packet-slowprotocols.c	\
+	packet-slsk.c	\
+	packet-smb-browse.c	\
+	packet-smb-common.c	\
+	packet-smb-logon.c	\
+	packet-smb-mailslot.c	\
+	packet-smb-pipe.c	\
+	packet-smb-sidsnooping.c	\
+	packet-smb.c	\
+	packet-smpp.c	\
+	packet-smtp.c	\
+	packet-sna.c	\
+	packet-snaeth.c	\
+	packet-sndcp.c	\
+	packet-snmp.c	\
+	packet-socks.c	\
+	packet-spnego.c	\
+	packet-spray.c	\
+	packet-srvloc.c	\
+	packet-sscop.c	\
+	packet-ssh.c	\
+	packet-ssl.c	\
+	packet-stat-notify.c	\
+	packet-stat.c	\
+	packet-stun.c	\
+	packet-sua.c	\
+	packet-symantec.c	\
+	packet-syslog.c	\
+	packet-t38.c	\
+	packet-tacacs.c	\
+	packet-tcap.c	\
+	packet-tcp.c	\
+	packet-tds.c	\
+	packet-teimanagement.c	\
+	packet-telnet.c	\
+	packet-teredo.c	\
+	packet-text-media.c	\
+	packet-tftp.c	\
+	packet-time.c	\
+	packet-tns.c	\
+	packet-tpkt.c	\
+	packet-tr.c	\
+	packet-trmac.c	\
+	packet-tsp.c	\
+	packet-tuxedo.c	\
+	packet-tzsp.c	\
+	packet-ucp.c	\
+	packet-udp.c	\
+	packet-v120.c	\
+	packet-vines.c	\
+	packet-vj.c	\
+	packet-vlan.c	\
+	packet-vrrp.c	\
+	packet-vtp.c	\
+	packet-wap.c	\
+	packet-wbxml.c	\
+	packet-wccp.c	\
+	packet-wcp.c	\
+	packet-wfleet-hdlc.c	\
+	packet-who.c	\
+	packet-wlancap.c	\
+	packet-wsp.c	\
+	packet-wtls.c	\
+	packet-wtp.c	\
+	packet-x11.c	\
+	packet-x25.c	\
+	packet-x29.c	\
+	packet-xdmcp.c	\
+	packet-xot.c	\
+	packet-xyplex.c	\
+	packet-yhoo.c	\
+	packet-ymsg.c	\
+	packet-ypbind.c	\
+	packet-yppasswd.c	\
+	packet-ypserv.c	\
+	packet-ypxfr.c	\
+	packet-zebra.c
+
+# corresponding headers
+DISSECTOR_INCLUDES =	\
+	packet-acse.h	\
+	packet-afp.h	\
+	packet-afs-defs.h	\
+	packet-afs-macros.h	\
+	packet-afs-register-info.h	\
+	packet-afs.h	\
+	packet-aim.h	\
+	packet-ansi_a.h	\
+	packet-ansi_map.h	\
+	packet-ap1394.h	\
+	packet-arcnet.h	\
+	packet-arp.h	\
+	packet-atalk.h	\
+	packet-atm.h	\
+	packet-ber.h	\
+	packet-bgp.h	\
+	packet-bootparams.h	\
+	packet-bssap.h	\
+	packet-chdlc.h	\
+	packet-clearcase.h	\
+	packet-clip.h	\
+	packet-data.h	\
+	packet-dccp.h	\
+	packet-dcerpc-atsvc.h	\
+	packet-dcerpc-browser.h	\
+	packet-dcerpc-dce122.h	\
+	packet-dcerpc-dcom.h	\
+	packet-dcerpc-dfs.h	\
+	packet-dcerpc-dnsserver.h	\
+	packet-dcerpc-drsuapi.h	\
+	packet-dcerpc-efs.h	\
+	packet-dcerpc-eventlog.h	\
+	packet-dcerpc-frsapi.h	\
+	packet-dcerpc-frsrpc.h	\
+	packet-dcerpc-initshutdown.h	\
+	packet-dcerpc-lsa.h	\
+	packet-dcerpc-mapi.h	\
+	packet-dcerpc-netlogon.h	\
+	packet-dcerpc-nt.h	\
+	packet-dcerpc-reg.h	\
+	packet-dcerpc-samr.h	\
+	packet-dcerpc-spoolss.h	\
+	packet-dcerpc-srvsvc.h	\
+	packet-dcerpc-svcctl.h	\
+	packet-dcerpc-tapi.h	\
+	packet-dcerpc-wkssvc.h	\
+	packet-dcerpc.h	\
+	packet-ddtp.h	\
+	packet-diameter-defs.h	\
+	packet-diffserv-mpls-common.h	\
+	packet-dns.h	\
+	packet-dvmrp.h	\
+	packet-e164.h   \
+	packet-edonkey.h	\
+	packet-esis.h	\
+	packet-eth.h	\
+	packet-fc.h	\
+	packet-fcbls.h	\
+	packet-fcct.h	\
+	packet-fcdns.h	\
+	packet-fcels.h	\
+	packet-fcfcs.h	\
+	packet-fcfzs.h	\
+	packet-fclctl.h	\
+	packet-fcp.h	\
+	packet-fcsb3.h	\
+	packet-fcsp.h	\
+	packet-fcswils.h	\
+	packet-fddi.h	\
+	packet-frame.h	\
+	packet-ftam.h	\
+	packet-giop.h	\
+	packet-gnutella.h	\
+	packet-gsm_a.h	\
+	packet-gsm_map.h	\
+	packet-gsm_sms.h	\
+	packet-gsm_ss.h	\
+	packet-gssapi.h	\
+	packet-gtp.h	\
+	packet-h225.h	\
+	packet-h235.h	\
+	packet-h245.h	\
+	packet-hclnfsd.h	\
+	packet-hpext.h	\
+	packet-http.h	\
+	packet-iax2.h	\
+	packet-ieee80211.h	\
+	packet-ieee8023.h	\
+	packet-igap.h	\
+	packet-igmp.h	\
+	packet-ip.h	\
+	packet-ipdc.h	\
+	packet-ipfc.h	\
+	packet-ipsec.h	\
+	packet-ipv6.h	\
+	packet-ipx.h	\
+	packet-isis-clv.h	\
+	packet-isis-hello.h	\
+	packet-isis-lsp.h	\
+	packet-isis-snp.h	\
+	packet-isis.h	\
+	packet-isl.h	\
+	packet-isup.h	\
+	packet-kerberos.h	\
+	packet-klm.h	\
+	packet-ldap.h	\
+	packet-ldp.h	\
+	packet-llc.h	\
+	packet-mip6.h	\
+	packet-mount.h	\
+	packet-mq.h	\
+	packet-mrdisc.h	\
+	packet-msnip.h	\
+	packet-mtp3.h	\
+	packet-ncp-int.h	\
+	packet-ncp-nmas.h	\
+	packet-ndps.h	\
+	packet-netbios.h	\
+	packet-nfs.h	\
+	packet-nisplus.h	\
+	packet-nlm.h	\
+	packet-ntp.h	\
+	packet-null.h	\
+	packet-osi-options.h	\
+	packet-osi.h	\
+	packet-pcnfsd.h	\
+	packet-per.h	\
+	packet-pflog.h	\
+	packet-pim.h	\
+	packet-pktc.h	\
+	packet-portmap.h	\
+	packet-ppp.h	\
+	packet-pres.h	\
+	packet-prism.h	\
+	packet-q931.h	\
+	packet-radiotap.h	\
+	packet-raw.h	\
+	packet-ripng.h	\
+	packet-rmi.h	\
+	packet-rpc.h	\
+	packet-rquota.h	\
+	packet-rsvp.h	\
+	packet-rtcp.h	\
+	packet-rtp.h	\
+	packet-rtps.h   \
+	packet-rtp-events.h	\
+	packet-rwall.h	\
+	packet-rx.h	\
+	packet-scsi.h	\
+	packet-sctp.h	\
+	packet-ses.h	\
+	packet-sip.h	\
+	packet-sll.h	\
+	packet-smb-browse.h	\
+	packet-smb-common.h	\
+	packet-smb-mailslot.h	\
+	packet-smb-pipe.h	\
+	packet-smb-sidsnooping.h	\
+	packet-sna.h	\
+	packet-snmp.h	\
+	packet-spray.h	\
+	packet-stat-notify.h	\
+	packet-stat.h	\
+	packet-tacacs.h	\
+	packet-tcap.h	\
+	packet-tcp.h	\
+	packet-tns.h	\
+	packet-tpkt.h	\
+	packet-tr.h	\
+	packet-udp.h	\
+	packet-vines.h	\
+	packet-vlan.h	\
+	packet-wap.h	\
+	packet-wccp.h	\
+	packet-wlancap.h	\
+	packet-wsp.h	\
+	packet-wtls.h	\
+	packet-wtp.h	\
+	packet-x11-keysym.h	\
+	packet-x11-keysymdef.h	\
+	packet-ypbind.h	\
+	packet-yppasswd.h	\
+	packet-ypserv.h	\
+	packet-ypxfr.h
+
+# dissector helpers (needed from the dissectors, but not a dissector itself)
+DISSECTOR_SUPPORT_SRC =	\
+	packet-dcerpc-nt.c	\
+	register.c
+
+# "BUILT_SOURCES" are built before any "make all" or "make check" targets.
+BUILT_SOURCES =		\
+	register.c	\
+	x11-declarations.h	\
+	x11-register-info.h
+
+# this target needed for distribution only
+noinst_HEADERS =	\
+	$(DISSECTOR_INCLUDES)
diff --git a/epan/dissectors/Makefile.nmake b/epan/dissectors/Makefile.nmake
new file mode 100644
index 0000000000..587843048d
--- /dev/null
+++ b/epan/dissectors/Makefile.nmake
@@ -0,0 +1,33 @@
+## Makefile for building ethereal.exe with Microsoft C and nmake
+## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
+#
+# $Id: Makefile.nmake 11400 2004-07-18 00:24:25Z guy $
+
+include ..\..\config.nmake
+
+############### no need to modify below this line #########
+
+CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../.. $(GLIB_CFLAGS) \
+	$(PCRE_CFLAGS) /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
+
+CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL 
+
+.c.obj::
+   $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
+
+DISSECTOR_SRC = $(DISSECTOR_SRC:../=)
+DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
+
+DISSECTOR_SUPPORT_SRC = $(DISSECTOR_SUPPORT_SRC:../=)
+DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj)
+
+#dissectors.lib: ../../config.h $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) $(EXTRA_OBJECTS)
+dissectors.lib: ../../config.h $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS)
+	link /lib /out:dissectors.lib $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS)
+
+
+clean:
+	rm -f dissectors.lib $(PDB_FILE) \
+		$(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS)
+
+distclean: clean
diff --git a/make-reg-dotc b/epan/dissectors/make-reg-dotc
index a90019af05..a90019af05 100755
--- a/make-reg-dotc
+++ b/epan/dissectors/make-reg-dotc
diff --git a/make-reg-dotc.py b/epan/dissectors/make-reg-dotc.py
index 5c1411cb9c..5c1411cb9c 100755
--- a/make-reg-dotc.py
+++ b/epan/dissectors/make-reg-dotc.py
diff --git a/ncp2222.py b/epan/dissectors/ncp2222.py
index b341510745..b341510745 100755
--- a/ncp2222.py
+++ b/epan/dissectors/ncp2222.py
diff --git a/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c
index b6730088ef..b6730088ef 100644
--- a/packet-3g-a11.c
+++ b/epan/dissectors/packet-3g-a11.c
diff --git a/packet-aarp.c b/epan/dissectors/packet-aarp.c
index 9c68873009..9c68873009 100644
--- a/packet-aarp.c
+++ b/epan/dissectors/packet-aarp.c
diff --git a/packet-acap.c b/epan/dissectors/packet-acap.c
index aee315dd2c..aee315dd2c 100644
--- a/packet-acap.c
+++ b/epan/dissectors/packet-acap.c
diff --git a/packet-acse.c b/epan/dissectors/packet-acse.c
index f7a4ed7e2e..f7a4ed7e2e 100644
--- a/packet-acse.c
+++ b/epan/dissectors/packet-acse.c
diff --git a/packet-acse.h b/epan/dissectors/packet-acse.h
index d5cb006b67..d5cb006b67 100644
--- a/packet-acse.h
+++ b/epan/dissectors/packet-acse.h
diff --git a/packet-afp.c b/epan/dissectors/packet-afp.c
index e0e50c48b4..e0e50c48b4 100644
--- a/packet-afp.c
+++ b/epan/dissectors/packet-afp.c
diff --git a/packet-afp.h b/epan/dissectors/packet-afp.h
index 1ab90f5992..1ab90f5992 100644
--- a/packet-afp.h
+++ b/epan/dissectors/packet-afp.h
diff --git a/packet-afs-defs.h b/epan/dissectors/packet-afs-defs.h
index 913b43839e..913b43839e 100644
--- a/packet-afs-defs.h
+++ b/epan/dissectors/packet-afs-defs.h
diff --git a/packet-afs-macros.h b/epan/dissectors/packet-afs-macros.h
index 0f84032b4b..0f84032b4b 100644
--- a/packet-afs-macros.h
+++ b/epan/dissectors/packet-afs-macros.h
diff --git a/packet-afs-register-info.h b/epan/dissectors/packet-afs-register-info.h
index 7b3d116c52..7b3d116c52 100644
--- a/packet-afs-register-info.h
+++ b/epan/dissectors/packet-afs-register-info.h
diff --git a/packet-afs.c b/epan/dissectors/packet-afs.c
index 2292e45bc2..2292e45bc2 100644
--- a/packet-afs.c
+++ b/epan/dissectors/packet-afs.c
diff --git a/packet-afs.h b/epan/dissectors/packet-afs.h
index 6569b08c9b..6569b08c9b 100644
--- a/packet-afs.h
+++ b/epan/dissectors/packet-afs.h
diff --git a/packet-aim-admin.c b/epan/dissectors/packet-aim-admin.c
index 5a347bff5d..5a347bff5d 100644
--- a/packet-aim-admin.c
+++ b/epan/dissectors/packet-aim-admin.c
diff --git a/packet-aim-adverts.c b/epan/dissectors/packet-aim-adverts.c
index a0fc9a4663..a0fc9a4663 100644
--- a/packet-aim-adverts.c
+++ b/epan/dissectors/packet-aim-adverts.c
diff --git a/packet-aim-bos.c b/epan/dissectors/packet-aim-bos.c
index 69db5c4fb5..69db5c4fb5 100644
--- a/packet-aim-bos.c
+++ b/epan/dissectors/packet-aim-bos.c
diff --git a/packet-aim-buddylist.c b/epan/dissectors/packet-aim-buddylist.c
index 2a2cbe2bda..2a2cbe2bda 100644
--- a/packet-aim-buddylist.c
+++ b/epan/dissectors/packet-aim-buddylist.c
diff --git a/packet-aim-chat.c b/epan/dissectors/packet-aim-chat.c
index 31905827c2..31905827c2 100644
--- a/packet-aim-chat.c
+++ b/epan/dissectors/packet-aim-chat.c
diff --git a/packet-aim-chatnav.c b/epan/dissectors/packet-aim-chatnav.c
index d7cb30704c..d7cb30704c 100644
--- a/packet-aim-chatnav.c
+++ b/epan/dissectors/packet-aim-chatnav.c
diff --git a/packet-aim-directory.c b/epan/dissectors/packet-aim-directory.c
index ea9d064d9f..ea9d064d9f 100644
--- a/packet-aim-directory.c
+++ b/epan/dissectors/packet-aim-directory.c
diff --git a/packet-aim-generic.c b/epan/dissectors/packet-aim-generic.c
index caefda6428..caefda6428 100644
--- a/packet-aim-generic.c
+++ b/epan/dissectors/packet-aim-generic.c
diff --git a/packet-aim-icq.c b/epan/dissectors/packet-aim-icq.c
index 6fc357b2cd..6fc357b2cd 100644
--- a/packet-aim-icq.c
+++ b/epan/dissectors/packet-aim-icq.c
diff --git a/packet-aim-invitation.c b/epan/dissectors/packet-aim-invitation.c
index 26b468d317..26b468d317 100644
--- a/packet-aim-invitation.c
+++ b/epan/dissectors/packet-aim-invitation.c
diff --git a/packet-aim-location.c b/epan/dissectors/packet-aim-location.c
index 44da9d81a5..44da9d81a5 100644
--- a/packet-aim-location.c
+++ b/epan/dissectors/packet-aim-location.c
diff --git a/packet-aim-messaging.c b/epan/dissectors/packet-aim-messaging.c
index 15522ea6c9..15522ea6c9 100644
--- a/packet-aim-messaging.c
+++ b/epan/dissectors/packet-aim-messaging.c
diff --git a/packet-aim-oft.c b/epan/dissectors/packet-aim-oft.c
index a4c8ded9f0..a4c8ded9f0 100644
--- a/packet-aim-oft.c
+++ b/epan/dissectors/packet-aim-oft.c
diff --git a/packet-aim-popup.c b/epan/dissectors/packet-aim-popup.c
index 8aad38fd25..8aad38fd25 100644
--- a/packet-aim-popup.c
+++ b/epan/dissectors/packet-aim-popup.c
diff --git a/packet-aim-signon.c b/epan/dissectors/packet-aim-signon.c
index e068de9e0f..e068de9e0f 100644
--- a/packet-aim-signon.c
+++ b/epan/dissectors/packet-aim-signon.c
diff --git a/packet-aim-ssi.c b/epan/dissectors/packet-aim-ssi.c
index 18e0faa662..18e0faa662 100644
--- a/packet-aim-ssi.c
+++ b/epan/dissectors/packet-aim-ssi.c
diff --git a/packet-aim-stats.c b/epan/dissectors/packet-aim-stats.c
index 2a5da29b2d..2a5da29b2d 100644
--- a/packet-aim-stats.c
+++ b/epan/dissectors/packet-aim-stats.c
diff --git a/packet-aim-translate.c b/epan/dissectors/packet-aim-translate.c
index dbf1f193c8..dbf1f193c8 100644
--- a/packet-aim-translate.c
+++ b/epan/dissectors/packet-aim-translate.c
diff --git a/packet-aim-userlookup.c b/epan/dissectors/packet-aim-userlookup.c
index ebf7c95531..ebf7c95531 100644
--- a/packet-aim-userlookup.c
+++ b/epan/dissectors/packet-aim-userlookup.c
diff --git a/packet-aim.c b/epan/dissectors/packet-aim.c
index 7a1d9b5e94..7a1d9b5e94 100644
--- a/packet-aim.c
+++ b/epan/dissectors/packet-aim.c
diff --git a/packet-aim.h b/epan/dissectors/packet-aim.h
index 5848aba9c0..5848aba9c0 100644
--- a/packet-aim.h
+++ b/epan/dissectors/packet-aim.h
diff --git a/packet-ajp13.c b/epan/dissectors/packet-ajp13.c
index 3fe267b0da..3fe267b0da 100644
--- a/packet-ajp13.c
+++ b/epan/dissectors/packet-ajp13.c
diff --git a/packet-alcap.c b/epan/dissectors/packet-alcap.c
index 92a4eb11c1..92a4eb11c1 100644
--- a/packet-alcap.c
+++ b/epan/dissectors/packet-alcap.c
diff --git a/packet-ans.c b/epan/dissectors/packet-ans.c
index bd2c791d99..bd2c791d99 100644
--- a/packet-ans.c
+++ b/epan/dissectors/packet-ans.c
diff --git a/packet-ansi_637.c b/epan/dissectors/packet-ansi_637.c
index 8285ed698f..8285ed698f 100644
--- a/packet-ansi_637.c
+++ b/epan/dissectors/packet-ansi_637.c
diff --git a/packet-ansi_683.c b/epan/dissectors/packet-ansi_683.c
index 0cecfa7a93..0cecfa7a93 100644
--- a/packet-ansi_683.c
+++ b/epan/dissectors/packet-ansi_683.c
diff --git a/packet-ansi_801.c b/epan/dissectors/packet-ansi_801.c
index 0dc32b518a..0dc32b518a 100644
--- a/packet-ansi_801.c
+++ b/epan/dissectors/packet-ansi_801.c
diff --git a/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c
index bc4884c05b..bc4884c05b 100644
--- a/packet-ansi_a.c
+++ b/epan/dissectors/packet-ansi_a.c
diff --git a/packet-ansi_a.h b/epan/dissectors/packet-ansi_a.h
index 9c49486aff..9c49486aff 100644
--- a/packet-ansi_a.h
+++ b/epan/dissectors/packet-ansi_a.h
diff --git a/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c
index 3cc58ede94..3cc58ede94 100644
--- a/packet-ansi_map.c
+++ b/epan/dissectors/packet-ansi_map.c
diff --git a/packet-ansi_map.h b/epan/dissectors/packet-ansi_map.h
index db7e4e9f79..db7e4e9f79 100644
--- a/packet-ansi_map.h
+++ b/epan/dissectors/packet-ansi_map.h
diff --git a/packet-aodv.c b/epan/dissectors/packet-aodv.c
index b262dccc79..b262dccc79 100644
--- a/packet-aodv.c
+++ b/epan/dissectors/packet-aodv.c
diff --git a/packet-ap1394.c b/epan/dissectors/packet-ap1394.c
index 9560391eaa..9560391eaa 100644
--- a/packet-ap1394.c
+++ b/epan/dissectors/packet-ap1394.c
diff --git a/packet-ap1394.h b/epan/dissectors/packet-ap1394.h
index f8f8cbc0ab..f8f8cbc0ab 100644
--- a/packet-ap1394.h
+++ b/epan/dissectors/packet-ap1394.h
diff --git a/packet-arcnet.c b/epan/dissectors/packet-arcnet.c
index 9fe970b3e0..9fe970b3e0 100644
--- a/packet-arcnet.c
+++ b/epan/dissectors/packet-arcnet.c
diff --git a/packet-arcnet.h b/epan/dissectors/packet-arcnet.h
index 7047671e51..7047671e51 100644
--- a/packet-arcnet.h
+++ b/epan/dissectors/packet-arcnet.h
diff --git a/packet-arp.c b/epan/dissectors/packet-arp.c
index a0e5153e13..a0e5153e13 100644
--- a/packet-arp.c
+++ b/epan/dissectors/packet-arp.c
diff --git a/packet-arp.h b/epan/dissectors/packet-arp.h
index 782ac7fbf5..782ac7fbf5 100644
--- a/packet-arp.h
+++ b/epan/dissectors/packet-arp.h
diff --git a/packet-asap.c b/epan/dissectors/packet-asap.c
index d06aef7434..d06aef7434 100644
--- a/packet-asap.c
+++ b/epan/dissectors/packet-asap.c
diff --git a/packet-ascend.c b/epan/dissectors/packet-ascend.c
index 1c3caa7f8d..1c3caa7f8d 100644
--- a/packet-ascend.c
+++ b/epan/dissectors/packet-ascend.c
diff --git a/packet-asf.c b/epan/dissectors/packet-asf.c
index db0b534d18..db0b534d18 100644
--- a/packet-asf.c
+++ b/epan/dissectors/packet-asf.c
diff --git a/packet-atalk.c b/epan/dissectors/packet-atalk.c
index f74520ef27..f74520ef27 100644
--- a/packet-atalk.c
+++ b/epan/dissectors/packet-atalk.c
diff --git a/packet-atalk.h b/epan/dissectors/packet-atalk.h
index 592dd1948e..592dd1948e 100644
--- a/packet-atalk.h
+++ b/epan/dissectors/packet-atalk.h
diff --git a/packet-atm.c b/epan/dissectors/packet-atm.c
index 1c2420d6d2..1c2420d6d2 100644
--- a/packet-atm.c
+++ b/epan/dissectors/packet-atm.c
diff --git a/packet-atm.h b/epan/dissectors/packet-atm.h
index 3e60eeeafe..3e60eeeafe 100644
--- a/packet-atm.h
+++ b/epan/dissectors/packet-atm.h
diff --git a/packet-auto_rp.c b/epan/dissectors/packet-auto_rp.c
index 2bfc62cfcf..2bfc62cfcf 100644
--- a/packet-auto_rp.c
+++ b/epan/dissectors/packet-auto_rp.c
diff --git a/packet-bacapp.c b/epan/dissectors/packet-bacapp.c
index b89a5051c6..b89a5051c6 100644
--- a/packet-bacapp.c
+++ b/epan/dissectors/packet-bacapp.c
diff --git a/packet-bacnet.c b/epan/dissectors/packet-bacnet.c
index 46053b7e5a..46053b7e5a 100644
--- a/packet-bacnet.c
+++ b/epan/dissectors/packet-bacnet.c
diff --git a/packet-beep.c b/epan/dissectors/packet-beep.c
index 7b02f1ce17..7b02f1ce17 100644
--- a/packet-beep.c
+++ b/epan/dissectors/packet-beep.c
diff --git a/packet-ber.c b/epan/dissectors/packet-ber.c
index b681b9bdc0..b681b9bdc0 100644
--- a/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
diff --git a/packet-ber.h b/epan/dissectors/packet-ber.h
index 5d00016602..5d00016602 100644
--- a/packet-ber.h
+++ b/epan/dissectors/packet-ber.h
diff --git a/packet-bfd.c b/epan/dissectors/packet-bfd.c
index 50d35d571f..50d35d571f 100644
--- a/packet-bfd.c
+++ b/epan/dissectors/packet-bfd.c
diff --git a/packet-bgp.c b/epan/dissectors/packet-bgp.c
index a0b91350f3..a0b91350f3 100644
--- a/packet-bgp.c
+++ b/epan/dissectors/packet-bgp.c
diff --git a/packet-bgp.h b/epan/dissectors/packet-bgp.h
index e92f278a21..e92f278a21 100644
--- a/packet-bgp.h
+++ b/epan/dissectors/packet-bgp.h
diff --git a/packet-bofl.c b/epan/dissectors/packet-bofl.c
index 3a9e9dd2f7..3a9e9dd2f7 100644
--- a/packet-bofl.c
+++ b/epan/dissectors/packet-bofl.c
diff --git a/packet-bootp.c b/epan/dissectors/packet-bootp.c
index 02ce06d3e7..02ce06d3e7 100644
--- a/packet-bootp.c
+++ b/epan/dissectors/packet-bootp.c
diff --git a/packet-bootparams.c b/epan/dissectors/packet-bootparams.c
index 3634a82a11..3634a82a11 100644
--- a/packet-bootparams.c
+++ b/epan/dissectors/packet-bootparams.c
diff --git a/packet-bootparams.h b/epan/dissectors/packet-bootparams.h
index 9601a6a6d1..9601a6a6d1 100644
--- a/packet-bootparams.h
+++ b/epan/dissectors/packet-bootparams.h
diff --git a/packet-bpdu.c b/epan/dissectors/packet-bpdu.c
index 194b54d25f..194b54d25f 100644
--- a/packet-bpdu.c
+++ b/epan/dissectors/packet-bpdu.c
diff --git a/packet-brdwlk.c b/epan/dissectors/packet-brdwlk.c
index 1fce4130d8..1fce4130d8 100644
--- a/packet-brdwlk.c
+++ b/epan/dissectors/packet-brdwlk.c
diff --git a/packet-bssap.c b/epan/dissectors/packet-bssap.c
index c422677a99..c422677a99 100644
--- a/packet-bssap.c
+++ b/epan/dissectors/packet-bssap.c
diff --git a/packet-bssap.h b/epan/dissectors/packet-bssap.h
index 63a2ce3df6..63a2ce3df6 100644
--- a/packet-bssap.h
+++ b/epan/dissectors/packet-bssap.h
diff --git a/packet-bssgp.c b/epan/dissectors/packet-bssgp.c
index 01e4e16dd6..01e4e16dd6 100644
--- a/packet-bssgp.c
+++ b/epan/dissectors/packet-bssgp.c
diff --git a/packet-bvlc.c b/epan/dissectors/packet-bvlc.c
index 16a703d1e5..16a703d1e5 100644
--- a/packet-bvlc.c
+++ b/epan/dissectors/packet-bvlc.c
diff --git a/packet-cast.c b/epan/dissectors/packet-cast.c
index 2c1d36a0bb..2c1d36a0bb 100644
--- a/packet-cast.c
+++ b/epan/dissectors/packet-cast.c
diff --git a/packet-ccsds.c b/epan/dissectors/packet-ccsds.c
index b3292a672c..b3292a672c 100644
--- a/packet-ccsds.c
+++ b/epan/dissectors/packet-ccsds.c
diff --git a/packet-cdp.c b/epan/dissectors/packet-cdp.c
index 1c3a100096..1c3a100096 100644
--- a/packet-cdp.c
+++ b/epan/dissectors/packet-cdp.c
diff --git a/packet-cgmp.c b/epan/dissectors/packet-cgmp.c
index d3611c7190..d3611c7190 100644
--- a/packet-cgmp.c
+++ b/epan/dissectors/packet-cgmp.c
diff --git a/packet-chdlc.c b/epan/dissectors/packet-chdlc.c
index 18eef17644..18eef17644 100644
--- a/packet-chdlc.c
+++ b/epan/dissectors/packet-chdlc.c
diff --git a/packet-chdlc.h b/epan/dissectors/packet-chdlc.h
index 262b80a21b..262b80a21b 100644
--- a/packet-chdlc.h
+++ b/epan/dissectors/packet-chdlc.h
diff --git a/packet-cisco-oui.c b/epan/dissectors/packet-cisco-oui.c
index 073e034ab1..073e034ab1 100644
--- a/packet-cisco-oui.c
+++ b/epan/dissectors/packet-cisco-oui.c
diff --git a/packet-clearcase.c b/epan/dissectors/packet-clearcase.c
index 8f654bf38f..8f654bf38f 100644
--- a/packet-clearcase.c
+++ b/epan/dissectors/packet-clearcase.c
diff --git a/packet-clearcase.h b/epan/dissectors/packet-clearcase.h
index 9d80c0e8f7..9d80c0e8f7 100644
--- a/packet-clearcase.h
+++ b/epan/dissectors/packet-clearcase.h
diff --git a/packet-clip.c b/epan/dissectors/packet-clip.c
index cae6dd1982..cae6dd1982 100644
--- a/packet-clip.c
+++ b/epan/dissectors/packet-clip.c
diff --git a/packet-clip.h b/epan/dissectors/packet-clip.h
index efc0ea66ff..efc0ea66ff 100644
--- a/packet-clip.h
+++ b/epan/dissectors/packet-clip.h
diff --git a/packet-clnp.c b/epan/dissectors/packet-clnp.c
index c94b855043..c94b855043 100644
--- a/packet-clnp.c
+++ b/epan/dissectors/packet-clnp.c
diff --git a/packet-cops.c b/epan/dissectors/packet-cops.c
index 8db35e43ed..8db35e43ed 100644
--- a/packet-cops.c
+++ b/epan/dissectors/packet-cops.c
diff --git a/packet-cosine.c b/epan/dissectors/packet-cosine.c
index 2c8fa84666..2c8fa84666 100644
--- a/packet-cosine.c
+++ b/epan/dissectors/packet-cosine.c
diff --git a/packet-cpfi.c b/epan/dissectors/packet-cpfi.c
index e478a255b6..e478a255b6 100644
--- a/packet-cpfi.c
+++ b/epan/dissectors/packet-cpfi.c
diff --git a/packet-cpha.c b/epan/dissectors/packet-cpha.c
index 77f7a75543..77f7a75543 100644
--- a/packet-cpha.c
+++ b/epan/dissectors/packet-cpha.c
diff --git a/packet-cups.c b/epan/dissectors/packet-cups.c
index 9f48d390aa..9f48d390aa 100644
--- a/packet-cups.c
+++ b/epan/dissectors/packet-cups.c
diff --git a/packet-data.c b/epan/dissectors/packet-data.c
index 29c190e524..29c190e524 100644
--- a/packet-data.c
+++ b/epan/dissectors/packet-data.c
diff --git a/packet-data.h b/epan/dissectors/packet-data.h
index 9906948b50..9906948b50 100644
--- a/packet-data.h
+++ b/epan/dissectors/packet-data.h
diff --git a/packet-dccp.c b/epan/dissectors/packet-dccp.c
index 60cf3c64f7..60cf3c64f7 100644
--- a/packet-dccp.c
+++ b/epan/dissectors/packet-dccp.c
diff --git a/packet-dccp.h b/epan/dissectors/packet-dccp.h
index 6142cae2e1..6142cae2e1 100644
--- a/packet-dccp.h
+++ b/epan/dissectors/packet-dccp.h
diff --git a/packet-dcerpc-afs4int.c b/epan/dissectors/packet-dcerpc-afs4int.c
index eae7f2a8b1..eae7f2a8b1 100644
--- a/packet-dcerpc-afs4int.c
+++ b/epan/dissectors/packet-dcerpc-afs4int.c
diff --git a/packet-dcerpc-atsvc.c b/epan/dissectors/packet-dcerpc-atsvc.c
index 5fb8b99262..5fb8b99262 100644
--- a/packet-dcerpc-atsvc.c
+++ b/epan/dissectors/packet-dcerpc-atsvc.c
diff --git a/packet-dcerpc-atsvc.h b/epan/dissectors/packet-dcerpc-atsvc.h
index b5e79659be..b5e79659be 100644
--- a/packet-dcerpc-atsvc.h
+++ b/epan/dissectors/packet-dcerpc-atsvc.h
diff --git a/packet-dcerpc-bossvr.c b/epan/dissectors/packet-dcerpc-bossvr.c
index ea13a37ab1..ea13a37ab1 100644
--- a/packet-dcerpc-bossvr.c
+++ b/epan/dissectors/packet-dcerpc-bossvr.c
diff --git a/packet-dcerpc-browser.c b/epan/dissectors/packet-dcerpc-browser.c
index 3a4e4156f3..3a4e4156f3 100644
--- a/packet-dcerpc-browser.c
+++ b/epan/dissectors/packet-dcerpc-browser.c
diff --git a/packet-dcerpc-browser.h b/epan/dissectors/packet-dcerpc-browser.h
index 3a434c8b87..3a434c8b87 100644
--- a/packet-dcerpc-browser.h
+++ b/epan/dissectors/packet-dcerpc-browser.h
diff --git a/packet-dcerpc-budb.c b/epan/dissectors/packet-dcerpc-budb.c
index 002e06cf0c..002e06cf0c 100644
--- a/packet-dcerpc-budb.c
+++ b/epan/dissectors/packet-dcerpc-budb.c
diff --git a/packet-dcerpc-butc.c b/epan/dissectors/packet-dcerpc-butc.c
index a6478f1f25..a6478f1f25 100644
--- a/packet-dcerpc-butc.c
+++ b/epan/dissectors/packet-dcerpc-butc.c
diff --git a/packet-dcerpc-cds_clerkserver.c b/epan/dissectors/packet-dcerpc-cds_clerkserver.c
index f708de6d75..f708de6d75 100644
--- a/packet-dcerpc-cds_clerkserver.c
+++ b/epan/dissectors/packet-dcerpc-cds_clerkserver.c
diff --git a/packet-dcerpc-cds_solicit.c b/epan/dissectors/packet-dcerpc-cds_solicit.c
index 6cb1375b51..6cb1375b51 100644
--- a/packet-dcerpc-cds_solicit.c
+++ b/epan/dissectors/packet-dcerpc-cds_solicit.c
diff --git a/packet-dcerpc-conv.c b/epan/dissectors/packet-dcerpc-conv.c
index bc8d3e77cc..bc8d3e77cc 100644
--- a/packet-dcerpc-conv.c
+++ b/epan/dissectors/packet-dcerpc-conv.c
diff --git a/packet-dcerpc-cprpc_server.c b/epan/dissectors/packet-dcerpc-cprpc_server.c
index bb7b2f1200..bb7b2f1200 100644
--- a/packet-dcerpc-cprpc_server.c
+++ b/epan/dissectors/packet-dcerpc-cprpc_server.c
diff --git a/packet-dcerpc-dce122.c b/epan/dissectors/packet-dcerpc-dce122.c
index d86869e927..d86869e927 100644
--- a/packet-dcerpc-dce122.c
+++ b/epan/dissectors/packet-dcerpc-dce122.c
diff --git a/packet-dcerpc-dce122.h b/epan/dissectors/packet-dcerpc-dce122.h
index 270ef03a7b..270ef03a7b 100644
--- a/packet-dcerpc-dce122.h
+++ b/epan/dissectors/packet-dcerpc-dce122.h
diff --git a/packet-dcerpc-dcom.h b/epan/dissectors/packet-dcerpc-dcom.h
index f07b48a1cf..f07b48a1cf 100644
--- a/packet-dcerpc-dcom.h
+++ b/epan/dissectors/packet-dcerpc-dcom.h
diff --git a/packet-dcerpc-dfs.c b/epan/dissectors/packet-dcerpc-dfs.c
index 84f887c9dd..84f887c9dd 100644
--- a/packet-dcerpc-dfs.c
+++ b/epan/dissectors/packet-dcerpc-dfs.c
diff --git a/packet-dcerpc-dfs.h b/epan/dissectors/packet-dcerpc-dfs.h
index 672495bdce..672495bdce 100644
--- a/packet-dcerpc-dfs.h
+++ b/epan/dissectors/packet-dcerpc-dfs.h
diff --git a/packet-dcerpc-dnsserver.c b/epan/dissectors/packet-dcerpc-dnsserver.c
index e6fdd83ce3..e6fdd83ce3 100644
--- a/packet-dcerpc-dnsserver.c
+++ b/epan/dissectors/packet-dcerpc-dnsserver.c
diff --git a/packet-dcerpc-dnsserver.h b/epan/dissectors/packet-dcerpc-dnsserver.h
index 39b13f0a58..39b13f0a58 100644
--- a/packet-dcerpc-dnsserver.h
+++ b/epan/dissectors/packet-dcerpc-dnsserver.h
diff --git a/packet-dcerpc-drsuapi.c b/epan/dissectors/packet-dcerpc-drsuapi.c
index 1f16f5ef52..1f16f5ef52 100644
--- a/packet-dcerpc-drsuapi.c
+++ b/epan/dissectors/packet-dcerpc-drsuapi.c
diff --git a/packet-dcerpc-drsuapi.h b/epan/dissectors/packet-dcerpc-drsuapi.h
index eeb4a6c7a0..eeb4a6c7a0 100644
--- a/packet-dcerpc-drsuapi.h
+++ b/epan/dissectors/packet-dcerpc-drsuapi.h
diff --git a/packet-dcerpc-dtsprovider.c b/epan/dissectors/packet-dcerpc-dtsprovider.c
index c564e11b68..c564e11b68 100644
--- a/packet-dcerpc-dtsprovider.c
+++ b/epan/dissectors/packet-dcerpc-dtsprovider.c
diff --git a/packet-dcerpc-dtsstime_req.c b/epan/dissectors/packet-dcerpc-dtsstime_req.c
index e45d36c546..e45d36c546 100644
--- a/packet-dcerpc-dtsstime_req.c
+++ b/epan/dissectors/packet-dcerpc-dtsstime_req.c
diff --git a/packet-dcerpc-efs.c b/epan/dissectors/packet-dcerpc-efs.c
index 260fbb0ef5..260fbb0ef5 100755..100644
--- a/packet-dcerpc-efs.c
+++ b/epan/dissectors/packet-dcerpc-efs.c
diff --git a/packet-dcerpc-efs.h b/epan/dissectors/packet-dcerpc-efs.h
index 31ac17a4d5..31ac17a4d5 100755..100644
--- a/packet-dcerpc-efs.h
+++ b/epan/dissectors/packet-dcerpc-efs.h
diff --git a/packet-dcerpc-epm.c b/epan/dissectors/packet-dcerpc-epm.c
index 548a3a6c90..548a3a6c90 100644
--- a/packet-dcerpc-epm.c
+++ b/epan/dissectors/packet-dcerpc-epm.c
diff --git a/packet-dcerpc-epm4.c b/epan/dissectors/packet-dcerpc-epm4.c
index 5d4c3ad385..5d4c3ad385 100644
--- a/packet-dcerpc-epm4.c
+++ b/epan/dissectors/packet-dcerpc-epm4.c
diff --git a/packet-dcerpc-eventlog.c b/epan/dissectors/packet-dcerpc-eventlog.c
index 4541330671..4541330671 100644
--- a/packet-dcerpc-eventlog.c
+++ b/epan/dissectors/packet-dcerpc-eventlog.c
diff --git a/packet-dcerpc-eventlog.h b/epan/dissectors/packet-dcerpc-eventlog.h
index 1c8e37eacc..1c8e37eacc 100644
--- a/packet-dcerpc-eventlog.h
+++ b/epan/dissectors/packet-dcerpc-eventlog.h
diff --git a/packet-dcerpc-fldb.c b/epan/dissectors/packet-dcerpc-fldb.c
index ee39792543..ee39792543 100644
--- a/packet-dcerpc-fldb.c
+++ b/epan/dissectors/packet-dcerpc-fldb.c
diff --git a/packet-dcerpc-frsapi.c b/epan/dissectors/packet-dcerpc-frsapi.c
index 979e708f06..979e708f06 100644
--- a/packet-dcerpc-frsapi.c
+++ b/epan/dissectors/packet-dcerpc-frsapi.c
diff --git a/packet-dcerpc-frsapi.h b/epan/dissectors/packet-dcerpc-frsapi.h
index dbd2ba9f5f..dbd2ba9f5f 100644
--- a/packet-dcerpc-frsapi.h
+++ b/epan/dissectors/packet-dcerpc-frsapi.h
diff --git a/packet-dcerpc-frsrpc.c b/epan/dissectors/packet-dcerpc-frsrpc.c
index 805e45b661..805e45b661 100644
--- a/packet-dcerpc-frsrpc.c
+++ b/epan/dissectors/packet-dcerpc-frsrpc.c
diff --git a/packet-dcerpc-frsrpc.h b/epan/dissectors/packet-dcerpc-frsrpc.h
index 8132405395..8132405395 100644
--- a/packet-dcerpc-frsrpc.h
+++ b/epan/dissectors/packet-dcerpc-frsrpc.h
diff --git a/packet-dcerpc-ftserver.c b/epan/dissectors/packet-dcerpc-ftserver.c
index 8d3223e088..8d3223e088 100644
--- a/packet-dcerpc-ftserver.c
+++ b/epan/dissectors/packet-dcerpc-ftserver.c
diff --git a/packet-dcerpc-icl_rpc.c b/epan/dissectors/packet-dcerpc-icl_rpc.c
index 16016e6eb7..16016e6eb7 100644
--- a/packet-dcerpc-icl_rpc.c
+++ b/epan/dissectors/packet-dcerpc-icl_rpc.c
diff --git a/packet-dcerpc-initshutdown.c b/epan/dissectors/packet-dcerpc-initshutdown.c
index 2d38ec1322..2d38ec1322 100644
--- a/packet-dcerpc-initshutdown.c
+++ b/epan/dissectors/packet-dcerpc-initshutdown.c
diff --git a/packet-dcerpc-initshutdown.h b/epan/dissectors/packet-dcerpc-initshutdown.h
index 4ff8b36eaf..4ff8b36eaf 100644
--- a/packet-dcerpc-initshutdown.h
+++ b/epan/dissectors/packet-dcerpc-initshutdown.h
diff --git a/packet-dcerpc-krb5rpc.c b/epan/dissectors/packet-dcerpc-krb5rpc.c
index b062e52db9..b062e52db9 100644
--- a/packet-dcerpc-krb5rpc.c
+++ b/epan/dissectors/packet-dcerpc-krb5rpc.c
diff --git a/packet-dcerpc-llb.c b/epan/dissectors/packet-dcerpc-llb.c
index efbd3e90b4..efbd3e90b4 100755..100644
--- a/packet-dcerpc-llb.c
+++ b/epan/dissectors/packet-dcerpc-llb.c
diff --git a/packet-dcerpc-lsa-ds.c b/epan/dissectors/packet-dcerpc-lsa-ds.c
index 8f48809115..8f48809115 100644
--- a/packet-dcerpc-lsa-ds.c
+++ b/epan/dissectors/packet-dcerpc-lsa-ds.c
diff --git a/packet-dcerpc-lsa.c b/epan/dissectors/packet-dcerpc-lsa.c
index d276869292..d276869292 100644
--- a/packet-dcerpc-lsa.c
+++ b/epan/dissectors/packet-dcerpc-lsa.c
diff --git a/packet-dcerpc-lsa.h b/epan/dissectors/packet-dcerpc-lsa.h
index 3347c34d06..3347c34d06 100644
--- a/packet-dcerpc-lsa.h
+++ b/epan/dissectors/packet-dcerpc-lsa.h
diff --git a/packet-dcerpc-mapi.c b/epan/dissectors/packet-dcerpc-mapi.c
index 5792f418e0..5792f418e0 100644
--- a/packet-dcerpc-mapi.c
+++ b/epan/dissectors/packet-dcerpc-mapi.c
diff --git a/packet-dcerpc-mapi.h b/epan/dissectors/packet-dcerpc-mapi.h
index ca92d508e9..ca92d508e9 100644
--- a/packet-dcerpc-mapi.h
+++ b/epan/dissectors/packet-dcerpc-mapi.h
diff --git a/packet-dcerpc-messenger.c b/epan/dissectors/packet-dcerpc-messenger.c
index 757fe2fb02..757fe2fb02 100644
--- a/packet-dcerpc-messenger.c
+++ b/epan/dissectors/packet-dcerpc-messenger.c
diff --git a/packet-dcerpc-mgmt.c b/epan/dissectors/packet-dcerpc-mgmt.c
index ac4f3e56a5..ac4f3e56a5 100644
--- a/packet-dcerpc-mgmt.c
+++ b/epan/dissectors/packet-dcerpc-mgmt.c
diff --git a/packet-dcerpc-ndr.c b/epan/dissectors/packet-dcerpc-ndr.c
index df2193ca72..df2193ca72 100644
--- a/packet-dcerpc-ndr.c
+++ b/epan/dissectors/packet-dcerpc-ndr.c
diff --git a/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c
index 7f06a040ac..7f06a040ac 100644
--- a/packet-dcerpc-netlogon.c
+++ b/epan/dissectors/packet-dcerpc-netlogon.c
diff --git a/packet-dcerpc-netlogon.h b/epan/dissectors/packet-dcerpc-netlogon.h
index 429d525e78..429d525e78 100644
--- a/packet-dcerpc-netlogon.h
+++ b/epan/dissectors/packet-dcerpc-netlogon.h
diff --git a/packet-dcerpc-nspi.c b/epan/dissectors/packet-dcerpc-nspi.c
index 459bd503d9..459bd503d9 100644
--- a/packet-dcerpc-nspi.c
+++ b/epan/dissectors/packet-dcerpc-nspi.c
diff --git a/packet-dcerpc-nt.c b/epan/dissectors/packet-dcerpc-nt.c
index 5af4750a3c..5af4750a3c 100644
--- a/packet-dcerpc-nt.c
+++ b/epan/dissectors/packet-dcerpc-nt.c
diff --git a/packet-dcerpc-nt.h b/epan/dissectors/packet-dcerpc-nt.h
index 59dc173469..59dc173469 100644
--- a/packet-dcerpc-nt.h
+++ b/epan/dissectors/packet-dcerpc-nt.h
diff --git a/packet-dcerpc-oxid.c b/epan/dissectors/packet-dcerpc-oxid.c
index 0c31a527a0..0c31a527a0 100644
--- a/packet-dcerpc-oxid.c
+++ b/epan/dissectors/packet-dcerpc-oxid.c
diff --git a/packet-dcerpc-rdaclif.c b/epan/dissectors/packet-dcerpc-rdaclif.c
index fb0b431f96..fb0b431f96 100755..100644
--- a/packet-dcerpc-rdaclif.c
+++ b/epan/dissectors/packet-dcerpc-rdaclif.c
diff --git a/packet-dcerpc-reg.c b/epan/dissectors/packet-dcerpc-reg.c
index 5cc600ad13..5cc600ad13 100644
--- a/packet-dcerpc-reg.c
+++ b/epan/dissectors/packet-dcerpc-reg.c
diff --git a/packet-dcerpc-reg.h b/epan/dissectors/packet-dcerpc-reg.h
index 6c7805aefb..6c7805aefb 100644
--- a/packet-dcerpc-reg.h
+++ b/epan/dissectors/packet-dcerpc-reg.h
diff --git a/packet-dcerpc-remact.c b/epan/dissectors/packet-dcerpc-remact.c
index 352940929a..352940929a 100644
--- a/packet-dcerpc-remact.c
+++ b/epan/dissectors/packet-dcerpc-remact.c
diff --git a/packet-dcerpc-rep_proc.c b/epan/dissectors/packet-dcerpc-rep_proc.c
index 350b22ade1..350b22ade1 100644
--- a/packet-dcerpc-rep_proc.c
+++ b/epan/dissectors/packet-dcerpc-rep_proc.c
diff --git a/packet-dcerpc-roverride.c b/epan/dissectors/packet-dcerpc-roverride.c
index 1423a6376a..1423a6376a 100644
--- a/packet-dcerpc-roverride.c
+++ b/epan/dissectors/packet-dcerpc-roverride.c
diff --git a/packet-dcerpc-rpriv.c b/epan/dissectors/packet-dcerpc-rpriv.c
index 50018c7b03..50018c7b03 100644
--- a/packet-dcerpc-rpriv.c
+++ b/epan/dissectors/packet-dcerpc-rpriv.c
diff --git a/packet-dcerpc-rs_acct.c b/epan/dissectors/packet-dcerpc-rs_acct.c
index f5d38ecb7e..f5d38ecb7e 100644
--- a/packet-dcerpc-rs_acct.c
+++ b/epan/dissectors/packet-dcerpc-rs_acct.c
diff --git a/packet-dcerpc-rs_attr.c b/epan/dissectors/packet-dcerpc-rs_attr.c
index 7c6f3f3e8e..7c6f3f3e8e 100644
--- a/packet-dcerpc-rs_attr.c
+++ b/epan/dissectors/packet-dcerpc-rs_attr.c
diff --git a/packet-dcerpc-rs_attr_schema.c b/epan/dissectors/packet-dcerpc-rs_attr_schema.c
index 7f3d768678..7f3d768678 100755..100644
--- a/packet-dcerpc-rs_attr_schema.c
+++ b/epan/dissectors/packet-dcerpc-rs_attr_schema.c
diff --git a/packet-dcerpc-rs_bind.c b/epan/dissectors/packet-dcerpc-rs_bind.c
index eda49acbeb..eda49acbeb 100644
--- a/packet-dcerpc-rs_bind.c
+++ b/epan/dissectors/packet-dcerpc-rs_bind.c
diff --git a/packet-dcerpc-rs_misc.c b/epan/dissectors/packet-dcerpc-rs_misc.c
index 27fb388910..27fb388910 100644
--- a/packet-dcerpc-rs_misc.c
+++ b/epan/dissectors/packet-dcerpc-rs_misc.c
diff --git a/packet-dcerpc-rs_pgo.c b/epan/dissectors/packet-dcerpc-rs_pgo.c
index 8357184eec..8357184eec 100644
--- a/packet-dcerpc-rs_pgo.c
+++ b/epan/dissectors/packet-dcerpc-rs_pgo.c
diff --git a/packet-dcerpc-rs_plcy.c b/epan/dissectors/packet-dcerpc-rs_plcy.c
index 58b499d010..58b499d010 100644
--- a/packet-dcerpc-rs_plcy.c
+++ b/epan/dissectors/packet-dcerpc-rs_plcy.c
diff --git a/packet-dcerpc-rs_prop_acct.c b/epan/dissectors/packet-dcerpc-rs_prop_acct.c
index 49f0401659..49f0401659 100644
--- a/packet-dcerpc-rs_prop_acct.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_acct.c
diff --git a/packet-dcerpc-rs_prop_acl.c b/epan/dissectors/packet-dcerpc-rs_prop_acl.c
index 2a96a833bb..2a96a833bb 100755..100644
--- a/packet-dcerpc-rs_prop_acl.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_acl.c
diff --git a/packet-dcerpc-rs_prop_attr.c b/epan/dissectors/packet-dcerpc-rs_prop_attr.c
index f03bbfe0ae..f03bbfe0ae 100755..100644
--- a/packet-dcerpc-rs_prop_attr.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_attr.c
diff --git a/packet-dcerpc-rs_prop_pgo.c b/epan/dissectors/packet-dcerpc-rs_prop_pgo.c
index 5dbe7a9d3f..5dbe7a9d3f 100755..100644
--- a/packet-dcerpc-rs_prop_pgo.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_pgo.c
diff --git a/packet-dcerpc-rs_prop_plcy.c b/epan/dissectors/packet-dcerpc-rs_prop_plcy.c
index afcace8964..afcace8964 100755..100644
--- a/packet-dcerpc-rs_prop_plcy.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_plcy.c
diff --git a/packet-dcerpc-rs_pwd_mgmt.c b/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c
index 7e029e1ccf..7e029e1ccf 100755..100644
--- a/packet-dcerpc-rs_pwd_mgmt.c
+++ b/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c
diff --git a/packet-dcerpc-rs_repadm.c b/epan/dissectors/packet-dcerpc-rs_repadm.c
index 6f1d035595..6f1d035595 100644
--- a/packet-dcerpc-rs_repadm.c
+++ b/epan/dissectors/packet-dcerpc-rs_repadm.c
diff --git a/packet-dcerpc-rs_replist.c b/epan/dissectors/packet-dcerpc-rs_replist.c
index e0baac8d3a..e0baac8d3a 100644
--- a/packet-dcerpc-rs_replist.c
+++ b/epan/dissectors/packet-dcerpc-rs_replist.c
diff --git a/packet-dcerpc-rs_repmgr.c b/epan/dissectors/packet-dcerpc-rs_repmgr.c
index d9e52e9359..d9e52e9359 100755..100644
--- a/packet-dcerpc-rs_repmgr.c
+++ b/epan/dissectors/packet-dcerpc-rs_repmgr.c
diff --git a/packet-dcerpc-rs_unix.c b/epan/dissectors/packet-dcerpc-rs_unix.c
index e51963adfa..e51963adfa 100644
--- a/packet-dcerpc-rs_unix.c
+++ b/epan/dissectors/packet-dcerpc-rs_unix.c
diff --git a/packet-dcerpc-rsec_login.c b/epan/dissectors/packet-dcerpc-rsec_login.c
index 26b11e304c..26b11e304c 100644
--- a/packet-dcerpc-rsec_login.c
+++ b/epan/dissectors/packet-dcerpc-rsec_login.c
diff --git a/packet-dcerpc-samr.c b/epan/dissectors/packet-dcerpc-samr.c
index 9e6d52fb43..9e6d52fb43 100644
--- a/packet-dcerpc-samr.c
+++ b/epan/dissectors/packet-dcerpc-samr.c
diff --git a/packet-dcerpc-samr.h b/epan/dissectors/packet-dcerpc-samr.h
index b8b83a7296..b8b83a7296 100644
--- a/packet-dcerpc-samr.h
+++ b/epan/dissectors/packet-dcerpc-samr.h
diff --git a/packet-dcerpc-secidmap.c b/epan/dissectors/packet-dcerpc-secidmap.c
index 9161d52422..9161d52422 100644
--- a/packet-dcerpc-secidmap.c
+++ b/epan/dissectors/packet-dcerpc-secidmap.c
diff --git a/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c
index 86220411b3..86220411b3 100644
--- a/packet-dcerpc-spoolss.c
+++ b/epan/dissectors/packet-dcerpc-spoolss.c
diff --git a/packet-dcerpc-spoolss.h b/epan/dissectors/packet-dcerpc-spoolss.h
index 34a718dbaa..34a718dbaa 100644
--- a/packet-dcerpc-spoolss.h
+++ b/epan/dissectors/packet-dcerpc-spoolss.h
diff --git a/packet-dcerpc-srvsvc.c b/epan/dissectors/packet-dcerpc-srvsvc.c
index d699a3be33..d699a3be33 100644
--- a/packet-dcerpc-srvsvc.c
+++ b/epan/dissectors/packet-dcerpc-srvsvc.c
diff --git a/packet-dcerpc-srvsvc.h b/epan/dissectors/packet-dcerpc-srvsvc.h
index 008b2624ad..008b2624ad 100644
--- a/packet-dcerpc-srvsvc.h
+++ b/epan/dissectors/packet-dcerpc-srvsvc.h
diff --git a/packet-dcerpc-svcctl.c b/epan/dissectors/packet-dcerpc-svcctl.c
index b2040cbfc6..b2040cbfc6 100644
--- a/packet-dcerpc-svcctl.c
+++ b/epan/dissectors/packet-dcerpc-svcctl.c
diff --git a/packet-dcerpc-svcctl.h b/epan/dissectors/packet-dcerpc-svcctl.h
index f5431e7746..f5431e7746 100644
--- a/packet-dcerpc-svcctl.h
+++ b/epan/dissectors/packet-dcerpc-svcctl.h
diff --git a/packet-dcerpc-tapi.c b/epan/dissectors/packet-dcerpc-tapi.c
index 628b04841d..628b04841d 100644
--- a/packet-dcerpc-tapi.c
+++ b/epan/dissectors/packet-dcerpc-tapi.c
diff --git a/packet-dcerpc-tapi.h b/epan/dissectors/packet-dcerpc-tapi.h
index 8749c79401..8749c79401 100644
--- a/packet-dcerpc-tapi.h
+++ b/epan/dissectors/packet-dcerpc-tapi.h
diff --git a/packet-dcerpc-tkn4int.c b/epan/dissectors/packet-dcerpc-tkn4int.c
index 55a5376595..55a5376595 100644
--- a/packet-dcerpc-tkn4int.c
+++ b/epan/dissectors/packet-dcerpc-tkn4int.c
diff --git a/packet-dcerpc-trksvr.c b/epan/dissectors/packet-dcerpc-trksvr.c
index e819c57346..e819c57346 100644
--- a/packet-dcerpc-trksvr.c
+++ b/epan/dissectors/packet-dcerpc-trksvr.c
diff --git a/packet-dcerpc-ubikdisk.c b/epan/dissectors/packet-dcerpc-ubikdisk.c
index c68b3d7e04..c68b3d7e04 100644
--- a/packet-dcerpc-ubikdisk.c
+++ b/epan/dissectors/packet-dcerpc-ubikdisk.c
diff --git a/packet-dcerpc-ubikvote.c b/epan/dissectors/packet-dcerpc-ubikvote.c
index eb9e79d162..eb9e79d162 100644
--- a/packet-dcerpc-ubikvote.c
+++ b/epan/dissectors/packet-dcerpc-ubikvote.c
diff --git a/packet-dcerpc-update.c b/epan/dissectors/packet-dcerpc-update.c
index 9da2fa232e..9da2fa232e 100644
--- a/packet-dcerpc-update.c
+++ b/epan/dissectors/packet-dcerpc-update.c
diff --git a/packet-dcerpc-wkssvc.c b/epan/dissectors/packet-dcerpc-wkssvc.c
index ed18756b1e..ed18756b1e 100644
--- a/packet-dcerpc-wkssvc.c
+++ b/epan/dissectors/packet-dcerpc-wkssvc.c
diff --git a/packet-dcerpc-wkssvc.h b/epan/dissectors/packet-dcerpc-wkssvc.h
index 5b442ba764..5b442ba764 100644
--- a/packet-dcerpc-wkssvc.h
+++ b/epan/dissectors/packet-dcerpc-wkssvc.h
diff --git a/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index d7e6b45e8f..afcafacf5a 100644
--- a/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -33,13 +33,13 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include "packet-dcerpc.h"
+#include <epan/dissectors/packet-dcerpc.h>
 #include <epan/conversation.h>
 #include "prefs.h"
 #include "reassemble.h"
 #include "tap.h"
-#include "packet-frame.h"
-#include "packet-dcerpc-nt.h"
+#include <epan/dissectors/packet-frame.h>
+#include <epan/dissectors/packet-dcerpc-nt.h>
 
 static int dcerpc_tap = -1;
 
diff --git a/packet-dcerpc.h b/epan/dissectors/packet-dcerpc.h
index be76c321ae..be76c321ae 100644
--- a/packet-dcerpc.h
+++ b/epan/dissectors/packet-dcerpc.h
diff --git a/packet-dcm.c b/epan/dissectors/packet-dcm.c
index cb42cf01ce..cb42cf01ce 100644
--- a/packet-dcm.c
+++ b/epan/dissectors/packet-dcm.c
diff --git a/packet-ddtp.c b/epan/dissectors/packet-ddtp.c
index b5d1c0ddb1..b5d1c0ddb1 100644
--- a/packet-ddtp.c
+++ b/epan/dissectors/packet-ddtp.c
diff --git a/packet-ddtp.h b/epan/dissectors/packet-ddtp.h
index 599b25c2a1..599b25c2a1 100644
--- a/packet-ddtp.h
+++ b/epan/dissectors/packet-ddtp.h
diff --git a/packet-dec-bpdu.c b/epan/dissectors/packet-dec-bpdu.c
index 13c4984133..13c4984133 100644
--- a/packet-dec-bpdu.c
+++ b/epan/dissectors/packet-dec-bpdu.c
diff --git a/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c
index 528969277f..528969277f 100644
--- a/packet-dhcpv6.c
+++ b/epan/dissectors/packet-dhcpv6.c
diff --git a/packet-diameter-defs.h b/epan/dissectors/packet-diameter-defs.h
index 0a4d6c96cf..0a4d6c96cf 100644
--- a/packet-diameter-defs.h
+++ b/epan/dissectors/packet-diameter-defs.h
diff --git a/packet-diameter.c b/epan/dissectors/packet-diameter.c
index acb9466014..acb9466014 100644
--- a/packet-diameter.c
+++ b/epan/dissectors/packet-diameter.c
diff --git a/packet-diffserv-mpls-common.c b/epan/dissectors/packet-diffserv-mpls-common.c
index 7491854239..7491854239 100644
--- a/packet-diffserv-mpls-common.c
+++ b/epan/dissectors/packet-diffserv-mpls-common.c
diff --git a/packet-diffserv-mpls-common.h b/epan/dissectors/packet-diffserv-mpls-common.h
index 4294ee06a8..4294ee06a8 100644
--- a/packet-diffserv-mpls-common.h
+++ b/epan/dissectors/packet-diffserv-mpls-common.h
diff --git a/packet-distcc.c b/epan/dissectors/packet-distcc.c
index a17e2d2ddd..a17e2d2ddd 100644
--- a/packet-distcc.c
+++ b/epan/dissectors/packet-distcc.c
diff --git a/packet-dlsw.c b/epan/dissectors/packet-dlsw.c
index 7c7de82851..7c7de82851 100644
--- a/packet-dlsw.c
+++ b/epan/dissectors/packet-dlsw.c
diff --git a/packet-dnp.c b/epan/dissectors/packet-dnp.c
index 7e58442869..7e58442869 100644
--- a/packet-dnp.c
+++ b/epan/dissectors/packet-dnp.c
diff --git a/packet-dns.c b/epan/dissectors/packet-dns.c
index bf23288f13..bf23288f13 100644
--- a/packet-dns.c
+++ b/epan/dissectors/packet-dns.c
diff --git a/packet-dns.h b/epan/dissectors/packet-dns.h
index 5f751c7c7d..5f751c7c7d 100644
--- a/packet-dns.h
+++ b/epan/dissectors/packet-dns.h
diff --git a/packet-dsi.c b/epan/dissectors/packet-dsi.c
index adbc28ed64..adbc28ed64 100644
--- a/packet-dsi.c
+++ b/epan/dissectors/packet-dsi.c
diff --git a/packet-dvmrp.c b/epan/dissectors/packet-dvmrp.c
index 9c919385fe..9c919385fe 100644
--- a/packet-dvmrp.c
+++ b/epan/dissectors/packet-dvmrp.c
diff --git a/packet-dvmrp.h b/epan/dissectors/packet-dvmrp.h
index 3e29d614cd..3e29d614cd 100644
--- a/packet-dvmrp.h
+++ b/epan/dissectors/packet-dvmrp.h
diff --git a/packet-e164.c b/epan/dissectors/packet-e164.c
index 6e449c6be0..6e449c6be0 100644
--- a/packet-e164.c
+++ b/epan/dissectors/packet-e164.c
diff --git a/packet-e164.h b/epan/dissectors/packet-e164.h
index a9d2ced989..a9d2ced989 100644
--- a/packet-e164.h
+++ b/epan/dissectors/packet-e164.h
diff --git a/packet-eap.c b/epan/dissectors/packet-eap.c
index d419598a1e..d419598a1e 100644
--- a/packet-eap.c
+++ b/epan/dissectors/packet-eap.c
diff --git a/packet-eapol.c b/epan/dissectors/packet-eapol.c
index 80a78c6c6c..80a78c6c6c 100644
--- a/packet-eapol.c
+++ b/epan/dissectors/packet-eapol.c
diff --git a/packet-echo.c b/epan/dissectors/packet-echo.c
index b90883041b..b90883041b 100644
--- a/packet-echo.c
+++ b/epan/dissectors/packet-echo.c
diff --git a/packet-edonkey.c b/epan/dissectors/packet-edonkey.c
index 038c224162..038c224162 100644
--- a/packet-edonkey.c
+++ b/epan/dissectors/packet-edonkey.c
diff --git a/packet-edonkey.h b/epan/dissectors/packet-edonkey.h
index 21bb2e6c60..21bb2e6c60 100644
--- a/packet-edonkey.h
+++ b/epan/dissectors/packet-edonkey.h
diff --git a/packet-eigrp.c b/epan/dissectors/packet-eigrp.c
index 70138f71b2..70138f71b2 100644
--- a/packet-eigrp.c
+++ b/epan/dissectors/packet-eigrp.c
diff --git a/packet-enc.c b/epan/dissectors/packet-enc.c
index e061f454a0..e061f454a0 100644
--- a/packet-enc.c
+++ b/epan/dissectors/packet-enc.c
diff --git a/packet-enip.c b/epan/dissectors/packet-enip.c
index 0ceb080ca5..0ceb080ca5 100644
--- a/packet-enip.c
+++ b/epan/dissectors/packet-enip.c
diff --git a/packet-enrp.c b/epan/dissectors/packet-enrp.c
index 1aa87c442b..1aa87c442b 100644
--- a/packet-enrp.c
+++ b/epan/dissectors/packet-enrp.c
diff --git a/packet-esis.c b/epan/dissectors/packet-esis.c
index b923067719..b923067719 100644
--- a/packet-esis.c
+++ b/epan/dissectors/packet-esis.c
diff --git a/packet-esis.h b/epan/dissectors/packet-esis.h
index f2231c68db..f2231c68db 100644
--- a/packet-esis.h
+++ b/epan/dissectors/packet-esis.h
diff --git a/packet-eth.c b/epan/dissectors/packet-eth.c
index 89b49b6d30..89b49b6d30 100644
--- a/packet-eth.c
+++ b/epan/dissectors/packet-eth.c
diff --git a/packet-eth.h b/epan/dissectors/packet-eth.h
index df190750d9..df190750d9 100644
--- a/packet-eth.h
+++ b/epan/dissectors/packet-eth.h
diff --git a/packet-etherip.c b/epan/dissectors/packet-etherip.c
index 302a422579..302a422579 100644
--- a/packet-etherip.c
+++ b/epan/dissectors/packet-etherip.c
diff --git a/packet-ethertype.c b/epan/dissectors/packet-ethertype.c
index ecbc6dc9cb..ecbc6dc9cb 100644
--- a/packet-ethertype.c
+++ b/epan/dissectors/packet-ethertype.c
diff --git a/packet-fc.c b/epan/dissectors/packet-fc.c
index 68253d2965..68253d2965 100644
--- a/packet-fc.c
+++ b/epan/dissectors/packet-fc.c
diff --git a/packet-fc.h b/epan/dissectors/packet-fc.h
index 772a9f4ce0..772a9f4ce0 100644
--- a/packet-fc.h
+++ b/epan/dissectors/packet-fc.h
diff --git a/packet-fcbls.h b/epan/dissectors/packet-fcbls.h
index 0517cd0aa5..0517cd0aa5 100644
--- a/packet-fcbls.h
+++ b/epan/dissectors/packet-fcbls.h
diff --git a/packet-fcct.c b/epan/dissectors/packet-fcct.c
index 269edacd97..269edacd97 100644
--- a/packet-fcct.c
+++ b/epan/dissectors/packet-fcct.c
diff --git a/packet-fcct.h b/epan/dissectors/packet-fcct.h
index 667a8c8a72..667a8c8a72 100644
--- a/packet-fcct.h
+++ b/epan/dissectors/packet-fcct.h
diff --git a/packet-fcdns.c b/epan/dissectors/packet-fcdns.c
index 78c2099ebd..78c2099ebd 100644
--- a/packet-fcdns.c
+++ b/epan/dissectors/packet-fcdns.c
diff --git a/packet-fcdns.h b/epan/dissectors/packet-fcdns.h
index d405ab46c5..d405ab46c5 100644
--- a/packet-fcdns.h
+++ b/epan/dissectors/packet-fcdns.h
diff --git a/packet-fcels.c b/epan/dissectors/packet-fcels.c
index a31387038f..a31387038f 100644
--- a/packet-fcels.c
+++ b/epan/dissectors/packet-fcels.c
diff --git a/packet-fcels.h b/epan/dissectors/packet-fcels.h
index aff03712d3..aff03712d3 100644
--- a/packet-fcels.h
+++ b/epan/dissectors/packet-fcels.h
diff --git a/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c
index 179e9f1e66..179e9f1e66 100644
--- a/packet-fcfcs.c
+++ b/epan/dissectors/packet-fcfcs.c
diff --git a/packet-fcfcs.h b/epan/dissectors/packet-fcfcs.h
index daca528a9a..daca528a9a 100644
--- a/packet-fcfcs.h
+++ b/epan/dissectors/packet-fcfcs.h
diff --git a/packet-fcfzs.c b/epan/dissectors/packet-fcfzs.c
index 6a3154d81f..6a3154d81f 100644
--- a/packet-fcfzs.c
+++ b/epan/dissectors/packet-fcfzs.c
diff --git a/packet-fcfzs.h b/epan/dissectors/packet-fcfzs.h
index 1d8bb82c13..1d8bb82c13 100644
--- a/packet-fcfzs.h
+++ b/epan/dissectors/packet-fcfzs.h
diff --git a/packet-fcip.c b/epan/dissectors/packet-fcip.c
index 194ff1c82b..194ff1c82b 100644
--- a/packet-fcip.c
+++ b/epan/dissectors/packet-fcip.c
diff --git a/packet-fclctl.c b/epan/dissectors/packet-fclctl.c
index fbb7ecf298..fbb7ecf298 100644
--- a/packet-fclctl.c
+++ b/epan/dissectors/packet-fclctl.c
diff --git a/packet-fclctl.h b/epan/dissectors/packet-fclctl.h
index 67c8bca908..67c8bca908 100644
--- a/packet-fclctl.h
+++ b/epan/dissectors/packet-fclctl.h
diff --git a/packet-fcp.c b/epan/dissectors/packet-fcp.c
index b1171e9e9b..b1171e9e9b 100644
--- a/packet-fcp.c
+++ b/epan/dissectors/packet-fcp.c
diff --git a/packet-fcp.h b/epan/dissectors/packet-fcp.h
index b3770cb977..b3770cb977 100644
--- a/packet-fcp.h
+++ b/epan/dissectors/packet-fcp.h
diff --git a/packet-fcsb3.c b/epan/dissectors/packet-fcsb3.c
index 84460e0677..84460e0677 100644
--- a/packet-fcsb3.c
+++ b/epan/dissectors/packet-fcsb3.c
diff --git a/packet-fcsb3.h b/epan/dissectors/packet-fcsb3.h
index c7a4301e83..c7a4301e83 100755..100644
--- a/packet-fcsb3.h
+++ b/epan/dissectors/packet-fcsb3.h
diff --git a/packet-fcsp.c b/epan/dissectors/packet-fcsp.c
index df87eea14a..df87eea14a 100755..100644
--- a/packet-fcsp.c
+++ b/epan/dissectors/packet-fcsp.c
diff --git a/packet-fcsp.h b/epan/dissectors/packet-fcsp.h
index 80d1f1f94f..80d1f1f94f 100755..100644
--- a/packet-fcsp.h
+++ b/epan/dissectors/packet-fcsp.h
diff --git a/packet-fcswils.c b/epan/dissectors/packet-fcswils.c
index 45cf941d37..45cf941d37 100644
--- a/packet-fcswils.c
+++ b/epan/dissectors/packet-fcswils.c
diff --git a/packet-fcswils.h b/epan/dissectors/packet-fcswils.h
index 729bf4092d..729bf4092d 100644
--- a/packet-fcswils.h
+++ b/epan/dissectors/packet-fcswils.h
diff --git a/packet-fddi.c b/epan/dissectors/packet-fddi.c
index a676f5767d..a676f5767d 100644
--- a/packet-fddi.c
+++ b/epan/dissectors/packet-fddi.c
diff --git a/packet-fddi.h b/epan/dissectors/packet-fddi.h
index bb2b40e5fc..bb2b40e5fc 100644
--- a/packet-fddi.h
+++ b/epan/dissectors/packet-fddi.h
diff --git a/packet-fix.c b/epan/dissectors/packet-fix.c
index 7d8931d60c..7d8931d60c 100644
--- a/packet-fix.c
+++ b/epan/dissectors/packet-fix.c
diff --git a/packet-fr.c b/epan/dissectors/packet-fr.c
index bb99dd18dc..bb99dd18dc 100644
--- a/packet-fr.c
+++ b/epan/dissectors/packet-fr.c
diff --git a/packet-frame.c b/epan/dissectors/packet-frame.c
index 5d53b752ef..5d53b752ef 100644
--- a/packet-frame.c
+++ b/epan/dissectors/packet-frame.c
diff --git a/packet-frame.h b/epan/dissectors/packet-frame.h
index 77fbff6f1f..77fbff6f1f 100644
--- a/packet-frame.h
+++ b/epan/dissectors/packet-frame.h
diff --git a/packet-ftam.c b/epan/dissectors/packet-ftam.c
index 504c7fc010..504c7fc010 100644
--- a/packet-ftam.c
+++ b/epan/dissectors/packet-ftam.c
diff --git a/packet-ftam.h b/epan/dissectors/packet-ftam.h
index 5c9fb8cafd..5c9fb8cafd 100644
--- a/packet-ftam.h
+++ b/epan/dissectors/packet-ftam.h
diff --git a/packet-ftp.c b/epan/dissectors/packet-ftp.c
index 1084e05720..1084e05720 100644
--- a/packet-ftp.c
+++ b/epan/dissectors/packet-ftp.c
diff --git a/packet-fw1.c b/epan/dissectors/packet-fw1.c
index d1c35aa67a..d1c35aa67a 100644
--- a/packet-fw1.c
+++ b/epan/dissectors/packet-fw1.c
diff --git a/packet-gift.c b/epan/dissectors/packet-gift.c
index 1022a637e9..1022a637e9 100644
--- a/packet-gift.c
+++ b/epan/dissectors/packet-gift.c
diff --git a/packet-giop.c b/epan/dissectors/packet-giop.c
index 5167ff7d86..5167ff7d86 100644
--- a/packet-giop.c
+++ b/epan/dissectors/packet-giop.c
diff --git a/packet-giop.h b/epan/dissectors/packet-giop.h
index 928bbf6eeb..928bbf6eeb 100644
--- a/packet-giop.h
+++ b/epan/dissectors/packet-giop.h
diff --git a/packet-gmrp.c b/epan/dissectors/packet-gmrp.c
index 872eb92a08..872eb92a08 100644
--- a/packet-gmrp.c
+++ b/epan/dissectors/packet-gmrp.c
diff --git a/packet-gnutella.c b/epan/dissectors/packet-gnutella.c
index a88301eb5d..a88301eb5d 100644
--- a/packet-gnutella.c
+++ b/epan/dissectors/packet-gnutella.c
diff --git a/packet-gnutella.h b/epan/dissectors/packet-gnutella.h
index f079595827..f079595827 100644
--- a/packet-gnutella.h
+++ b/epan/dissectors/packet-gnutella.h
diff --git a/packet-gprs-llc.c b/epan/dissectors/packet-gprs-llc.c
index a3837a9221..a3837a9221 100644
--- a/packet-gprs-llc.c
+++ b/epan/dissectors/packet-gprs-llc.c
diff --git a/packet-gprs-ns.c b/epan/dissectors/packet-gprs-ns.c
index 1a63cb29c8..1a63cb29c8 100644
--- a/packet-gprs-ns.c
+++ b/epan/dissectors/packet-gprs-ns.c
diff --git a/packet-gre.c b/epan/dissectors/packet-gre.c
index b7a29f575c..b7a29f575c 100644
--- a/packet-gre.c
+++ b/epan/dissectors/packet-gre.c
diff --git a/packet-gsm_a.c b/epan/dissectors/packet-gsm_a.c
index 93fd544ac8..93fd544ac8 100644
--- a/packet-gsm_a.c
+++ b/epan/dissectors/packet-gsm_a.c
diff --git a/packet-gsm_a.h b/epan/dissectors/packet-gsm_a.h
index 6a6d084315..6a6d084315 100644
--- a/packet-gsm_a.h
+++ b/epan/dissectors/packet-gsm_a.h
diff --git a/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c
index 2f2bbeb8e9..2f2bbeb8e9 100644
--- a/packet-gsm_map.c
+++ b/epan/dissectors/packet-gsm_map.c
diff --git a/packet-gsm_map.h b/epan/dissectors/packet-gsm_map.h
index c313a8f1b8..c313a8f1b8 100644
--- a/packet-gsm_map.h
+++ b/epan/dissectors/packet-gsm_map.h
diff --git a/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c
index 2ae4cb7bd1..2ae4cb7bd1 100644
--- a/packet-gsm_sms.c
+++ b/epan/dissectors/packet-gsm_sms.c
diff --git a/packet-gsm_sms.h b/epan/dissectors/packet-gsm_sms.h
index bb55808543..bb55808543 100644
--- a/packet-gsm_sms.h
+++ b/epan/dissectors/packet-gsm_sms.h
diff --git a/packet-gsm_sms_ud.c b/epan/dissectors/packet-gsm_sms_ud.c
index fb9ae7b639..fb9ae7b639 100755..100644
--- a/packet-gsm_sms_ud.c
+++ b/epan/dissectors/packet-gsm_sms_ud.c
diff --git a/packet-gsm_ss.c b/epan/dissectors/packet-gsm_ss.c
index 01963aa756..01963aa756 100644
--- a/packet-gsm_ss.c
+++ b/epan/dissectors/packet-gsm_ss.c
diff --git a/packet-gsm_ss.h b/epan/dissectors/packet-gsm_ss.h
index 8c6c6f7f49..8c6c6f7f49 100644
--- a/packet-gsm_ss.h
+++ b/epan/dissectors/packet-gsm_ss.h
diff --git a/packet-gssapi.c b/epan/dissectors/packet-gssapi.c
index 84ef44ff63..e89eb78c30 100644
--- a/packet-gssapi.c
+++ b/epan/dissectors/packet-gssapi.c
@@ -40,9 +40,9 @@
 
 #include "asn1.h"
 #include "format-oid.h"
-#include "packet-dcerpc.h"
-#include "packet-gssapi.h"
-#include "packet-frame.h"
+#include <epan/dissectors/packet-dcerpc.h>
+#include <epan/dissectors/packet-gssapi.h>
+#include <epan/dissectors/packet-frame.h>
 #include "epan/conversation.h"
 
 static int proto_gssapi = -1;
diff --git a/packet-gssapi.h b/epan/dissectors/packet-gssapi.h
index 761b8b4c1d..761b8b4c1d 100644
--- a/packet-gssapi.h
+++ b/epan/dissectors/packet-gssapi.h
diff --git a/packet-gtp.c b/epan/dissectors/packet-gtp.c
index 58fa038fd7..58fa038fd7 100644
--- a/packet-gtp.c
+++ b/epan/dissectors/packet-gtp.c
diff --git a/packet-gtp.h b/epan/dissectors/packet-gtp.h
index 2afccb64b8..2afccb64b8 100644
--- a/packet-gtp.h
+++ b/epan/dissectors/packet-gtp.h
diff --git a/packet-gvrp.c b/epan/dissectors/packet-gvrp.c
index 80fd96ad05..80fd96ad05 100644
--- a/packet-gvrp.c
+++ b/epan/dissectors/packet-gvrp.c
diff --git a/packet-h1.c b/epan/dissectors/packet-h1.c
index 245dff7c16..245dff7c16 100644
--- a/packet-h1.c
+++ b/epan/dissectors/packet-h1.c
diff --git a/packet-h225.c b/epan/dissectors/packet-h225.c
index 7da3f330cd..7da3f330cd 100644
--- a/packet-h225.c
+++ b/epan/dissectors/packet-h225.c
diff --git a/packet-h225.h b/epan/dissectors/packet-h225.h
index 0b2eb3f834..0b2eb3f834 100644
--- a/packet-h225.h
+++ b/epan/dissectors/packet-h225.h
diff --git a/packet-h235.c b/epan/dissectors/packet-h235.c
index e97be14376..e97be14376 100644
--- a/packet-h235.c
+++ b/epan/dissectors/packet-h235.c
diff --git a/packet-h235.h b/epan/dissectors/packet-h235.h
index e5663d4d5d..e5663d4d5d 100644
--- a/packet-h235.h
+++ b/epan/dissectors/packet-h235.h
diff --git a/packet-h245.c b/epan/dissectors/packet-h245.c
index 899dab9fb6..899dab9fb6 100644
--- a/packet-h245.c
+++ b/epan/dissectors/packet-h245.c
diff --git a/packet-h245.h b/epan/dissectors/packet-h245.h
index 288e9925f1..288e9925f1 100644
--- a/packet-h245.h
+++ b/epan/dissectors/packet-h245.h
diff --git a/packet-h261.c b/epan/dissectors/packet-h261.c
index 8b291d2e9b..8b291d2e9b 100644
--- a/packet-h261.c
+++ b/epan/dissectors/packet-h261.c
diff --git a/packet-h263.c b/epan/dissectors/packet-h263.c
index e0feaf106a..e0feaf106a 100644
--- a/packet-h263.c
+++ b/epan/dissectors/packet-h263.c
diff --git a/packet-h450.c b/epan/dissectors/packet-h450.c
index fffbd98cda..fffbd98cda 100644
--- a/packet-h450.c
+++ b/epan/dissectors/packet-h450.c
diff --git a/packet-hclnfsd.c b/epan/dissectors/packet-hclnfsd.c
index 1adf5ac57a..1adf5ac57a 100644
--- a/packet-hclnfsd.c
+++ b/epan/dissectors/packet-hclnfsd.c
diff --git a/packet-hclnfsd.h b/epan/dissectors/packet-hclnfsd.h
index e42392722c..e42392722c 100644
--- a/packet-hclnfsd.h
+++ b/epan/dissectors/packet-hclnfsd.h
diff --git a/packet-hpext.c b/epan/dissectors/packet-hpext.c
index 3a14dbb9c3..3a14dbb9c3 100644
--- a/packet-hpext.c
+++ b/epan/dissectors/packet-hpext.c
diff --git a/packet-hpext.h b/epan/dissectors/packet-hpext.h
index ec7e148ca2..ec7e148ca2 100644
--- a/packet-hpext.h
+++ b/epan/dissectors/packet-hpext.h
diff --git a/packet-hsrp.c b/epan/dissectors/packet-hsrp.c
index 62f20e1f8b..62f20e1f8b 100644
--- a/packet-hsrp.c
+++ b/epan/dissectors/packet-hsrp.c
diff --git a/packet-http.c b/epan/dissectors/packet-http.c
index 76f70e289f..76f70e289f 100644
--- a/packet-http.c
+++ b/epan/dissectors/packet-http.c
diff --git a/packet-http.h b/epan/dissectors/packet-http.h
index e79ffa4e43..e79ffa4e43 100644
--- a/packet-http.h
+++ b/epan/dissectors/packet-http.h
diff --git a/packet-hyperscsi.c b/epan/dissectors/packet-hyperscsi.c
index f4ed93349a..f4ed93349a 100644
--- a/packet-hyperscsi.c
+++ b/epan/dissectors/packet-hyperscsi.c
diff --git a/packet-iapp.c b/epan/dissectors/packet-iapp.c
index 4ec7ad94dd..4ec7ad94dd 100644
--- a/packet-iapp.c
+++ b/epan/dissectors/packet-iapp.c
diff --git a/packet-iax2.c b/epan/dissectors/packet-iax2.c
index 6277a1922a..6277a1922a 100644
--- a/packet-iax2.c
+++ b/epan/dissectors/packet-iax2.c
diff --git a/packet-iax2.h b/epan/dissectors/packet-iax2.h
index 96e861f944..96e861f944 100644
--- a/packet-iax2.h
+++ b/epan/dissectors/packet-iax2.h
diff --git a/packet-ib.c b/epan/dissectors/packet-ib.c
index 13fe694897..13fe694897 100644
--- a/packet-ib.c
+++ b/epan/dissectors/packet-ib.c
diff --git a/packet-icap.c b/epan/dissectors/packet-icap.c
index 214febaa26..214febaa26 100644
--- a/packet-icap.c
+++ b/epan/dissectors/packet-icap.c
diff --git a/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c
index d77f7c0ffe..d77f7c0ffe 100644
--- a/packet-icmpv6.c
+++ b/epan/dissectors/packet-icmpv6.c
diff --git a/packet-icp.c b/epan/dissectors/packet-icp.c
index 83eea14ac9..83eea14ac9 100644
--- a/packet-icp.c
+++ b/epan/dissectors/packet-icp.c
diff --git a/packet-icq.c b/epan/dissectors/packet-icq.c
index 407abe431f..407abe431f 100644
--- a/packet-icq.c
+++ b/epan/dissectors/packet-icq.c
diff --git a/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index d6f86433a8..d6f86433a8 100644
--- a/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
diff --git a/packet-ieee80211.h b/epan/dissectors/packet-ieee80211.h
index c6396cb8e4..c6396cb8e4 100644
--- a/packet-ieee80211.h
+++ b/epan/dissectors/packet-ieee80211.h
diff --git a/packet-ieee8023.c b/epan/dissectors/packet-ieee8023.c
index 5e8f98aa2d..5e8f98aa2d 100644
--- a/packet-ieee8023.c
+++ b/epan/dissectors/packet-ieee8023.c
diff --git a/packet-ieee8023.h b/epan/dissectors/packet-ieee8023.h
index 48c1d13548..48c1d13548 100644
--- a/packet-ieee8023.h
+++ b/epan/dissectors/packet-ieee8023.h
diff --git a/packet-igap.c b/epan/dissectors/packet-igap.c
index 287b8c451d..287b8c451d 100644
--- a/packet-igap.c
+++ b/epan/dissectors/packet-igap.c
diff --git a/packet-igap.h b/epan/dissectors/packet-igap.h
index e8907e7bd0..e8907e7bd0 100644
--- a/packet-igap.h
+++ b/epan/dissectors/packet-igap.h
diff --git a/packet-igmp.c b/epan/dissectors/packet-igmp.c
index 11aaad97a1..11aaad97a1 100644
--- a/packet-igmp.c
+++ b/epan/dissectors/packet-igmp.c
diff --git a/packet-igmp.h b/epan/dissectors/packet-igmp.h
index b37ac5729e..b37ac5729e 100644
--- a/packet-igmp.h
+++ b/epan/dissectors/packet-igmp.h
diff --git a/packet-igrp.c b/epan/dissectors/packet-igrp.c
index bbbc4b60be..bbbc4b60be 100644
--- a/packet-igrp.c
+++ b/epan/dissectors/packet-igrp.c
diff --git a/packet-image-gif.c b/epan/dissectors/packet-image-gif.c
index c58d5f5a56..c58d5f5a56 100755..100644
--- a/packet-image-gif.c
+++ b/epan/dissectors/packet-image-gif.c
diff --git a/packet-image-jfif.c b/epan/dissectors/packet-image-jfif.c
index 666584c84d..666584c84d 100644
--- a/packet-image-jfif.c
+++ b/epan/dissectors/packet-image-jfif.c
diff --git a/packet-imap.c b/epan/dissectors/packet-imap.c
index 88075e96d5..88075e96d5 100644
--- a/packet-imap.c
+++ b/epan/dissectors/packet-imap.c
diff --git a/packet-ip.c b/epan/dissectors/packet-ip.c
index 9a5d3e6154..9a5d3e6154 100644
--- a/packet-ip.c
+++ b/epan/dissectors/packet-ip.c
diff --git a/packet-ip.h b/epan/dissectors/packet-ip.h
index 43c6f5e5ac..43c6f5e5ac 100644
--- a/packet-ip.h
+++ b/epan/dissectors/packet-ip.h
diff --git a/packet-ipdc.c b/epan/dissectors/packet-ipdc.c
index e2378ba6e2..e2378ba6e2 100644
--- a/packet-ipdc.c
+++ b/epan/dissectors/packet-ipdc.c
diff --git a/packet-ipdc.h b/epan/dissectors/packet-ipdc.h
index 514b27e682..514b27e682 100644
--- a/packet-ipdc.h
+++ b/epan/dissectors/packet-ipdc.h
diff --git a/packet-ipfc.c b/epan/dissectors/packet-ipfc.c
index 2845dfe7ea..2845dfe7ea 100644
--- a/packet-ipfc.c
+++ b/epan/dissectors/packet-ipfc.c
diff --git a/packet-ipfc.h b/epan/dissectors/packet-ipfc.h
index 8a329893d4..8a329893d4 100644
--- a/packet-ipfc.h
+++ b/epan/dissectors/packet-ipfc.h
diff --git a/packet-ipmi.c b/epan/dissectors/packet-ipmi.c
index ea0ff5caa7..ea0ff5caa7 100644
--- a/packet-ipmi.c
+++ b/epan/dissectors/packet-ipmi.c
diff --git a/packet-ipp.c b/epan/dissectors/packet-ipp.c
index 4b01e19cd2..4b01e19cd2 100644
--- a/packet-ipp.c
+++ b/epan/dissectors/packet-ipp.c
diff --git a/packet-ipsec-udp.c b/epan/dissectors/packet-ipsec-udp.c
index afb52d0814..afb52d0814 100644
--- a/packet-ipsec-udp.c
+++ b/epan/dissectors/packet-ipsec-udp.c
diff --git a/packet-ipsec.c b/epan/dissectors/packet-ipsec.c
index 5ca0ed54dd..5ca0ed54dd 100644
--- a/packet-ipsec.c
+++ b/epan/dissectors/packet-ipsec.c
diff --git a/packet-ipsec.h b/epan/dissectors/packet-ipsec.h
index 62d3d58a9f..62d3d58a9f 100644
--- a/packet-ipsec.h
+++ b/epan/dissectors/packet-ipsec.h
diff --git a/packet-ipv6.c b/epan/dissectors/packet-ipv6.c
index 3c0a2b6572..3c0a2b6572 100644
--- a/packet-ipv6.c
+++ b/epan/dissectors/packet-ipv6.c
diff --git a/packet-ipv6.h b/epan/dissectors/packet-ipv6.h
index 693e8f6543..693e8f6543 100644
--- a/packet-ipv6.h
+++ b/epan/dissectors/packet-ipv6.h
diff --git a/packet-ipvs-syncd.c b/epan/dissectors/packet-ipvs-syncd.c
index 928dcba807..928dcba807 100644
--- a/packet-ipvs-syncd.c
+++ b/epan/dissectors/packet-ipvs-syncd.c
diff --git a/packet-ipx.c b/epan/dissectors/packet-ipx.c
index 3b851d48ef..3b851d48ef 100644
--- a/packet-ipx.c
+++ b/epan/dissectors/packet-ipx.c
diff --git a/packet-ipx.h b/epan/dissectors/packet-ipx.h
index 859fd9b09f..859fd9b09f 100644
--- a/packet-ipx.h
+++ b/epan/dissectors/packet-ipx.h
diff --git a/packet-ipxwan.c b/epan/dissectors/packet-ipxwan.c
index 764f9cbc3e..764f9cbc3e 100644
--- a/packet-ipxwan.c
+++ b/epan/dissectors/packet-ipxwan.c
diff --git a/packet-irc.c b/epan/dissectors/packet-irc.c
index 66976bed7b..66976bed7b 100644
--- a/packet-irc.c
+++ b/epan/dissectors/packet-irc.c
diff --git a/packet-isakmp.c b/epan/dissectors/packet-isakmp.c
index 6092c7ef2d..6092c7ef2d 100644
--- a/packet-isakmp.c
+++ b/epan/dissectors/packet-isakmp.c
diff --git a/packet-iscsi.c b/epan/dissectors/packet-iscsi.c
index c141535e6c..c141535e6c 100644
--- a/packet-iscsi.c
+++ b/epan/dissectors/packet-iscsi.c
diff --git a/packet-isdn.c b/epan/dissectors/packet-isdn.c
index e1c2337cc2..e1c2337cc2 100644
--- a/packet-isdn.c
+++ b/epan/dissectors/packet-isdn.c
diff --git a/packet-isis-clv.c b/epan/dissectors/packet-isis-clv.c
index 371576118d..371576118d 100644
--- a/packet-isis-clv.c
+++ b/epan/dissectors/packet-isis-clv.c
diff --git a/packet-isis-clv.h b/epan/dissectors/packet-isis-clv.h
index 90d4a7bc3e..90d4a7bc3e 100644
--- a/packet-isis-clv.h
+++ b/epan/dissectors/packet-isis-clv.h
diff --git a/packet-isis-hello.c b/epan/dissectors/packet-isis-hello.c
index f7518d5bfa..f7518d5bfa 100644
--- a/packet-isis-hello.c
+++ b/epan/dissectors/packet-isis-hello.c
diff --git a/packet-isis-hello.h b/epan/dissectors/packet-isis-hello.h
index 31ab933958..31ab933958 100644
--- a/packet-isis-hello.h
+++ b/epan/dissectors/packet-isis-hello.h
diff --git a/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c
index 36d975e924..36d975e924 100644
--- a/packet-isis-lsp.c
+++ b/epan/dissectors/packet-isis-lsp.c
diff --git a/packet-isis-lsp.h b/epan/dissectors/packet-isis-lsp.h
index 751dfd5c0d..751dfd5c0d 100644
--- a/packet-isis-lsp.h
+++ b/epan/dissectors/packet-isis-lsp.h
diff --git a/packet-isis-snp.c b/epan/dissectors/packet-isis-snp.c
index 34b6109961..34b6109961 100644
--- a/packet-isis-snp.c
+++ b/epan/dissectors/packet-isis-snp.c
diff --git a/packet-isis-snp.h b/epan/dissectors/packet-isis-snp.h
index 252f04866c..252f04866c 100644
--- a/packet-isis-snp.h
+++ b/epan/dissectors/packet-isis-snp.h
diff --git a/packet-isis.c b/epan/dissectors/packet-isis.c
index 47b5a411c6..47b5a411c6 100644
--- a/packet-isis.c
+++ b/epan/dissectors/packet-isis.c
diff --git a/packet-isis.h b/epan/dissectors/packet-isis.h
index f4565eced3..f4565eced3 100644
--- a/packet-isis.h
+++ b/epan/dissectors/packet-isis.h
diff --git a/packet-isl.c b/epan/dissectors/packet-isl.c
index daf984661d..daf984661d 100644
--- a/packet-isl.c
+++ b/epan/dissectors/packet-isl.c
diff --git a/packet-isl.h b/epan/dissectors/packet-isl.h
index d26417c9f0..d26417c9f0 100644
--- a/packet-isl.h
+++ b/epan/dissectors/packet-isl.h
diff --git a/packet-ismp.c b/epan/dissectors/packet-ismp.c
index 2e5da036df..2e5da036df 100644
--- a/packet-ismp.c
+++ b/epan/dissectors/packet-ismp.c
diff --git a/packet-isns.c b/epan/dissectors/packet-isns.c
index f4fa286494..f4fa286494 100644
--- a/packet-isns.c
+++ b/epan/dissectors/packet-isns.c
diff --git a/packet-isup.c b/epan/dissectors/packet-isup.c
index a2189d843b..a2189d843b 100644
--- a/packet-isup.c
+++ b/epan/dissectors/packet-isup.c
diff --git a/packet-isup.h b/epan/dissectors/packet-isup.h
index 0704d05417..0704d05417 100644
--- a/packet-isup.h
+++ b/epan/dissectors/packet-isup.h
diff --git a/packet-iua.c b/epan/dissectors/packet-iua.c
index 516961cd71..516961cd71 100644
--- a/packet-iua.c
+++ b/epan/dissectors/packet-iua.c
diff --git a/packet-jabber.c b/epan/dissectors/packet-jabber.c
index 78b3f6c8c0..78b3f6c8c0 100644
--- a/packet-jabber.c
+++ b/epan/dissectors/packet-jabber.c
diff --git a/packet-kadm5.c b/epan/dissectors/packet-kadm5.c
index a292a8f19d..a292a8f19d 100644
--- a/packet-kadm5.c
+++ b/epan/dissectors/packet-kadm5.c
diff --git a/packet-kerberos.c b/epan/dissectors/packet-kerberos.c
index a84046d179..2c186138b3 100644
--- a/packet-kerberos.c
+++ b/epan/dissectors/packet-kerberos.c
@@ -58,18 +58,18 @@
 
 #include <epan/strutil.h>
 
-#include "packet-kerberos.h"
-#include "packet-netbios.h"
-#include "packet-tcp.h"
+#include <epan/dissectors/packet-kerberos.h>
+#include <epan/dissectors/packet-netbios.h>
+#include <epan/dissectors/packet-tcp.h>
 #include "prefs.h"
-#include "packet-ber.h"
-#include "packet-smb-common.h"
+#include <epan/dissectors/packet-ber.h>
+#include <epan/dissectors/packet-smb-common.h>
 
-#include "packet-dcerpc-netlogon.h"
-#include "packet-dcerpc.h"
+#include <epan/dissectors/packet-dcerpc-netlogon.h>
+#include <epan/dissectors/packet-dcerpc.h>
 
 #include "asn1.h"		/* for "subid_t" */
-#include "packet-gssapi.h"
+#include <epan/dissectors/packet-gssapi.h>
 
 #define UDP_PORT_KERBEROS		88
 #define TCP_PORT_KERBEROS		88
diff --git a/packet-kerberos.h b/epan/dissectors/packet-kerberos.h
index 9e915e5618..9e915e5618 100644
--- a/packet-kerberos.h
+++ b/epan/dissectors/packet-kerberos.h
diff --git a/packet-klm.c b/epan/dissectors/packet-klm.c
index c8e455f4a2..c8e455f4a2 100644
--- a/packet-klm.c
+++ b/epan/dissectors/packet-klm.c
diff --git a/packet-klm.h b/epan/dissectors/packet-klm.h
index 03ba46fc86..03ba46fc86 100644
--- a/packet-klm.h
+++ b/epan/dissectors/packet-klm.h
diff --git a/packet-kpasswd.c b/epan/dissectors/packet-kpasswd.c
index efd396bca8..efd396bca8 100644
--- a/packet-kpasswd.c
+++ b/epan/dissectors/packet-kpasswd.c
diff --git a/packet-l2tp.c b/epan/dissectors/packet-l2tp.c
index 719d8b32d3..719d8b32d3 100644
--- a/packet-l2tp.c
+++ b/epan/dissectors/packet-l2tp.c
diff --git a/packet-lapb.c b/epan/dissectors/packet-lapb.c
index 0b010e5073..0b010e5073 100644
--- a/packet-lapb.c
+++ b/epan/dissectors/packet-lapb.c
diff --git a/packet-lapbether.c b/epan/dissectors/packet-lapbether.c
index 5257e7f383..5257e7f383 100644
--- a/packet-lapbether.c
+++ b/epan/dissectors/packet-lapbether.c
diff --git a/packet-lapd.c b/epan/dissectors/packet-lapd.c
index d766047ef8..d766047ef8 100644
--- a/packet-lapd.c
+++ b/epan/dissectors/packet-lapd.c
diff --git a/packet-laplink.c b/epan/dissectors/packet-laplink.c
index 279240b06b..279240b06b 100644
--- a/packet-laplink.c
+++ b/epan/dissectors/packet-laplink.c
diff --git a/packet-ldap.c b/epan/dissectors/packet-ldap.c
index 583b9142f1..583b9142f1 100644
--- a/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
diff --git a/packet-ldap.h b/epan/dissectors/packet-ldap.h
index 0462ae66fc..0462ae66fc 100644
--- a/packet-ldap.h
+++ b/epan/dissectors/packet-ldap.h
diff --git a/packet-ldp.c b/epan/dissectors/packet-ldp.c
index d4682034d0..d4682034d0 100644
--- a/packet-ldp.c
+++ b/epan/dissectors/packet-ldp.c
diff --git a/packet-ldp.h b/epan/dissectors/packet-ldp.h
index e1e311df2e..e1e311df2e 100644
--- a/packet-ldp.h
+++ b/epan/dissectors/packet-ldp.h
diff --git a/packet-llc.c b/epan/dissectors/packet-llc.c
index 6d488c446d..6d488c446d 100644
--- a/packet-llc.c
+++ b/epan/dissectors/packet-llc.c
diff --git a/packet-llc.h b/epan/dissectors/packet-llc.h
index 1271473404..1271473404 100644
--- a/packet-llc.h
+++ b/epan/dissectors/packet-llc.h
diff --git a/packet-lmi.c b/epan/dissectors/packet-lmi.c
index 7a37bcb509..7a37bcb509 100644
--- a/packet-lmi.c
+++ b/epan/dissectors/packet-lmi.c
diff --git a/packet-lmp.c b/epan/dissectors/packet-lmp.c
index 5d019a3f0d..5d019a3f0d 100644
--- a/packet-lmp.c
+++ b/epan/dissectors/packet-lmp.c
diff --git a/packet-lpd.c b/epan/dissectors/packet-lpd.c
index d79ea39638..d79ea39638 100644
--- a/packet-lpd.c
+++ b/epan/dissectors/packet-lpd.c
diff --git a/packet-lwapp.c b/epan/dissectors/packet-lwapp.c
index ee23838bce..ee23838bce 100644
--- a/packet-lwapp.c
+++ b/epan/dissectors/packet-lwapp.c
diff --git a/packet-m2pa.c b/epan/dissectors/packet-m2pa.c
index db548e3e86..db548e3e86 100644
--- a/packet-m2pa.c
+++ b/epan/dissectors/packet-m2pa.c
diff --git a/packet-m2tp.c b/epan/dissectors/packet-m2tp.c
index e17b80f31a..e17b80f31a 100644
--- a/packet-m2tp.c
+++ b/epan/dissectors/packet-m2tp.c
diff --git a/packet-m2ua.c b/epan/dissectors/packet-m2ua.c
index 48ab05a047..48ab05a047 100644
--- a/packet-m2ua.c
+++ b/epan/dissectors/packet-m2ua.c
diff --git a/packet-m3ua.c b/epan/dissectors/packet-m3ua.c
index 407a394bc2..407a394bc2 100644
--- a/packet-m3ua.c
+++ b/epan/dissectors/packet-m3ua.c
diff --git a/packet-mbtcp.c b/epan/dissectors/packet-mbtcp.c
index 4d9549b45f..4d9549b45f 100644
--- a/packet-mbtcp.c
+++ b/epan/dissectors/packet-mbtcp.c
diff --git a/packet-mdshdr.c b/epan/dissectors/packet-mdshdr.c
index b99f0b1a6c..b99f0b1a6c 100644
--- a/packet-mdshdr.c
+++ b/epan/dissectors/packet-mdshdr.c
diff --git a/packet-media.c b/epan/dissectors/packet-media.c
index 726da7a292..726da7a292 100755..100644
--- a/packet-media.c
+++ b/epan/dissectors/packet-media.c
diff --git a/packet-mip.c b/epan/dissectors/packet-mip.c
index ce2e46bd80..ce2e46bd80 100644
--- a/packet-mip.c
+++ b/epan/dissectors/packet-mip.c
diff --git a/packet-mip6.c b/epan/dissectors/packet-mip6.c
index cf0cf16b37..cf0cf16b37 100644
--- a/packet-mip6.c
+++ b/epan/dissectors/packet-mip6.c
diff --git a/packet-mip6.h b/epan/dissectors/packet-mip6.h
index ec3d1ad9b8..ec3d1ad9b8 100644
--- a/packet-mip6.h
+++ b/epan/dissectors/packet-mip6.h
diff --git a/packet-mmse.c b/epan/dissectors/packet-mmse.c
index 7a55215b3d..7a55215b3d 100644
--- a/packet-mmse.c
+++ b/epan/dissectors/packet-mmse.c
diff --git a/packet-mount.c b/epan/dissectors/packet-mount.c
index 7dd2c345c9..7dd2c345c9 100644
--- a/packet-mount.c
+++ b/epan/dissectors/packet-mount.c
diff --git a/packet-mount.h b/epan/dissectors/packet-mount.h
index a6b503e2a8..a6b503e2a8 100644
--- a/packet-mount.h
+++ b/epan/dissectors/packet-mount.h
diff --git a/packet-mpeg1.c b/epan/dissectors/packet-mpeg1.c
index e0a94920e1..e0a94920e1 100644
--- a/packet-mpeg1.c
+++ b/epan/dissectors/packet-mpeg1.c
diff --git a/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c
index 2dde42f368..2dde42f368 100644
--- a/packet-mpls-echo.c
+++ b/epan/dissectors/packet-mpls-echo.c
diff --git a/packet-mpls.c b/epan/dissectors/packet-mpls.c
index 459122b621..459122b621 100644
--- a/packet-mpls.c
+++ b/epan/dissectors/packet-mpls.c
diff --git a/packet-mq-pcf.c b/epan/dissectors/packet-mq-pcf.c
index df586039bd..df586039bd 100644
--- a/packet-mq-pcf.c
+++ b/epan/dissectors/packet-mq-pcf.c
diff --git a/packet-mq.c b/epan/dissectors/packet-mq.c
index 666415f7ae..666415f7ae 100644
--- a/packet-mq.c
+++ b/epan/dissectors/packet-mq.c
diff --git a/packet-mq.h b/epan/dissectors/packet-mq.h
index e2b8a18759..e2b8a18759 100644
--- a/packet-mq.h
+++ b/epan/dissectors/packet-mq.h
diff --git a/packet-mrdisc.c b/epan/dissectors/packet-mrdisc.c
index 82a00e72fe..82a00e72fe 100644
--- a/packet-mrdisc.c
+++ b/epan/dissectors/packet-mrdisc.c
diff --git a/packet-mrdisc.h b/epan/dissectors/packet-mrdisc.h
index 5056bb1195..5056bb1195 100644
--- a/packet-mrdisc.h
+++ b/epan/dissectors/packet-mrdisc.h
diff --git a/packet-msdp.c b/epan/dissectors/packet-msdp.c
index cb15ca0c3d..cb15ca0c3d 100644
--- a/packet-msdp.c
+++ b/epan/dissectors/packet-msdp.c
diff --git a/packet-msn-messenger.c b/epan/dissectors/packet-msn-messenger.c
index 1b12c13eac..1b12c13eac 100644
--- a/packet-msn-messenger.c
+++ b/epan/dissectors/packet-msn-messenger.c
diff --git a/packet-msnip.c b/epan/dissectors/packet-msnip.c
index e0ec3f0c85..e0ec3f0c85 100644
--- a/packet-msnip.c
+++ b/epan/dissectors/packet-msnip.c
diff --git a/packet-msnip.h b/epan/dissectors/packet-msnip.h
index 5cbd4bccd4..5cbd4bccd4 100644
--- a/packet-msnip.h
+++ b/epan/dissectors/packet-msnip.h
diff --git a/packet-msproxy.c b/epan/dissectors/packet-msproxy.c
index b42d1f0a22..b42d1f0a22 100644
--- a/packet-msproxy.c
+++ b/epan/dissectors/packet-msproxy.c
diff --git a/packet-mtp2.c b/epan/dissectors/packet-mtp2.c
index 9dfc559b6c..9dfc559b6c 100644
--- a/packet-mtp2.c
+++ b/epan/dissectors/packet-mtp2.c
diff --git a/packet-mtp3.c b/epan/dissectors/packet-mtp3.c
index b23d801b46..b23d801b46 100644
--- a/packet-mtp3.c
+++ b/epan/dissectors/packet-mtp3.c
diff --git a/packet-mtp3.h b/epan/dissectors/packet-mtp3.h
index cdc1f476d6..cdc1f476d6 100644
--- a/packet-mtp3.h
+++ b/epan/dissectors/packet-mtp3.h
diff --git a/packet-mtp3mg.c b/epan/dissectors/packet-mtp3mg.c
index 7bc8e4f39b..7bc8e4f39b 100644
--- a/packet-mtp3mg.c
+++ b/epan/dissectors/packet-mtp3mg.c
diff --git a/packet-multipart.c b/epan/dissectors/packet-multipart.c
index 55942c4ba4..55942c4ba4 100755..100644
--- a/packet-multipart.c
+++ b/epan/dissectors/packet-multipart.c
diff --git a/packet-mysql.c b/epan/dissectors/packet-mysql.c
index bda5bf6fb3..bda5bf6fb3 100644
--- a/packet-mysql.c
+++ b/epan/dissectors/packet-mysql.c
diff --git a/packet-nbipx.c b/epan/dissectors/packet-nbipx.c
index 3717b063f3..3717b063f3 100644
--- a/packet-nbipx.c
+++ b/epan/dissectors/packet-nbipx.c
diff --git a/packet-nbns.c b/epan/dissectors/packet-nbns.c
index e2d51d206c..e2d51d206c 100644
--- a/packet-nbns.c
+++ b/epan/dissectors/packet-nbns.c
diff --git a/packet-ncp-int.h b/epan/dissectors/packet-ncp-int.h
index 124fac3085..124fac3085 100644
--- a/packet-ncp-int.h
+++ b/epan/dissectors/packet-ncp-int.h
diff --git a/packet-ncp-nmas.c b/epan/dissectors/packet-ncp-nmas.c
index 65517acbbc..65517acbbc 100644
--- a/packet-ncp-nmas.c
+++ b/epan/dissectors/packet-ncp-nmas.c
diff --git a/packet-ncp-nmas.h b/epan/dissectors/packet-ncp-nmas.h
index cca79a5776..cca79a5776 100644
--- a/packet-ncp-nmas.h
+++ b/epan/dissectors/packet-ncp-nmas.h
diff --git a/packet-ncp.c b/epan/dissectors/packet-ncp.c
index 01b8729372..01b8729372 100644
--- a/packet-ncp.c
+++ b/epan/dissectors/packet-ncp.c
diff --git a/packet-ncp2222.inc b/epan/dissectors/packet-ncp2222.inc
index 52331bedba..52331bedba 100644
--- a/packet-ncp2222.inc
+++ b/epan/dissectors/packet-ncp2222.inc
diff --git a/packet-ndmp.c b/epan/dissectors/packet-ndmp.c
index 4bf431a815..4bf431a815 100644
--- a/packet-ndmp.c
+++ b/epan/dissectors/packet-ndmp.c
diff --git a/packet-ndps.c b/epan/dissectors/packet-ndps.c
index 17d890e2e2..17d890e2e2 100644
--- a/packet-ndps.c
+++ b/epan/dissectors/packet-ndps.c
diff --git a/packet-ndps.h b/epan/dissectors/packet-ndps.h
index ac7d23eb90..ac7d23eb90 100644
--- a/packet-ndps.h
+++ b/epan/dissectors/packet-ndps.h
diff --git a/packet-netbios.c b/epan/dissectors/packet-netbios.c
index 973731b77f..973731b77f 100644
--- a/packet-netbios.c
+++ b/epan/dissectors/packet-netbios.c
diff --git a/packet-netbios.h b/epan/dissectors/packet-netbios.h
index 6bc1d51ac5..6bc1d51ac5 100644
--- a/packet-netbios.h
+++ b/epan/dissectors/packet-netbios.h
diff --git a/packet-netflow.c b/epan/dissectors/packet-netflow.c
index fcb560feaf..fcb560feaf 100644
--- a/packet-netflow.c
+++ b/epan/dissectors/packet-netflow.c
diff --git a/packet-nfs.c b/epan/dissectors/packet-nfs.c
index 3b73d5640e..3b73d5640e 100644
--- a/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
diff --git a/packet-nfs.h b/epan/dissectors/packet-nfs.h
index 5c5be608df..5c5be608df 100644
--- a/packet-nfs.h
+++ b/epan/dissectors/packet-nfs.h
diff --git a/packet-nfsacl.c b/epan/dissectors/packet-nfsacl.c
index 5999ec45d2..5999ec45d2 100644
--- a/packet-nfsacl.c
+++ b/epan/dissectors/packet-nfsacl.c
diff --git a/packet-nfsauth.c b/epan/dissectors/packet-nfsauth.c
index fb15990de9..fb15990de9 100644
--- a/packet-nfsauth.c
+++ b/epan/dissectors/packet-nfsauth.c
diff --git a/packet-nisplus.c b/epan/dissectors/packet-nisplus.c
index ed2975986e..ed2975986e 100644
--- a/packet-nisplus.c
+++ b/epan/dissectors/packet-nisplus.c
diff --git a/packet-nisplus.h b/epan/dissectors/packet-nisplus.h
index dbc6c50aee..dbc6c50aee 100644
--- a/packet-nisplus.h
+++ b/epan/dissectors/packet-nisplus.h
diff --git a/packet-nlm.c b/epan/dissectors/packet-nlm.c
index 7aa352c082..7aa352c082 100644
--- a/packet-nlm.c
+++ b/epan/dissectors/packet-nlm.c
diff --git a/packet-nlm.h b/epan/dissectors/packet-nlm.h
index 65e3ec18b4..65e3ec18b4 100644
--- a/packet-nlm.h
+++ b/epan/dissectors/packet-nlm.h
diff --git a/packet-nlsp.c b/epan/dissectors/packet-nlsp.c
index 11b3159510..11b3159510 100644
--- a/packet-nlsp.c
+++ b/epan/dissectors/packet-nlsp.c
diff --git a/packet-nntp.c b/epan/dissectors/packet-nntp.c
index 71478fcd07..71478fcd07 100644
--- a/packet-nntp.c
+++ b/epan/dissectors/packet-nntp.c
diff --git a/packet-nt-oui.c b/epan/dissectors/packet-nt-oui.c
index 5a471943cf..5a471943cf 100644
--- a/packet-nt-oui.c
+++ b/epan/dissectors/packet-nt-oui.c
diff --git a/packet-nt-sonmp.c b/epan/dissectors/packet-nt-sonmp.c
index f0c2bebbaa..f0c2bebbaa 100644
--- a/packet-nt-sonmp.c
+++ b/epan/dissectors/packet-nt-sonmp.c
diff --git a/packet-nt-tpcp.c b/epan/dissectors/packet-nt-tpcp.c
index 71d9e31085..71d9e31085 100644
--- a/packet-nt-tpcp.c
+++ b/epan/dissectors/packet-nt-tpcp.c
diff --git a/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c
index 1d3cbcca20..1d3cbcca20 100644
--- a/packet-ntlmssp.c
+++ b/epan/dissectors/packet-ntlmssp.c
diff --git a/packet-ntp.c b/epan/dissectors/packet-ntp.c
index 10c563b6e0..10c563b6e0 100644
--- a/packet-ntp.c
+++ b/epan/dissectors/packet-ntp.c
diff --git a/packet-ntp.h b/epan/dissectors/packet-ntp.h
index 889231aa21..889231aa21 100644
--- a/packet-ntp.h
+++ b/epan/dissectors/packet-ntp.h
diff --git a/packet-null.c b/epan/dissectors/packet-null.c
index cf0dc20af6..cf0dc20af6 100644
--- a/packet-null.c
+++ b/epan/dissectors/packet-null.c
diff --git a/packet-null.h b/epan/dissectors/packet-null.h
index 88eb16e46b..88eb16e46b 100644
--- a/packet-null.h
+++ b/epan/dissectors/packet-null.h
diff --git a/packet-olsr.c b/epan/dissectors/packet-olsr.c
index a3739ddfe3..a3739ddfe3 100644
--- a/packet-olsr.c
+++ b/epan/dissectors/packet-olsr.c
diff --git a/packet-osi-options.c b/epan/dissectors/packet-osi-options.c
index f49cffed75..f49cffed75 100644
--- a/packet-osi-options.c
+++ b/epan/dissectors/packet-osi-options.c
diff --git a/packet-osi-options.h b/epan/dissectors/packet-osi-options.h
index 27ee3ded8c..27ee3ded8c 100644
--- a/packet-osi-options.h
+++ b/epan/dissectors/packet-osi-options.h
diff --git a/packet-osi.c b/epan/dissectors/packet-osi.c
index 6afbc80adf..6afbc80adf 100644
--- a/packet-osi.c
+++ b/epan/dissectors/packet-osi.c
diff --git a/packet-osi.h b/epan/dissectors/packet-osi.h
index 9594917c09..9594917c09 100644
--- a/packet-osi.h
+++ b/epan/dissectors/packet-osi.h
diff --git a/packet-ospf.c b/epan/dissectors/packet-ospf.c
index 02ac9e64fd..02ac9e64fd 100644
--- a/packet-ospf.c
+++ b/epan/dissectors/packet-ospf.c
diff --git a/packet-pcnfsd.c b/epan/dissectors/packet-pcnfsd.c
index 40578c1e49..40578c1e49 100644
--- a/packet-pcnfsd.c
+++ b/epan/dissectors/packet-pcnfsd.c
diff --git a/packet-pcnfsd.h b/epan/dissectors/packet-pcnfsd.h
index f217bdc768..f217bdc768 100644
--- a/packet-pcnfsd.h
+++ b/epan/dissectors/packet-pcnfsd.h
diff --git a/packet-per.c b/epan/dissectors/packet-per.c
index a18355ee4a..a18355ee4a 100644
--- a/packet-per.c
+++ b/epan/dissectors/packet-per.c
diff --git a/packet-per.h b/epan/dissectors/packet-per.h
index 1aa640af81..1aa640af81 100644
--- a/packet-per.h
+++ b/epan/dissectors/packet-per.h
diff --git a/packet-pflog.c b/epan/dissectors/packet-pflog.c
index 4f53a07f2b..4f53a07f2b 100644
--- a/packet-pflog.c
+++ b/epan/dissectors/packet-pflog.c
diff --git a/packet-pflog.h b/epan/dissectors/packet-pflog.h
index fa51bb9926..fa51bb9926 100644
--- a/packet-pflog.h
+++ b/epan/dissectors/packet-pflog.h
diff --git a/packet-pgm.c b/epan/dissectors/packet-pgm.c
index 9e7a8857be..9e7a8857be 100644
--- a/packet-pgm.c
+++ b/epan/dissectors/packet-pgm.c
diff --git a/packet-pim.c b/epan/dissectors/packet-pim.c
index 485bb0ee33..485bb0ee33 100644
--- a/packet-pim.c
+++ b/epan/dissectors/packet-pim.c
diff --git a/packet-pim.h b/epan/dissectors/packet-pim.h
index e4b7514212..e4b7514212 100644
--- a/packet-pim.h
+++ b/epan/dissectors/packet-pim.h
diff --git a/packet-pktc.c b/epan/dissectors/packet-pktc.c
index 07b63f5bf6..07b63f5bf6 100644
--- a/packet-pktc.c
+++ b/epan/dissectors/packet-pktc.c
diff --git a/packet-pktc.h b/epan/dissectors/packet-pktc.h
index a00b9579c7..a00b9579c7 100644
--- a/packet-pktc.h
+++ b/epan/dissectors/packet-pktc.h
diff --git a/packet-pop.c b/epan/dissectors/packet-pop.c
index e78a53be54..e78a53be54 100644
--- a/packet-pop.c
+++ b/epan/dissectors/packet-pop.c
diff --git a/packet-portmap.c b/epan/dissectors/packet-portmap.c
index 72b55e6beb..72b55e6beb 100644
--- a/packet-portmap.c
+++ b/epan/dissectors/packet-portmap.c
diff --git a/packet-portmap.h b/epan/dissectors/packet-portmap.h
index 695bad532c..695bad532c 100644
--- a/packet-portmap.h
+++ b/epan/dissectors/packet-portmap.h
diff --git a/packet-postgresql.c b/epan/dissectors/packet-postgresql.c
index 651ba1fb8f..651ba1fb8f 100644
--- a/packet-postgresql.c
+++ b/epan/dissectors/packet-postgresql.c
diff --git a/packet-ppp.c b/epan/dissectors/packet-ppp.c
index 66962677a8..66962677a8 100644
--- a/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
diff --git a/packet-ppp.h b/epan/dissectors/packet-ppp.h
index 900f209199..900f209199 100644
--- a/packet-ppp.h
+++ b/epan/dissectors/packet-ppp.h
diff --git a/packet-pppoe.c b/epan/dissectors/packet-pppoe.c
index d1f33240fc..d1f33240fc 100644
--- a/packet-pppoe.c
+++ b/epan/dissectors/packet-pppoe.c
diff --git a/packet-pptp.c b/epan/dissectors/packet-pptp.c
index f4db883388..f4db883388 100644
--- a/packet-pptp.c
+++ b/epan/dissectors/packet-pptp.c
diff --git a/packet-pres.c b/epan/dissectors/packet-pres.c
index 61b421e285..61b421e285 100644
--- a/packet-pres.c
+++ b/epan/dissectors/packet-pres.c
diff --git a/packet-pres.h b/epan/dissectors/packet-pres.h
index a8a7f35178..a8a7f35178 100644
--- a/packet-pres.h
+++ b/epan/dissectors/packet-pres.h
diff --git a/packet-prism.c b/epan/dissectors/packet-prism.c
index 57cc16b38a..57cc16b38a 100644
--- a/packet-prism.c
+++ b/epan/dissectors/packet-prism.c
diff --git a/packet-prism.h b/epan/dissectors/packet-prism.h
index 7af1893345..7af1893345 100644
--- a/packet-prism.h
+++ b/epan/dissectors/packet-prism.h
diff --git a/packet-ptp.c b/epan/dissectors/packet-ptp.c
index f6081f98a6..f6081f98a6 100644
--- a/packet-ptp.c
+++ b/epan/dissectors/packet-ptp.c
diff --git a/packet-q2931.c b/epan/dissectors/packet-q2931.c
index db34e3286e..db34e3286e 100644
--- a/packet-q2931.c
+++ b/epan/dissectors/packet-q2931.c
diff --git a/packet-q931.c b/epan/dissectors/packet-q931.c
index 10da9f3c95..10da9f3c95 100644
--- a/packet-q931.c
+++ b/epan/dissectors/packet-q931.c
diff --git a/packet-q931.h b/epan/dissectors/packet-q931.h
index c01cb39788..c01cb39788 100644
--- a/packet-q931.h
+++ b/epan/dissectors/packet-q931.h
diff --git a/packet-q933.c b/epan/dissectors/packet-q933.c
index 96b48a528b..96b48a528b 100644
--- a/packet-q933.c
+++ b/epan/dissectors/packet-q933.c
diff --git a/packet-qllc.c b/epan/dissectors/packet-qllc.c
index f0913ca76b..f0913ca76b 100644
--- a/packet-qllc.c
+++ b/epan/dissectors/packet-qllc.c
diff --git a/packet-quake.c b/epan/dissectors/packet-quake.c
index 752a19b7b8..752a19b7b8 100644
--- a/packet-quake.c
+++ b/epan/dissectors/packet-quake.c
diff --git a/packet-quake2.c b/epan/dissectors/packet-quake2.c
index 188077e3e4..188077e3e4 100644
--- a/packet-quake2.c
+++ b/epan/dissectors/packet-quake2.c
diff --git a/packet-quake3.c b/epan/dissectors/packet-quake3.c
index bb8fbb3403..bb8fbb3403 100644
--- a/packet-quake3.c
+++ b/epan/dissectors/packet-quake3.c
diff --git a/packet-quakeworld.c b/epan/dissectors/packet-quakeworld.c
index 5af335a52a..5af335a52a 100644
--- a/packet-quakeworld.c
+++ b/epan/dissectors/packet-quakeworld.c
diff --git a/packet-radiotap.c b/epan/dissectors/packet-radiotap.c
index e9adad14a3..e9adad14a3 100644
--- a/packet-radiotap.c
+++ b/epan/dissectors/packet-radiotap.c
diff --git a/packet-radiotap.h b/epan/dissectors/packet-radiotap.h
index c92ecb7762..c92ecb7762 100644
--- a/packet-radiotap.h
+++ b/epan/dissectors/packet-radiotap.h
diff --git a/packet-radius.c b/epan/dissectors/packet-radius.c
index ac561d4990..ac561d4990 100644
--- a/packet-radius.c
+++ b/epan/dissectors/packet-radius.c
diff --git a/packet-ranap.c b/epan/dissectors/packet-ranap.c
index 2ec6df5edc..2ec6df5edc 100644
--- a/packet-ranap.c
+++ b/epan/dissectors/packet-ranap.c
diff --git a/packet-raw.c b/epan/dissectors/packet-raw.c
index 77939b5cf7..77939b5cf7 100644
--- a/packet-raw.c
+++ b/epan/dissectors/packet-raw.c
diff --git a/packet-raw.h b/epan/dissectors/packet-raw.h
index 40480ec0cc..40480ec0cc 100644
--- a/packet-raw.h
+++ b/epan/dissectors/packet-raw.h
diff --git a/packet-rip.c b/epan/dissectors/packet-rip.c
index a39a14a841..a39a14a841 100644
--- a/packet-rip.c
+++ b/epan/dissectors/packet-rip.c
diff --git a/packet-ripng.c b/epan/dissectors/packet-ripng.c
index 7ed7526e92..7ed7526e92 100644
--- a/packet-ripng.c
+++ b/epan/dissectors/packet-ripng.c
diff --git a/packet-ripng.h b/epan/dissectors/packet-ripng.h
index 1dc0b4f641..1dc0b4f641 100644
--- a/packet-ripng.h
+++ b/epan/dissectors/packet-ripng.h
diff --git a/packet-rlogin.c b/epan/dissectors/packet-rlogin.c
index 5f09780830..5f09780830 100644
--- a/packet-rlogin.c
+++ b/epan/dissectors/packet-rlogin.c
diff --git a/packet-rmcp.c b/epan/dissectors/packet-rmcp.c
index eb03f595b8..eb03f595b8 100644
--- a/packet-rmcp.c
+++ b/epan/dissectors/packet-rmcp.c
diff --git a/packet-rmi.c b/epan/dissectors/packet-rmi.c
index ca1ed61d2a..ca1ed61d2a 100644
--- a/packet-rmi.c
+++ b/epan/dissectors/packet-rmi.c
diff --git a/packet-rmi.h b/epan/dissectors/packet-rmi.h
index 80ed7b357a..80ed7b357a 100644
--- a/packet-rmi.h
+++ b/epan/dissectors/packet-rmi.h
diff --git a/packet-rmp.c b/epan/dissectors/packet-rmp.c
index bef7158581..bef7158581 100644
--- a/packet-rmp.c
+++ b/epan/dissectors/packet-rmp.c
diff --git a/packet-rpc.c b/epan/dissectors/packet-rpc.c
index 07de41b8f5..07de41b8f5 100644
--- a/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
diff --git a/packet-rpc.h b/epan/dissectors/packet-rpc.h
index 3eb5312e8b..3eb5312e8b 100644
--- a/packet-rpc.h
+++ b/epan/dissectors/packet-rpc.h
diff --git a/packet-rpl.c b/epan/dissectors/packet-rpl.c
index 9fc84ac5af..9fc84ac5af 100644
--- a/packet-rpl.c
+++ b/epan/dissectors/packet-rpl.c
diff --git a/packet-rquota.c b/epan/dissectors/packet-rquota.c
index 98f3fc7d62..98f3fc7d62 100644
--- a/packet-rquota.c
+++ b/epan/dissectors/packet-rquota.c
diff --git a/packet-rquota.h b/epan/dissectors/packet-rquota.h
index 3bfdaced7f..3bfdaced7f 100644
--- a/packet-rquota.h
+++ b/epan/dissectors/packet-rquota.h
diff --git a/packet-rsh.c b/epan/dissectors/packet-rsh.c
index 856588a085..856588a085 100644
--- a/packet-rsh.c
+++ b/epan/dissectors/packet-rsh.c
diff --git a/packet-rstat.c b/epan/dissectors/packet-rstat.c
index 8401651576..8401651576 100644
--- a/packet-rstat.c
+++ b/epan/dissectors/packet-rstat.c
diff --git a/packet-rsvp.c b/epan/dissectors/packet-rsvp.c
index dec783e763..dec783e763 100644
--- a/packet-rsvp.c
+++ b/epan/dissectors/packet-rsvp.c
diff --git a/packet-rsvp.h b/epan/dissectors/packet-rsvp.h
index 020d74c30c..020d74c30c 100644
--- a/packet-rsvp.h
+++ b/epan/dissectors/packet-rsvp.h
diff --git a/packet-rsync.c b/epan/dissectors/packet-rsync.c
index 0195e06ed3..0195e06ed3 100644
--- a/packet-rsync.c
+++ b/epan/dissectors/packet-rsync.c
diff --git a/packet-rtcp.c b/epan/dissectors/packet-rtcp.c
index 86a826f7e6..86a826f7e6 100644
--- a/packet-rtcp.c
+++ b/epan/dissectors/packet-rtcp.c
diff --git a/packet-rtcp.h b/epan/dissectors/packet-rtcp.h
index 30e0ee5dd9..30e0ee5dd9 100644
--- a/packet-rtcp.h
+++ b/epan/dissectors/packet-rtcp.h
diff --git a/packet-rtp-events.c b/epan/dissectors/packet-rtp-events.c
index 13630e462a..13630e462a 100644
--- a/packet-rtp-events.c
+++ b/epan/dissectors/packet-rtp-events.c
diff --git a/packet-rtp-events.h b/epan/dissectors/packet-rtp-events.h
index 76c972f1d1..76c972f1d1 100644
--- a/packet-rtp-events.h
+++ b/epan/dissectors/packet-rtp-events.h
diff --git a/packet-rtp.c b/epan/dissectors/packet-rtp.c
index 900b01c2be..900b01c2be 100644
--- a/packet-rtp.c
+++ b/epan/dissectors/packet-rtp.c
diff --git a/packet-rtp.h b/epan/dissectors/packet-rtp.h
index 788e060f1c..788e060f1c 100644
--- a/packet-rtp.h
+++ b/epan/dissectors/packet-rtp.h
diff --git a/packet-rtps.c b/epan/dissectors/packet-rtps.c
index 6adcf73806..6adcf73806 100644
--- a/packet-rtps.c
+++ b/epan/dissectors/packet-rtps.c
diff --git a/packet-rtps.h b/epan/dissectors/packet-rtps.h
index cbd768f2e3..cbd768f2e3 100644
--- a/packet-rtps.h
+++ b/epan/dissectors/packet-rtps.h
diff --git a/packet-rtsp.c b/epan/dissectors/packet-rtsp.c
index 1a1453494e..1a1453494e 100644
--- a/packet-rtsp.c
+++ b/epan/dissectors/packet-rtsp.c
diff --git a/packet-rwall.c b/epan/dissectors/packet-rwall.c
index 531bb0d80f..531bb0d80f 100644
--- a/packet-rwall.c
+++ b/epan/dissectors/packet-rwall.c
diff --git a/packet-rwall.h b/epan/dissectors/packet-rwall.h
index f63d3c88eb..f63d3c88eb 100644
--- a/packet-rwall.h
+++ b/epan/dissectors/packet-rwall.h
diff --git a/packet-rx.c b/epan/dissectors/packet-rx.c
index 8600c38635..8600c38635 100644
--- a/packet-rx.c
+++ b/epan/dissectors/packet-rx.c
diff --git a/packet-rx.h b/epan/dissectors/packet-rx.h
index 9824675b1f..9824675b1f 100644
--- a/packet-rx.h
+++ b/epan/dissectors/packet-rx.h
diff --git a/packet-sadmind.c b/epan/dissectors/packet-sadmind.c
index ffcf2a065c..ffcf2a065c 100644
--- a/packet-sadmind.c
+++ b/epan/dissectors/packet-sadmind.c
diff --git a/packet-sap.c b/epan/dissectors/packet-sap.c
index c54ad1ecd8..c54ad1ecd8 100644
--- a/packet-sap.c
+++ b/epan/dissectors/packet-sap.c
diff --git a/packet-sccp.c b/epan/dissectors/packet-sccp.c
index 88dee1a850..88dee1a850 100644
--- a/packet-sccp.c
+++ b/epan/dissectors/packet-sccp.c
diff --git a/packet-sccpmg.c b/epan/dissectors/packet-sccpmg.c
index a0f90fcdba..a0f90fcdba 100755..100644
--- a/packet-sccpmg.c
+++ b/epan/dissectors/packet-sccpmg.c
diff --git a/packet-scsi.c b/epan/dissectors/packet-scsi.c
index 0e34fb9d70..0e34fb9d70 100644
--- a/packet-scsi.c
+++ b/epan/dissectors/packet-scsi.c
diff --git a/packet-scsi.h b/epan/dissectors/packet-scsi.h
index ed2ff42e7c..ed2ff42e7c 100644
--- a/packet-scsi.h
+++ b/epan/dissectors/packet-scsi.h
diff --git a/packet-sctp.c b/epan/dissectors/packet-sctp.c
index 4e2712db3d..4e2712db3d 100644
--- a/packet-sctp.c
+++ b/epan/dissectors/packet-sctp.c
diff --git a/packet-sctp.h b/epan/dissectors/packet-sctp.h
index 72e5cd594f..72e5cd594f 100644
--- a/packet-sctp.h
+++ b/epan/dissectors/packet-sctp.h
diff --git a/packet-sdlc.c b/epan/dissectors/packet-sdlc.c
index 12a6e2c140..12a6e2c140 100644
--- a/packet-sdlc.c
+++ b/epan/dissectors/packet-sdlc.c
diff --git a/packet-sdp.c b/epan/dissectors/packet-sdp.c
index 3460bca5f7..3460bca5f7 100644
--- a/packet-sdp.c
+++ b/epan/dissectors/packet-sdp.c
diff --git a/packet-sebek.c b/epan/dissectors/packet-sebek.c
index 7ba6882965..7ba6882965 100644
--- a/packet-sebek.c
+++ b/epan/dissectors/packet-sebek.c
diff --git a/packet-ses.c b/epan/dissectors/packet-ses.c
index b1f00d845c..b1f00d845c 100644
--- a/packet-ses.c
+++ b/epan/dissectors/packet-ses.c
diff --git a/packet-ses.h b/epan/dissectors/packet-ses.h
index 7a8830fd6f..7a8830fd6f 100644
--- a/packet-ses.h
+++ b/epan/dissectors/packet-ses.h
diff --git a/packet-sflow.c b/epan/dissectors/packet-sflow.c
index 9177a7be74..9177a7be74 100644
--- a/packet-sflow.c
+++ b/epan/dissectors/packet-sflow.c
diff --git a/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c
index 8cbbcc824c..8cbbcc824c 100644
--- a/packet-sigcomp.c
+++ b/epan/dissectors/packet-sigcomp.c
diff --git a/packet-sip.c b/epan/dissectors/packet-sip.c
index e6eba141cf..e6eba141cf 100644
--- a/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
diff --git a/packet-sip.h b/epan/dissectors/packet-sip.h
index e8702758e5..e8702758e5 100755..100644
--- a/packet-sip.h
+++ b/epan/dissectors/packet-sip.h
diff --git a/packet-sipfrag.c b/epan/dissectors/packet-sipfrag.c
index c40bfaf89f..c40bfaf89f 100644
--- a/packet-sipfrag.c
+++ b/epan/dissectors/packet-sipfrag.c
diff --git a/packet-skinny.c b/epan/dissectors/packet-skinny.c
index ff8b025799..ff8b025799 100644
--- a/packet-skinny.c
+++ b/epan/dissectors/packet-skinny.c
diff --git a/packet-slimp3.c b/epan/dissectors/packet-slimp3.c
index 89071840eb..89071840eb 100644
--- a/packet-slimp3.c
+++ b/epan/dissectors/packet-slimp3.c
diff --git a/packet-sll.c b/epan/dissectors/packet-sll.c
index d1fb2a968f..d1fb2a968f 100644
--- a/packet-sll.c
+++ b/epan/dissectors/packet-sll.c
diff --git a/packet-sll.h b/epan/dissectors/packet-sll.h
index e108e9f13d..e108e9f13d 100644
--- a/packet-sll.h
+++ b/epan/dissectors/packet-sll.h
diff --git a/packet-slowprotocols.c b/epan/dissectors/packet-slowprotocols.c
index aa50a31b3a..aa50a31b3a 100644
--- a/packet-slowprotocols.c
+++ b/epan/dissectors/packet-slowprotocols.c
diff --git a/packet-slsk.c b/epan/dissectors/packet-slsk.c
index a9f75795e8..a9f75795e8 100644
--- a/packet-slsk.c
+++ b/epan/dissectors/packet-slsk.c
diff --git a/packet-smb-browse.c b/epan/dissectors/packet-smb-browse.c
index 103e7799aa..103e7799aa 100644
--- a/packet-smb-browse.c
+++ b/epan/dissectors/packet-smb-browse.c
diff --git a/packet-smb-browse.h b/epan/dissectors/packet-smb-browse.h
index 20385fe949..20385fe949 100644
--- a/packet-smb-browse.h
+++ b/epan/dissectors/packet-smb-browse.h
diff --git a/packet-smb-common.c b/epan/dissectors/packet-smb-common.c
index f5e4d09275..f5e4d09275 100644
--- a/packet-smb-common.c
+++ b/epan/dissectors/packet-smb-common.c
diff --git a/packet-smb-common.h b/epan/dissectors/packet-smb-common.h
index 94d0a4b889..94d0a4b889 100644
--- a/packet-smb-common.h
+++ b/epan/dissectors/packet-smb-common.h
diff --git a/packet-smb-logon.c b/epan/dissectors/packet-smb-logon.c
index a1060353f0..a1060353f0 100644
--- a/packet-smb-logon.c
+++ b/epan/dissectors/packet-smb-logon.c
diff --git a/packet-smb-mailslot.c b/epan/dissectors/packet-smb-mailslot.c
index 9ad7db08ed..9ad7db08ed 100644
--- a/packet-smb-mailslot.c
+++ b/epan/dissectors/packet-smb-mailslot.c
diff --git a/packet-smb-mailslot.h b/epan/dissectors/packet-smb-mailslot.h
index aa8cf9a9d7..aa8cf9a9d7 100644
--- a/packet-smb-mailslot.h
+++ b/epan/dissectors/packet-smb-mailslot.h
diff --git a/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c
index b7ba500976..b7ba500976 100644
--- a/packet-smb-pipe.c
+++ b/epan/dissectors/packet-smb-pipe.c
diff --git a/packet-smb-pipe.h b/epan/dissectors/packet-smb-pipe.h
index 5df9511689..5df9511689 100644
--- a/packet-smb-pipe.h
+++ b/epan/dissectors/packet-smb-pipe.h
diff --git a/packet-smb-sidsnooping.c b/epan/dissectors/packet-smb-sidsnooping.c
index 84cdb8125e..84cdb8125e 100644
--- a/packet-smb-sidsnooping.c
+++ b/epan/dissectors/packet-smb-sidsnooping.c
diff --git a/packet-smb-sidsnooping.h b/epan/dissectors/packet-smb-sidsnooping.h
index b369b525fe..b369b525fe 100644
--- a/packet-smb-sidsnooping.h
+++ b/epan/dissectors/packet-smb-sidsnooping.h
diff --git a/packet-smb.c b/epan/dissectors/packet-smb.c
index 33d1c8fca3..33d1c8fca3 100644
--- a/packet-smb.c
+++ b/epan/dissectors/packet-smb.c
diff --git a/packet-smpp.c b/epan/dissectors/packet-smpp.c
index 5d92afc530..5d92afc530 100644
--- a/packet-smpp.c
+++ b/epan/dissectors/packet-smpp.c
diff --git a/packet-smtp.c b/epan/dissectors/packet-smtp.c
index f95978411c..f95978411c 100644
--- a/packet-smtp.c
+++ b/epan/dissectors/packet-smtp.c
diff --git a/packet-sna.c b/epan/dissectors/packet-sna.c
index be53b18c43..be53b18c43 100644
--- a/packet-sna.c
+++ b/epan/dissectors/packet-sna.c
diff --git a/packet-sna.h b/epan/dissectors/packet-sna.h
index 47056a5a46..47056a5a46 100644
--- a/packet-sna.h
+++ b/epan/dissectors/packet-sna.h
diff --git a/packet-snaeth.c b/epan/dissectors/packet-snaeth.c
index b4e055a917..b4e055a917 100644
--- a/packet-snaeth.c
+++ b/epan/dissectors/packet-snaeth.c
diff --git a/packet-sndcp.c b/epan/dissectors/packet-sndcp.c
index b6123b3310..b6123b3310 100644
--- a/packet-sndcp.c
+++ b/epan/dissectors/packet-sndcp.c
diff --git a/packet-snmp.c b/epan/dissectors/packet-snmp.c
index fc6d191df8..fc6d191df8 100644
--- a/packet-snmp.c
+++ b/epan/dissectors/packet-snmp.c
diff --git a/packet-snmp.h b/epan/dissectors/packet-snmp.h
index 3f4f3feed5..3f4f3feed5 100644
--- a/packet-snmp.h
+++ b/epan/dissectors/packet-snmp.h
diff --git a/packet-socks.c b/epan/dissectors/packet-socks.c
index 502eb68a2b..502eb68a2b 100644
--- a/packet-socks.c
+++ b/epan/dissectors/packet-socks.c
diff --git a/packet-spnego.c b/epan/dissectors/packet-spnego.c
index 70eace5ff2..70eace5ff2 100644
--- a/packet-spnego.c
+++ b/epan/dissectors/packet-spnego.c
diff --git a/packet-spray.c b/epan/dissectors/packet-spray.c
index e2b74d3aee..e2b74d3aee 100644
--- a/packet-spray.c
+++ b/epan/dissectors/packet-spray.c
diff --git a/packet-spray.h b/epan/dissectors/packet-spray.h
index 68153ef672..68153ef672 100644
--- a/packet-spray.h
+++ b/epan/dissectors/packet-spray.h
diff --git a/packet-srvloc.c b/epan/dissectors/packet-srvloc.c
index a5a099b249..a5a099b249 100644
--- a/packet-srvloc.c
+++ b/epan/dissectors/packet-srvloc.c
diff --git a/packet-sscop.c b/epan/dissectors/packet-sscop.c
index ae048ecf36..ae048ecf36 100644
--- a/packet-sscop.c
+++ b/epan/dissectors/packet-sscop.c
diff --git a/packet-ssh.c b/epan/dissectors/packet-ssh.c
index 9cc34d3b6f..9cc34d3b6f 100644
--- a/packet-ssh.c
+++ b/epan/dissectors/packet-ssh.c
diff --git a/packet-ssl.c b/epan/dissectors/packet-ssl.c
index 38d1245d57..38d1245d57 100644
--- a/packet-ssl.c
+++ b/epan/dissectors/packet-ssl.c
diff --git a/packet-stat-notify.c b/epan/dissectors/packet-stat-notify.c
index ad5ff36189..ad5ff36189 100644
--- a/packet-stat-notify.c
+++ b/epan/dissectors/packet-stat-notify.c
diff --git a/packet-stat-notify.h b/epan/dissectors/packet-stat-notify.h
index f0f5e791ca..f0f5e791ca 100644
--- a/packet-stat-notify.h
+++ b/epan/dissectors/packet-stat-notify.h
diff --git a/packet-stat.c b/epan/dissectors/packet-stat.c
index a631ef4519..a631ef4519 100644
--- a/packet-stat.c
+++ b/epan/dissectors/packet-stat.c
diff --git a/packet-stat.h b/epan/dissectors/packet-stat.h
index 8ad388feaa..8ad388feaa 100644
--- a/packet-stat.h
+++ b/epan/dissectors/packet-stat.h
diff --git a/packet-stun.c b/epan/dissectors/packet-stun.c
index 45249e1646..45249e1646 100644
--- a/packet-stun.c
+++ b/epan/dissectors/packet-stun.c
diff --git a/packet-sua.c b/epan/dissectors/packet-sua.c
index cd90c4e390..cd90c4e390 100644
--- a/packet-sua.c
+++ b/epan/dissectors/packet-sua.c
diff --git a/packet-symantec.c b/epan/dissectors/packet-symantec.c
index 1969ab4f3f..1969ab4f3f 100644
--- a/packet-symantec.c
+++ b/epan/dissectors/packet-symantec.c
diff --git a/packet-syslog.c b/epan/dissectors/packet-syslog.c
index 67859835e7..67859835e7 100644
--- a/packet-syslog.c
+++ b/epan/dissectors/packet-syslog.c
diff --git a/packet-t38.c b/epan/dissectors/packet-t38.c
index 5fe112dbc1..5fe112dbc1 100644
--- a/packet-t38.c
+++ b/epan/dissectors/packet-t38.c
diff --git a/packet-tacacs.c b/epan/dissectors/packet-tacacs.c
index 8968beb5a5..8968beb5a5 100644
--- a/packet-tacacs.c
+++ b/epan/dissectors/packet-tacacs.c
diff --git a/packet-tacacs.h b/epan/dissectors/packet-tacacs.h
index 0c8adc24c6..0c8adc24c6 100644
--- a/packet-tacacs.h
+++ b/epan/dissectors/packet-tacacs.h
diff --git a/packet-tcap.c b/epan/dissectors/packet-tcap.c
index 4c87ebf756..4c87ebf756 100644
--- a/packet-tcap.c
+++ b/epan/dissectors/packet-tcap.c
diff --git a/packet-tcap.h b/epan/dissectors/packet-tcap.h
index 7af75162f5..7af75162f5 100644
--- a/packet-tcap.h
+++ b/epan/dissectors/packet-tcap.h
diff --git a/packet-tcp.c b/epan/dissectors/packet-tcp.c
index e48d7d0379..e48d7d0379 100644
--- a/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
diff --git a/packet-tcp.h b/epan/dissectors/packet-tcp.h
index a33472a978..a33472a978 100644
--- a/packet-tcp.h
+++ b/epan/dissectors/packet-tcp.h
diff --git a/packet-tds.c b/epan/dissectors/packet-tds.c
index f443ea53b1..f443ea53b1 100644
--- a/packet-tds.c
+++ b/epan/dissectors/packet-tds.c
diff --git a/packet-teimanagement.c b/epan/dissectors/packet-teimanagement.c
index 8d6dab4d41..8d6dab4d41 100644
--- a/packet-teimanagement.c
+++ b/epan/dissectors/packet-teimanagement.c
diff --git a/packet-telnet.c b/epan/dissectors/packet-telnet.c
index 2f76364754..2f76364754 100644
--- a/packet-telnet.c
+++ b/epan/dissectors/packet-telnet.c
diff --git a/packet-teredo.c b/epan/dissectors/packet-teredo.c
index f591997a69..f591997a69 100644
--- a/packet-teredo.c
+++ b/epan/dissectors/packet-teredo.c
diff --git a/packet-text-media.c b/epan/dissectors/packet-text-media.c
index 7e4d9516bf..7e4d9516bf 100644
--- a/packet-text-media.c
+++ b/epan/dissectors/packet-text-media.c
diff --git a/packet-tftp.c b/epan/dissectors/packet-tftp.c
index 879619b72f..879619b72f 100644
--- a/packet-tftp.c
+++ b/epan/dissectors/packet-tftp.c
diff --git a/packet-time.c b/epan/dissectors/packet-time.c
index 73c115d13d..73c115d13d 100644
--- a/packet-time.c
+++ b/epan/dissectors/packet-time.c
diff --git a/packet-tns.c b/epan/dissectors/packet-tns.c
index f3e0d50ed7..f3e0d50ed7 100644
--- a/packet-tns.c
+++ b/epan/dissectors/packet-tns.c
diff --git a/packet-tns.h b/epan/dissectors/packet-tns.h
index 26ea435704..26ea435704 100644
--- a/packet-tns.h
+++ b/epan/dissectors/packet-tns.h
diff --git a/packet-tpkt.c b/epan/dissectors/packet-tpkt.c
index 88938f56fe..88938f56fe 100644
--- a/packet-tpkt.c
+++ b/epan/dissectors/packet-tpkt.c
diff --git a/packet-tpkt.h b/epan/dissectors/packet-tpkt.h
index f4404e8f0e..f4404e8f0e 100644
--- a/packet-tpkt.h
+++ b/epan/dissectors/packet-tpkt.h
diff --git a/packet-tr.c b/epan/dissectors/packet-tr.c
index 79d1130a6a..79d1130a6a 100644
--- a/packet-tr.c
+++ b/epan/dissectors/packet-tr.c
diff --git a/packet-tr.h b/epan/dissectors/packet-tr.h
index 910bd4799c..910bd4799c 100644
--- a/packet-tr.h
+++ b/epan/dissectors/packet-tr.h
diff --git a/packet-trmac.c b/epan/dissectors/packet-trmac.c
index 42472b9866..42472b9866 100644
--- a/packet-trmac.c
+++ b/epan/dissectors/packet-trmac.c
diff --git a/packet-tsp.c b/epan/dissectors/packet-tsp.c
index 1673712f0b..1673712f0b 100644
--- a/packet-tsp.c
+++ b/epan/dissectors/packet-tsp.c
diff --git a/packet-tuxedo.c b/epan/dissectors/packet-tuxedo.c
index 8144643694..8144643694 100644
--- a/packet-tuxedo.c
+++ b/epan/dissectors/packet-tuxedo.c
diff --git a/packet-tzsp.c b/epan/dissectors/packet-tzsp.c
index b7db2431e8..b7db2431e8 100644
--- a/packet-tzsp.c
+++ b/epan/dissectors/packet-tzsp.c
diff --git a/packet-ucp.c b/epan/dissectors/packet-ucp.c
index 6ff5490dd1..6ff5490dd1 100644
--- a/packet-ucp.c
+++ b/epan/dissectors/packet-ucp.c
diff --git a/packet-udp.c b/epan/dissectors/packet-udp.c
index a905d46408..a905d46408 100644
--- a/packet-udp.c
+++ b/epan/dissectors/packet-udp.c
diff --git a/packet-udp.h b/epan/dissectors/packet-udp.h
index 06fd66c708..06fd66c708 100644
--- a/packet-udp.h
+++ b/epan/dissectors/packet-udp.h
diff --git a/packet-v120.c b/epan/dissectors/packet-v120.c
index b47668fc2a..b47668fc2a 100644
--- a/packet-v120.c
+++ b/epan/dissectors/packet-v120.c
diff --git a/packet-vines.c b/epan/dissectors/packet-vines.c
index 4440012385..4440012385 100644
--- a/packet-vines.c
+++ b/epan/dissectors/packet-vines.c
diff --git a/packet-vines.h b/epan/dissectors/packet-vines.h
index ff8a2c7a73..ff8a2c7a73 100644
--- a/packet-vines.h
+++ b/epan/dissectors/packet-vines.h
diff --git a/packet-vj.c b/epan/dissectors/packet-vj.c
index 30bbe0cbca..30bbe0cbca 100644
--- a/packet-vj.c
+++ b/epan/dissectors/packet-vj.c
diff --git a/packet-vlan.c b/epan/dissectors/packet-vlan.c
index d9d423f411..d9d423f411 100644
--- a/packet-vlan.c
+++ b/epan/dissectors/packet-vlan.c
diff --git a/packet-vlan.h b/epan/dissectors/packet-vlan.h
index 356b01a7c2..356b01a7c2 100644
--- a/packet-vlan.h
+++ b/epan/dissectors/packet-vlan.h
diff --git a/packet-vrrp.c b/epan/dissectors/packet-vrrp.c
index e85c1c8cc4..e85c1c8cc4 100644
--- a/packet-vrrp.c
+++ b/epan/dissectors/packet-vrrp.c
diff --git a/packet-vtp.c b/epan/dissectors/packet-vtp.c
index 0b82539b81..0b82539b81 100644
--- a/packet-vtp.c
+++ b/epan/dissectors/packet-vtp.c
diff --git a/packet-wap.c b/epan/dissectors/packet-wap.c
index f53db7b24c..f53db7b24c 100644
--- a/packet-wap.c
+++ b/epan/dissectors/packet-wap.c
diff --git a/packet-wap.h b/epan/dissectors/packet-wap.h
index a28cdbf984..a28cdbf984 100644
--- a/packet-wap.h
+++ b/epan/dissectors/packet-wap.h
diff --git a/packet-wbxml.c b/epan/dissectors/packet-wbxml.c
index 2ebba21fe4..2ebba21fe4 100644
--- a/packet-wbxml.c
+++ b/epan/dissectors/packet-wbxml.c
diff --git a/packet-wccp.c b/epan/dissectors/packet-wccp.c
index ef5d89fb62..ef5d89fb62 100644
--- a/packet-wccp.c
+++ b/epan/dissectors/packet-wccp.c
diff --git a/packet-wccp.h b/epan/dissectors/packet-wccp.h
index 7f3bf35c9a..7f3bf35c9a 100644
--- a/packet-wccp.h
+++ b/epan/dissectors/packet-wccp.h
diff --git a/packet-wcp.c b/epan/dissectors/packet-wcp.c
index c46afafd31..c46afafd31 100644
--- a/packet-wcp.c
+++ b/epan/dissectors/packet-wcp.c
diff --git a/packet-wfleet-hdlc.c b/epan/dissectors/packet-wfleet-hdlc.c
index 9c70f2d0fd..9c70f2d0fd 100644
--- a/packet-wfleet-hdlc.c
+++ b/epan/dissectors/packet-wfleet-hdlc.c
diff --git a/packet-who.c b/epan/dissectors/packet-who.c
index 1050ecb7a3..1050ecb7a3 100644
--- a/packet-who.c
+++ b/epan/dissectors/packet-who.c
diff --git a/packet-wlancap.c b/epan/dissectors/packet-wlancap.c
index ecb15a1419..ecb15a1419 100644
--- a/packet-wlancap.c
+++ b/epan/dissectors/packet-wlancap.c
diff --git a/packet-wlancap.h b/epan/dissectors/packet-wlancap.h
index 05c0990fcb..05c0990fcb 100644
--- a/packet-wlancap.h
+++ b/epan/dissectors/packet-wlancap.h
diff --git a/packet-wsp.c b/epan/dissectors/packet-wsp.c
index e05bc1874c..e05bc1874c 100644
--- a/packet-wsp.c
+++ b/epan/dissectors/packet-wsp.c
diff --git a/packet-wsp.h b/epan/dissectors/packet-wsp.h
index cd3773e32e..cd3773e32e 100644
--- a/packet-wsp.h
+++ b/epan/dissectors/packet-wsp.h
diff --git a/packet-wtls.c b/epan/dissectors/packet-wtls.c
index 50e0dbfa5a..50e0dbfa5a 100644
--- a/packet-wtls.c
+++ b/epan/dissectors/packet-wtls.c
diff --git a/packet-wtls.h b/epan/dissectors/packet-wtls.h
index d8acf91630..d8acf91630 100644
--- a/packet-wtls.h
+++ b/epan/dissectors/packet-wtls.h
diff --git a/packet-wtp.c b/epan/dissectors/packet-wtp.c
index d05693ebc2..d05693ebc2 100644
--- a/packet-wtp.c
+++ b/epan/dissectors/packet-wtp.c
diff --git a/packet-wtp.h b/epan/dissectors/packet-wtp.h
index 552cff095c..552cff095c 100644
--- a/packet-wtp.h
+++ b/epan/dissectors/packet-wtp.h
diff --git a/packet-x11-keysym.h b/epan/dissectors/packet-x11-keysym.h
index 9afbfd5e93..9afbfd5e93 100644
--- a/packet-x11-keysym.h
+++ b/epan/dissectors/packet-x11-keysym.h
diff --git a/packet-x11-keysymdef.h b/epan/dissectors/packet-x11-keysymdef.h
index c1e263e273..c1e263e273 100644
--- a/packet-x11-keysymdef.h
+++ b/epan/dissectors/packet-x11-keysymdef.h
diff --git a/packet-x11.c b/epan/dissectors/packet-x11.c
index dc7a16751c..dc7a16751c 100644
--- a/packet-x11.c
+++ b/epan/dissectors/packet-x11.c
diff --git a/packet-x25.c b/epan/dissectors/packet-x25.c
index 653b5049c1..653b5049c1 100644
--- a/packet-x25.c
+++ b/epan/dissectors/packet-x25.c
diff --git a/packet-x29.c b/epan/dissectors/packet-x29.c
index 5d7b937b47..5d7b937b47 100644
--- a/packet-x29.c
+++ b/epan/dissectors/packet-x29.c
diff --git a/packet-xdmcp.c b/epan/dissectors/packet-xdmcp.c
index 6bf94692c7..6bf94692c7 100644
--- a/packet-xdmcp.c
+++ b/epan/dissectors/packet-xdmcp.c
diff --git a/packet-xot.c b/epan/dissectors/packet-xot.c
index 6c3f56fe15..6c3f56fe15 100644
--- a/packet-xot.c
+++ b/epan/dissectors/packet-xot.c
diff --git a/packet-xyplex.c b/epan/dissectors/packet-xyplex.c
index 9ad7a58b59..9ad7a58b59 100644
--- a/packet-xyplex.c
+++ b/epan/dissectors/packet-xyplex.c
diff --git a/packet-yhoo.c b/epan/dissectors/packet-yhoo.c
index f812816421..f812816421 100644
--- a/packet-yhoo.c
+++ b/epan/dissectors/packet-yhoo.c
diff --git a/packet-ymsg.c b/epan/dissectors/packet-ymsg.c
index a9ed099730..a9ed099730 100644
--- a/packet-ymsg.c
+++ b/epan/dissectors/packet-ymsg.c
diff --git a/packet-ypbind.c b/epan/dissectors/packet-ypbind.c
index c66a503550..c66a503550 100644
--- a/packet-ypbind.c
+++ b/epan/dissectors/packet-ypbind.c
diff --git a/packet-ypbind.h b/epan/dissectors/packet-ypbind.h
index 19ef71f84f..19ef71f84f 100644
--- a/packet-ypbind.h
+++ b/epan/dissectors/packet-ypbind.h
diff --git a/packet-yppasswd.c b/epan/dissectors/packet-yppasswd.c
index 2db6fe9644..2db6fe9644 100644
--- a/packet-yppasswd.c
+++ b/epan/dissectors/packet-yppasswd.c
diff --git a/packet-yppasswd.h b/epan/dissectors/packet-yppasswd.h
index 9e6f666c4c..9e6f666c4c 100644
--- a/packet-yppasswd.h
+++ b/epan/dissectors/packet-yppasswd.h
diff --git a/packet-ypserv.c b/epan/dissectors/packet-ypserv.c
index 18aa640384..18aa640384 100644
--- a/packet-ypserv.c
+++ b/epan/dissectors/packet-ypserv.c
diff --git a/packet-ypserv.h b/epan/dissectors/packet-ypserv.h
index b528bf6493..b528bf6493 100644
--- a/packet-ypserv.h
+++ b/epan/dissectors/packet-ypserv.h
diff --git a/packet-ypxfr.c b/epan/dissectors/packet-ypxfr.c
index 706e68e636..706e68e636 100644
--- a/packet-ypxfr.c
+++ b/epan/dissectors/packet-ypxfr.c
diff --git a/packet-ypxfr.h b/epan/dissectors/packet-ypxfr.h
index 9a346806fa..9a346806fa 100644
--- a/packet-ypxfr.h
+++ b/epan/dissectors/packet-ypxfr.h
diff --git a/packet-zebra.c b/epan/dissectors/packet-zebra.c
index 5e5bfaef2b..5e5bfaef2b 100644
--- a/packet-zebra.c
+++ b/epan/dissectors/packet-zebra.c
diff --git a/process-x11-fields.pl b/epan/dissectors/process-x11-fields.pl
index 057f9b44b7..057f9b44b7 100644
--- a/process-x11-fields.pl
+++ b/epan/dissectors/process-x11-fields.pl
diff --git a/x11-fields b/epan/dissectors/x11-fields
index 51625d953e..51625d953e 100644
--- a/x11-fields
+++ b/epan/dissectors/x11-fields
diff --git a/epan/plugins.c b/epan/plugins.c
index 588895eff5..e6f0a8d184 100644
--- a/epan/plugins.c
+++ b/epan/plugins.c
@@ -62,14 +62,14 @@
 #include "conversation.h"
 #include "reassemble.h"
 #include "prefs.h"
-#include "packet-giop.h"
-#include "packet-tpkt.h"
-#include "packet-tcp.h"
-#include "packet-rpc.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 "tap.h"
 #include "asn1.h"
-#include "packet-per.h"
-#include "packet-ber.h"
+#include <epan/dissectors/packet-per.h>
+#include <epan/dissectors/packet-ber.h>
 #include "xdlc.h"
 #include "crc16.h"
 #include "report_err.h"
diff --git a/epan/to_str.c b/epan/to_str.c
index cd8597c8b6..1b5c57d81d 100644
--- a/epan/to_str.c
+++ b/epan/to_str.c
@@ -64,7 +64,7 @@
 #include "atalk-utils.h"
 #include "sna-utils.h"
 #include "osi-utils.h"
-#include "packet-mtp3.h"
+#include <epan/dissectors/packet-mtp3.h>
 #include <stdio.h>
 #include <time.h>
 
diff --git a/file.c b/file.c
index 6983ff11d1..c6337053ac 100644
--- a/file.c
+++ b/file.c
@@ -86,7 +86,7 @@
 #include <epan/epan_dissect.h>
 #include "tap.h"
 #include "tap_dfilter_dlg.h"
-#include "packet-data.h"
+#include <epan/dissectors/packet-data.h>
 
 /* Win32 needs the O_BINARY flag for open() */
 #ifndef O_BINARY
diff --git a/gtk/ansi_a_stat.c b/gtk/ansi_a_stat.c
index 68d9e90e16..439a7b871a 100644
--- a/gtk/ansi_a_stat.c
+++ b/gtk/ansi_a_stat.c
@@ -47,8 +47,8 @@
 #include "dlg_utils.h"
 #include "tap.h"
 #include "../register.h"
-#include "packet-bssap.h"
-#include "packet-ansi_a.h"
+#include <epan/dissectors/packet-bssap.h>
+#include <epan/dissectors/packet-ansi_a.h>
 #include "../globals.h"
 #include "filter_prefs.h"
 #include "compat_macros.h"
diff --git a/gtk/ansi_map_stat.c b/gtk/ansi_map_stat.c
index 6b334ccdfc..f93dac2232 100644
--- a/gtk/ansi_map_stat.c
+++ b/gtk/ansi_map_stat.c
@@ -50,7 +50,7 @@
 #include "../globals.h"
 #include "filter_prefs.h"
 #include "compat_macros.h"
-#include "packet-ansi_map.h"
+#include <epan/dissectors/packet-ansi_map.h>
 #include "ui_util.h"
 
 
diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c
index c9d86e2d04..a8a90d4399 100644
--- a/gtk/dcerpc_stat.c
+++ b/gtk/dcerpc_stat.c
@@ -46,7 +46,7 @@
 #include "ui_util.h"
 #include "tap.h"
 #include "../register.h"
-#include "packet-dcerpc.h"
+#include <epan/dissectors/packet-dcerpc.h>
 #include "../globals.h"
 #include "filter_prefs.h"
 #include "compat_macros.h"
diff --git a/gtk/endpoint_talkers_eth.c b/gtk/endpoint_talkers_eth.c
index 1318fd6e66..e60a9e300f 100644
--- a/gtk/endpoint_talkers_eth.c
+++ b/gtk/endpoint_talkers_eth.c
@@ -37,7 +37,7 @@
 #include "../tap.h"
 #include "../register.h"
 #include "endpoint_talkers_table.h"
-#include "packet-eth.h"
+#include <epan/dissectors/packet-eth.h>
 
 
 static int
diff --git a/gtk/endpoint_talkers_fc.c b/gtk/endpoint_talkers_fc.c
index 7d3ea9413c..dbe9ec3054 100644
--- a/gtk/endpoint_talkers_fc.c
+++ b/gtk/endpoint_talkers_fc.c
@@ -37,7 +37,7 @@
 #include "../tap.h"
 #include "../register.h"
 #include "endpoint_talkers_table.h"
-#include "packet-fc.h"
+#include <epan/dissectors/packet-fc.h>
 
 
 static int
diff --git a/gtk/endpoint_talkers_fddi.c b/gtk/endpoint_talkers_fddi.c
index 40c31794cc..0f1c9d5870 100644
--- a/gtk/endpoint_talkers_fddi.c
+++ b/gtk/endpoint_talkers_fddi.c
@@ -37,7 +37,7 @@
 #include "../tap.h"
 #include "../register.h"
 #include "endpoint_talkers_table.h"
-#include "packet-fddi.h"
+#include <epan/dissectors/packet-fddi.h>
 
 
 static int
diff --git a/gtk/endpoint_talkers_ip.c b/gtk/endpoint_talkers_ip.c
index 3d97e37300..0b165d912d 100644
--- a/gtk/endpoint_talkers_ip.c
+++ b/gtk/endpoint_talkers_ip.c
@@ -37,7 +37,7 @@
 #include "../tap.h"
 #include "../register.h"
 #include "endpoint_talkers_table.h"
-#include "packet-ip.h"
+#include <epan/dissectors/packet-ip.h>
 
 
 static int
diff --git a/gtk/endpoint_talkers_ipx.c b/gtk/endpoint_talkers_ipx.c
index 4e2dfa0392..4fc501c5f3 100644
--- a/gtk/endpoint_talkers_ipx.c
+++ b/gtk/endpoint_talkers_ipx.c
@@ -37,7 +37,7 @@
 #include "../tap.h"
 #include "../register.h"
 #include "endpoint_talkers_table.h"
-#include "packet-ipx.h"
+#include <epan/dissectors/packet-ipx.h>
 
 
 static int
diff --git a/gtk/endpoint_talkers_tcpip.c b/gtk/endpoint_talkers_tcpip.c
index 004ef62a4c..04151317f2 100644
--- a/gtk/endpoint_talkers_tcpip.c
+++ b/gtk/endpoint_talkers_tcpip.c
@@ -37,7 +37,7 @@
 #include "../tap.h"
 #include "../register.h"
 #include "endpoint_talkers_table.h"
-#include "packet-tcp.h"
+#include <epan/dissectors/packet-tcp.h>
 
 
 static int
diff --git a/gtk/endpoint_talkers_tr.c b/gtk/endpoint_talkers_tr.c
index cf5708a3a0..a859c4e4df 100644
--- a/gtk/endpoint_talkers_tr.c
+++ b/gtk/endpoint_talkers_tr.c
@@ -37,7 +37,7 @@
 #include "../tap.h"
 #include "../register.h"
 #include "endpoint_talkers_table.h"
-#include "packet-tr.h"
+#include <epan/dissectors/packet-tr.h>
 
 
 static int
diff --git a/gtk/endpoint_talkers_udpip.c b/gtk/endpoint_talkers_udpip.c
index 706990358f..838c6856e8 100644
--- a/gtk/endpoint_talkers_udpip.c
+++ b/gtk/endpoint_talkers_udpip.c
@@ -37,7 +37,7 @@
 #include "../tap.h"
 #include "../register.h"
 #include "endpoint_talkers_table.h"
-#include "packet-udp.h"
+#include <epan/dissectors/packet-udp.h>
 
 
 static int
diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c
index a5187e526e..c310d302cf 100644
--- a/gtk/fc_stat.c
+++ b/gtk/fc_stat.c
@@ -40,7 +40,7 @@
 
 #include "tap_menu.h"
 #include "../tap.h"
-#include "../packet-fc.h"
+#include <epan/dissectors/packet-fc.h>
 #include "../register.h"
 #include "../timestats.h"
 #include "compat_macros.h"
diff --git a/gtk/follow_dlg.c b/gtk/follow_dlg.c
index dd4518bde2..1ef0a8df93 100644
--- a/gtk/follow_dlg.c
+++ b/gtk/follow_dlg.c
@@ -53,7 +53,7 @@
 #include "main.h"
 #include "alert_box.h"
 #include "simple_dialog.h"
-#include "packet-ipv6.h"
+#include <epan/dissectors/packet-ipv6.h>
 #include "prefs.h"
 #include <epan/resolv.h>
 #include "util.h"
diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c
index e79910e886..fb06e4acf3 100644
--- a/gtk/gsm_a_stat.c
+++ b/gtk/gsm_a_stat.c
@@ -47,8 +47,8 @@
 #include "dlg_utils.h"
 #include "tap.h"
 #include "../register.h"
-#include "packet-bssap.h"
-#include "packet-gsm_a.h"
+#include <epan/dissectors/packet-bssap.h>
+#include <epan/dissectors/packet-gsm_a.h>
 #include "../globals.h"
 #include "filter_prefs.h"
 #include "compat_macros.h"
diff --git a/gtk/gsm_map_stat.c b/gtk/gsm_map_stat.c
index aac5582da1..4d69da729a 100644
--- a/gtk/gsm_map_stat.c
+++ b/gtk/gsm_map_stat.c
@@ -52,7 +52,7 @@
 #include "filter_prefs.h"
 #include "compat_macros.h"
 
-#include "packet-gsm_map.h"
+#include <epan/dissectors/packet-gsm_map.h>
 #include "gsm_map_stat.h"
 
 typedef struct column_arrows {
diff --git a/gtk/gsm_map_summary.c b/gtk/gsm_map_summary.c
index 53c207283b..e8c913b85d 100644
--- a/gtk/gsm_map_summary.c
+++ b/gtk/gsm_map_summary.c
@@ -45,7 +45,7 @@
 #include "compat_macros.h"
 #include "tap.h"
 
-#include "packet-gsm_map.h"
+#include <epan/dissectors/packet-gsm_map.h>
 #include "gsm_map_stat.h"
 
 #define SUM_STR_MAX 1024
diff --git a/gtk/h225_counter.c b/gtk/h225_counter.c
index be0f4bd200..690bef1fca 100644
--- a/gtk/h225_counter.c
+++ b/gtk/h225_counter.c
@@ -42,7 +42,7 @@
 #include "tap_menu.h"
 #include "../tap.h"
 #include "../register.h"
-#include "../packet-h225.h"
+#include <epan/dissectors/packet-h225.h>
 #include "gtk_stat_util.h"
 #include "compat_macros.h"
 #include "../simple_dialog.h"
diff --git a/gtk/h225_ras_srt.c b/gtk/h225_ras_srt.c
index 2a9d78cdf8..19750a7fa3 100644
--- a/gtk/h225_ras_srt.c
+++ b/gtk/h225_ras_srt.c
@@ -42,7 +42,7 @@
 #include "tap_menu.h"
 #include "../tap.h"
 #include "../register.h"
-#include "../packet-h225.h"
+#include <epan/dissectors/packet-h225.h>
 #include "../timestats.h"
 #include "gtk_stat_util.h"
 #include "compat_macros.h"
diff --git a/gtk/hostlist_eth.c b/gtk/hostlist_eth.c
index 88c61e346c..330a7ca2f4 100644
--- a/gtk/hostlist_eth.c
+++ b/gtk/hostlist_eth.c
@@ -37,7 +37,7 @@
 #include "../tap.h"
 #include "../register.h"
 #include "hostlist_table.h"
-#include "packet-eth.h"
+#include <epan/dissectors/packet-eth.h>
 
 
 static int
diff --git a/gtk/hostlist_fc.c b/gtk/hostlist_fc.c
index 5ac88f55c8..30cef350e1 100644
--- a/gtk/hostlist_fc.c
+++ b/gtk/hostlist_fc.c
@@ -37,7 +37,7 @@
 #include "../tap.h"
 #include "../register.h"
 #include "hostlist_table.h"
-#include "packet-fc.h"
+#include <epan/dissectors/packet-fc.h>
 
 
 static int
diff --git a/gtk/hostlist_fddi.c b/gtk/hostlist_fddi.c
index 62098070dc..63c23b6598 100644
--- a/gtk/hostlist_fddi.c
+++ b/gtk/hostlist_fddi.c
@@ -37,7 +37,7 @@
 #include "../tap.h"
 #include "../register.h"
 #include "hostlist_table.h"
-#include "packet-fddi.h"
+#include <epan/dissectors/packet-fddi.h>
 
 
 static int
diff --git a/gtk/hostlist_ip.c b/gtk/hostlist_ip.c
index a738f897a8..32544c4f2b 100644
--- a/gtk/hostlist_ip.c
+++ b/gtk/hostlist_ip.c
@@ -39,7 +39,7 @@
 #include "../tap.h"
 #include "../register.h"
 #include "hostlist_table.h"
-#include "packet-ip.h"
+#include <epan/dissectors/packet-ip.h>
 
 
 static int
diff --git a/gtk/hostlist_ipx.c b/gtk/hostlist_ipx.c
index 7d9903456b..12be5b2aa3 100644
--- a/gtk/hostlist_ipx.c
+++ b/gtk/hostlist_ipx.c
@@ -37,7 +37,7 @@
 #include "../tap.h"
 #include "../register.h"
 #include "hostlist_table.h"
-#include "packet-ipx.h"
+#include <epan/dissectors/packet-ipx.h>
 
 
 static int
diff --git a/gtk/hostlist_tcpip.c b/gtk/hostlist_tcpip.c
index e47c337ef0..1b75b93fd6 100644
--- a/gtk/hostlist_tcpip.c
+++ b/gtk/hostlist_tcpip.c
@@ -37,7 +37,7 @@
 #include "../tap.h"
 #include "../register.h"
 #include "hostlist_table.h"
-#include "packet-tcp.h"
+#include <epan/dissectors/packet-tcp.h>
 
 
 static int
diff --git a/gtk/hostlist_tr.c b/gtk/hostlist_tr.c
index f68d56ea70..e0cd79d62a 100644
--- a/gtk/hostlist_tr.c
+++ b/gtk/hostlist_tr.c
@@ -37,7 +37,7 @@
 #include "../tap.h"
 #include "../register.h"
 #include "hostlist_table.h"
-#include "packet-tr.h"
+#include <epan/dissectors/packet-tr.h>
 
 
 static int
diff --git a/gtk/hostlist_udpip.c b/gtk/hostlist_udpip.c
index 9640c245eb..5574ad20c3 100644
--- a/gtk/hostlist_udpip.c
+++ b/gtk/hostlist_udpip.c
@@ -37,7 +37,7 @@
 #include "../tap.h"
 #include "../register.h"
 #include "hostlist_table.h"
-#include "packet-udp.h"
+#include <epan/dissectors/packet-udp.h>
 
 
 static int
diff --git a/gtk/http_stat.c b/gtk/http_stat.c
index 4a7f9c7031..982c928095 100644
--- a/gtk/http_stat.c
+++ b/gtk/http_stat.c
@@ -39,7 +39,7 @@
 #include "dlg_utils.h"
 #include "tap.h"
 #include "../register.h"
-#include "../packet-http.h"
+#include <epan/dissectors/packet-http.h>
 #include "../globals.h"
 #include "compat_macros.h"
 #include "../tap_dfilter_dlg.h"
diff --git a/gtk/isup_stat.c b/gtk/isup_stat.c
index d186cb4fac..61222d4ab4 100644
--- a/gtk/isup_stat.c
+++ b/gtk/isup_stat.c
@@ -50,7 +50,7 @@
 #include "../globals.h"
 #include "filter_prefs.h"
 #include "compat_macros.h"
-#include "packet-isup.h"
+#include <epan/dissectors/packet-isup.h>
 #include "ui_util.h"
 
 
diff --git a/gtk/ldap_stat.c b/gtk/ldap_stat.c
index a48d509bcd..189ab46f7a 100644
--- a/gtk/ldap_stat.c
+++ b/gtk/ldap_stat.c
@@ -40,7 +40,7 @@
 
 #include "tap_menu.h"
 #include "../tap.h"
-#include "../packet-ldap.h"
+#include <epan/dissectors/packet-ldap.h>
 #include "../register.h"
 #include "../timestats.h"
 #include "compat_macros.h"
diff --git a/gtk/mtp3_stat.c b/gtk/mtp3_stat.c
index 02d46ebd21..84cfb063d1 100644
--- a/gtk/mtp3_stat.c
+++ b/gtk/mtp3_stat.c
@@ -52,7 +52,7 @@
 #include "compat_macros.h"
 #include "ui_util.h"
 
-#include "packet-mtp3.h"
+#include <epan/dissectors/packet-mtp3.h>
 #include "mtp3_stat.h"
 
 typedef struct column_arrows {
diff --git a/gtk/mtp3_summary.c b/gtk/mtp3_summary.c
index 585bd020c3..1716ef1029 100644
--- a/gtk/mtp3_summary.c
+++ b/gtk/mtp3_summary.c
@@ -48,7 +48,7 @@
 #include "compat_macros.h"
 #include "tap.h"
 
-#include "packet-mtp3.h"
+#include <epan/dissectors/packet-mtp3.h>
 #include "mtp3_stat.h"
 
 #define SUM_STR_MAX 1024
diff --git a/gtk/rpc_progs.c b/gtk/rpc_progs.c
index af5ecf0c9b..d24996c405 100644
--- a/gtk/rpc_progs.c
+++ b/gtk/rpc_progs.c
@@ -40,7 +40,7 @@
 #include "tap_menu.h"
 #include "tap.h"
 #include "../register.h"
-#include "packet-rpc.h"
+#include <epan/dissectors/packet-rpc.h>
 #include "../globals.h"
 #include "ui_util.h"
 #include "dlg_utils.h"
diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c
index aea44c6919..6ff5750fe2 100644
--- a/gtk/rpc_stat.c
+++ b/gtk/rpc_stat.c
@@ -43,7 +43,7 @@
 #include "dlg_utils.h"
 #include "tap.h"
 #include "../register.h"
-#include "packet-rpc.h"
+#include <epan/dissectors/packet-rpc.h>
 #include "../globals.h"
 #include "filter_prefs.h"
 #include "compat_macros.h"
diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c
index 615058cf2b..cddea86e6f 100644
--- a/gtk/rtp_analysis.c
+++ b/gtk/rtp_analysis.c
@@ -50,7 +50,7 @@
 #include "util.h"
 #include "tap.h"
 #include "register.h"
-#include "packet-rtp.h"
+#include <epan/dissectors/packet-rtp.h>
 #include "g711.h"
 #include "rtp_pt.h"
 
diff --git a/gtk/rtp_stream.c b/gtk/rtp_stream.c
index 44d38355e4..eb7365deeb 100644
--- a/gtk/rtp_stream.c
+++ b/gtk/rtp_stream.c
@@ -36,7 +36,7 @@
 
 #include "tap.h"
 #include "register.h"
-#include "packet-rtp.h"
+#include <epan/dissectors/packet-rtp.h>
 
 #include "alert_box.h"
 #include "simple_dialog.h"
diff --git a/gtk/sip_stat.c b/gtk/sip_stat.c
index 6e37ffca44..a50e57a566 100644
--- a/gtk/sip_stat.c
+++ b/gtk/sip_stat.c
@@ -40,7 +40,7 @@
 #include "dlg_utils.h"
 #include "tap.h"
 #include "../register.h"
-#include "../packet-sip.h"
+#include <epan/dissectors/packet-sip.h>
 #include "../globals.h"
 #include "compat_macros.h"
 #include "../tap_dfilter_dlg.h"
diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c
index 3809208584..4a30dbc65f 100644
--- a/gtk/wsp_stat.c
+++ b/gtk/wsp_stat.c
@@ -42,7 +42,7 @@
 #include "../register.h"
 #include "../globals.h"
 #include "compat_macros.h"
-#include "../packet-wsp.h"
+#include <epan/dissectors/packet-wsp.h>
 #include "../tap_dfilter_dlg.h"
 #include "tap_dfilter_dlg.h"
 
diff --git a/ipproto.c b/ipproto.c
index e4f81f8ae2..4cb7799453 100644
--- a/ipproto.c
+++ b/ipproto.c
@@ -35,7 +35,7 @@
 #include "ipproto.h"
 #include <epan/packet.h>
 #include <epan/resolv.h>
-#include "packet-ip.h"
+#include <epan/dissectors/packet-ip.h>
 
 #ifdef NEED_SNPRINTF_H
 # include "snprintf.h"
diff --git a/plugins/giop/packet-coseventcomm.c b/plugins/giop/packet-coseventcomm.c
index 5b098ab1fc..fe622cb3ca 100644
--- a/plugins/giop/packet-coseventcomm.c
+++ b/plugins/giop/packet-coseventcomm.c
@@ -45,7 +45,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/proto.h>
-#include "packet-giop.h"
+#include <epan/dissectors/packet-giop.h>
 
 #include "plugins/plugin_api_defs.h"
 
diff --git a/plugins/giop/packet-cosnaming.c b/plugins/giop/packet-cosnaming.c
index 43f6c15cd3..bdbcd01381 100644
--- a/plugins/giop/packet-cosnaming.c
+++ b/plugins/giop/packet-cosnaming.c
@@ -45,7 +45,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/proto.h>
-#include "packet-giop.h"
+#include <epan/dissectors/packet-giop.h>
 
 #include "plugins/plugin_api_defs.h"
 
diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c
index c7a1b86e7f..e722d84c01 100644
--- a/plugins/gryphon/packet-gryphon.c
+++ b/plugins/gryphon/packet-gryphon.c
@@ -39,7 +39,7 @@
 #include <gmodule.h>
 #include <epan/packet.h>
 #include "packet-gryphon.h"
-#include "packet-tcp.h"
+#include <epan/dissectors/packet-tcp.h>
 #include "prefs.h"
 
 #include "plugins/plugin_api_defs.h"
diff --git a/plugins/plugin_api.h b/plugins/plugin_api.h
index 3ee009b6c6..fab5d44eee 100644
--- a/plugins/plugin_api.h
+++ b/plugins/plugin_api.h
@@ -48,14 +48,14 @@
 #include <epan/report_err.h>
 #include "prefs.h"
 #include "reassemble.h"
-#include "packet-giop.h"
-#include "packet-tpkt.h"
-#include "packet-tcp.h"
-#include "packet-rpc.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 "tap.h"
 #include "asn1.h"
-#include "packet-per.h"
-#include "packet-ber.h"
+#include <epan/dissectors/packet-per.h>
+#include <epan/dissectors/packet-ber.h>
 #include "xdlc.h"
 #include "crc16.h"
 #include "epan/except.h"
diff --git a/plugins/plugin_api_list.c b/plugins/plugin_api_list.c
index 5dd3a25d93..5f7ca096f6 100644
--- a/plugins/plugin_api_list.c
+++ b/plugins/plugin_api_list.c
@@ -33,12 +33,12 @@
 #include <epan/except.h>
 #include "prefs.h"
 #include "reassemble.h"
-#include "packet-giop.h"
-#include "packet-per.h"
-#include "packet-ber.h"
-#include "packet-tpkt.h"
-#include "packet-tcp.h"
-#include "packet-rpc.h"
+#include <epan/dissectors/packet-giop.h>
+#include <epan/dissectors/packet-per.h>
+#include <epan/dissectors/packet-ber.h>
+#include <epan/dissectors/packet-tpkt.h>
+#include <epan/dissectors/packet-tcp.h>
+#include <epan/dissectors/packet-rpc.h>
 #include "tap.h"
 #include "asn1.h"
 #include "xdlc.h"
diff --git a/print.c b/print.c
index 7ca7705ab8..23f5884a06 100644
--- a/print.c
+++ b/print.c
@@ -40,8 +40,8 @@
 #include "print.h"
 #include "ps.h"
 #include "util.h"
-#include "packet-data.h"
-#include "packet-frame.h"
+#include <epan/dissectors/packet-data.h>
+#include <epan/dissectors/packet-frame.h>
 
 #define PDML_VERSION "0"
 #define PSML_VERSION "0"
diff --git a/reassemble.c b/reassemble.c
index 70c475c349..4d968a95d0 100644
--- a/reassemble.c
+++ b/reassemble.c
@@ -32,7 +32,7 @@
 
 #include "reassemble.h"
 
-#include "packet-dcerpc.h"
+#include <epan/dissectors/packet-dcerpc.h>
 
 typedef struct _fragment_key {
 	address src;
diff --git a/tap-ansi_astat.c b/tap-ansi_astat.c
index bb97694b88..6f6f9d1fb6 100644
--- a/tap-ansi_astat.c
+++ b/tap-ansi_astat.c
@@ -46,8 +46,8 @@
 #include "epan/packet_info.h"
 #include "epan/value_string.h"
 #include "tap.h"
-#include "packet-bssap.h"
-#include "packet-ansi_a.h"
+#include <epan/dissectors/packet-bssap.h>
+#include <epan/dissectors/packet-ansi_a.h>
 #include "register.h"
 
 
diff --git a/tap-dcerpcstat.c b/tap-dcerpcstat.c
index aa4c64ec7d..2a9993b104 100644
--- a/tap-dcerpcstat.c
+++ b/tap-dcerpcstat.c
@@ -35,7 +35,7 @@
 #include <string.h>
 #include "epan/packet_info.h"
 #include "tap.h"
-#include "packet-dcerpc.h"
+#include <epan/dissectors/packet-dcerpc.h>
 #include "register.h"
 
 /* used to keep track of statistics for a specific procedure */
diff --git a/tap-gsm_astat.c b/tap-gsm_astat.c
index ecaca3ea2f..25e83cbe02 100644
--- a/tap-gsm_astat.c
+++ b/tap-gsm_astat.c
@@ -46,8 +46,8 @@
 #include "epan/packet_info.h"
 #include "epan/value_string.h"
 #include "tap.h"
-#include "packet-bssap.h"
-#include "packet-gsm_a.h"
+#include <epan/dissectors/packet-bssap.h>
+#include <epan/dissectors/packet-gsm_a.h>
 #include "register.h"
 
 
diff --git a/tap-h225counter.c b/tap-h225counter.c
index c9ed94d9ee..878cf591c4 100644
--- a/tap-h225counter.c
+++ b/tap-h225counter.c
@@ -42,7 +42,7 @@
 #include "tap.h"
 #include "epan/value_string.h"
 #include "register.h"
-#include "packet-h225.h"
+#include <epan/dissectors/packet-h225.h>
 
 /* following values represent the size of their valuestring arrays */
 
diff --git a/tap-h225rassrt.c b/tap-h225rassrt.c
index 97f5409f95..f908e780b9 100755
--- a/tap-h225rassrt.c
+++ b/tap-h225rassrt.c
@@ -38,7 +38,7 @@
 #include "tap.h"
 #include "epan/value_string.h"
 #include "register.h"
-#include "packet-h225.h"
+#include <epan/dissectors/packet-h225.h>
 #include "timestats.h"
 
 /* following values represent the size of their valuestring arrays */
diff --git a/tap-httpstat.c b/tap-httpstat.c
index 2828819632..57ac1b67db 100644
--- a/tap-httpstat.c
+++ b/tap-httpstat.c
@@ -33,7 +33,7 @@
 #include "epan/value_string.h"
 #include "tap.h"
 #include "register.h"
-#include "packet-http.h"
+#include <epan/dissectors/packet-http.h>
 
 	
 /* used to keep track of the statictics for an entire program interface */
diff --git a/tap-iousers.c b/tap-iousers.c
index 63989b094f..2fe4fabd6c 100644
--- a/tap-iousers.c
+++ b/tap-iousers.c
@@ -38,14 +38,14 @@
 #include <epan/resolv.h>
 #include "tap.h"
 #include "register.h"
-#include "packet-ip.h"
-#include "packet-ipx.h"
-#include "packet-tcp.h"
-#include "packet-udp.h"
-#include "packet-eth.h"
-#include "packet-tr.h"
-#include "packet-fc.h"
-#include "packet-fddi.h"
+#include <epan/dissectors/packet-ip.h>
+#include <epan/dissectors/packet-ipx.h>
+#include <epan/dissectors/packet-tcp.h>
+#include <epan/dissectors/packet-udp.h>
+#include <epan/dissectors/packet-eth.h>
+#include <epan/dissectors/packet-tr.h>
+#include <epan/dissectors/packet-fc.h>
+#include <epan/dissectors/packet-fddi.h>
 #include <string.h>
 
 typedef struct _io_users_t {
diff --git a/tap-rpcprogs.c b/tap-rpcprogs.c
index caa4a0ecac..3c7b488420 100644
--- a/tap-rpcprogs.c
+++ b/tap-rpcprogs.c
@@ -39,7 +39,7 @@
 #include <string.h>
 #include "epan/packet_info.h"
 #include "tap.h"
-#include "packet-rpc.h"
+#include <epan/dissectors/packet-rpc.h>
 #include "register.h"
 
 /* used to keep track of statistics for a specific program/version */
diff --git a/tap-rpcstat.c b/tap-rpcstat.c
index 8c1e7bba15..337fdcabd1 100644
--- a/tap-rpcstat.c
+++ b/tap-rpcstat.c
@@ -45,7 +45,7 @@
 #include <string.h>
 #include "epan/packet_info.h"
 #include "tap.h"
-#include "packet-rpc.h"
+#include <epan/dissectors/packet-rpc.h>
 #include "register.h"
 
 /* used to keep track of statistics for a specific procedure */
diff --git a/tap-sipstat.c b/tap-sipstat.c
index fb517e6b1f..791c7b1fc5 100644
--- a/tap-sipstat.c
+++ b/tap-sipstat.c
@@ -38,7 +38,7 @@
 #include "tap.h"
 #include "epan/value_string.h"
 #include "register.h"
-#include "packet-sip.h"
+#include <epan/dissectors/packet-sip.h>
 
 /* used to keep track of the statictics for an entire program interface */
 typedef struct _sip_stats_t {
diff --git a/tap-smbsids.c b/tap-smbsids.c
index 0f1e4c640a..4543676d3a 100644
--- a/tap-smbsids.c
+++ b/tap-smbsids.c
@@ -38,7 +38,7 @@
 
 #include <string.h>
 #include "epan/packet_info.h"
-#include "packet-smb-sidsnooping.h"
+#include <epan/dissectors/packet-smb-sidsnooping.h>
 #include "register.h"
 #include "tap.h"
 #include "epan/value_string.h"
diff --git a/tap-wspstat.c b/tap-wspstat.c
index 8c099d2b03..a43a165ac6 100644
--- a/tap-wspstat.c
+++ b/tap-wspstat.c
@@ -46,7 +46,7 @@
 #include "tap.h"
 #include "register.h"
 #include "epan/value_string.h"
-#include "packet-wsp.h"
+#include <epan/dissectors/packet-wsp.h>
 
 /* used to keep track of the stats for a specific PDU type*/
 typedef struct _wsp_pdu_t {