diff --git a/epan/Makefile.am b/epan/Makefile.am
index 8f380504a4..e14305abfc 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -29,11 +29,11 @@ if HAVE_LIBLUA
 wslua_lib = wslua/libwslua.la
 wslua_dir = wslua
 wslua_dist_dir =
-else            # HAVE_LIBLUA
+else		# HAVE_LIBLUA
 wslua_lib =
 wslua_dir =
 wslua_dist_dir = wslua
-endif           # HAVE_LIBLUA
+endif		# HAVE_LIBLUA
 
 if HAVE_LIBPY
 wspython_lib = wspython/libwspython.la
@@ -71,7 +71,7 @@ AM_NON_GENERATED_CFLAGS += -Werror
 endif
 
 #Since code generated by lex may trigger gcc warnings, we are now generating two
-#libraries.  A single library is generated with the lex code without the barrier
+#libraries. A single library is generated with the lex code without the barrier
 #"stop on warning". An other library is generated from the remaining source
 #files with the "stop on warning" barrier.
 libwireshark_la_SOURCES = \
@@ -96,17 +96,17 @@ libwireshark_asmopt_la_SOURCES = \
 
 EXTRA_DIST = \
 	diam_dict.l		\
-	dtd_grammar.lemon 	\
-	dtd_parse.l 		\
-	dtd_parse.h 		\
-	dtd_preparse.l 		\
-	enterprise-numbers  	\
+	dtd_grammar.lemon	\
+	dtd_parse.l		\
+	dtd_parse.h		\
+	dtd_preparse.l		\
+	enterprise-numbers	\
 	libwireshark.vcproj	\
 	Makefile.common		\
 	Makefile.nmake		\
-	radius_dict.l   	\
+	radius_dict.l		\
 	tvbtest.c		\
-	reassemble_test.c 	\
+	reassemble_test.c	\
 	uat_load.l		\
 	exntest.c		\
 	oids_test.c		\
@@ -117,10 +117,10 @@ CLEANFILES = \
 	doxygen-epan.tag		\
 	libwireshark.a			\
 	libwireshark.la			\
-	libwireshark_generated.a 	\
-	libwireshark_generated.la 	\
-	libwireshark_asmopt.a 		\
-	libwireshark_asmopt.la 		\
+	libwireshark_generated.a	\
+	libwireshark_generated.la	\
+	libwireshark_asmopt.a		\
+	libwireshark_asmopt.la		\
 	*~
 
 DISTCLEANFILES = \
diff --git a/epan/Makefile.common b/epan/Makefile.common
index 5505e1ac9b..3eb2e228ce 100644
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -107,11 +107,11 @@ LIBWIRESHARK_SRC =		\
 # We distribute Lemon and rdps.py with Wireshark, so we don't distribute the
 # files they produce.
 #
-NODIST_LIBWIRESHARK_GENERATED_C_FILES = \
-	dtd_grammar.c		\
+NODIST_LIBWIRESHARK_GENERATED_C_FILES =	\
+	dtd_grammar.c			\
 	ps.c
 
-NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES = \
+NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES =	\
 	dtd_grammar.h
 
 #
diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am
index d9baf02fe1..7b634523ff 100644
--- a/epan/dissectors/Makefile.am
+++ b/epan/dissectors/Makefile.am
@@ -28,8 +28,8 @@ AM_CPPFLAGS = -I$(srcdir)/../.. -I$(srcdir)/.. \
 include Makefile.common
 
 libdirtydissectors_la_SOURCES = \
-	$(DIRTY_DISSECTOR_SRC)      \
-	$(DIRTY_ASN1_DISSECTOR_SRC) \
+	$(DIRTY_DISSECTOR_SRC)		\
+	$(DIRTY_ASN1_DISSECTOR_SRC)	\
 	$(DIRTY_PIDL_DISSECTOR_SRC)
 
 if HAVE_WARNINGS_AS_ERRORS
