Fix [-Wmissing-prototypes]

svn path=/trunk/; revision=54095

103 files changed, 284 insertions, 74 deletions

diff --git a/epan/dissectors/packet-adwin.c b/epan/dissectors/packet-adwin.c
index 9030a101fc..1cd106a0a0 100644
--- a/epan/dissectors/packet-adwin.c
+++ b/epan/dissectors/packet-adwin.c
@@ -32,6 +32,9 @@
 #include <epan/conversation.h>
 #include <epan/wmem/wmem.h>
 
+void proto_reg_handoff_adwin(void);
+void proto_register_adwin(void);
+
 /* This is registered to a different protocol */
 #define ADWIN_COMM_PORT 6543
 
diff --git a/epan/dissectors/packet-mac-lte-framed.c b/epan/dissectors/packet-mac-lte-framed.c
index 4a8b8bd471..b420eb1043 100644
--- a/epan/dissectors/packet-mac-lte-framed.c
+++ b/epan/dissectors/packet-mac-lte-framed.c
@@ -30,6 +30,7 @@
 
 #include "packet-mac-lte.h"
 
+void proto_register_mac_lte_framed(void);
 
 /* Initialize the protocol and registered fields. */
 static int proto_mac_lte_framed = -1;
diff --git a/epan/dissectors/packet-maccontrol.c b/epan/dissectors/packet-maccontrol.c
index 76f7afad77..d89e75a6a5 100644
--- a/epan/dissectors/packet-maccontrol.c
+++ b/epan/dissectors/packet-maccontrol.c
@@ -34,6 +34,9 @@
 #include "packet-llc.h"
 #include <epan/etypes.h>
 
+void proto_register_macctrl(void);
+void proto_reg_handoff_macctrl(void);
+
 static int proto_macctrl = -1;
 
 static int hf_macctrl_opcode       = -1;
diff --git a/epan/dissectors/packet-macsec.c b/epan/dissectors/packet-macsec.c
index 55f712dcff..3c8c939143 100644
--- a/epan/dissectors/packet-macsec.c
+++ b/epan/dissectors/packet-macsec.c
@@ -30,6 +30,9 @@
 #include <epan/packet.h>
 #include <epan/etypes.h>
 
+void proto_register_macsec(void);
+void proto_reg_handoff_macsec(void);
+
 #define TCI_V_MASK   0x80
 #define TCI_ES_MASK  0x40
 #define TCI_SC_MASK  0x20
diff --git a/epan/dissectors/packet-mactelnet.c b/epan/dissectors/packet-mactelnet.c
index 1ea09b6166..24aae45cdb 100644
--- a/epan/dissectors/packet-mactelnet.c
+++ b/epan/dissectors/packet-mactelnet.c
@@ -35,10 +35,11 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 
-#define PROTO_TAG_MACTELNET "MAC-Telnet"
-
+void proto_register_mactelnet(void);
 void proto_reg_handoff_mactelnet(void);
 
+#define PROTO_TAG_MACTELNET "MAC-Telnet"
+
 /* Initialize the protocol and registered fields */
 static gint proto_mactelnet = -1;
 static gint hf_mactelnet_control_packet = -1;
diff --git a/epan/dissectors/packet-manolito.c b/epan/dissectors/packet-manolito.c
index dea56388ba..593912e7ca 100644
--- a/epan/dissectors/packet-manolito.c
+++ b/epan/dissectors/packet-manolito.c
@@ -32,6 +32,9 @@
 #include <epan/packet.h>
 #include <epan/wmem/wmem.h>
 
