diff --git a/epan/address_to_str.c b/epan/address_to_str.c
index 1965d88cee..ba3b25388c 100644
--- a/epan/address_to_str.c
+++ b/epan/address_to_str.c
@@ -477,6 +477,30 @@ tvb_fcwwn_to_str(tvbuff_t *tvb, const gint offset)
 	return fcwwn_to_str (tvb_get_ptr(tvb, offset, 8));
 }
 
+/* XXX FIXME
+remove this one later when every call has been converted to address_to_str()
+*/
+gchar *
+ax25_to_str(const guint8 *ad)
+{
+	return bytestring_to_str(ad, 7, ':');
+}
+
+/* XXX FIXME
+remove this one later when every call has been converted to address_to_str()
+*/
+gchar *
+get_ax25_name(const guint8 *ad)
+{
+	address addr;
+
+	addr.type = AT_AX25;
+	addr.len  = 7;
+	addr.data = ad;
+
+	return address_to_str( &addr );
+}
+
 /*XXX FIXME the code below may be called very very frequently in the future.
   optimize it for speed and get rid of the slow sprintfs */
 /* XXX - perhaps we should have individual address types register
diff --git a/epan/to_str.c b/epan/to_str.c
index f173816b65..cda834f11c 100644
--- a/epan/to_str.c
+++ b/epan/to_str.c
@@ -1024,30 +1024,6 @@ decode_numeric_bitfield(const guint32 val, const guint32 mask, const int width,
   return buf;
 }
 
-/* XXX FIXME
-remove this one later when every call has been converted to address_to_str()
-*/
-gchar *
-ax25_to_str(const guint8 *ad)
-{
-	return bytestring_to_str(ad, 7, ':');
-}
-
-/* XXX FIXME
-remove this one later when every call has been converted to address_to_str()
-*/
-gchar *
-get_ax25_name(const guint8 *ad)
-{
-	address addr;
-
-	addr.type = AT_AX25;
-	addr.len  = 7;
-	addr.data = ad;
-
-	return address_to_str( &addr );
-}
-
 /*
  This function is very fast and this function is called a lot.
  XXX update the ep_address_to_str stuff to use this function.