Fix warnings

svn path=/trunk/; revision=54089

75 files changed, 204 insertions, 40 deletions

diff --git a/epan/dissectors/packet-bittorrent.c b/epan/dissectors/packet-bittorrent.c
index 384ad2906a..f1999d2c81 100644
--- a/epan/dissectors/packet-bittorrent.c
+++ b/epan/dissectors/packet-bittorrent.c
@@ -35,6 +35,9 @@
 
 #include "packet-tcp.h"
 
+void proto_register_bittorrent(void);
+void proto_reg_handoff_bittorrent(void);
+
 /*
  * See
  *
diff --git a/epan/dissectors/packet-bt-utp.c b/epan/dissectors/packet-bt-utp.c
index 87777d4e36..c20a0453f4 100644
--- a/epan/dissectors/packet-bt-utp.c
+++ b/epan/dissectors/packet-bt-utp.c
@@ -29,6 +29,9 @@
 #include <epan/conversation.h>
 #include <epan/prefs.h>
 
+void proto_register_bt_utp(void);
+void proto_reg_handoff_bt_utp(void);
+
 enum {
   ST_DATA  = 0,
   ST_FIN   = 1,
@@ -152,8 +155,6 @@ static int hf_bt_utp_data = -1;
 static gint ett_bt_utp = -1;
 static gint ett_bt_utp_extension = -1;
 
-void proto_reg_handoff_bt_utp(void);
-
 static gint
 get_utp_version(tvbuff_t *tvb) {
   guint8 v0_flags, v0_ext;
diff --git a/epan/dissectors/packet-bzr.c b/epan/dissectors/packet-bzr.c
index 239b86511f..1b89a086b2 100644
--- a/epan/dissectors/packet-bzr.c
+++ b/epan/dissectors/packet-bzr.c
@@ -34,6 +34,9 @@
 #include <epan/prefs.h>
 #include "packet-tcp.h"
 
+void proto_register_bzr(void);
+void proto_reg_handoff_bzr(void);
+
 static int proto_bzr = -1;
 
 static gint ett_bzr = -1;
diff --git a/epan/dissectors/packet-ccsds.c b/epan/dissectors/packet-ccsds.c
index fee8d7f4ba..1cf8259b5e 100644
--- a/epan/dissectors/packet-ccsds.c
+++ b/epan/dissectors/packet-ccsds.c
@@ -32,6 +32,8 @@
 #include <epan/expert.h>
 #include <epan/prefs.h>
 
+void proto_register_ccsds(void);
+void proto_reg_handoff_ccsds(void);
 
 /*
  * See
diff --git a/epan/dissectors/packet-dcerpc-messenger.c b/epan/dissectors/packet-dcerpc-messenger.c
index dc70ec55a1..55338fbf45 100644
--- a/epan/dissectors/packet-dcerpc-messenger.c
+++ b/epan/dissectors/packet-dcerpc-messenger.c
@@ -30,6 +30,8 @@
 #include "packet-dcerpc-nt.h"
 #include "packet-windows-common.h"
 
+void proto_register_dcerpc_messenger(void);
+void proto_reg_handoff_dcerpc_messenger(void);
 
 static int proto_dcerpc_messenger = -1;
 static int hf_messenger_opnum = -1;
diff --git a/epan/dissectors/packet-dcerpc-misc.c b/epan/dissectors/packet-dcerpc-misc.c
index 4c69d0b14e..3a5fa97845 100644
--- a/epan/dissectors/packet-dcerpc-misc.c
+++ b/epan/dissectors/packet-dcerpc-misc.c
@@ -108,10 +108,8 @@ const value_string misc_winreg_Type_vals[] = {
 { 0, NULL }
 };
 static int misc_dissect_element_winreg_Data_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_);
-static int misc_dissect_element_winreg_Data_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_);
 static int misc_dissect_element_winreg_Data_binary(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_);
 static int misc_dissect_element_winreg_Data_value(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_);
-static int misc_dissect_element_winreg_Data_value(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_);
 static int misc_dissect_element_winreg_Data_string_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_);
 static int misc_dissect_element_winreg_Data_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_);
 static int
diff --git a/epan/dissectors/packet-enc.c b/epan/dissectors/packet-enc.c
index b45a151ee4..f482e2aa1d 100644
--- a/epan/dissectors/packet-enc.c
+++ b/epan/dissectors/packet-enc.c
@@ -37,6 +37,9 @@
 #include "packet-ip.h"
 #include "packet-ipv6.h"
 
+void proto_register_enc(void);
+void proto_reg_handoff_enc(void);
+
 #ifndef offsetof
 /* Can't trust stddef.h to be there for us */
 # define offsetof(type, member) ((size_t)(&((type *)0)->member))