+void proto_register_manolito(void);
+void proto_reg_handoff_manolito(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_manolito = -1;
 static int hf_manolito_checksum = -1;
diff --git a/epan/dissectors/packet-mbim.c b/epan/dissectors/packet-mbim.c
index b89d7a353f..134ffe0e9a 100644
--- a/epan/dissectors/packet-mbim.c
+++ b/epan/dissectors/packet-mbim.c
@@ -43,6 +43,7 @@
 #include "packet-gsm_sms.h"
 #include "packet-usb.h"
 
+void proto_register_mbim(void);
 void proto_reg_handoff_mbim(void);
 
 /* Initialize the protocol and registered fields */
diff --git a/epan/dissectors/packet-mbtcp.c b/epan/dissectors/packet-mbtcp.c
index db5e0845bb..f3f0ef732b 100644
--- a/epan/dissectors/packet-mbtcp.c
+++ b/epan/dissectors/packet-mbtcp.c
@@ -81,7 +81,11 @@
 #include "packet-mbtcp.h"
 #include <epan/prefs.h>
 #include <epan/expert.h>
-#include <epan/crc16-tvb.h> /* For CRC verification */\
+#include <epan/crc16-tvb.h> /* For CRC verification */
+
+void proto_register_modbus(void);
+void proto_reg_handoff_mbtcp(void);
+void proto_reg_handoff_mbrtu(void);
 
 /* Initialize the protocol and registered fields */
 static int proto_mbtcp = -1;
@@ -1376,9 +1380,6 @@ dissect_modbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
 
 /* Register the protocol with Wireshark */
 
-void proto_reg_handoff_mbtcp(void);
-void proto_reg_handoff_mbrtu(void);
-
 void
 proto_register_modbus(void)
 {
diff --git a/epan/dissectors/packet-mdshdr.c b/epan/dissectors/packet-mdshdr.c
index 36a1022c8b..2fc16adeb8 100644
--- a/epan/dissectors/packet-mdshdr.c
+++ b/epan/dissectors/packet-mdshdr.c
@@ -32,6 +32,9 @@
 #include <epan/prefs.h>
 #include "packet-fc.h"
 
+void proto_register_mdshdr(void);
+void proto_reg_handoff_mdshdr(void);
+
 #define MDSHDR_VERSION_OFFSET             0
 
 /* Mdshdr Control bits */
@@ -129,8 +132,6 @@ static const value_string eof_vals[] = {
     {0,                          NULL},
 };
 
-void proto_reg_handoff_mdshdr(void);
-
 static void
 dissect_mdshdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
diff --git a/epan/dissectors/packet-media.c b/epan/dissectors/packet-media.c
index 9de3b935d3..52e5480989 100644
--- a/epan/dissectors/packet-media.c
+++ b/epan/dissectors/packet-media.c
@@ -33,6 +33,8 @@
 #include <glib.h>
 #include <epan/packet.h>
 
+void proto_register_media(void);
+
 /* proto_media cannot be static because it's referenced in the
  * print routines
  */
diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c
index bb06752569..46f53f54d8 100644
--- a/epan/dissectors/packet-megaco.c
+++ b/epan/dissectors/packet-megaco.c
@@ -64,6 +64,9 @@
 #include <epan/gcp.h>
 #include <epan/tap.h>
 
+void proto_register_megaco(void);
+void proto_reg_handoff_megaco(void);
+
 #define PORT_MEGACO_TXT 2944
 #define PORT_MEGACO_BIN 2945
 
@@ -3356,8 +3359,6 @@ static gint megaco_tvb_find_token(tvbuff_t* tvb, gint offset, gint maxlength){
     }
 }
 
-void proto_reg_handoff_megaco(void);
-
 void
 proto_register_megaco(void)
 {
diff --git a/epan/dissectors/packet-memcache.c b/epan/dissectors/packet-memcache.c
index 25fd50f561..02fbccc271 100644
--- a/epan/dissectors/packet-memcache.c
+++ b/epan/dissectors/packet-memcache.c
@@ -44,6 +44,9 @@
 
 #include "packet-tcp.h"
 
+void proto_register_memcache (void);
+void proto_reg_handoff_memcache(void);
+
 #define PNAME  "Memcache Protocol"
 #define PSNAME "MEMCACHE"
 #define PFNAME "memcache"
@@ -105,8 +108,6 @@
 
 static int proto_memcache = -1;
 
-void proto_reg_handoff_memcache(void);
-
 static range_t *memcache_tcp_port_range = NULL;
 static range_t *memcache_udp_port_range = NULL;
 static dissector_handle_t memcache_tcp_handle;
diff --git a/epan/dissectors/packet-mesh.c b/epan/dissectors/packet-mesh.c
index d41aea4796..56e66fb42d 100644
--- a/epan/dissectors/packet-mesh.c
+++ b/epan/dissectors/packet-mesh.c
@@ -30,6 +30,8 @@
 
 #include <epan/packet.h>
 
+void proto_register_mesh(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_mesh = -1;
 static int hf_mesh_ttl = -1;
diff --git a/epan/dissectors/packet-meta.c b/epan/dissectors/packet-meta.c
index 3089d80543..c6114cf099 100644
--- a/epan/dissectors/packet-meta.c
+++ b/epan/dissectors/packet-meta.c
@@ -35,6 +35,9 @@
 #include "packet-sscop.h"
 #include "packet-gsm_a_common.h"
 
+void proto_register_meta(void);
+void proto_reg_handoff_meta(void);
+
 /* schemas */
 #define META_SCHEMA_PCAP        1
 #define META_SCHEMA_DXT         2
diff --git a/epan/dissectors/packet-mih.c b/epan/dissectors/packet-mih.c
index 7c491a78b6..09067646b8 100644
--- a/epan/dissectors/packet-mih.c
+++ b/epan/dissectors/packet-mih.c
@@ -42,6 +42,8 @@
 #include <epan/etypes.h>
 #include <glib.h>
 
+void proto_register_mih(void);
+void proto_reg_handoff_mih(void);
 
 #define MIH_PORT 4551
 
diff --git a/epan/dissectors/packet-mikey.c b/epan/dissectors/packet-mikey.c
index de165c07b0..4d564a12c1 100644
--- a/epan/dissectors/packet-mikey.c
+++ b/epan/dissectors/packet-mikey.c
@@ -47,6 +47,9 @@
 #include <epan/asn1.h>
 #include <epan/dissectors/packet-x509af.h>
 
+void proto_register_mikey(void);
+void proto_reg_handoff_mikey(void);
+
 #define PORT_MIKEY 2269
 static guint global_mikey_tcp_port = PORT_MIKEY;
 
@@ -604,7 +607,6 @@ struct mikey_dissector_entry {
 };
 
 /* Forward declaration we need below */
-void proto_reg_handoff_mikey(void);
 static int dissect_payload(int payload, mikey_t *mikey, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
 
 
diff --git a/epan/dissectors/packet-mim.c b/epan/dissectors/packet-mim.c
index 1503e1254a..910f29acf8 100644
--- a/epan/dissectors/packet-mim.c
+++ b/epan/dissectors/packet-mim.c
@@ -35,6 +35,9 @@
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
 
+void proto_register_mim(void);
+void proto_reg_handoff_fabricpath(void);
+
 static int proto_fp = -1 ;
 static gint ett_mim = -1 ;
 static gint ett_hmac = -1 ;
@@ -117,7 +120,6 @@ static dissector_handle_t eth_dissector ;
 
 
 static int dissect_fp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ );
-void proto_reg_handoff_fabricpath(void);
 
 
 static gboolean
diff --git a/epan/dissectors/packet-mime-encap.c b/epan/dissectors/packet-mime-encap.c
index d5109e96dc..29c0902ab7 100644
--- a/epan/dissectors/packet-mime-encap.c
+++ b/epan/dissectors/packet-mime-encap.c
@@ -30,6 +30,9 @@
 
 #include "tvbuff-int.h"
 
+void proto_register_mime_encap(void);
+void proto_reg_handoff_mime_encap(void);
+
 static int proto_mime_encap = -1;
 
 static heur_dissector_list_t heur_subdissector_list;
diff --git a/epan/dissectors/packet-mint.c b/epan/dissectors/packet-mint.c
index 53773d93e1..764953308f 100644
--- a/epan/dissectors/packet-mint.c
+++ b/epan/dissectors/packet-mint.c
@@ -49,6 +49,9 @@
 #include <epan/expert.h>
 #include <epan/show_exception.h>
 
+void proto_register_mint(void);
+void proto_reg_handoff_mint(void);
+
 #define PROTO_SHORT_NAME "MiNT"
 #define PROTO_LONG_NAME "Media indepentend Network Transport"
 
diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c
index 171c9d2fe6..68119e0b07 100644
--- a/epan/dissectors/packet-mip6.c
+++ b/epan/dissectors/packet-mip6.c
@@ -64,6 +64,9 @@
 #include "packet-e212.h"
 #include "packet-gsm_a_common.h"
 
+void proto_register_mip6(void);
+void proto_reg_handoff_mip6(void);
+
 #define UDP_PORT_PMIP6_CNTL 5436
 
 static dissector_table_t mip6_vsm_dissector_table;
diff --git a/epan/dissectors/packet-mmse.c b/epan/dissectors/packet-mmse.c
index 45550855b9..1e66d22603 100644
--- a/epan/dissectors/packet-mmse.c
+++ b/epan/dissectors/packet-mmse.c
@@ -45,7 +45,9 @@
 #include <epan/wmem/wmem.h>
 #include "packet-wap.h"
 #include "packet-wsp.h"
-/* #include "packet-mmse.h" */		/* We autoregister	*/
+
+void proto_register_mmse(void);
+void proto_reg_handoff_mmse(void);
 
 #define	MM_QUOTE		0x7F	/* Quoted string	*/
 
diff --git a/epan/dissectors/packet-mndp.c b/epan/dissectors/packet-mndp.c
index 90e2a833d7..af0919e9f6 100644
--- a/epan/dissectors/packet-mndp.c
+++ b/epan/dissectors/packet-mndp.c
@@ -38,6 +38,9 @@
 #include <epan/packet.h>
 #include <epan/wmem/wmem.h>
 
+void proto_register_mndp(void);
+void proto_reg_handoff_mndp(void);
+
 /* protocol handles */
 static int proto_mndp = -1;
 
@@ -369,4 +372,3 @@ proto_reg_handoff_mndp(void)
 	dissector_add_uint("udp.port", PORT_MNDP, mndp_handle);
 	/* heur_dissector_add("udp", dissect_mndp_heur, proto_mndp); */
 }
-
diff --git a/epan/dissectors/packet-mojito.c b/epan/dissectors/packet-mojito.c
index 48199ae30a..4eff580b20 100644
--- a/epan/dissectors/packet-mojito.c
+++ b/epan/dissectors/packet-mojito.c
@@ -31,6 +31,9 @@
 #include <epan/prefs.h>
 #include <epan/expert.h>
 
+void proto_register_mojito(void);
+void proto_reg_handoff_mojito(void);
+
 #define MOJITO_HEADER_LENGTH    38
 
 /* All the Defines for OpCodes */
diff --git a/epan/dissectors/packet-moldudp.c b/epan/dissectors/packet-moldudp.c
index fc6d3eb459..84cb9d4b82 100644
--- a/epan/dissectors/packet-moldudp.c
+++ b/epan/dissectors/packet-moldudp.c
@@ -33,6 +33,7 @@
 #include <epan/prefs.h>
 #include <epan/expert.h>
 
+void proto_register_moldudp(void);
 void proto_reg_handoff_moldudp(void);
 
 /* Initialize the protocol and registered fields */
diff --git a/epan/dissectors/packet-moldudp64.c b/epan/dissectors/packet-moldudp64.c
index f941c56f3b..e8202b503a 100644
--- a/epan/dissectors/packet-moldudp64.c
+++ b/epan/dissectors/packet-moldudp64.c
@@ -33,6 +33,7 @@
 #include <epan/prefs.h>
 #include <epan/expert.h>
 
+void proto_register_moldudp64(void);
 void proto_reg_handoff_moldudp64(void);
 
 /* Initialize the protocol and registered fields */
diff --git a/epan/dissectors/packet-mp4ves.c b/epan/dissectors/packet-mp4ves.c
index 47569edc2a..5e038825e1 100644
--- a/epan/dissectors/packet-mp4ves.c
+++ b/epan/dissectors/packet-mp4ves.c
@@ -38,6 +38,9 @@
 
 #include <epan/prefs.h>
 
+void proto_register_mp4ves(void);
+void proto_reg_handoff_mp4ves(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_mp4ves	= -1;
 
@@ -894,9 +897,6 @@ dissect_mp4ves_name(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *tree, voi
 }
 
 void
-proto_reg_handoff_mp4ves(void);
-
-void
 proto_register_mp4ves(void)
 {
 
diff --git a/epan/dissectors/packet-mpeg-dsmcc.c b/epan/dissectors/packet-mpeg-dsmcc.c
index cd6336efcc..5eec1e9e94 100644
--- a/epan/dissectors/packet-mpeg-dsmcc.c
+++ b/epan/dissectors/packet-mpeg-dsmcc.c
@@ -34,6 +34,9 @@
 #include <epan/crc32-tvb.h>
 #include <epan/dissectors/packet-mpeg-sect.h>
 
+void proto_register_dsmcc(void);
+void proto_reg_handoff_dsmcc(void);
+
 /* NOTE: Please try to keep this status comment up to date until the spec is
  * completely implemented - there are a large number of tables in the spec.
  *
diff --git a/epan/dissectors/packet-mpeg-pat.c b/epan/dissectors/packet-mpeg-pat.c
index aaf292c264..ee2e84f574 100644
--- a/epan/dissectors/packet-mpeg-pat.c
+++ b/epan/dissectors/packet-mpeg-pat.c
@@ -31,6 +31,9 @@
 #include <epan/prefs.h>
 #include <epan/dissectors/packet-mpeg-sect.h>
 
+void proto_register_mpeg_pat(void);
+void proto_reg_handoff_mpeg_pat(void);
+
 static int proto_mpeg_pat = -1;
 static int hf_mpeg_pat_transport_stream_id = -1;
 static int hf_mpeg_pat_reserved = -1;
diff --git a/epan/dissectors/packet-mpeg-pmt.c b/epan/dissectors/packet-mpeg-pmt.c
index f46b74750d..314c0c6246 100644
--- a/epan/dissectors/packet-mpeg-pmt.c
+++ b/epan/dissectors/packet-mpeg-pmt.c
@@ -32,6 +32,9 @@
 
 #include "packet-mpeg-descriptor.h"
 
+void proto_register_mpeg_pmt(void);
+void proto_reg_handoff_mpeg_pmt(void);
+
 static int proto_mpeg_pmt = -1;
 static int hf_mpeg_pmt_program_number = -1;
 static int hf_mpeg_pmt_reserved1 = -1;
diff --git a/epan/dissectors/packet-mpeg-sect.c b/epan/dissectors/packet-mpeg-sect.c
index 622ed0be21..b309dbd7f5 100644
--- a/epan/dissectors/packet-mpeg-sect.c
+++ b/epan/dissectors/packet-mpeg-sect.c
@@ -33,6 +33,8 @@
 #include <epan/expert.h>
 #include <epan/dissectors/packet-mpeg-sect.h>
 
+void proto_register_mpeg_sect(void);
+
 static int proto_mpeg_sect = -1;
 static int hf_mpeg_sect_table_id = -1;
 static int hf_mpeg_sect_syntax_indicator = -1;
diff --git a/epan/dissectors/packet-mpeg1.c b/epan/dissectors/packet-mpeg1.c
index f464aa2ecd..0c07bd1f71 100644
--- a/epan/dissectors/packet-mpeg1.c
+++ b/epan/dissectors/packet-mpeg1.c
@@ -38,6 +38,9 @@
 
 #include <epan/rtp_pt.h>
 
+void proto_register_mpeg1(void);
+void proto_reg_handoff_mpeg1(void);
+
 #define RTP_MPG_MBZ(word) ( word >> 11)
 #define RTP_MPG_T(word)   ( (word >> 10) & 1 )
 #define RTP_MPG_TR(word)   ( word & 0x3ff )
diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c
index 75abab63c1..3865612f91 100644
--- a/epan/dissectors/packet-mpls-echo.c
+++ b/epan/dissectors/packet-mpls-echo.c
@@ -43,10 +43,11 @@
 #include "packet-ldp.h"
 #include "packet-mpls.h"
 
-#define UDP_PORT_MPLS_ECHO 3503
-
+void proto_register_mpls_echo(void);
 void proto_reg_handoff_mpls_echo(void);
 
+#define UDP_PORT_MPLS_ECHO 3503
+
 static int proto_mpls_echo = -1;
 static int hf_mpls_echo_version = -1;
 static int hf_mpls_echo_mbz = -1;
diff --git a/epan/dissectors/packet-mpls-pm.c b/epan/dissectors/packet-mpls-pm.c
index 89570ef9d7..e18c652aa9 100644
--- a/epan/dissectors/packet-mpls-pm.c
+++ b/epan/dissectors/packet-mpls-pm.c
@@ -35,6 +35,9 @@
 #include <epan/packet.h>
 #include <packet-ip.h>
 
+void proto_register_mpls_pm(void);
+void proto_reg_handoff_mpls_pm(void);
+
 /* message control flags */
 #define MPLS_PM_FLAGS_R     0x08
 #define MPLS_PM_FLAGS_T     0x04
diff --git a/epan/dissectors/packet-mpls-psc.c b/epan/dissectors/packet-mpls-psc.c
index 031580c948..ab0b29c6f3 100644
--- a/epan/dissectors/packet-mpls-psc.c
+++ b/epan/dissectors/packet-mpls-psc.c
@@ -35,6 +35,8 @@
 #include <epan/packet.h>
 #include <packet-ip.h>
 
+void proto_register_mpls_psc(void);
+
 static gint proto_mpls_psc = -1;
 
 static gint ett_mpls_psc = -1;
diff --git a/epan/dissectors/packet-mpls-y1711.c b/epan/dissectors/packet-mpls-y1711.c
index e747ac8a7f..b9e349906b 100644
--- a/epan/dissectors/packet-mpls-y1711.c
+++ b/epan/dissectors/packet-mpls-y1711.c
@@ -47,6 +47,9 @@
 
 #include "packet-mpls.h"
 
+void proto_register_mpls_y1711(void);
+void proto_reg_handoff_mpls_y1711(void);
+
 static gint proto_mpls_y1711 = -1;
 
 static int hf_mpls_y1711_function_type = -1;
diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c
index 33049d097d..ebc26a8e5e 100644
--- a/epan/dissectors/packet-mpls.c
+++ b/epan/dissectors/packet-mpls.c
@@ -66,6 +66,9 @@
 #include "packet-pw-common.h"
 #include "packet-bfd.h"
 
+void proto_register_mpls(void);
+void proto_reg_handoff_mpls(void);
+
 /* As per RFC 6428 http://tools.ietf.org/html/rfc6428, Section: 3.3 */
 #define ACH_TYPE_BFD_CC               0x0022
 #define ACH_TYPE_BFD_CV               0x0023
diff --git a/epan/dissectors/packet-mplstp-oam.c b/epan/dissectors/packet-mplstp-oam.c
index 4e329570cd..9cfb9f1c2d 100644
--- a/epan/dissectors/packet-mplstp-oam.c
+++ b/epan/dissectors/packet-mplstp-oam.c
@@ -33,6 +33,9 @@
 #include <packet-ip.h>
 #include <epan/dissectors/packet-bfd.h>
 
+void proto_register_mplstp_lock(void);
+void proto_register_mplstp_fm(void);
+
 /* MPLS-TP FM protocol specific variables */
 static gint proto_mplstp_fm     = -1;
 static gint ett_mplstp_fm       = -1;
diff --git a/epan/dissectors/packet-mq-pcf.c b/epan/dissectors/packet-mq-pcf.c
index c1337fd812..805298fe5e 100644
--- a/epan/dissectors/packet-mq-pcf.c
+++ b/epan/dissectors/packet-mq-pcf.c
@@ -47,6 +47,9 @@
 #include "packet-mq.h"
 #include "wmem/wmem.h"
 
+void proto_register_mqpcf(void);
+void proto_reg_handoff_mqpcf(void);
+
 #define PCF_MAX_PARM 999
 #define PCF_MAX_LIST 20000
 
diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c
index dd42b166f3..e9133083a6 100644
--- a/epan/dissectors/packet-mq.c
+++ b/epan/dissectors/packet-mq.c
@@ -89,6 +89,9 @@
 #include "packet-tcp.h"
 #include "packet-mq.h"
 
+void proto_register_mq(void);
+void proto_reg_handoff_mq(void);
+
 static int proto_mq = -1;
 static int hf_mq_tsh_StructID = -1;
 static int hf_mq_tsh_mqseglen = -1;
diff --git a/epan/dissectors/packet-mrcpv2.c b/epan/dissectors/packet-mrcpv2.c
index f94a8c40bc..532602dbe5 100644
--- a/epan/dissectors/packet-mrcpv2.c
+++ b/epan/dissectors/packet-mrcpv2.c
@@ -49,6 +49,9 @@
 
 #include <wsutil/str_util.h>
 
+void proto_register_mrcpv2(void);
+void proto_reg_handoff_mrcpv2(void);
+
 /* mrcp-version SP message-length */
 /*   mrcp-version = "MRCP" "/" 1*2DIGIT "." 1*2DIGIT  ==> up to 10 chars */
 /*   SP ==> whitespace, 1 char */
@@ -269,9 +272,6 @@ static const value_string header_type_vals[] = {
     { 0,    NULL }
 };
 
-/* Forward declaration we need below (if using proto_reg_handoff... as a prefs callback) */
-void proto_reg_handoff_mrcpv2(void);
-
 /* Initialize the protocol and registered fields */
 static int proto_mrcpv2 = -1;
 static int hf_mrcpv2_Request_Line = -1;
diff --git a/epan/dissectors/packet-mrdisc.c b/epan/dissectors/packet-mrdisc.c
index aa612454b1..f567a18d61 100644
--- a/epan/dissectors/packet-mrdisc.c
+++ b/epan/dissectors/packet-mrdisc.c
@@ -46,6 +46,7 @@
 #include "packet-igmp.h"
 #include "packet-mrdisc.h"
 
+void proto_register_mrdisc(void);
 
 static int proto_mrdisc = -1;
 static int hf_checksum = -1;
diff --git a/epan/dissectors/packet-msdp.c b/epan/dissectors/packet-msdp.c
index e39eabe815..48ee8e8c3f 100644
--- a/epan/dissectors/packet-msdp.c
+++ b/epan/dissectors/packet-msdp.c
@@ -32,6 +32,9 @@
 #include <epan/packet.h>
 #include <epan/to_str.h>
 
+void proto_register_msdp(void);
+void proto_reg_handoff_msdp(void);
+
 /* MSDP message types. The messages are TLV (Type-Length-Value) encoded */
 enum { MSDP_SA     = 1,
        MSDP_SA_REQ,
@@ -575,6 +578,4 @@ proto_reg_handoff_msdp(void)
         dissector_add_uint("tcp.port", 639, msdp_handle);
 
         ip_handle = find_dissector("ip");
-
-        return;
 }
diff --git a/epan/dissectors/packet-msnip.c b/epan/dissectors/packet-msnip.c
index ca5d70e802..beb077c2a2 100644
--- a/epan/dissectors/packet-msnip.c
+++ b/epan/dissectors/packet-msnip.c
@@ -44,6 +44,7 @@
 #include "packet-igmp.h"
 #include "packet-msnip.h"
 
+void proto_register_msnip(void);
 
 static int proto_msnip = -1;
 static int hf_checksum = -1;
diff --git a/epan/dissectors/packet-msnlb.c b/epan/dissectors/packet-msnlb.c
index 078c7025f2..261f527e5d 100644
--- a/epan/dissectors/packet-msnlb.c
+++ b/epan/dissectors/packet-msnlb.c
@@ -29,6 +29,9 @@
 #include <epan/etypes.h>
 #include "packet-smb-common.h"
 
+void proto_register_msnlb(void);
+void proto_reg_handoff_msnlb(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_msnlb = -1;
 
diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c
index febcfde8b7..42f202aac6 100644
--- a/epan/dissectors/packet-msrp.c
+++ b/epan/dissectors/packet-msrp.c
@@ -42,6 +42,9 @@
 
 #include "packet-msrp.h"
 
+void proto_register_msrp(void);
+void proto_reg_handoff_msrp(void);
+
 #define TCP_PORT_MSRP 0
 
 #define MSRP_HDR "MSRP"
diff --git a/epan/dissectors/packet-mstp.c b/epan/dissectors/packet-mstp.c
index ad5fc146c0..d27a913199 100644
--- a/epan/dissectors/packet-mstp.c
+++ b/epan/dissectors/packet-mstp.c
@@ -43,6 +43,9 @@
 #include "packet-llc.h"
 #include "packet-mstp.h"
 
+void proto_register_mstp(void);
+void proto_reg_handoff_mstp(void);
+
 /* Probably should be a preference, but here for now */
 #define BACNET_MSTP_SUMMARY_IN_TREE
 #define BACNET_MSTP_CHECKSUM_VALIDATE
diff --git a/epan/dissectors/packet-mtp2.c b/epan/dissectors/packet-mtp2.c
index 327a4a7c0e..835ee0828b 100644
--- a/epan/dissectors/packet-mtp2.c
+++ b/epan/dissectors/packet-mtp2.c
@@ -36,6 +36,9 @@
 #include <epan/crc16-tvb.h>
 #include <epan/expert.h>
 
+void proto_register_mtp2(void);
+void proto_reg_handoff_mtp2(void);
+
 static dissector_handle_t mtp2_handle;
 
 /* Initialize the protocol and registered fields */
diff --git a/epan/dissectors/packet-mtp3.c b/epan/dissectors/packet-mtp3.c
index 276917b315..91b596c3fc 100644
--- a/epan/dissectors/packet-mtp3.c
+++ b/epan/dissectors/packet-mtp3.c
@@ -50,6 +50,9 @@
 #include "packet-sccp.h"
 #include "packet-frame.h"
 
+void proto_register_mtp3(void);
+void proto_reg_handoff_mtp3(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_mtp3  = -1;
 
diff --git a/epan/dissectors/packet-mtp3mg.c b/epan/dissectors/packet-mtp3mg.c
index 849edff100..e65330547b 100644
--- a/epan/dissectors/packet-mtp3mg.c
+++ b/epan/dissectors/packet-mtp3mg.c
@@ -45,6 +45,9 @@
 
 #include <packet-mtp3.h>
 
+void proto_register_mtp3mg(void);
+void proto_reg_handoff_mtp3mg(void);
+
 #define H0H1_LENGTH 1
 #define H0_MASK     0x0f
 #define H1_MASK     0xf0
diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c
index b413667e02..6f5ea6f91c 100644
--- a/epan/dissectors/packet-multipart.c
+++ b/epan/dissectors/packet-multipart.c
@@ -70,6 +70,9 @@
 
 #include "packet-imf.h"
 
+void proto_register_multipart(void);
+void proto_reg_handoff_multipart(void);
+
 /* Dissector table for media requiring special attention in multipart
  * encapsulation. */
 static dissector_table_t multipart_media_subdissector_table;
diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c
index e2b8ec0818..4ca433e0e1 100644
--- a/epan/dissectors/packet-nas_eps.c
+++ b/epan/dissectors/packet-nas_eps.c
@@ -39,6 +39,9 @@
 #include "packet-e212.h"
 #include "packet-lcsap.h"
 
+void proto_register_nas_eps(void);
+void proto_reg_handoff_nas_eps(void);
+
 #define PNAME  "Non-Access-Stratum (NAS)PDU"
 #define PSNAME "NAS-EPS"
 #define PFNAME "nas-eps"
@@ -4984,7 +4987,8 @@ dissect_nas_eps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 }
 
 void
-proto_register_nas_eps(void) {
+proto_register_nas_eps(void)
+{
     guint     i;
     guint     last_offset;
     module_t *nas_eps_module;
diff --git a/epan/dissectors/packet-nasdaq-soup.c b/epan/dissectors/packet-nasdaq-soup.c
index 6b11c16708..ed56ad1446 100644
--- a/epan/dissectors/packet-nasdaq-soup.c
+++ b/epan/dissectors/packet-nasdaq-soup.c
@@ -34,6 +34,9 @@
 
 #include "packet-tcp.h"
 
+void proto_register_nasdaq_soup(void);
+void proto_reg_handoff_nasdaq_soup(void);
+
 static const value_string message_types_val[] = {
       { 'S', "Sequenced Data" },
       { 'R', "Client Heartbeat" },
diff --git a/epan/dissectors/packet-nat-pmp.c b/epan/dissectors/packet-nat-pmp.c
index 4f5e24e538..70488b76d4 100644
--- a/epan/dissectors/packet-nat-pmp.c
+++ b/epan/dissectors/packet-nat-pmp.c
@@ -39,6 +39,9 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 
+void proto_register_nat_pmp(void);
+void proto_reg_handoff_nat_pmp(void);
+
 #define PCP_STATUS_PORT  5350
 #define PCP_PORT         5351
 
diff --git a/epan/dissectors/packet-nb_rtpmux.c b/epan/dissectors/packet-nb_rtpmux.c
index 92d5bbf377..6dab640598 100644
--- a/epan/dissectors/packet-nb_rtpmux.c
+++ b/epan/dissectors/packet-nb_rtpmux.c
@@ -29,6 +29,9 @@
 
 #include <epan/packet.h>
 
+void proto_register_nb_rtpmux(void);
+void proto_reg_handoff_nb_rtpmux(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_nb_rtpmux = -1;
 static int hf_nb_rtpmux_compressed = -1;
diff --git a/epan/dissectors/packet-nbd.c b/epan/dissectors/packet-nbd.c
index b19d8958b3..41d86ec8a9 100644
--- a/epan/dissectors/packet-nbd.c
+++ b/epan/dissectors/packet-nbd.c
@@ -34,6 +34,9 @@
 #include <epan/wmem/wmem.h>
 #include "packet-tcp.h"
 
+void proto_register_nbd(void);
+void proto_reg_handoff_nbd(void);
+
 static gint proto_nbd = -1;
 static int hf_nbd_magic = -1;
 static int hf_nbd_type = -1;
diff --git a/epan/dissectors/packet-nbns.c b/epan/dissectors/packet-nbns.c
index 7415d8a3bd..161060d6b3 100644
--- a/epan/dissectors/packet-nbns.c
+++ b/epan/dissectors/packet-nbns.c
@@ -40,6 +40,9 @@
 #include "packet-netbios.h"
 #include "packet-tcp.h"
 
+void proto_register_nbt(void);
+void proto_reg_handoff_nbt(void);
+
 static int proto_nbns = -1;
 static int hf_nbns_flags = -1;
 static int hf_nbns_flags_response = -1;
diff --git a/epan/dissectors/packet-ncp-nmas.c b/epan/dissectors/packet-ncp-nmas.c
index f3d094ecc5..2bf81a8c57 100644
--- a/epan/dissectors/packet-ncp-nmas.c
+++ b/epan/dissectors/packet-ncp-nmas.c
@@ -32,6 +32,8 @@
 #include "packet-ncp-int.h"
 #include "packet-ncp-nmas.h"
 
+void proto_register_nmas(void);
+
 static gint ett_nmas = -1;
 
 static int proto_nmas = -1;
diff --git a/epan/dissectors/packet-ncp-sss.c b/epan/dissectors/packet-ncp-sss.c
index b170b92d40..46afec012f 100644
--- a/epan/dissectors/packet-ncp-sss.c
+++ b/epan/dissectors/packet-ncp-sss.c
@@ -33,6 +33,8 @@
 #include "packet-ncp-sss.h"
 #include "isprint.h"
 
+void proto_register_sss(void);
+
 static gint ett_sss = -1;
 
 static int proto_sss = -1;
diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c
index 6fce19d269..eca85e1fb7 100644
--- a/epan/dissectors/packet-ncp.c
+++ b/epan/dissectors/packet-ncp.c
@@ -58,6 +58,9 @@
 #include <epan/conversation.h>
 #include <epan/tap.h>
 
+void proto_register_ncp(void);
+void proto_reg_handoff_ncp(void);
+
 int proto_ncp = -1;
 static int hf_ncp_ip_ver = -1;
 static int hf_ncp_ip_length = -1;
diff --git a/epan/dissectors/packet-ncs.c b/epan/dissectors/packet-ncs.c
index 2064c3d9c6..74fb866eed 100644
--- a/epan/dissectors/packet-ncs.c
+++ b/epan/dissectors/packet-ncs.c
@@ -30,6 +30,9 @@
 #include <epan/packet.h>
 #include <epan/ipproto.h>
 
+void proto_register_ncs(void);
+void proto_reg_handoff_ncs(void);
+
 static gint ett_ncs = -1;
 
 static int proto_ncs = -1;
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c
index 9adc83b494..3eb5d2224b 100644
--- a/epan/dissectors/packet-ndmp.c
+++ b/epan/dissectors/packet-ndmp.c
@@ -45,6 +45,9 @@
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
 
+void proto_register_ndmp(void);
+void proto_reg_handoff_ndmp(void);
+
 #define TCP_PORT_NDMP 10000
 
 static  dissector_handle_t ndmp_handle;
diff --git a/epan/dissectors/packet-ndp.c b/epan/dissectors/packet-ndp.c
index 752eddb042..30e58e1c48 100644
--- a/epan/dissectors/packet-ndp.c
+++ b/epan/dissectors/packet-ndp.c
@@ -39,6 +39,9 @@
 #include <epan/packet.h>
 #include <epan/nlpid.h>
 
+void proto_register_ndp(void);
+void proto_reg_handoff_ndps(void);
+
 /* Although this protocol is proprietary it is documented in the SynOptics MIB's
  * So I'm not giving anything away :-)
  * The only thing I have not done is decode the segment identifier;
diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c
index f64add45a4..a7e80f1b87 100644
--- a/epan/dissectors/packet-ndps.c
+++ b/epan/dissectors/packet-ndps.c
@@ -41,6 +41,9 @@
 #include "packet-tcp.h"
 #include "packet-ndps.h"
 
+void proto_register_ndps(void);
+void proto_reg_handoff_ndps(void);
+
 /* Limit the number of items we can add to the tree. */
 #define NDPS_MAX_ITEMS 100
 
diff --git a/epan/dissectors/packet-negoex.c b/epan/dissectors/packet-negoex.c
index a0ce91728f..f338db72bd 100644
--- a/epan/dissectors/packet-negoex.c
+++ b/epan/dissectors/packet-negoex.c
@@ -35,6 +35,9 @@
 #include "packet-dcerpc.h"
 #include "packet-gssapi.h"
 
+void proto_register_negoex(void);
+void proto_reg_handoff_negoex(void);
+
 static int proto_negoex = -1;
 static int hf_negoex_sig = -1;
 static int hf_negoex_message_type = -1;
@@ -515,11 +518,6 @@ dissect_negoex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 }
 
-static void
-negoex_init_protocol(void)
-{
-}
-
 void
 proto_register_negoex(void)
 {
@@ -628,7 +626,6 @@ proto_register_negoex(void)
     );
   proto_register_field_array(proto_negoex, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
-  register_init_routine(&negoex_init_protocol);
 
   /* negoex_module = prefs_register_protocol(proto_negoex, NULL);*/
 
diff --git a/epan/dissectors/packet-netanalyzer.c b/epan/dissectors/packet-netanalyzer.c
index 27c8cf5214..f2397f51d0 100644
--- a/epan/dissectors/packet-netanalyzer.c
+++ b/epan/dissectors/packet-netanalyzer.c
@@ -65,10 +65,9 @@
 #include <epan/wmem/wmem.h>
 #include <expert.h>
 
-
+void proto_register_netanalyzer(void);
 void proto_reg_handoff_netanalyzer(void);
 
-
 #define HEADER_SIZE  4
 #define INFO_TYPE_OFFSET    18
 
diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c
index f51f4a16f6..5f317f7555 100644
--- a/epan/dissectors/packet-netbios.c
+++ b/epan/dissectors/packet-netbios.c
@@ -36,6 +36,9 @@
 #include <epan/prefs.h>
 #include "packet-netbios.h"
 
+void proto_register_netbios(void);
+void proto_reg_handoff_netbios(void);
+
 /* Netbios command numbers */
 #define NB_ADD_GROUP		0x00
 #define NB_ADD_NAME		0x01
diff --git a/epan/dissectors/packet-netdump.c b/epan/dissectors/packet-netdump.c
index c2f572e6c0..61d5181879 100644
--- a/epan/dissectors/packet-netdump.c
+++ b/epan/dissectors/packet-netdump.c
@@ -31,7 +31,7 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 
-/* forward reference */
+void proto_register_netdump(void);
 void proto_reg_handoff_netdump(void);
 
 /* Initialize the protocol and registered fields */
diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c
index 0d64a345c5..91e2636e6e 100644
--- a/epan/dissectors/packet-netflow.c
+++ b/epan/dissectors/packet-netflow.c
@@ -134,6 +134,8 @@
 #include "packet-ntp.h"
 #include <epan/expert.h>
 
+void proto_register_netflow(void);
+void proto_reg_handoff_netflow(void);
 
 #if 0
 #define ipfix_debug0(str) g_warning(str)
@@ -1534,8 +1536,6 @@ nbar_fmt_id(gchar *result, guint32 nbar_id)
 }
 
 
-void            proto_reg_handoff_netflow(void);
-
 typedef struct _hdrinfo_t {
     guint8  vspec;
     guint32 src_id;            /* SourceID in NetFlow V9, Observation Domain ID in IPFIX */
diff --git a/epan/dissectors/packet-netperfmeter.c b/epan/dissectors/packet-netperfmeter.c
index aacc045845..b2a7ae0e1d 100644
--- a/epan/dissectors/packet-netperfmeter.c
+++ b/epan/dissectors/packet-netperfmeter.c
@@ -33,6 +33,8 @@
 #include <epan/packet.h>
 #include <epan/sctpppids.h>
 
+void proto_register_npmp(void);
+void proto_reg_handoff_npmp(void);
 
 static int  proto_npmp      = -1;
 static gint ett_npmp        = -1;
diff --git a/epan/dissectors/packet-netrom.c b/epan/dissectors/packet-netrom.c
index 7b464a4350..bc443d019b 100644
--- a/epan/dissectors/packet-netrom.c
+++ b/epan/dissectors/packet-netrom.c
@@ -54,6 +54,9 @@
 
 #include "packet-netrom.h"
 
+void proto_register_netrom(void);
+void proto_reg_handoff_netrom(void);
+
 #define STRLEN 80
 
 #define AX25_ADDR_LEN		   7	/* length of an AX.25 address */
@@ -75,9 +78,6 @@
 
 #define NETROM_PROTO_IP		0x0C
 
-/* Forward declaration we need below */
-void proto_reg_handoff_netrom(void);
-
 /* Dissector handles - all the possibles are listed */
 static dissector_handle_t ip_handle;
 static dissector_handle_t default_handle;
diff --git a/epan/dissectors/packet-netsync.c b/epan/dissectors/packet-netsync.c
index 5a25745185..92c44d0ceb 100644
--- a/epan/dissectors/packet-netsync.c
+++ b/epan/dissectors/packet-netsync.c
@@ -35,6 +35,9 @@
 #include "dwarf.h"
 #include "packet-tcp.h"
 
+void proto_register_netsync(void);
+void proto_reg_handoff_netsync(void);
+
 /*
  * See
  *
@@ -90,8 +93,6 @@ static const value_string netsync_cmd_vals[] = {
 
 #define NETSNYC_MERKLE_HASH_LENGTH 20
 
-void proto_reg_handoff_netsync(void);
-
 /* Define the monotone netsync proto */
 static int proto_netsync = -1;
 
diff --git a/epan/dissectors/packet-newmail.c b/epan/dissectors/packet-newmail.c
index 4688479521..1b23385994 100644
--- a/epan/dissectors/packet-newmail.c
+++ b/epan/dissectors/packet-newmail.c
@@ -30,6 +30,7 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 
+void proto_register_newmail(void);
 void proto_reg_handoff_newmail(void);
 
 /* Variables for preferences */
diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c
index f831884cf4..6f2a783b34 100644
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -40,6 +40,9 @@
 #include <wsutil/crc32.h>
 #include <epan/expert.h>
 
+void proto_register_nfs(void);
+void proto_reg_handoff_nfs(void);
+
 /* NON-NFS-version-specific hf variables */
 static int proto_nfs = -1;
 static int hf_nfs_access_check  = -1;
diff --git a/epan/dissectors/packet-nfsauth.c b/epan/dissectors/packet-nfsauth.c
index 6846282ddd..8d60a09589 100644
--- a/epan/dissectors/packet-nfsauth.c
+++ b/epan/dissectors/packet-nfsauth.c
@@ -26,10 +26,11 @@
 
 #include "config.h"
 
-
-
 #include "packet-rpc.h"
 
+void proto_register_nfsauth(void);
+void proto_reg_handoff_nfsauth(void);
+
 static int proto_nfsauth = -1;
 static int hf_nfsauth_procedure_v1 = -1;
 
diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c
index ec8d858580..bc913caed9 100644
--- a/epan/dissectors/packet-nhrp.c
+++ b/epan/dissectors/packet-nhrp.c
@@ -48,6 +48,9 @@
 #include <epan/dissectors/packet-llc.h>
 #include "packet-nhrp.h"
 
+void proto_register_nhrp(void);
+void proto_reg_handoff_nhrp(void);
+
 /* forward reference */
 static void _dissect_nhrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     gboolean nested, gboolean codeinfo);
diff --git a/epan/dissectors/packet-nisplus.c b/epan/dissectors/packet-nisplus.c
index a02e6d8dbe..3512073f6a 100644
--- a/epan/dissectors/packet-nisplus.c
+++ b/epan/dissectors/packet-nisplus.c
@@ -29,6 +29,11 @@
 #include "packet-rpc.h"
 #include "packet-nisplus.h"
 
+void proto_register_nis(void);
+void proto_reg_handoff_nis(void);
+void proto_register_niscb(void);
+void proto_reg_handoff_niscb(void);
+
 static int proto_nisplus = -1;
 static int hf_nisplus_procedure_v3 = -1;
 static int hf_nisplus_object = -1;
diff --git a/epan/dissectors/packet-nlm.c b/epan/dissectors/packet-nlm.c
index 7a7bb9d53b..78ceac4597 100644
--- a/epan/dissectors/packet-nlm.c
+++ b/epan/dissectors/packet-nlm.c
@@ -33,14 +33,15 @@
 
 #include "config.h"
 
-
-
 #include "packet-rpc.h"
 #include "packet-nfs.h"
 #include "packet-nlm.h"
 #include <epan/prefs.h>
 #include <string.h>
 
+void proto_register_nlm(void);
+void proto_reg_handoff_nlm(void);
+
 /*
  * NFS Lock Manager protocol specs can only be found in actual
  * implementations or in the nice book:
diff --git a/epan/dissectors/packet-nlsp.c b/epan/dissectors/packet-nlsp.c
index b889e1bc0f..9422b8417d 100644
--- a/epan/dissectors/packet-nlsp.c
+++ b/epan/dissectors/packet-nlsp.c
@@ -31,6 +31,9 @@
 #include <epan/to_str.h>
 #include "packet-ipx.h"
 
+void proto_register_nlsp(void);
+void proto_reg_handoff_nlsp(void);
+
 /* NLSP base header */
 static int proto_nlsp                    = -1;
 
diff --git a/epan/dissectors/packet-nsip.c b/epan/dissectors/packet-nsip.c
index 63b7b121e8..d4f48f5491 100644
--- a/epan/dissectors/packet-nsip.c
+++ b/epan/dissectors/packet-nsip.c
@@ -31,14 +31,15 @@
 
 #include <prefs.h>
 
+void proto_register_nsip(void);
+void proto_reg_handoff_nsip(void);
+
 #define NSIP_DEBUG 0
 #define NSIP_SEP ", " /* Separator string */
 
 static range_t *global_nsip_udp_port_range;
 #define DEFAULT_NSIP_PORT_RANGE "2157,19999"
 
-void proto_reg_handoff_nsip(void);
-
 /* Initialize the protocol and registered fields */
 static int proto_nsip = -1;
 
diff --git a/epan/dissectors/packet-nsrp.c b/epan/dissectors/packet-nsrp.c
index a6a5e0b3c2..725769f94f 100644
--- a/epan/dissectors/packet-nsrp.c
+++ b/epan/dissectors/packet-nsrp.c
@@ -51,6 +51,9 @@
 #include <epan/packet.h>
 #include <epan/etypes.h>
 
+void proto_register_nsrp(void);
+void proto_reg_handoff_nsrp(void);
+
 #define NSRP_MIN_LEN    32
 
 /* Initialize the protocol and registered fields */
diff --git a/epan/dissectors/packet-nt-oui.c b/epan/dissectors/packet-nt-oui.c
index 2766ba1e57..1f554c43d6 100644
--- a/epan/dissectors/packet-nt-oui.c
+++ b/epan/dissectors/packet-nt-oui.c
@@ -28,6 +28,8 @@
 #include "packet-llc.h"
 #include <epan/oui.h>
 
+void proto_register_nortel_oui(void);
+
 static int hf_llc_nortel_pid = -1;
 
 static const value_string nortel_pid_vals[] = {
diff --git a/epan/dissectors/packet-nt-tpcp.c b/epan/dissectors/packet-nt-tpcp.c
index 2b08a159fa..40cb8b75e5 100644
--- a/epan/dissectors/packet-nt-tpcp.c
+++ b/epan/dissectors/packet-nt-tpcp.c
@@ -32,6 +32,9 @@
 #include <epan/packet.h>
 #include <epan/addr_resolv.h> /* this is for get_hostname and get_udp_port */
 
+void proto_register_tpcp(void);
+void proto_reg_handoff_tpcp(void);
+
 #define UDP_PORT_TPCP   3121
 
 /* TPCP version1/2 PDU format */
diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c
index 2c3d5abb66..34d1b64b3e 100644
--- a/epan/dissectors/packet-ntlmssp.c
+++ b/epan/dissectors/packet-ntlmssp.c
@@ -58,6 +58,9 @@
 
 #include "packet-ntlmssp.h"
 
+void proto_register_ntlmssp(void);
+void proto_reg_handoff_ntlmssp(void);
+
 static int ntlmssp_tap = -1;
 
 #define CLIENT_SIGN_TEXT "session key to client-to-server signing key magic constant"
diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c
index a6d237396c..35cc0aef07 100644
--- a/epan/dissectors/packet-ntp.c
+++ b/epan/dissectors/packet-ntp.c
@@ -39,6 +39,9 @@
 
 #include "packet-ntp.h"
 
+void proto_register_ntp(void);
+void proto_reg_handoff_ntp(void);
+
 /*
  * Dissecting NTP packets version 3 and 4 (RFC5905, RFC2030, RFC1769, RFC1361,
  * RFC1305).
diff --git a/epan/dissectors/packet-null.c b/epan/dissectors/packet-null.c
index 1ba8c4695c..80bb03d44c 100644
--- a/epan/dissectors/packet-null.c
+++ b/epan/dissectors/packet-null.c
@@ -41,6 +41,9 @@
 #include <epan/etypes.h>
 #include <epan/aftypes.h>
 
+void proto_register_null(void);
+void proto_reg_handoff_null(void);
+
 static dissector_table_t null_dissector_table;
 static dissector_table_t ethertype_dissector_table;
 
diff --git a/epan/dissectors/packet-nwmtp.c b/epan/dissectors/packet-nwmtp.c
index 5e231d0ece..70e2355851 100644
--- a/epan/dissectors/packet-nwmtp.c
+++ b/epan/dissectors/packet-nwmtp.c
@@ -30,6 +30,8 @@
 
 #include <epan/packet.h>
 
+void proto_register_mwmtp(void);
+void proto_reg_handoff_nwmtp(void);
 
 static dissector_handle_t mtp_handle;
 static gint proto_nwmtp = -1;
diff --git a/epan/dissectors/packet-oicq.c b/epan/dissectors/packet-oicq.c
index 8ce426e472..157bab6aa1 100644
--- a/epan/dissectors/packet-oicq.c
+++ b/epan/dissectors/packet-oicq.c
@@ -37,6 +37,9 @@
 
 #include <epan/packet.h>
 
+void proto_register_oicq(void);
+void proto_reg_handoff_oicq(void);
+
 /*
         Protocol Flag:     8bit unsigned
         Sender Flag:       16bit unsigned
diff --git a/epan/dissectors/packet-oipf.c b/epan/dissectors/packet-oipf.c
index abf426bcc7..51cc964f27 100644
--- a/epan/dissectors/packet-oipf.c
+++ b/epan/dissectors/packet-oipf.c
@@ -32,6 +32,9 @@
 #include <glib.h>
 #include <epan/packet.h>
 
+void proto_register_oipf(void);
+void proto_reg_handoff_oipf(void);
+
 static int proto_oipf_ciplus = -1;
 
 static gint ett_oipf_ciplus = -1;
diff --git a/epan/dissectors/packet-omron-fins.c b/epan/dissectors/packet-omron-fins.c
index 83596e1f45..40927a1393 100644
--- a/epan/dissectors/packet-omron-fins.c
+++ b/epan/dissectors/packet-omron-fins.c
@@ -39,6 +39,9 @@
 #include <epan/expert.h>
 #include <epan/wmem/wmem.h>
 
+void proto_register_omron_fins(void);
+void proto_reg_handoff_omron_fins(void);
+
 #define OMRON_FINS_UDP_PORT 9600
 
 static int proto_omron_fins = -1;
diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c
index 37d206fcb8..98f851ca55 100644
--- a/epan/dissectors/packet-ositp.c
+++ b/epan/dissectors/packet-ositp.c
@@ -45,6 +45,10 @@
 #include <epan/expert.h>
 #include <epan/strutil.h>
 
+void proto_register_cotp(void);
+void proto_register_cltp(void);
+void proto_reg_handoff_cotp(void);
+
 /* protocols and fields */
 
 static int  proto_clnp;
diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c
index bec917fc04..d268a9550a 100644
--- a/epan/dissectors/packet-ospf.c
+++ b/epan/dissectors/packet-ospf.c
@@ -71,6 +71,9 @@
 #include <epan/addr_resolv.h>
 #include "packet-rsvp.h"
 
+void proto_register_ospf(void);
+void proto_reg_handoff_ospf(void);
+
 #define OSPF_VERSION_2 2
 #define OSPF_VERSION_3 3
 #define OSPF_AF_4 4
diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c
index 00b9d7504f..5f7da63eff 100644
--- a/epan/dissectors/packet-p_mul.c
+++ b/epan/dissectors/packet-p_mul.c
@@ -49,6 +49,9 @@
 #include "packet-cdt.h"
 #include "packet-ber.h"
 
+void proto_register_p_mul(void);
+void proto_reg_handoff_p_mul(void);
+
 #define PNAME  "P_Mul (ACP142)"
 #define PSNAME "P_MUL"
 #define PFNAME "p_mul"
@@ -75,8 +78,6 @@
 #define DECODE_BER       1
 #define DECODE_CDT       2
 
-void proto_reg_handoff_p_mul (void);
-
 static int proto_p_mul = -1;
 
 static int hf_length = -1;
diff --git a/epan/dissectors/packet-pcli.c b/epan/dissectors/packet-pcli.c
index da684ac915..c1dc9230ee 100644
--- a/epan/dissectors/packet-pcli.c
+++ b/epan/dissectors/packet-pcli.c
@@ -38,12 +38,13 @@
 #include <epan/prefs.h>
 #include <epan/strutil.h>
 
+void proto_register_pcli(void);
+void proto_reg_handoff_pcli(void);
+
 /* Define udp_port for lawful intercept */
 
 #define UDP_PORT_PCLI 9000
 
-void proto_reg_handoff_pcli(void);
-
 /* Define the pcli proto */
 
 static int proto_pcli = -1;
diff --git a/epan/dissectors/packet-pcnfsd.c b/epan/dissectors/packet-pcnfsd.c
index e77ad40d26..0422b3a7b2 100644
--- a/epan/dissectors/packet-pcnfsd.c
+++ b/epan/dissectors/packet-pcnfsd.c
@@ -39,6 +39,9 @@ Protocol information comes from the book
 #include "packet-pcnfsd.h"
 #include <epan/wmem/wmem.h>
 
+void proto_register_pcnfsd(void);
+void proto_reg_handoff_pcnfsd(void);
+
 static int proto_pcnfsd = -1;
 static int hf_pcnfsd_procedure_v1 = -1;
 static int hf_pcnfsd_procedure_v2 = -1;
diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c
index a4d6eef7c2..fbee1bb242 100644
--- a/epan/dissectors/packet-per.c
+++ b/epan/dissectors/packet-per.c
@@ -46,6 +46,7 @@ proper helper routines
 #include <epan/expert.h>
 #include "packet-per.h"
 
+void proto_register_per(void);
 
 static int proto_per = -1;
 static int hf_per_GeneralString_length = -1;
@@ -2675,11 +2676,6 @@ proto_register_per(void)
 
 }
 
-void
-proto_reg_handoff_per(void)
-{
-}
-
 /*
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *
diff --git a/epan/dissectors/packet-pw-common.c b/epan/dissectors/packet-pw-common.c
index 6a60615d8e..7ba11dd0c4 100644
--- a/epan/dissectors/packet-pw-common.c
+++ b/epan/dissectors/packet-pw-common.c
@@ -28,8 +28,8 @@
 #include <epan/packet.h>
 #include "packet-pw-common.h"
 
-void proto_register_pw_common(void);
-void proto_reg_handoff_pw_common(void);
+void proto_register_pw_padding(void);
+void proto_reg_handoff_pw_padding(void);
 
 static const char string_ok[] = "Ok";
 
diff --git a/epan/dissectors/packet-rmcp.c b/epan/dissectors/packet-rmcp.c
index 145d337efb..6b892ed831 100644
--- a/epan/dissectors/packet-rmcp.c
+++ b/epan/dissectors/packet-rmcp.c
@@ -31,14 +31,17 @@
 #include <glib.h>
 #include <epan/packet.h>
 
+void proto_register_rmcp(void);
+void proto_register_rsp(void);
+void proto_reg_handoff_rmcp(void);
+void proto_reg_handoff_rsp(void);
+
 /*
  * See
  *	http://www.dmtf.org/standards/standard_alert.php
  *      http://www.dmtf.org/standards/documents/ASF/DSP0136.pdf
  * (the ASF specification includes RMCP)
  */
-void proto_register_rmcp(void);
-void proto_reg_handoff_rmcp(void);
 
 static int proto_rmcp = -1;
 static int hf_rmcp_version = -1;
diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c
index b8d0730c71..b2264a5d06 100644
--- a/epan/dissectors/packet-rsl.c
+++ b/epan/dissectors/packet-rsl.c
@@ -43,6 +43,7 @@
 #include "packet-rtcp.h"
 
 void proto_register_rsl(void);
+void proto_reg_handoff_rsl(void);
 
 /* Initialize the protocol and registered fields */
 static int proto_rsl        = -1;
@@ -3927,8 +3928,6 @@ dissect_rsl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 /* Register the protocol with Wireshark */
 void proto_register_rsl(void)
 {
-    void proto_reg_handoff_rsl(void);
-
     /* Setup list of header fields */
     static hf_register_info hf[] = {
         { &hf_rsl_msg_dsc,
diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c
index 54906b3bab..86db5aa699 100644
--- a/epan/dissectors/packet-sigcomp.c
+++ b/epan/dissectors/packet-sigcomp.c
@@ -44,6 +44,7 @@
 #include <epan/sigcomp_state_hdlr.h>
 
 void proto_register_sigcomp(void);
+void proto_reg_handoff_sigcomp(void);
 
 /* Initialize the protocol and registered fields */
 static int proto_sigcomp                            = -1;
@@ -2243,8 +2244,6 @@ tvb_raw_text_add(tvbuff_t *tvb, proto_tree *tree)
 void
 proto_register_sigcomp(void)
 {
-    void proto_reg_handoff_sigcomp(void);
-
 /* Setup list of header fields  See Section 1.6.1 for details*/
     static hf_register_info hf[] = {
         { &hf_sigcomp_t_bit,
diff --git a/epan/dissectors/packet-smb-sidsnooping.c b/epan/dissectors/packet-smb-sidsnooping.c
index 5a8963e592..7bc267e3d2 100644
--- a/epan/dissectors/packet-smb-sidsnooping.c
+++ b/epan/dissectors/packet-smb-sidsnooping.c
@@ -39,6 +39,8 @@
 #include <epan/dissectors/packet-smb.h>
 #include "packet-smb-sidsnooping.h"
 
+void proto_register_smb_sidsnooping(void);
+
 #if 0
 static int hf_lsa = -1;
 static int hf_lsa_opnum = -1;
@@ -411,9 +413,3 @@ proto_register_smb_sidsnooping(void)
 {
   	register_init_routine(sid_snooping_init);
 }
-
-void
-proto_reg_handoff_smb_sidsnooping(void)
-{
-}
-
diff --git a/epan/dissectors/packet-tn5250.c b/epan/dissectors/packet-tn5250.c
index 364706e8ab..855f2db335 100644
--- a/epan/dissectors/packet-tn5250.c
+++ b/epan/dissectors/packet-tn5250.c
@@ -40,6 +40,8 @@
 #include <epan/conversation.h>
 #include "packet-tn5250.h"
 
+void proto_register_tn5250(void);
+
 typedef struct tn5250_conv_info_t {
   struct tn5250_conv_info_t *next;
   address outbound_addr;
diff --git a/epan/dissectors/packet-usb-hid.c b/epan/dissectors/packet-usb-hid.c
index 969312e27a..09b5d0918b 100644
--- a/epan/dissectors/packet-usb-hid.c
+++ b/epan/dissectors/packet-usb-hid.c
@@ -29,6 +29,9 @@
 #include "packet-usb.h"
 #include "packet-usb-hid.h"
 
+void proto_register_usb_hid(void);
+void proto_reg_handoff_usb_hid(void);
+
 /* protocols and header fields */
 static int proto_usb_hid = -1;
 static int hf_usb_hid_item_bSize = -1;
@@ -1140,7 +1143,8 @@ proto_register_usb_hid(void)
 }
 
 void
-proto_reg_handoff_usb_hid(void) {
+proto_reg_handoff_usb_hid(void)
+{
     dissector_handle_t usb_hid_control_handle, usb_hid_descr_handle;
 
     usb_hid_control_handle = new_create_dissector_handle(dissect_usb_hid_control, proto_usb_hid);
diff --git a/epan/dissectors/packet-usb-hub.c b/epan/dissectors/packet-usb-hub.c
index 90863b8bfd..9c76146ae0 100644
--- a/epan/dissectors/packet-usb-hub.c
+++ b/epan/dissectors/packet-usb-hub.c
@@ -33,6 +33,9 @@
 #include <epan/packet.h>
 #include "packet-usb.h"
 
+void proto_register_usb_hub(void);
+void proto_reg_handoff_usb_hub(void);
+
 /* protocols and header fields */
 static int proto_usb_hub = -1;
 
@@ -818,7 +821,8 @@ proto_register_usb_hub(void)
 }
 
 void
-proto_reg_handoff_usb_hub(void) {
+proto_reg_handoff_usb_hub(void)
+{
 	dissector_handle_t usb_hub_control_handle;
 
 	usb_hub_control_handle = new_create_dissector_handle(dissect_usb_hub_control, proto_usb_hub);