diff --git a/epan/dissectors/packet-dvmrp.c b/epan/dissectors/packet-dvmrp.c
index b4ef0af794..ef0d1c9dce 100644
--- a/epan/dissectors/packet-dvmrp.c
+++ b/epan/dissectors/packet-dvmrp.c
@@ -59,6 +59,7 @@
 #include "packet-igmp.h"
 
 void proto_register_dvmrp(void);
+void proto_reg_handoff_dvmrp(void);
 
 static int proto_dvmrp = -1;
 static int hf_version = -1;
@@ -676,7 +677,7 @@ dissect_dvmrp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int
 }
 
 /* This function is only called from the IGMP dissector */
-int
+static int
 dissect_dvmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* data _U_)
 {
 	proto_tree *tree;
diff --git a/epan/dissectors/packet-igap.c b/epan/dissectors/packet-igap.c
index 779612f3b4..1b9c8ffc00 100644
--- a/epan/dissectors/packet-igap.c
+++ b/epan/dissectors/packet-igap.c
@@ -48,6 +48,7 @@
 #include "packet-igmp.h"
 
 void proto_register_igap(void);
+void proto_reg_handoff_igap(void);
 
 static int proto_igap      = -1;
 static int hf_type         = -1;
@@ -132,7 +133,7 @@ static const value_string igap_account_status[] = {
 #define MESSAGE_SIZE    64
 
 /* This function is only called from the IGMP dissector */
-int
+static int
 dissect_igap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* data _U_)
 {
     proto_tree *tree;
diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c
index a1a6a8e15b..27f25006c4 100644
--- a/epan/dissectors/packet-mpls-echo.c
+++ b/epan/dissectors/packet-mpls-echo.c
@@ -1682,7 +1682,7 @@ dissect_mpls_echo_tlv(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tre
 /*
  * Dissector for MPLS Echo (LSP PING) packets
  */
-int
+static int
 dissect_mpls_echo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
     int         offset = 0, rem = 0, len;
diff --git a/epan/dissectors/packet-mpls-psc.c b/epan/dissectors/packet-mpls-psc.c
index 2f43c61a3e..c087ece2a1 100644
--- a/epan/dissectors/packet-mpls-psc.c
+++ b/epan/dissectors/packet-mpls-psc.c
@@ -34,6 +34,7 @@
 #include <packet-ip.h>
 
 void proto_register_mpls_psc(void);
+void proto_reg_handoff_mpls_psc(void);
 
 static gint proto_mpls_psc = -1;
 
diff --git a/epan/dissectors/packet-mplstp-oam.c b/epan/dissectors/packet-mplstp-oam.c
index 25f2902e7c..6eac19979c 100644
--- a/epan/dissectors/packet-mplstp-oam.c
+++ b/epan/dissectors/packet-mplstp-oam.c
@@ -34,6 +34,8 @@
 
 void proto_register_mplstp_lock(void);
 void proto_register_mplstp_fm(void);
+void proto_reg_handoff_mplstp_lock(void);
+void proto_reg_handoff_mplstp_fm(void);
 
 /* MPLS-TP FM protocol specific variables */
 static gint proto_mplstp_fm     = -1;
diff --git a/epan/dissectors/packet-mrdisc.c b/epan/dissectors/packet-mrdisc.c
index 71db82feb2..273f4542d5 100644
--- a/epan/dissectors/packet-mrdisc.c
+++ b/epan/dissectors/packet-mrdisc.c
@@ -44,6 +44,7 @@
 #include "packet-igmp.h"
 
 void proto_register_mrdisc(void);
+void proto_reg_handoff_mrdisc(void);
 
 static int proto_mrdisc = -1;
 static int hf_checksum = -1;
@@ -183,7 +184,7 @@ dissect_mrdisc_mrst(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
 
 
 /* This function is only called from the IGMP dissector */
-int
+static int
 dissect_mrdisc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* data _U_)
 {
 	proto_tree *tree;
@@ -192,9 +193,9 @@ dissect_mrdisc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
 	int offset = 0;
 	guint32 dst = g_htonl(MC_ALL_ROUTERS);
 
-    /* Shouldn't be destined for us */
+	/* Shouldn't be destined for us */
 	if (memcmp(pinfo->dst.data, &dst, 4))
-        return 0;
+	return 0;
 
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "MRDISC");
 	col_clear(pinfo->cinfo, COL_INFO);
diff --git a/epan/dissectors/packet-msnip.c b/epan/dissectors/packet-msnip.c
index dd85598f5c..a111645bcc 100644
--- a/epan/dissectors/packet-msnip.c
+++ b/epan/dissectors/packet-msnip.c
@@ -42,6 +42,7 @@
 #include "packet-igmp.h"
 
 void proto_register_msnip(void);
+void proto_reg_handoff_msnip(void);
 
 static int proto_msnip = -1;
 static int hf_checksum = -1;
@@ -211,7 +212,7 @@ dissect_msnip_gm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int
 
 
 /* This function is only called from the IGMP dissector */
-int
+static int
 dissect_msnip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* data _U_)
 {
 	proto_tree *tree;
@@ -220,9 +221,9 @@ dissect_msnip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
 	int offset = 0;
 	guint32 dst = g_htonl(MC_ALL_IGMPV3_ROUTERS);
 
-    /* Shouldn't be destined for us */
+	/* Shouldn't be destined for us */
 	if (memcmp(pinfo->dst.data, &dst, 4))
-        return 0;
+	return 0;
 
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSNIP");
 	col_clear(pinfo->cinfo, COL_INFO);
diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c
index 561bb907f9..f62a87b9cc 100644
--- a/epan/dissectors/packet-pim.c
+++ b/epan/dissectors/packet-pim.c
@@ -264,7 +264,7 @@ static const value_string pimv1_modevals[] = {
 };
 
 /* This function is only called from the IGMP dissector */
-int
+static int
 dissect_pimv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) {
     guint8 pim_type;
     guint8 pim_ver;
diff --git a/epan/dissectors/packet-rgmp.c b/epan/dissectors/packet-rgmp.c
index 9641773f10..e646b1a21d 100644
--- a/epan/dissectors/packet-rgmp.c
+++ b/epan/dissectors/packet-rgmp.c
@@ -35,6 +35,7 @@
 #include "packet-igmp.h"
 
 void proto_register_rgmp(void);
+void proto_reg_handoff_rgmp(void);
 
 static int proto_rgmp      = -1;
 static int hf_type         = -1;
@@ -55,7 +56,7 @@ static const value_string rgmp_types[] = {
 };
 
 /* This function is only called from the IGMP dissector */
-int
+static int
 dissect_rgmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* data _U_)
 {
     proto_tree *tree;