diff --git a/epan/dissectors/packet-etch.c b/epan/dissectors/packet-etch.c
index 382f85db1a..843015a7ba 100644
--- a/epan/dissectors/packet-etch.c
+++ b/epan/dissectors/packet-etch.c
@@ -212,8 +212,8 @@ gbl_symbols_array_append(guint32 hash, gchar *symbol)
 static gint
 gbl_symbols_compare_vs(gconstpointer  a, gconstpointer  b)
 {
-  value_string *vsa = (value_string *)a;
-  value_string *vsb = (value_string *)b;
+  const value_string *vsa = (const value_string *)a;
+  const value_string *vsb = (const value_string *)b;
 
   if(vsa->value > vsb->value)
     return 1;
diff --git a/epan/dissectors/packet-fddi.c b/epan/dissectors/packet-fddi.c
index d1e8954c07..ef40178b9a 100644
--- a/epan/dissectors/packet-fddi.c
+++ b/epan/dissectors/packet-fddi.c
@@ -41,6 +41,9 @@
 
 #include <epan/addr_resolv.h>
 
+void proto_register_fddi(void);
+void proto_reg_handoff_fddi(void);
+
 static int proto_fddi = -1;
 static int hf_fddi_fc = -1;
 static int hf_fddi_fc_clf = -1;
diff --git a/epan/dissectors/packet-finger.c b/epan/dissectors/packet-finger.c
index aac57767c2..022a273c48 100644
--- a/epan/dissectors/packet-finger.c
+++ b/epan/dissectors/packet-finger.c
@@ -30,10 +30,11 @@
 #include <epan/wmem/wmem.h>
 #include <epan/expert.h>
 
-#define FINGER_PORT     79  /* This is the registered IANA port */
-
+void proto_register_finger(void);
 void proto_reg_handoff_finger(void);
 
+#define FINGER_PORT     79  /* This is the registered IANA port */
+
 static int proto_finger = -1;
 static int hf_finger_query = -1;
 static int hf_finger_response = -1;
diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c
index 08b9fc7cf4..8a7e45a9b3 100644
--- a/epan/dissectors/packet-fix.c
+++ b/epan/dissectors/packet-fix.c
@@ -318,15 +318,15 @@ dissect_fix_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da
                     switch (fix_fields[i].type) {
                     case 1: /* strings */
                         proto_tree_add_string_format_value(fix_tree, fix_fields[i].hf_id, tvb, field_offset, tag->field_len, value,
-                            "%s (%s)", value, str_to_str(value, (string_string *)fix_fields[i].table, "unknown %s"));
+                            "%s (%s)", value, str_to_str(value, (const string_string *)fix_fields[i].table, "unknown %s"));
                         break;
                     case 2: /* char */
                         proto_tree_add_string_format_value(fix_tree, fix_fields[i].hf_id, tvb, field_offset, tag->field_len, value,
-                            "%s (%s)", value, val_to_str(*value, (value_string *)fix_fields[i].table, "unknown %d"));
+                            "%s (%s)", value, val_to_str(*value, (const value_string *)fix_fields[i].table, "unknown %d"));
                         break;
                     default:
                         proto_tree_add_string_format_value(fix_tree, fix_fields[i].hf_id, tvb, field_offset, tag->field_len, value,
-                            "%s (%s)", value, val_to_str(atoi(value), (value_string *)fix_fields[i].table, "unknown %d"));
+                            "%s (%s)", value, val_to_str(atoi(value), (const value_string *)fix_fields[i].table, "unknown %d"));
                         break;
                     }
                 }
diff --git a/epan/dissectors/packet-fw1.c b/epan/dissectors/packet-fw1.c
index 1cf6f73736..6f285290e0 100644
--- a/epan/dissectors/packet-fw1.c
+++ b/epan/dissectors/packet-fw1.c
@@ -91,6 +91,9 @@
 #include <epan/wmem/wmem.h>
 #include <epan/etypes.h>
 
+void proto_register_fw1(void);
+void proto_reg_handoff_fw1(void);
+
 /* Place FW1 summary in proto tree */
 static gboolean fw1_summary_in_tree = TRUE;
 static gboolean fw1_with_uuid = FALSE;
@@ -293,4 +296,4 @@ void
 proto_reg_handoff_fw1(void)
 {
     ethertype_handle = find_dissector("ethertype");
-}
\ No newline at end of file
+}
diff --git a/epan/dissectors/packet-gadu-gadu.c b/epan/dissectors/packet-gadu-gadu.c
index b74db64c8b..28a61f661c 100644
--- a/epan/dissectors/packet-gadu-gadu.c
+++ b/epan/dissectors/packet-gadu-gadu.c
@@ -37,6 +37,9 @@
 
 #include <epan/dissectors/packet-tcp.h>
 
+void proto_register_gadu_gadu(void);
+void proto_reg_handoff_gadu_gadu(void);
+
 #define TCP_PORT_GADU_GADU 8074	/* assigned by IANA */
 
 /* desegmentation of Gadu-Gadu over TCP */
diff --git a/epan/dissectors/packet-git.c b/epan/dissectors/packet-git.c
index 82a170561f..413431a436 100644
--- a/epan/dissectors/packet-git.c
+++ b/epan/dissectors/packet-git.c
@@ -36,6 +36,9 @@
 #include <epan/prefs.h>
 #include "packet-tcp.h"
 
+void proto_register_git(void);
+void proto_reg_handoff_git(void);
+
 static dissector_handle_t git_handle;
 
 static int proto_git = -1;
diff --git a/epan/dissectors/packet-glbp.c b/epan/dissectors/packet-glbp.c
index 054cdbf795..5e82967b96 100644
--- a/epan/dissectors/packet-glbp.c
+++ b/epan/dissectors/packet-glbp.c
@@ -44,6 +44,9 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 
+void proto_register_glbp(void);
+void proto_reg_handoff_glbp(void);
+
 static int proto_glbp = -1;
 /* glbp header? */
 static gint hf_glbp_version = -1;
diff --git a/epan/dissectors/packet-glusterd.c b/epan/dissectors/packet-glusterd.c
index df6eaba220..0323eb40b6 100644
--- a/epan/dissectors/packet-glusterd.c
+++ b/epan/dissectors/packet-glusterd.c
@@ -43,6 +43,9 @@
 #include "packet-rpc.h"
 #include "packet-gluster.h"
 
+void proto_register_gluster_gd_mgmt(void);
+void proto_reg_handoff_gluster_gd_mgmt(void);
+
 /* Initialize the protocol and registered fields */
 static gint proto_glusterd = -1;
 static gint proto_gd_mgmt = -1;
diff --git a/epan/dissectors/packet-gmhdr.c b/epan/dissectors/packet-gmhdr.c
index 285e37ea4a..5fde8e29a7 100644
--- a/epan/dissectors/packet-gmhdr.c
+++ b/epan/dissectors/packet-gmhdr.c
@@ -38,6 +38,9 @@
 
 #include "packet-ieee8023.h"
 
