5 files changed, 9 insertions, 49 deletions
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index c8c6ba5cb4..0c82651e51 100644
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -1632,7 +1632,6 @@ DISSECTOR_INCLUDES =	\
 	packet-zbee-zdp.h	\
 	packet-zep.h	\
 	packet-ziop.h	\
-	rpc_defrag.h	\
 	$(GENERATED_HEADER_FILES) \
 	$(CUSTOM_HEADER_FILES)
 
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c
index f79b33d615..7bb69dcb47 100644
--- a/epan/dissectors/packet-ndmp.c
+++ b/epan/dissectors/packet-ndmp.c
@@ -44,7 +44,6 @@
 #include "packet-scsi.h"
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
-#include <epan/dissectors/rpc_defrag.h>
 
 #define TCP_PORT_NDMP 10000
 
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index 1c160c9232..e8edba979a 100644
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -43,7 +43,6 @@
 
 #include "packet-rpc.h"
 #include "packet-tcp.h"
-#include <epan/dissectors/rpc_defrag.h>
 #include "packet-nfs.h"
 
 /*
@@ -298,7 +297,12 @@ GHashTable *rpc_progs = NULL;
 /* Hash table with info on RPC procedure numbers */
 GHashTable *rpc_procs = NULL;
 
+typedef gboolean (*rec_dissector_t)(tvbuff_t *, packet_info *, proto_tree *,
+	tvbuff_t *, fragment_head *, gboolean, guint32, gboolean);
+
 static void dissect_rpc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+static void show_rpc_fraginfo(tvbuff_t *tvb, tvbuff_t *frag_tvb, proto_tree *tree,
+    guint32 rpc_rm, fragment_head *ipfd_head, packet_info *pinfo);
 
 /***********************************/
 /* Hash array with procedure names */
@@ -3080,7 +3084,7 @@ call_message_dissector(tvbuff_t *tvb, tvbuff_t *rec_tvb, packet_info *pinfo,
 	return rpc_succeeded;
 }
 
-int
+static int
 dissect_rpc_fragment(tvbuff_t *tvb, int offset, packet_info *pinfo,
     proto_tree *tree, rec_dissector_t dissector, gboolean is_heur,
     int proto, int ett, gboolean defragment, gboolean first_pdu, struct tcpinfo *tcpinfo)
diff --git a/epan/dissectors/packet-rpc.h b/epan/dissectors/packet-rpc.h
index 7087cf9932..34571ed278 100644
--- a/epan/dissectors/packet-rpc.h
+++ b/epan/dissectors/packet-rpc.h
@@ -103,6 +103,9 @@
 #define RPC_STRING_DATA "<DATA>"
 #define RPC_STRING_TRUNCATED "<TRUNCATED>"
 
+#define RPC_RM_LASTFRAG	0x80000000U
+#define RPC_RM_FRAGLEN	0x7fffffffU
+
 extern const value_string rpc_authgss_svc[];
 typedef enum {
 	FLAVOR_UNKNOWN,		/* authentication flavor unknown */
diff --git a/epan/dissectors/rpc_defrag.h b/epan/dissectors/rpc_defrag.h
deleted file mode 100644
index 0cec855ec7..0000000000
--- a/epan/dissectors/rpc_defrag.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* rpc_defrag.h
- * Declarations for RPC defragmentation
- *
- * $Id$
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef __RPC_DEFRAG_H__
-#define __RPC_DEFRAG_H__
-
-#include "reassemble.h"
-
-/*
- * RPC-over-TCP fragmentation.
- */
-#define RPC_RM_LASTFRAG	0x80000000U
-#define RPC_RM_FRAGLEN	0x7fffffffU
-
-typedef gboolean (*rec_dissector_t)(tvbuff_t *, packet_info *, proto_tree *,
-	tvbuff_t *, fragment_head *, gboolean, guint32, gboolean);
-
-extern void show_rpc_fraginfo(tvbuff_t *tvb, tvbuff_t *frag_tvb,
-	proto_tree *tree, guint32 rpc_rm, fragment_head *ipfd_head, packet_info *pinfo);
-extern int dissect_rpc_fragment(tvbuff_t *tvb, int offset, packet_info *pinfo,
-	proto_tree *tree, rec_dissector_t dissector, gboolean is_heur,
-	int proto, int ett, gboolean defragment, gboolean first_pdu, struct tcpinfo *tcpinfo);
-
-#endif /* __RPC_DEFRAG_H__ */