@@ -46,7 +46,7 @@ libdissectors_la_SOURCES = \
 	$(DISSECTOR_SUPPORT_SRC)
 libdissectors_la_CFLAGS = $(AM_CLEAN_CFLAGS)
 
-# include dceprc and pidl in the source tarball.  But nothing to build...
+# include dceprc and pidl in the source tarball. But nothing to build...
 DIST_SUBDIRS = dcerpc pidl
 
 EXTRA_DIST = \
@@ -73,11 +73,11 @@ x11-dissector: $(top_srcdir)/tools/process-x11-fields.pl x11-fields $(top_srcdir
 # register_all_protocol_handoffs() that calls the handoff registration
 # routines for all protocols.
 #
-# We do this by scanning through sources.  If that turns out to be too slow,
+# We do this by scanning 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 an
+# Formatting conventions: The name of the proto_register_* routines an
 # proto_reg_handoff_* routines must start in column zero, or must be
 # preceded only by "void " starting in column zero, and must not be
 # inside #if.
@@ -91,7 +91,7 @@ x11-dissector: $(top_srcdir)/tools/process-x11-fields.pl x11-fields $(top_srcdir
 #
 # Therefore, we have a script to generate the register.c file.
 # The shell script runs slowly, as multiple greps and seds are run
-# for each input file; this is especially slow on Windows.  Therefore,
+# for each input file; this is especially slow on Windows. Therefore,
 # if Python is present (as indicated by PYTHON being defined), we run
 # a faster Python script to do that work instead.
 #
@@ -118,7 +118,7 @@ register.c: $(plugin_src) $(ALL_DISSECTORS_SRC) Makefile.common Custom.common $(
 # 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
+# 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.
@@ -130,7 +130,7 @@ register.c: $(plugin_src) $(ALL_DISSECTORS_SRC) Makefile.common Custom.common $(
 #	@rm -f $(distdir)/register.c
 
 # XXX - We may want to add register-cache.pkl to the distribution at
-# some point.  It should be portable across architectures.
+# some point. It should be portable across architectures.
 CLEANFILES = \
 	libdissectors.a			\
 	libdissectors.la		\
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index 42ce3153cf..ec4199fa64 100644
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -46,30 +46,30 @@ GENERATED_FILES = $(GENERATED_HEADER_FILES) $(GENERATED_C_FILES)
 #
 # PIDL-generated DCE RPC dissectors without warnings.
 #
-PIDL_DISSECTOR_SRC = \
-	packet-dcerpc-atsvc.c \
+PIDL_DISSECTOR_SRC =	\
+	packet-dcerpc-atsvc.c	\
 	packet-dcerpc-budb.c	\
 	packet-dcerpc-butc.c	\
-	packet-dcerpc-dssetup.c \
-	packet-dcerpc-efs.c \
-	packet-dcerpc-frstrans.c \
-	packet-dcerpc-initshutdown.c \
-	packet-dcerpc-nspi.c \
-	packet-dcerpc-rfr.c \
-	packet-dcerpc-srvsvc.c \
-	packet-dcerpc-wkssvc.c \
+	packet-dcerpc-dssetup.c	\
+	packet-dcerpc-efs.c	\
+	packet-dcerpc-frstrans.c	\
+	packet-dcerpc-initshutdown.c	\
+	packet-dcerpc-nspi.c	\
+	packet-dcerpc-rfr.c	\
+	packet-dcerpc-srvsvc.c	\
+	packet-dcerpc-wkssvc.c	\
 	packet-dcerpc-wzcsvc.c
 
 #
 # PIDL-generated DCE RPC dissectors with warnings.
 #
-DIRTY_PIDL_DISSECTOR_SRC = \
-	packet-dcerpc-dfs.c \
+DIRTY_PIDL_DISSECTOR_SRC =	\
+	packet-dcerpc-dfs.c	\
 	packet-dcerpc-dnsserver.c	\
 	packet-dcerpc-drsuapi.c	\
-	packet-dcerpc-eventlog.c \
-	packet-dcerpc-lsa.c \
-	packet-dcerpc-mapi.c \
+	packet-dcerpc-eventlog.c	\
+	packet-dcerpc-lsa.c	\
+	packet-dcerpc-mapi.c	\
 	packet-dcerpc-misc.c	\
 	packet-dcerpc-winreg.c
 
@@ -98,128 +98,128 @@ PIDL_DISSECTOR_INCLUDES = \
 # asn2wrs-generated ASN.1 dissectors without warnings.
 #
 ASN1_DISSECTOR_SRC = \
-	packet-acp133.c \
-	packet-acse.c \
-	packet-ansi_tcap.c \
-	packet-atn-ulcs.c\
+	packet-acp133.c	\
+	packet-acse.c	\
+	packet-ansi_tcap.c	\
+	packet-atn-ulcs.c	\
 	packet-atn-cm.c	\
 	packet-atn-cpdlc.c	\
-	packet-c1222.c \
-	packet-camel.c \
-	packet-cdt.c \
+	packet-c1222.c	\
+	packet-camel.c	\
+	packet-cdt.c	\
 	packet-charging_ase.c	\
-	packet-cmip.c \
-	packet-cmp.c \
-	packet-cms.c \
-	packet-credssp.c \
-	packet-crmf.c \
-	packet-dap.c \
-	packet-disp.c \
-	packet-dop.c \
-	packet-dsp.c \
-	packet-ess.c \
-	packet-ftam.c \
-	packet-goose.c \
-	packet-HI2Operations.c \
-	packet-h225.c \
-	packet-h235.c \
-	packet-h245.c \
-	packet-h248.c \
-	packet-h282.c \
-	packet-h283.c \
-	packet-h323.c \
-	packet-h450.c \
-	packet-h450-ros.c \
-	packet-h460.c \
-	packet-h501.c \
-	packet-hnbap.c \
-	packet-idmp.c \
-	packet-idrp.c \
-	packet-ilp.c \
-	packet-inap.c \
-	packet-isdn-sup.c \
-	packet-lcsap.c \
-	packet-logotypecertextn.c \
-	packet-lpp.c \
-	packet-lppa.c \
-	packet-lppe.c \
-	packet-lte-rrc.c \
-	packet-mms.c \
-	packet-mpeg-audio.c \
-	packet-mpeg-pes.c \
-	packet-nbap.c \
-	packet-novell_pkis.c \
-	packet-ns_cert_exts.c \
-	packet-ocsp.c \
-	packet-opsi.c \
-	packet-p22.c \
-	packet-p7.c \
-	packet-p772.c \
-	packet-pcap.c \
-	packet-pkcs1.c \
-	packet-pkinit.c \
-	packet-pkix1explicit.c \
-	packet-pkix1implicit.c \
-	packet-pkixac.c \
-	packet-pkixproxy.c \
-	packet-pkixqualified.c \
-	packet-pkixtsp.c \
-	packet-pres.c		\
-	packet-q932.c \
-	packet-q932-ros.c \
-	packet-qsig.c \
-	packet-ranap.c		\
-	packet-ros.c \
-	packet-rrc.c \
-	packet-rrlp.c \
-	packet-rtse.c \
-	packet-rua.c \
-	packet-s1ap.c		\
-	packet-sabp.c \
-	packet-sbc-ap.c \
-	packet-smrse.c \
-	packet-spnego.c \
-	packet-sv.c \
-	packet-sysex.c \
-	packet-t124.c \
-	packet-t125.c \
-	packet-t38.c		\
-	packet-tetra.c \
-	packet-ulp.c \
-	packet-wlancertextn.c \
-	packet-x224.c \
-	packet-x2ap.c		\
-	packet-x509af.c \
-	packet-x509ce.c \
-	packet-x509if.c \
+	packet-cmip.c	\
+	packet-cmp.c	\
+	packet-cms.c	\
+	packet-credssp.c	\
+	packet-crmf.c	\
+	packet-dap.c	\
+	packet-disp.c	\
+	packet-dop.c	\
+	packet-dsp.c	\
+	packet-ess.c	\
+	packet-ftam.c	\
+	packet-goose.c	\
+	packet-HI2Operations.c	\
+	packet-h225.c	\
+	packet-h235.c	\
+	packet-h245.c	\
+	packet-h248.c	\
+	packet-h282.c	\
+	packet-h283.c	\
+	packet-h323.c	\
+	packet-h450.c	\
+	packet-h450-ros.c	\
+	packet-h460.c	\
+	packet-h501.c	\
+	packet-hnbap.c	\
+	packet-idmp.c	\
+	packet-idrp.c	\
+	packet-ilp.c	\
+	packet-inap.c	\
+	packet-isdn-sup.c	\
+	packet-lcsap.c	\
+	packet-logotypecertextn.c	\
+	packet-lpp.c	\
+	packet-lppa.c	\
+	packet-lppe.c	\
+	packet-lte-rrc.c	\
+	packet-mms.c	\
+	packet-mpeg-audio.c	\
+	packet-mpeg-pes.c	\
+	packet-nbap.c	\
+	packet-novell_pkis.c	\
+	packet-ns_cert_exts.c	\
+	packet-ocsp.c	\
+	packet-opsi.c	\
+	packet-p22.c	\
+	packet-p7.c	\
+	packet-p772.c	\
+	packet-pcap.c	\
+	packet-pkcs1.c	\
+	packet-pkinit.c	\
+	packet-pkix1explicit.c	\
+	packet-pkix1implicit.c	\
+	packet-pkixac.c	\
+	packet-pkixproxy.c	\
+	packet-pkixqualified.c	\
+	packet-pkixtsp.c	\
+	packet-pres.c	\
+	packet-q932.c	\
+	packet-q932-ros.c	\
+	packet-qsig.c	\
+	packet-ranap.c	\
+	packet-ros.c	\
+	packet-rrc.c	\
+	packet-rrlp.c	\
+	packet-rtse.c	\
+	packet-rua.c	\
+	packet-s1ap.c	\
+	packet-sabp.c	\
+	packet-sbc-ap.c	\
+	packet-smrse.c	\
+	packet-spnego.c	\
+	packet-sv.c	\
+	packet-sysex.c	\
+	packet-t124.c	\
+	packet-t125.c	\
+	packet-t38.c	\
+	packet-tetra.c	\
+	packet-ulp.c	\
+	packet-wlancertextn.c	\
+	packet-x224.c	\
+	packet-x2ap.c	\
+	packet-x509af.c	\
+	packet-x509ce.c	\
+	packet-x509if.c	\
 	packet-x509sat.c
 
 #
 # asn2wrs-generated ASN.1 dissectors with warnings.
 # and idl2wrs-generated dissectors
 DIRTY_ASN1_DISSECTOR_SRC = \
-	packet-ansi_map.c \
+	packet-ansi_map.c	\
 	packet-coseventcomm.c	\
 	packet-cosnaming.c	\
-	packet-gprscdr.c \
-	packet-gsm_map.c \
-	packet-ldap.c \
-	packet-m3ap.c \
-	packet-p1.c \
-	packet-parlay.c \
-	packet-pkcs12.c \
-	packet-rnsap.c \
-	packet-snmp.c \
-	packet-tango.c \
-	packet-tcap.c \
+	packet-gprscdr.c	\
+	packet-gsm_map.c	\
+	packet-ldap.c	\
+	packet-m3ap.c	\
+	packet-p1.c	\
+	packet-parlay.c	\
+	packet-pkcs12.c	\
+	packet-rnsap.c	\
+	packet-snmp.c	\
+	packet-tango.c	\
+	packet-tcap.c	\
 	$(CUSTOM_DIRTY_ASN1_DISSECTOR_SRC)
 
 FILE_DISSECTOR_SRC = \
-	file-elf.c \
-	file-file.c \
-	file-gif.c \
-	file-jpeg.c \
-	file-mp4.c \
+	file-elf.c	\
+	file-file.c	\
+	file-gif.c	\
+	file-jpeg.c	\
+	file-mp4.c	\
 	file-png.c
 #
 # Dissectors without warnings.
@@ -253,7 +253,7 @@ DISSECTOR_SRC = \
 	packet-aim-email.c	\
 	packet-aim-generic.c	\
 	packet-aim-icq.c	\
-	packet-aim-invitation.c \
+	packet-aim-invitation.c	\
 	packet-aim-location.c	\
 	packet-aim-messaging.c	\
 	packet-aim-oft.c	\
@@ -263,7 +263,7 @@ DISSECTOR_SRC = \
 	packet-aim-sst.c	\
 	packet-aim-stats.c	\
 	packet-aim-translate.c	\
-	packet-aim-userlookup.c \
+	packet-aim-userlookup.c	\
 	packet-aim.c		\
 	packet-ajp13.c		\
 	packet-alcap.c		\
@@ -361,15 +361,15 @@ DISSECTOR_SRC = \
 	packet-bt-oui.c		\
 	packet-bvlc.c		\
 	packet-bzr.c		\
-	packet-calcappprotocol.c  \
+	packet-calcappprotocol.c	\
 	packet-canopen.c	\
 	packet-capwap.c		\
 	packet-carp.c		\
 	packet-cast.c		\
-	packet-catapult-dct2000.c \
+	packet-catapult-dct2000.c	\
 	packet-ccsds.c		\
 	packet-cdp.c		\
-	packet-cell_broadcast.c \
+	packet-cell_broadcast.c	\
 	packet-cfm.c		\
 	packet-cfdp.c		\
 	packet-cgmp.c		\
@@ -394,7 +394,7 @@ DISSECTOR_SRC = \
 	packet-cnip.c		\
 	packet-coap.c		\
 	packet-collectd.c	\
-	packet-componentstatus.c \
+	packet-componentstatus.c	\
 	packet-cops.c		\
 	packet-cosine.c		\
 	packet-cpfi.c		\
@@ -589,7 +589,7 @@ DISSECTOR_SRC = \
 	packet-foundry.c	\
 	packet-fp_hint.c	\
 	packet-fr.c		\
-	packet-fractalgeneratorprotocol.c \
+	packet-fractalgeneratorprotocol.c	\
 	packet-frame.c		\
 	packet-ftp.c		\
 	packet-fw1.c		\
@@ -606,7 +606,7 @@ DISSECTOR_SRC = \
 	packet-gluster_pmap.c	\
 	packet-glusterd.c	\
 	packet-glusterfs.c	\
-	packet-glusterfs_hndsk.c \
+	packet-glusterfs_hndsk.c	\
 	packet-gmhdr.c		\
 	packet-gmr1_bcch.c	\
 	packet-gmr1_common.c	\
@@ -629,7 +629,7 @@ DISSECTOR_SRC = \
 	packet-gsm_abis_oml.c	\
 	packet-gsm_bsslap.c	\
 	packet-gsm_bssmap_le.c	\
-	packet-gsm_cbch.c       \
+	packet-gsm_cbch.c	\
 	packet-gsm_ipa.c	\
 	packet-gsm_rlcmac.c	\
 	packet-gsm_sim.c	\
@@ -673,7 +673,7 @@ DISSECTOR_SRC = \
 	packet-homeplug.c	\
 	packet-hp-erm.c		\
 	packet-hpext.c		\
-	packet-hpfeeds.c        \
+	packet-hpfeeds.c	\
 	packet-hpsw.c		\
 	packet-hpteam.c		\
 	packet-hsr-prp-supervision.c	\
@@ -681,7 +681,7 @@ DISSECTOR_SRC = \
 	packet-hsrp.c		\
 	packet-http.c		\
 	packet-http2.c		\
-	packet-http-urlencoded.c \
+	packet-http-urlencoded.c	\
 	packet-hyperscsi.c	\
 	packet-i2c.c		\
 	packet-iana-oui.c	\
@@ -716,7 +716,7 @@ DISSECTOR_SRC = \
 	packet-imap.c		\
 	packet-imf.c		\
 	packet-infiniband.c	\
-	packet-infiniband_sdp.c \
+	packet-infiniband_sdp.c	\
 	packet-interlink.c	\
 	packet-ip.c		\
 	packet-ipars.c		\
@@ -805,7 +805,7 @@ DISSECTOR_SRC = \
 	packet-lsc.c		\
 	packet-ltp.c		\
 	packet-lwapp.c		\
-  packet-lwm.c		\
+	packet-lwm.c		\
 	packet-lwres.c		\
 	packet-m2pa.c		\
 	packet-m2tp.c		\
@@ -845,7 +845,7 @@ DISSECTOR_SRC = \
 	packet-mp2t.c		\
 	packet-mp4ves.c		\
 	packet-mpeg-ca.c	\
-	packet-mpeg-descriptor.c \
+	packet-mpeg-descriptor.c	\
 	packet-mpeg-dsmcc.c	\
 	packet-mpeg-pat.c	\
 	packet-mpeg-pmt.c	\
@@ -1012,7 +1012,7 @@ DISSECTOR_SRC = \
 	packet-rdt.c		\
 	packet-redback.c	\
 	packet-redbackli.c	\
-	packet-reload-framing.c \
+	packet-reload-framing.c	\
 	packet-reload.c		\
 	packet-retix-bpdu.c	\
 	packet-rfc2190.c	\
@@ -1072,7 +1072,7 @@ DISSECTOR_SRC = \
 	packet-sccp.c		\
 	packet-sccpmg.c		\
 	packet-scop.c		\
-	packet-scriptingservice.c \
+	packet-scriptingservice.c	\
 	packet-scsi-mmc.c	\
 	packet-scsi-osd.c	\
 	packet-scsi-sbc.c	\
@@ -1215,7 +1215,7 @@ DISSECTOR_SRC = \
 	packet-vntag.c		\
 	packet-vp8.c		\
 	packet-vrrp.c		\
-	packet-vrt.c        \
+	packet-vrt.c		\
 	packet-vssmonitoring.c	\
 	packet-vtp.c		\
 	packet-vuze-dht.c	\
@@ -1251,7 +1251,7 @@ DISSECTOR_SRC = \
 	packet-xdmcp.c		\
 	packet-xmcp.c		\
 	packet-xml.c		\
-	packet-xmpp-conference.c \
+	packet-xmpp-conference.c	\
 	packet-xmpp-core.c	\
 	packet-xmpp-gtalk.c	\
 	packet-xmpp-jingle.c	\
@@ -1270,7 +1270,7 @@ DISSECTOR_SRC = \
 	packet-ypxfr.c		\
 	packet-zbee-aps.c	\
 	packet-zbee-nwk.c	\
-	packet-zbee-nwk-gp.c \
+	packet-zbee-nwk-gp.c	\
 	packet-zbee-security.c	\
 	packet-zbee-zcl.c	\
 	packet-zbee-zcl-general.c	\
@@ -1346,10 +1346,10 @@ DISSECTOR_INCLUDES =	\
 	packet-cipsafety.h	\
 	packet-clearcase.h	\
 	packet-clip.h	\
-	packet-cmip.h \
+	packet-cmip.h	\
 	packet-cmp.h	\
 	packet-cms.h	\
-	packet-credssp.h \
+	packet-credssp.h	\
 	packet-crmf.h	\
 	packet-csn1.h	\
 	packet-dap.h	\
@@ -1378,7 +1378,7 @@ DISSECTOR_INCLUDES =	\
 	packet-dcom-dispatch.h	\
 	packet-dcm.h	\
 	packet-ddtp.h	\
-	packet-diameter.h \
+	packet-diameter.h	\
 	packet-diffserv-mpls-common.h	\
 	packet-disp.h	\
 	packet-dis-enums.h	\
@@ -1392,8 +1392,8 @@ DISSECTOR_INCLUDES =	\
 	packet-enip.h	\
 	packet-erf.h	\
 	packet-dvmrp.h	\
-	packet-e164.h   \
-	packet-e212.h   \
+	packet-e164.h	\
+	packet-e212.h	\
 	packet-edonkey.h	\
 	packet-enc.h	\
 	packet-epmd.h	\
@@ -1423,7 +1423,7 @@ DISSECTOR_INCLUDES =	\
 	packet-gmr1_common.h	\
 	packet-gmr1_rr.h	\
 	packet-gnutella.h	\
-	packet-gprscdr.h \
+	packet-gprscdr.h	\
 	packet-gre.h	\
 	packet-gsm_a_common.h	\
 	packet-gsm_a_rr.h	\
@@ -1460,7 +1460,7 @@ DISSECTOR_INCLUDES =	\
 	packet-ieee802a.h	\
 	packet-igap.h	\
 	packet-igmp.h	\
-	packet-imf.h    \
+	packet-imf.h	\
 	packet-inap.h	\
 	packet-infiniband.h	\
 	packet-ip.h	\
@@ -1474,13 +1474,13 @@ DISSECTOR_INCLUDES =	\
 	packet-isis-clv.h	\
 	packet-isl.h	\
 	packet-isup.h	\
-	packet-iwarp-ddp-rdmap.h \
+	packet-iwarp-ddp-rdmap.h	\
 	packet-jxta.h	\
 	packet-kerberos.h	\
 	packet-klm.h	\
 	packet-l2tp.h	\
 	packet-ldap.h	\
-	packet-lcsap.h \
+	packet-lcsap.h	\
 	packet-ldp.h	\
 	packet-llc.h	\
 	packet-lldp.h	\
@@ -1494,7 +1494,7 @@ DISSECTOR_INCLUDES =	\
 	packet-mms.h	\
 	packet-mount.h	\
 	packet-mp4ves.h		\
-	packet-mpeg-descriptor.h \
+	packet-mpeg-descriptor.h	\
 	packet-mpeg-pmt.h	\
 	packet-mpeg-sect.h	\
 	packet-mpls.h	\
@@ -1507,7 +1507,7 @@ DISSECTOR_INCLUDES =	\
 	packet-nbap.h	\
 	packet-ncp-int.h	\
 	packet-ncp-nmas.h	\
-	packet-ncp-sss.h \
+	packet-ncp-sss.h	\
 	packet-ndmp.h	\
 	packet-ndps.h	\
 	packet-netbios.h	\
@@ -1525,7 +1525,7 @@ DISSECTOR_INCLUDES =	\
 	packet-osi-options.h	\
 	packet-p1.h	\
 	packet-p22.h	\
-	packet-p7.h \
+	packet-p7.h	\
 	packet-p772.h	\
 	packet-pcnfsd.h	\
 	packet-pdcp-lte.h	\
@@ -1567,18 +1567,18 @@ DISSECTOR_INCLUDES =	\
 	packet-ros.h	\
 	packet-rpc.h	\
 	packet-rquota.h	\
-	packet-rrc.h \
+	packet-rrc.h	\
 	packet-rsvp.h	\
 	packet-rtcp.h	\
 	packet-rtp.h	\
-	packet-rtps.h   \
+	packet-rtps.h	\
 	packet-rtp-events.h	\
 	packet-rtse.h	\
 	packet-rtsp.h	\
 	packet-rwall.h	\
 	packet-rx.h		\
 	packet-s1ap.h	\
-	packet-sccp.h \
+	packet-sccp.h	\
 	packet-scsi.h	\
 	packet-scsi-mmc.h	\
 	packet-scsi-osd.h	\
@@ -1604,7 +1604,7 @@ DISSECTOR_INCLUDES =	\
 	packet-spice.h	\
 	packet-spray.h	\
 	packet-sprt.h	\
-	packet-sscop.h \
+	packet-sscop.h	\
 	packet-ssl.h	\
 	packet-ssl-utils.h	\
 	packet-stat.h	\
@@ -1654,13 +1654,13 @@ DISSECTOR_INCLUDES =	\
 	packet-x509if.h	\
 	packet-x509sat.h	\
 	packet-xml.h	\
-	packet-xmpp-conference.h \
-	packet-xmpp-core.h \
-	packet-xmpp-gtalk.h \
-	packet-xmpp.h \
-	packet-xmpp-jingle.h \
-	packet-xmpp-other.h \
-	packet-xmpp-utils.h \
+	packet-xmpp-conference.h	\
+	packet-xmpp-core.h	\
+	packet-xmpp-gtalk.h	\
+	packet-xmpp.h	\
+	packet-xmpp-jingle.h	\
+	packet-xmpp-other.h	\
+	packet-xmpp-utils.h	\
 	packet-ypbind.h	\
 	packet-yppasswd.h	\
 	packet-ypserv.h	\
@@ -1673,7 +1673,7 @@ DISSECTOR_INCLUDES =	\
 	packet-zbee-zdp.h	\
 	packet-zep.h	\
 	packet-ziop.h	\
-	$(GENERATED_HEADER_FILES) \
+	$(GENERATED_HEADER_FILES)	\
 	$(CUSTOM_HEADER_FILES)
 
 # IPMI sub-parsers for each network function code
@@ -1684,7 +1684,7 @@ IPMI_SUBPARSERS = \
 	packet-ipmi-picmg.c	\
 	packet-ipmi-se.c	\
 	packet-ipmi-storage.c	\
-	packet-ipmi-transport.c \
+	packet-ipmi-transport.c	\
 	packet-ipmi-pps.c	\
 	packet-ipmi-update.c
 
@@ -1692,21 +1692,21 @@ IPMI_SUBPARSERS = \
 # directory, but they're not dissectors themselves, i.e. they're not
 # used to generate "register.c").
 DISSECTOR_SUPPORT_SRC =	\
-	$(IPMI_SUBPARSERS) \
-	packet-dcerpc-nt.c \
-	usb.c \
+	$(IPMI_SUBPARSERS)	\
+	packet-dcerpc-nt.c	\
+	usb.c	\
 	register.c
 
 # this target needed for distribution only
 noinst_HEADERS =	\
-	$(DISSECTOR_INCLUDES) \
+	$(DISSECTOR_INCLUDES)	\
 	$(FILE_DISSECTOR_INCLUDES)
 
-ALL_DISSECTORS_SRC = \
-	$(DISSECTOR_SRC) \
-	$(FILE_DISSECTOR_SRC) \
-	$(DIRTY_DISSECTOR_SRC) \
-	$(PIDL_DISSECTOR_SRC) \
-	$(DIRTY_PIDL_DISSECTOR_SRC) \
-	$(ASN1_DISSECTOR_SRC) \
+ALL_DISSECTORS_SRC =	\
+	$(DISSECTOR_SRC)	\
+	$(FILE_DISSECTOR_SRC)	\
+	$(DIRTY_DISSECTOR_SRC)	\
+	$(PIDL_DISSECTOR_SRC)	\
+	$(DIRTY_PIDL_DISSECTOR_SRC)	\
+	$(ASN1_DISSECTOR_SRC)	\
 	$(DIRTY_ASN1_DISSECTOR_SRC)