+void proto_register_gmhdr(void);
+void proto_reg_handoff_gmhdr(void);
+
 #define GMHDR_FTYPE_PKTSIZE             1
 #define GMHDR_FTYPE_SRCPORT_G           2
 #define GMHDR_FTYPE_TIMESTAMP_LOCAL     3
diff --git a/epan/dissectors/packet-gpef.c b/epan/dissectors/packet-gpef.c
index 0dfc8c910a..d0c61ebf18 100644
--- a/epan/dissectors/packet-gpef.c
+++ b/epan/dissectors/packet-gpef.c
@@ -33,6 +33,9 @@
 #include "packet-x509af.h"
 #include "packet-x509if.h"
 
+void proto_register_gpef(void);
+void proto_reg_handoff_gpef(void);
+
 static int proto_gpef = -1;
 static int hf_gpef_keycount = -1;
 static int hf_gpef_efskey = -1;
diff --git a/epan/dissectors/packet-gvrp.c b/epan/dissectors/packet-gvrp.c
index 7aa2117a5e..8ce049dfd0 100644
--- a/epan/dissectors/packet-gvrp.c
+++ b/epan/dissectors/packet-gvrp.c
@@ -30,6 +30,9 @@
 #include <epan/packet.h>
 #include <epan/llcsaps.h>
 
+void proto_register_gvrp(void);
+void proto_reg_handoff_gvrp(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_gvrp = -1;
 static int hf_gvrp_proto_id = -1;
diff --git a/epan/dissectors/packet-hyperscsi.c b/epan/dissectors/packet-hyperscsi.c
index 89247e9a5d..1b1d5ceb3c 100644
--- a/epan/dissectors/packet-hyperscsi.c
+++ b/epan/dissectors/packet-hyperscsi.c
@@ -29,6 +29,9 @@
 
 #include <epan/packet.h>
 
+void proto_register_hyperscsi(void);
+void proto_reg_handoff_hyperscsi(void);
+
 static int proto_hyperscsi;
 
 static int hf_hs_cmd = -1;
@@ -193,6 +196,7 @@ proto_register_hyperscsi(void)
   register_dissector("hyperscsi", dissect_hyperscsi, proto_hyperscsi);
 }
 
+/* XXX <epan/etypes.h> */
 #define ETHERTYPE_HYPERSCSI 0x889A
 
 void
diff --git a/epan/dissectors/packet-i2c.c b/epan/dissectors/packet-i2c.c
index b678714216..87358e46f6 100644
--- a/epan/dissectors/packet-i2c.c
+++ b/epan/dissectors/packet-i2c.c
@@ -35,6 +35,9 @@
 #include "packet-i2c.h"
 #include "packet-hdcp.h"
 
+void proto_register_i2c(void);
+void proto_reg_handoff_i2c(void);
+
 static int proto_i2c = -1;
 
 static int hf_i2c_bus = -1;
diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c
index f3fe003319..c0895fb5fa 100644
--- a/epan/dissectors/packet-icmp.c
+++ b/epan/dissectors/packet-icmp.c
@@ -51,6 +51,9 @@
 #include <epan/wmem/wmem.h>
 #include <epan/tap.h>
 
+void proto_register_icmp(void);
+void proto_reg_handoff_icmp(void);
+
 static int icmp_tap = -1;
 
 /* Conversation related data */
diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c
index 15d6665a73..89689daa37 100644
--- a/epan/dissectors/packet-icmpv6.c
+++ b/epan/dissectors/packet-icmpv6.c
@@ -57,6 +57,9 @@
 #include "packet-6lowpan.h"
 #include "packet-ip.h"
 
+void proto_register_icmpv6(void);
+void proto_reg_handoff_icmpv6(void);
+
 /*
  * The information used comes from:
  * RFC 1885/2463/4443: Internet Control Message Protocol (ICMPv6) for the Internet Protocol Version 6 (IPv6) Specification
diff --git a/epan/dissectors/packet-icp.c b/epan/dissectors/packet-icp.c
index 0d1d6c56bc..248f24fcae 100644
--- a/epan/dissectors/packet-icp.c
+++ b/epan/dissectors/packet-icp.c
@@ -33,6 +33,9 @@
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 
+void proto_register_icp(void);
+void proto_reg_handoff_icp(void);
+
 static int proto_icp=-1;
 static int hf_icp_length=-1;
 static int hf_icp_opcode=-1;
diff --git a/epan/dissectors/packet-idp.c b/epan/dissectors/packet-idp.c
index 6660436305..e02147c501 100644
--- a/epan/dissectors/packet-idp.c
+++ b/epan/dissectors/packet-idp.c
@@ -30,6 +30,9 @@
 #include "packet-idp.h"
 #include <epan/etypes.h>
 
+void proto_register_idp(void);
+void proto_reg_handoff_idp(void);
+
 static int proto_idp = -1;
 static int hf_idp_checksum = -1;
 static int hf_idp_len = -1;
diff --git a/epan/dissectors/packet-ifcp.c b/epan/dissectors/packet-ifcp.c
index 38c766ce55..d12cab39f6 100644
--- a/epan/dissectors/packet-ifcp.c
+++ b/epan/dissectors/packet-ifcp.c
@@ -40,6 +40,9 @@
 #include "packet-tcp.h"
 #include "packet-fc.h"
 
+void proto_register_ifcp(void);
+void proto_reg_handoff_ifcp(void);
+
 #define iFCP_ENCAP_HEADER_LEN                    28
 #define iFCP_MIN_HEADER_LEN                      16 /* upto frame len field */
 
diff --git a/epan/dissectors/packet-igrp.c b/epan/dissectors/packet-igrp.c
index 59b14e1c6a..7cd3c8a349 100644
--- a/epan/dissectors/packet-igrp.c
+++ b/epan/dissectors/packet-igrp.c
@@ -37,6 +37,9 @@
 #include <epan/to_str.h>
 #include <epan/ipproto.h>
 
