5 files changed, 6 insertions, 32 deletions
diff --git a/epan/dissectors/ncp2222.py b/epan/dissectors/ncp2222.py
index 5e156ccf62..0b285e8544 100644
--- a/epan/dissectors/ncp2222.py
+++ b/epan/dissectors/ncp2222.py
@@ -6341,7 +6341,7 @@ static int hf_nds_segment_error = -1;
 
 	# final_registration_ncp2222()
 	print """
-void
+static void
 final_registration_ncp2222(void)
 {
 	int i;
diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c
index dc2937d48f..721357bf40 100644
--- a/epan/dissectors/packet-atalk.c
+++ b/epan/dissectors/packet-atalk.c
@@ -44,6 +44,7 @@
 #include <epan/reassemble.h>
 #include <epan/emem.h>
 
+#include "packet-atalk.h"
 #include "packet-afp.h"
 
 /* Tables for reassembly of fragments. */
diff --git a/epan/dissectors/packet-atalk.h b/epan/dissectors/packet-atalk.h
index 592dd1948e..ab145dc0aa 100644
--- a/epan/dissectors/packet-atalk.h
+++ b/epan/dissectors/packet-atalk.h
@@ -21,33 +21,6 @@
 #ifndef __PACKET_ATALK_H__
 #define __PACKET_ATALK_H__
 
-/*
- * Structure used to represent a DDP address; gives the layout of the
- * data pointed to by an AT_ATALK "address" structure.
- */
-struct atalk_ddp_addr {
-	guint16	net;
-	guint8	node;
-	guint8	port;
-};
-
-/*
- * DDP packet types.
- */
-#define DDP_RTMPDATA	0x01
-#define DDP_NBP		0x02
-#define DDP_ATP		0x03
-#define DDP_AEP		0x04
-#define DDP_RTMPREQ	0x05
-#define DDP_ZIP		0x06
-#define DDP_ADSP	0x07
-#define DDP_EIGRP	0x58
-
-/*
- * Routine to take a DDP address and generate a string.
- */
-extern gchar *atalk_addr_to_str(const struct atalk_ddp_addr *addrp);
-
 extern void capture_llap(packet_counts *ld);
 
 #endif
diff --git a/epan/dissectors/packet-dcerpc-samr.c b/epan/dissectors/packet-dcerpc-samr.c
index 4527455675..af4e65ccfc 100644
--- a/epan/dissectors/packet-dcerpc-samr.c
+++ b/epan/dissectors/packet-dcerpc-samr.c
@@ -239,7 +239,7 @@ struct access_mask_info samr_connect_access_mask_info = {
 };
 
 
-int
+static int
 sam_dissect_SAM_SECURITY_DESCRIPTOR_data(tvbuff_t *tvb, int offset,
                              packet_info *pinfo, proto_tree *tree,
                              guint8 *drep)
@@ -267,7 +267,7 @@ sam_dissect_SAM_SECURITY_DESCRIPTOR_data(tvbuff_t *tvb, int offset,
        return offset;
 }
 
-int
+static int
 sam_dissect_SAM_SECURITY_DESCRIPTOR(tvbuff_t *tvb, int offset,
                        packet_info *pinfo, proto_tree *parent_tree,
                        guint8 *drep)
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index d6e3adac78..7984f9e227 100644
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -3218,7 +3218,7 @@ dissect_rpc_fragment(tvbuff_t *tvb, int offset, packet_info *pinfo,
  *         (i.e., to the RPC record mark field).
  */
 
-int
+static int
 find_rpc_over_tcp_reply_start(tvbuff_t *tvb, int offset)
 {
 
@@ -3355,7 +3355,7 @@ int      i;
  *       if no valid RPC header is found.
  */
 
-int
+static int
 find_and_dissect_rpc_fragment(tvbuff_t *tvb, int offset, packet_info *pinfo,
 							  proto_tree *tree, rec_dissector_t dissector,
 							  gboolean is_heur,