diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c
index 0bf8003f5c..e8a722f1e0 100644
--- a/epan/dissectors/packet-arp.c
+++ b/epan/dissectors/packet-arp.c
@@ -564,7 +564,7 @@ static const value_string atm_nsap_afi_vals[] = {
 /*
  * XXX - shouldn't there be a centralized routine for dissecting NSAPs?
  * See also "dissect_nsap()" in epan/dissectors/packet-isup.c and
- * "print_nsap_net_buf()" and "print_nsap_net()" in epan/osi=utils.c.
+ * "print_nsap_net()" in epan/osi=utils.c.
  */
 void
 dissect_atm_nsap(tvbuff_t *tvb, packet_info* pinfo, int offset, int len, proto_tree *tree)
diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c
index b11cabe69c..875ef71427 100644
--- a/epan/dissectors/packet-isup.c
+++ b/epan/dissectors/packet-isup.c
@@ -4148,7 +4148,7 @@ static const value_string iana_icp_values[] = {
 /*
  * XXX - shouldn't there be a centralized routine for dissecting NSAPs?
  * See also "dissect_atm_nsap()" in epan/dissectors/packet-arp.c and
- * "print_nsap_net_buf()" and "print_nsap_net()" in epan/osi_utils.c.
+ * "print_nsap_net()" in epan/osi_utils.c.
  */
 void
 dissect_nsap(tvbuff_t *parameter_tvb, gint offset, gint len, proto_tree *parameter_tree)
diff --git a/epan/osi-utils.c b/epan/osi-utils.c
index 58c86ba5cf..08816bb9c0 100644
--- a/epan/osi-utils.c
+++ b/epan/osi-utils.c
@@ -35,6 +35,9 @@
 #include "address.h"
 #include "address_types.h"
 
+static void print_nsap_net_buf( const guint8 *, int, gchar *, int);
+static void print_area_buf ( const guint8 *, int, gchar *, int);
+
 /*
  * XXX - shouldn't there be a centralized routine for dissecting NSAPs?
  * See also "dissect_atm_nsap()" in epan/dissectors/packet-arp.c and
@@ -50,8 +53,7 @@ print_nsap_net( tvbuff_t *tvb, const gint offset, int length )
   return( cur );
 }
 
-/* XXX - Should these be converted to string buffers? */
-void
+static void
 print_nsap_net_buf( const guint8 *ad, int length, gchar *buf, int buf_len)
 {
   gchar *cur;
@@ -150,7 +152,7 @@ print_area(tvbuff_t *tvb, const gint offset, int length)
   return cur;
 }
 
-void
+static void
 print_area_buf(const guint8 *ad, int length, gchar *buf, int buf_len)
 {
   gchar *cur;
diff --git a/epan/osi-utils.h b/epan/osi-utils.h
index a0b74e71a9..ddb1c75ca6 100644
--- a/epan/osi-utils.h
+++ b/epan/osi-utils.h
@@ -46,9 +46,7 @@
 #define NSAP_IDI_GOSIP2       0x47
 
 gchar*     print_nsap_net ( tvbuff_t *, const gint, int );
-void       print_nsap_net_buf( const guint8 *, int, gchar *, int);
 gchar*     print_area     ( tvbuff_t *, const gint, int );
-void       print_area_buf ( const guint8 *, int, gchar *, int);
 gchar*     print_system_id(wmem_allocator_t *, const guint8 *, int );
 gchar*     tvb_print_system_id( tvbuff_t *, const gint, int );
 void       print_system_id_buf( const guint8 *, int, gchar *, int);