+void proto_register_igrp(void);
+void proto_reg_handoff_igrp(void);
+
 #define IGRP_HEADER_LENGTH 12
 #define IGRP_ENTRY_LENGTH 14
 
diff --git a/epan/dissectors/packet-image-gif.c b/epan/dissectors/packet-image-gif.c
index 42c9eb33e3..332223e4bd 100644
--- a/epan/dissectors/packet-image-gif.c
+++ b/epan/dissectors/packet-image-gif.c
@@ -45,6 +45,9 @@
 
 #include <epan/packet.h>
 
+void proto_register_gif(void);
+void proto_reg_handoff_gif(void);
+
 /* General-purpose debug logger.
  * Requires double parentheses because of variable arguments of printf().
  *
diff --git a/epan/dissectors/packet-interlink.c b/epan/dissectors/packet-interlink.c
index 626e9cbc0a..230ab0b871 100644
--- a/epan/dissectors/packet-interlink.c
+++ b/epan/dissectors/packet-interlink.c
@@ -28,6 +28,8 @@
 
 #include <epan/packet.h>
 
+void proto_register_interlink(void);
+void proto_reg_handoff_interlink(void);
 
 /*
  * No public information available.
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c
index 3fa6511856..b4fde3a10e 100644
--- a/epan/dissectors/packet-ip.c
+++ b/epan/dissectors/packet-ip.c
@@ -60,6 +60,8 @@
 #include <epan/geoip_db.h>
 #endif /* HAVE_GEOIP */
 
+void proto_register_ip(void);
+void proto_reg_handoff_ip(void);
 
 static int ip_tap = -1;
 
diff --git a/epan/dissectors/packet-ipars.c b/epan/dissectors/packet-ipars.c
index d96ba0cf41..909ba40b1e 100644
--- a/epan/dissectors/packet-ipars.c
+++ b/epan/dissectors/packet-ipars.c
@@ -33,6 +33,8 @@
 #include <epan/packet.h>
 #include <epan/wmem/wmem.h>
 
+void proto_register_ipars(void);
+
 static int      proto_ipars     = -1;
 static guint8   ipars_eomtype   = G_MAXUINT8;
 static gint     ett_ipars       = -1;
diff --git a/epan/dissectors/packet-ipfc.c b/epan/dissectors/packet-ipfc.c
index 17be670dce..7d565d3e39 100644
--- a/epan/dissectors/packet-ipfc.c
+++ b/epan/dissectors/packet-ipfc.c
@@ -41,6 +41,9 @@
 #include "packet-ipfc.h"
 #include "packet-llc.h"
 
