diff --git a/libfreefare/freefare.h b/libfreefare/freefare.h
index fc707d7..8d02e41 100644
--- a/libfreefare/freefare.h
+++ b/libfreefare/freefare.h
@@ -74,6 +74,9 @@ bool		 felica_taste (nfc_device *device, nfc_target target);
 #define FELICA_SC_RW 0x0009
 #define FELICA_SC_RO 0x000b
 
+FreefareTag	 felica_tag_new (nfc_device *device, nfc_target target);
+void		 felica_tag_free (FreefareTag tag);
+
 ssize_t		 felica_read (FreefareTag tag, uint16_t service, uint8_t block, uint8_t *data, size_t length);
 ssize_t		 felica_read_ex (FreefareTag tag, uint16_t service, uint8_t block_count, uint8_t blocks[], uint8_t *data, size_t length);
 ssize_t		 felica_write (FreefareTag tag, uint16_t service, uint8_t block, uint8_t *data, size_t length);
@@ -83,6 +86,10 @@ ssize_t		 felica_write_ex (FreefareTag tag, uint16_t service, uint8_t block_coun
 
 bool		 mifare_ultralight_taste (nfc_device *device, nfc_target target);
 bool		 mifare_ultralightc_taste (nfc_device *device, nfc_target target);
+FreefareTag	 mifare_ultralight_tag_new (nfc_device *device, nfc_target target);
+FreefareTag	 mifare_ultralightc_tag_new (nfc_device *device, nfc_target target);
+void		 mifare_ultralight_tag_free (FreefareTag tag);
+void		 mifare_ultralightc_tag_free (FreefareTag tag);
 
 int		 mifare_ultralight_connect (FreefareTag tag);
 int		 mifare_ultralight_disconnect (FreefareTag tag);
@@ -99,6 +106,9 @@ bool		 is_mifare_ultralightc_on_reader (nfc_device *device, nfc_iso14443a_info n
 
 bool		 mifare_classic1k_taste (nfc_device *device, nfc_target target);
 bool		 mifare_classic4k_taste (nfc_device *device, nfc_target target);
+FreefareTag	 mifare_classic1k_tag_new (nfc_device *device, nfc_target target);
+FreefareTag	 mifare_classic4k_tag_new (nfc_device *device, nfc_target target);
+void		 mifare_classic_tag_free (FreefareTag tag);
 
 typedef unsigned char MifareClassicBlock[16];
 
@@ -354,6 +364,9 @@ struct mifare_desfire_file_settings {
     } settings;
 };
 
+FreefareTag	 mifare_desfire_tag_new (nfc_device *device, nfc_target target);
+void		 mifare_desfire_tag_free (FreefareTag tags);
+
 int		 mifare_desfire_connect (FreefareTag tag);
 int		 mifare_desfire_disconnect (FreefareTag tag);
 
diff --git a/libfreefare/freefare_internal.h b/libfreefare/freefare_internal.h
index e38b3a8..18f2b62 100644
--- a/libfreefare/freefare_internal.h
+++ b/libfreefare/freefare_internal.h
@@ -102,17 +102,6 @@ struct mad_sector_0x00;
 struct mad_sector_0x10;
 
 void		 nxp_crc (uint8_t *crc, const uint8_t value);
-FreefareTag	 felica_tag_new (nfc_device *device, nfc_target target);
-void		 felica_tag_free (FreefareTag tag);
-FreefareTag	 mifare_classic1k_tag_new (nfc_device *device, nfc_target target);
-FreefareTag	 mifare_classic4k_tag_new (nfc_device *device, nfc_target target);
-void		 mifare_classic_tag_free (FreefareTag tag);
-FreefareTag	 mifare_desfire_tag_new (nfc_device *device, nfc_target target);
-void		 mifare_desfire_tag_free (FreefareTag tags);
-FreefareTag	 mifare_ultralight_tag_new (nfc_device *device, nfc_target target);
-void		 mifare_ultralight_tag_free (FreefareTag tag);
-FreefareTag	 mifare_ultralightc_tag_new (nfc_device *device, nfc_target target);
-void		 mifare_ultralightc_tag_free (FreefareTag tag);
 uint8_t		 sector_0x00_crc8 (Mad mad);
 uint8_t		 sector_0x10_crc8 (Mad mad);