+void proto_register_ipfc(void);
+void proto_reg_handoff_ipfc(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_ipfc              = -1;
 static int hf_ipfc_network_da = -1;
diff --git a/epan/dissectors/packet-ipmi-session.c b/epan/dissectors/packet-ipmi-session.c
index a51c25b396..7e7da9481c 100644
--- a/epan/dissectors/packet-ipmi-session.c
+++ b/epan/dissectors/packet-ipmi-session.c
@@ -31,6 +31,9 @@
 #include <glib.h>
 #include <epan/packet.h>
 
+void proto_register_ipmi_session(void);
+void proto_reg_handoff_ipmi_session(void);
+
 #define RMCP_CLASS_IPMI 0x07
 
 static int proto_ipmi_session = -1;
diff --git a/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c
index ca57ffff83..d31b3a0f1b 100644
--- a/epan/dissectors/packet-ipmi.c
+++ b/epan/dissectors/packet-ipmi.c
@@ -38,6 +38,8 @@
 
 #include "packet-ipmi.h"
 
+void proto_register_ipmi(void);
+
 /*
  * See the IPMI specifications at
  *
@@ -1358,10 +1360,6 @@ dissect_ipmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 /* Register IPMB protocol.
  */
-void
-proto_reg_handoff_ipmi(void)
-{
-}
 
 void
 proto_register_ipmi(void)
diff --git a/epan/dissectors/packet-ipp.c b/epan/dissectors/packet-ipp.c
index 482fc83aeb..575b8766cf 100644
--- a/epan/dissectors/packet-ipp.c
+++ b/epan/dissectors/packet-ipp.c
@@ -34,6 +34,9 @@
 #include <epan/to_str.h>
 #include "packet-http.h"
 
+void proto_register_ipp(void);
+void proto_reg_handoff_ipp(void);
+
 static int proto_ipp = -1;
 static int hf_ipp_timestamp = -1;
 
diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c
index c7af580567..40be4247f0 100644
--- a/epan/dissectors/packet-ipsec.c
+++ b/epan/dissectors/packet-ipsec.c
@@ -93,6 +93,8 @@ ADD: Additional generic (non-checked) ICV length of 128, 192 and 256.
 #include <wsutil/wsgcrypt.h>
 #endif /* HAVE_LIBGCRYPT */
 
+void proto_register_ipsec(void);
+void proto_reg_handoff_ipsec(void);
 
 static int proto_ah = -1;
 static int hf_ah_spi = -1;
diff --git a/epan/dissectors/packet-iso7816.c b/epan/dissectors/packet-iso7816.c
index 8d2ac13ade..e0f7f488fb 100644
--- a/epan/dissectors/packet-iso7816.c
+++ b/epan/dissectors/packet-iso7816.c
@@ -40,6 +40,9 @@
 #include <epan/expert.h>
 #include <epan/wmem/wmem.h>
 
+void proto_register_iso7816(void);
+void proto_reg_handoff_iso7816(void);
+
 static int proto_iso7816 = -1;
 static int proto_iso7816_atr = -1;
 
diff --git a/epan/dissectors/packet-jmirror.c b/epan/dissectors/packet-jmirror.c
index 079db45e79..abdfde7142 100644
--- a/epan/dissectors/packet-jmirror.c
+++ b/epan/dissectors/packet-jmirror.c
@@ -30,6 +30,9 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 
+void proto_register_jmirror(void);
+void proto_reg_handoff_jmirror(void);
+
 #define MIRROR_HDR_SZ           8
 #define MIRROR_ID_SZ            4
 #define SESSION_ID_SZ           4
@@ -52,9 +55,6 @@ static dissector_handle_t hdlc_handle;
 
 static guint global_jmirror_udp_port = DEF_JMIRROR_UDP_PORT;
 
-/* Forward declaration */
-void proto_reg_handoff_jmirror(void);
-
 /* Routine to return the dissector handle based on heuristic packet inspection */
 static dissector_handle_t
 get_heuristic_handle(tvbuff_t *tvb)
diff --git a/epan/dissectors/packet-kingfisher.c b/epan/dissectors/packet-kingfisher.c
index 3929992258..73079bccc2 100644
--- a/epan/dissectors/packet-kingfisher.c
+++ b/epan/dissectors/packet-kingfisher.c
@@ -31,6 +31,9 @@
 #include <epan/wmem/wmem.h>
 #include <epan/conversation.h>
 
+void proto_register_kingfisher(void);
+void proto_reg_handoff_kingfisher(void);
+
 #define SUPPORT_KINGFISHER_SERIES_2
 
 #define TCP_PORT_KINGFISHER         4058
diff --git a/epan/dissectors/packet-klm.c b/epan/dissectors/packet-klm.c
index e8a1ef5498..f42aab1893 100644
--- a/epan/dissectors/packet-klm.c
+++ b/epan/dissectors/packet-klm.c
@@ -24,12 +24,13 @@
 
 #include "config.h"
 
-
-
 #include "packet-rpc.h"
 #include "packet-nfs.h"
 #include "packet-klm.h"
 
+void proto_register_klm(void);
+void proto_reg_handoff_klm(void);
+
 static int proto_klm = -1;
 static int hf_klm_procedure_v1 = -1;
 static int hf_klm_exclusive = -1;
diff --git a/epan/dissectors/packet-kpasswd.c b/epan/dissectors/packet-kpasswd.c
index 7983dd5ff4..2f0c1f69f5 100644
--- a/epan/dissectors/packet-kpasswd.c
+++ b/epan/dissectors/packet-kpasswd.c
@@ -34,6 +34,9 @@
 #include "packet-ber.h"
 #include <epan/prefs.h>
 
+void proto_register_kpasswd(void);
+void proto_reg_handoff_kpasswd(void);
+
 /* Desegment Kerberos over TCP messages */
 static gboolean kpasswd_desegment = TRUE;
 
diff --git a/epan/dissectors/packet-l1-events.c b/epan/dissectors/packet-l1-events.c
index c6711824c9..b6b7820aa0 100644
--- a/epan/dissectors/packet-l1-events.c
+++ b/epan/dissectors/packet-l1-events.c
@@ -37,6 +37,8 @@
 #include <wiretap/wtap.h>
 #include <epan/strutil.h>
 
+void proto_register_l1_events(void);
+void proto_reg_handoff_l1_events(void);
 
 /*
  * dissector for line-based text messages from layer 1
diff --git a/epan/dissectors/packet-lanforge.c b/epan/dissectors/packet-lanforge.c
index 0b6be777b8..06cb585cb0 100644
--- a/epan/dissectors/packet-lanforge.c
+++ b/epan/dissectors/packet-lanforge.c
@@ -37,6 +37,9 @@
 
 #include <epan/packet.h>
 
+void proto_register_lanforge(void);
+void proto_reg_handoff_lanforge(void);
+
 /* magic num used for heuristic */
 #define LANFORGE_MAGIC 0x1a2b3c4d
 
diff --git a/epan/dissectors/packet-lapsat.c b/epan/dissectors/packet-lapsat.c
index 51d236d76e..05a03eddef 100644
--- a/epan/dissectors/packet-lapsat.c
+++ b/epan/dissectors/packet-lapsat.c
@@ -40,6 +40,8 @@
 #include <epan/reassemble.h>
 #include <epan/wmem/wmem.h>
 
+void proto_register_lapsat(void);
+void proto_reg_handoff_lapsat(void);
 
 static int proto_lapsat = -1;
 
diff --git a/epan/dissectors/packet-lisp.c b/epan/dissectors/packet-lisp.c
index 9f17831f13..9fe81f09b3 100644
--- a/epan/dissectors/packet-lisp.c
+++ b/epan/dissectors/packet-lisp.c
@@ -33,6 +33,9 @@
 #include <epan/expert.h>
 #include <epan/wmem/wmem.h>
 
+void proto_register_lisp(void);
+void proto_reg_handoff_lisp(void);
+
 #define INET_ADDRLEN        4
 #define INET6_ADDRLEN       16
 
diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c
index f50456df77..7685367fac 100644
--- a/epan/dissectors/packet-lldp.c
+++ b/epan/dissectors/packet-lldp.c
@@ -38,6 +38,9 @@
 #include <epan/addr_resolv.h>
 #include "packet-lldp.h"
 
+void proto_register_lldp(void);
+void proto_reg_handoff_lldp(void);
+
 /* Sub Dissector Tables */
 static dissector_table_t oui_unique_code_table;
 
diff --git a/epan/dissectors/packet-llrp.c b/epan/dissectors/packet-llrp.c
index ce8d3ebd07..5efe8341e2 100644
--- a/epan/dissectors/packet-llrp.c
+++ b/epan/dissectors/packet-llrp.c
@@ -34,6 +34,9 @@
 #include <epan/expert.h>
 #include <epan/dissectors/packet-tcp.h>
 
+void proto_register_llrp(void);
+void proto_reg_handoff_llrp(void);
+
 #define LLRP_PORT 5084
 
 /* Initialize the protocol and registered fields */
diff --git a/epan/dissectors/packet-loop.c b/epan/dissectors/packet-loop.c
index c45b6411a0..c1e5ea3002 100644
--- a/epan/dissectors/packet-loop.c
+++ b/epan/dissectors/packet-loop.c
@@ -32,6 +32,9 @@
 #include <epan/packet.h>
 #include <epan/etypes.h>
 
+void proto_register_loop(void);
+void proto_reg_handoff_loop(void);
+
 static int proto_loop = -1;
 static int hf_loop_skipcount = -1;
 static int hf_loop_function = -1;
diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c
index 46c5fd3c25..4704408c93 100644
--- a/epan/dissectors/packet-mac-lte.c
+++ b/epan/dissectors/packet-mac-lte.c
@@ -34,6 +34,8 @@
 #include "packet-mac-lte.h"
 #include "packet-rlc-lte.h"
 
+void proto_register_mac_lte(void);
+void proto_reg_handoff_mac_lte(void);
 
 /* Described in:
  * 3GPP TS 36.321 Evolved Universal Terrestrial Radio Access (E-UTRA)
diff --git a/epan/dissectors/packet-mongo.c b/epan/dissectors/packet-mongo.c
index 6000844ea7..03b8659e72 100644
--- a/epan/dissectors/packet-mongo.c
+++ b/epan/dissectors/packet-mongo.c
@@ -41,6 +41,9 @@
 #include <epan/expert.h>
 #include "packet-tcp.h"
 
+void proto_register_mongo(void);
+void proto_reg_handoff_mongo(void);
+
 /* This is not IANA assigned nor registered */
 #define TCP_PORT_MONGO 27017
 
@@ -137,9 +140,6 @@ static const value_string binary_type_vals[] = {
 };
 #endif
 
-void proto_reg_handoff_mongo(void);
-
-
 static int proto_mongo = -1;
 static int hf_mongo_message_length = -1;
 static int hf_mongo_request_id = -1;
diff --git a/epan/dissectors/packet-mount.c b/epan/dissectors/packet-mount.c
index ae2d6fa0c6..ed183b1b5c 100644
--- a/epan/dissectors/packet-mount.c
+++ b/epan/dissectors/packet-mount.c
@@ -34,7 +34,8 @@
 #include "packet-mount.h"
 #include "packet-nfs.h"
 
-
+void proto_register_mount(void);
+void proto_reg_handoff_mount(void);
 
 static int proto_mount = -1;
 static int proto_sgi_mount = -1;
diff --git a/epan/dissectors/packet-mpeg-ca.c b/epan/dissectors/packet-mpeg-ca.c
index 07c8c71be1..65f667ffe9 100644
--- a/epan/dissectors/packet-mpeg-ca.c
+++ b/epan/dissectors/packet-mpeg-ca.c
@@ -32,6 +32,9 @@
 
 #include "packet-mpeg-descriptor.h"
 
+void proto_register_mpeg_ca(void);
+void proto_reg_handoff_mpeg_ca(void);
+
 static int proto_mpeg_ca = -1;
 static int hf_mpeg_ca_reserved = -1;
 static int hf_mpeg_ca_version_number = -1;
diff --git a/epan/dissectors/packet-msn-messenger.c b/epan/dissectors/packet-msn-messenger.c
index a89dd4688d..785bcc1f9f 100644
--- a/epan/dissectors/packet-msn-messenger.c
+++ b/epan/dissectors/packet-msn-messenger.c
@@ -31,6 +31,9 @@
 #include <epan/packet.h>
 #include <epan/strutil.h>
 
+void proto_register_msnms(void);
+void proto_reg_handoff_msnms(void);
+
 /*
  * The now-expired Internet-Draft for the MSN Messenger 1.0 protocol
  * can, as of the time of the writing of this comment, be found at:
diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c
index 61d34b179d..80c32e06f9 100644
--- a/epan/dissectors/packet-msproxy.c
+++ b/epan/dissectors/packet-msproxy.c
@@ -55,8 +55,8 @@
 #include "packet-tcp.h"
 #include "packet-udp.h"
 
-extern void udp_hash_add(guint16 proto,
-        void (*dissect)(const guchar *, int, frame_data *, proto_tree *));
+void proto_register_msproxy(void);
+void proto_reg_handoff_msproxy(void);
 
 
 static int proto_msproxy = -1;
diff --git a/epan/dissectors/packet-nettl.c b/epan/dissectors/packet-nettl.c
index 1ef61f70c0..a896632436 100644
--- a/epan/dissectors/packet-nettl.c
+++ b/epan/dissectors/packet-nettl.c
@@ -34,6 +34,9 @@
 #include <epan/ipproto.h>
 #include <wiretap/nettl.h>
 
+void proto_register_nettl(void);
+void proto_reg_handoff_nettl(void);
+
 /* Initialize the protocol and registered fields */
 
 static int proto_nettl = -1;
diff --git a/epan/dissectors/packet-nntp.c b/epan/dissectors/packet-nntp.c
index 977db1e048..b0c774b9de 100644
--- a/epan/dissectors/packet-nntp.c
+++ b/epan/dissectors/packet-nntp.c
@@ -29,6 +29,9 @@
 #include <epan/packet.h>
 #include <epan/strutil.h>
 
+void proto_register_nntp(void);
+void proto_reg_handoff_nntp(void);
+
 static int proto_nntp = -1;
 static int hf_nntp_response = -1;
 static int hf_nntp_request = -1;
diff --git a/epan/dissectors/packet-olsr.c b/epan/dissectors/packet-olsr.c
index 0c57422cdc..0bb63912e7 100644
--- a/epan/dissectors/packet-olsr.c
+++ b/epan/dissectors/packet-olsr.c
@@ -40,6 +40,9 @@
 #include <epan/prefs.h>
 #include <epan/expert.h>
 
+void proto_register_olsr(void);
+void proto_reg_handoff_olsr(void);
+
 #define UDP_PORT_OLSR   698
 #define HELLO   1
 #define TC      2
diff --git a/epan/dissectors/packet-omapi.c b/epan/dissectors/packet-omapi.c
index 2ab45403de..f1a80c9d9d 100644
--- a/epan/dissectors/packet-omapi.c
+++ b/epan/dissectors/packet-omapi.c
@@ -50,6 +50,9 @@
 #include <epan/packet.h>
 #include <epan/ptvcursor.h>
 
+void proto_register_omapi(void);
+void proto_reg_handoff_omapi(void);
+
 static int proto_omapi = -1;
 static int hf_omapi_version = -1;
 static int hf_omapi_hlength = -1;
diff --git a/epan/dissectors/packet-osi.c b/epan/dissectors/packet-osi.c
index 848334a678..b974f451b8 100644
--- a/epan/dissectors/packet-osi.c
+++ b/epan/dissectors/packet-osi.c
@@ -42,6 +42,9 @@
 #include "packet-esis.h"
 #include "packet-tpkt.h"
 
+void proto_reg_handoff_osi(void);
+void proto_register_osi(void);
+
 static int  proto_osi         = -1;
 static dissector_handle_t osi_handle;
 
diff --git a/epan/dissectors/packet-ouch.c b/epan/dissectors/packet-ouch.c
index 0d857a80ee..268bf8c21b 100644
--- a/epan/dissectors/packet-ouch.c
+++ b/epan/dissectors/packet-ouch.c
@@ -55,6 +55,8 @@
 
 #include "packet-tcp.h"
 
+void proto_register_ouch(void);
+void proto_reg_handoff_ouch(void);
 
 static const value_string pkt_type_val[] = {
     { 'O', "Enter Order" },
diff --git a/epan/dissectors/packet-packetbb.c b/epan/dissectors/packet-packetbb.c
index ff98ab256c..b83816afa7 100644
--- a/epan/dissectors/packet-packetbb.c
+++ b/epan/dissectors/packet-packetbb.c
@@ -33,6 +33,9 @@
 
 #include <string.h>
 
+void proto_reg_handoff_packetbb(void);
+void proto_register_packetbb(void);
+
 #define PACKET_HEADER_HASSEQNR     0x08
 #define PACKET_HEADER_HASTLV       0x04
 
diff --git a/epan/dissectors/packet-packetlogger.c b/epan/dissectors/packet-packetlogger.c
index 83378e3caa..1cc4bf5b62 100644
--- a/epan/dissectors/packet-packetlogger.c
+++ b/epan/dissectors/packet-packetlogger.c
@@ -29,6 +29,9 @@
 #include <epan/packet.h>
 #include <wiretap/wtap.h>
 
+void proto_register_packetlogger(void);
+void proto_reg_handoff_packetlogger(void);
+
 #define PNAME  "PacketLogger"
 #define PSNAME "PKTLOG"
 #define PFNAME "packetlogger"
diff --git a/epan/dissectors/packet-paltalk.c b/epan/dissectors/packet-paltalk.c
index 7fe9af05a0..bf0935f2bb 100644
--- a/epan/dissectors/packet-paltalk.c
+++ b/epan/dissectors/packet-paltalk.c
@@ -33,6 +33,9 @@
 
 #include "packet-tcp.h"
 
+void proto_register_paltalk(void);
+void proto_reg_handoff_paltalk(void);
+
 #define INET_IPV4_ADDRESS_FROM_BYTES(a,b,c,d) g_htonl(((a)<<24) | ((b)<<16) | ((c)<<8) | (d)) /* *network* order */
 
 #define PALTALK_SERVERS_ADDRESS INET_IPV4_ADDRESS_FROM_BYTES(199,106,0,0)      /* 199.106.0.0 in *network* order */
diff --git a/epan/dissectors/packet-pcep.c b/epan/dissectors/packet-pcep.c
index 3d11eaf658..3dcfbb174f 100644
--- a/epan/dissectors/packet-pcep.c
+++ b/epan/dissectors/packet-pcep.c
@@ -38,6 +38,9 @@
 #include <epan/expert.h>
 #include "packet-tcp.h"
 
+void proto_register_pcep(void);
+void proto_reg_handoff_pcep(void);
+
 /*differents types of objects*/
 #define PCEP_OPEN_OBJ                    1
 #define PCEP_RP_OBJ                      2
@@ -2625,8 +2628,8 @@ dissect_pcep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
 
 /*Register the protocol with wireshark*/
 void
-proto_register_pcep(void) {
-
+proto_register_pcep(void)
+{
     static hf_register_info pcepf_info[] = {
 
         /* Message type number */
diff --git a/epan/dissectors/packet-pcp.c b/epan/dissectors/packet-pcp.c
index 353d5970fa..723c0e3670 100644
--- a/epan/dissectors/packet-pcp.c
+++ b/epan/dissectors/packet-pcp.c
@@ -28,6 +28,9 @@
 #include <epan/expert.h>
 #include "packet-tcp.h"
 
+void proto_register_pcp(void);
+void proto_reg_handoff_pcp(void);
+
 #define PCP_PORT 44321
 #define PCP_HEADER_LEN 12
 
diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c
index ab91ad7ede..b9b125fc35 100644
--- a/epan/dissectors/packet-pdcp-lte.c
+++ b/epan/dissectors/packet-pdcp-lte.c
@@ -37,6 +37,9 @@
 #include "packet-rlc-lte.h"
 #include "packet-pdcp-lte.h"
 
+void proto_register_pdcp(void);
+void proto_reg_handoff_pdcp_lte(void);
+
 /* Described in:
  * 3GPP TS 36.323 Evolved Universal Terrestrial Radio Access (E-UTRA)
  *                Packet Data Convergence Protocol (PDCP) specification v11.0.0
diff --git a/epan/dissectors/packet-peekremote.c b/epan/dissectors/packet-peekremote.c
index 727dc8cf30..49b3532f7b 100644
--- a/epan/dissectors/packet-peekremote.c
+++ b/epan/dissectors/packet-peekremote.c
@@ -56,6 +56,9 @@
 #include <epan/packet.h>
 #include <wiretap/wtap.h>
 
+void proto_register_peekremote(void);
+void proto_reg_handoff_peekremote(void);
+
 static int proto_peekremote = -1;
 static gint hf_peekremote_unknown1 = -1;
 static gint hf_peekremote_unknown2 = -1;
diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c
index b67bee398a..bd6ecb9682 100644
--- a/epan/dissectors/packet-pgm.c
+++ b/epan/dissectors/packet-pgm.c
@@ -37,13 +37,14 @@
 #include <epan/wmem/wmem.h>
 #include <epan/ptvcursor.h>
 
+void proto_register_pgm(void);
+void proto_reg_handoff_pgm(void);
+
 /*
  * Flag to control whether to check the PGM checksum.
  */
 static gboolean pgm_check_checksum = TRUE;
 
-void proto_reg_handoff_pgm(void);
-
 /* constants for hdr types */
 #define PGM_SPM_PCKT  0x00
 #define PGM_ODATA_PCKT  0x04
diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c
index d0acaa83d5..62222b9a66 100644
--- a/epan/dissectors/packet-pim.c
+++ b/epan/dissectors/packet-pim.c
@@ -35,6 +35,9 @@
 #include <epan/wmem/wmem.h>
 #include "packet-pim.h"
 
+void proto_register_pim(void);
+void proto_reg_handoff_pim(void);
+
 #define PIM_TYPE(x)     ((x) & 0x0f)
 #define PIM_VER(x)      (((x) & 0xf0) >> 4)
 
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c
index e8652e9b00..cd3344488c 100644
--- a/epan/dissectors/packet-smb.c
+++ b/epan/dissectors/packet-smb.c
@@ -53,6 +53,9 @@
 #include "packet-ntlmssp.h"
 #include "packet-smb2.h"
 
+void proto_register_smb(void);
+void proto_reg_handoff_smb(void);
+
 /*
  * Various specifications and documents about SMB can be found in
  *
diff --git a/epan/dissectors/packet-ucp.c b/epan/dissectors/packet-ucp.c
index c64aea4318..25eea68e9c 100644
--- a/epan/dissectors/packet-ucp.c
+++ b/epan/dissectors/packet-ucp.c
@@ -47,6 +47,9 @@
 
 #include "packet-tcp.h"
 
+void proto_register_ucp(void);
+void proto_reg_handoff_ucp(void);
+
 /* Tap Record */
 typedef struct _ucp_tap_rec_t {
     guint message_type; /* 0 = Operation; 1 = Result */
diff --git a/epan/dissectors/packet-usb-video.c b/epan/dissectors/packet-usb-video.c
index ce1e886662..c0e8413418 100644
--- a/epan/dissectors/packet-usb-video.c
+++ b/epan/dissectors/packet-usb-video.c
@@ -33,6 +33,7 @@
 #include "packet-usb.h"
 
 void proto_register_usb_vid(void);
+void proto_reg_handoff_usb_vid(void);
 
 /* References are to sections in USB Video Class specifications -
  * specifically V1.5, but versions have tended to keep
@@ -216,9 +217,6 @@ void proto_register_usb_vid(void);
 #define USB_SETUP_GET_RES_ALL       0x94    /* UVC 1.5 */
 #define USB_SETUP_GET_DEF_ALL       0x97    /* UVC 1.5 */
 
-void proto_reg_handoff_usb_vid(void);
-void proto_reg_handoff_usb_vid(void);
-
 /* protocols and header fields */
 static int proto_usb_vid = -1;
 
diff --git a/epan/dwarf.c b/epan/dwarf.c
index 2053ec5472..957bcffeac 100644
--- a/epan/dwarf.c
+++ b/epan/dwarf.c
@@ -26,6 +26,8 @@
 
 #include <epan/tvbuff.h>
 
+#include "dwarf.h"
+
 gint
 dissect_uleb128(tvbuff_t *tvb, gint offset, guint64 *value)
 {
diff --git a/plugins/wimaxmacphy/packet-wimaxmacphy.c b/plugins/wimaxmacphy/packet-wimaxmacphy.c
index 29bb0cdb66..bb71031e06 100644
--- a/plugins/wimaxmacphy/packet-wimaxmacphy.c
+++ b/plugins/wimaxmacphy/packet-wimaxmacphy.c
@@ -36,9 +36,6 @@
    in a header file. If not, a header file is not needed at all. */
 #include "packet-wimaxmacphy.h"
 
-/* Forward declaration we need below */
-void proto_reg_handoff_wimaxmacphy(void);
-
 /* Initialize the protocol and registered fields */
 
 static int proto_wimaxmacphy                                         = -1;
diff --git a/ui/gtk/sctp_stat_gtk.h b/ui/gtk/sctp_stat_gtk.h
index a4602ffd6c..517caae8d1 100644
--- a/ui/gtk/sctp_stat_gtk.h
+++ b/ui/gtk/sctp_stat_gtk.h
@@ -119,8 +119,6 @@ struct sctp_udata {
 	guint16             dir;
 };
 
-const sctp_allassocs_info_t* sctp_stat_get_info(void);
-
 void assoc_analyse(sctp_assoc_info_t* assoc);
 
 void set_child(struct sctp_udata *child, struct sctp_analyse *parent);
@@ -161,4 +159,4 @@ void update_analyse_dlg(struct sctp_analyse* u_data);
 
 void sctp_set_assoc_filter(void);
 
-#endif
\ No newline at end of file
+#endif