diff --git a/examples/Makefile.am b/examples/Makefile.am
index 42b8d1a..9d403ff 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -18,7 +18,8 @@ nfc_poll_LDADD = $(top_builddir)/libnfc/libnfc.la \
 		 $(top_builddir)/examples/libnfcutils.a
 
 nfc_anticol_SOURCES = nfc-anticol.c
-nfc_anticol_LDADD = $(top_builddir)/libnfc/libnfc.la
+nfc_anticol_LDADD = $(top_builddir)/libnfc/libnfc.la \
+		    $(top_builddir)/examples/libnfcutils.a
 
 nfc_list_SOURCES = nfc-list.c
 nfc_list_LDADD = $(top_builddir)/libnfc/libnfc.la \
@@ -31,10 +32,12 @@ nfc_mfclassic_SOURCES = nfc-mfclassic.c mifaretag.h
 nfc_mfclassic_LDADD = $(top_builddir)/libnfc/libnfc.la
 
 nfc_relay_SOURCES = nfc-relay.c
-nfc_relay_LDADD = $(top_builddir)/libnfc/libnfc.la
+nfc_relay_LDADD = $(top_builddir)/libnfc/libnfc.la \
+		  $(top_builddir)/examples/libnfcutils.a
 
 nfc_emulate_SOURCES = nfc-emulate.c
-nfc_emulate_LDADD = $(top_builddir)/libnfc/libnfc.la
+nfc_emulate_LDADD = $(top_builddir)/libnfc/libnfc.la \
+		    $(top_builddir)/examples/libnfcutils.a
 
 nfcip_target_SOURCES = nfcip-target.c
 nfcip_target_LDADD = $(top_builddir)/libnfc/libnfc.la
diff --git a/examples/nfc-anticol.c b/examples/nfc-anticol.c
index 675ce18..a646e71 100644
--- a/examples/nfc-anticol.c
+++ b/examples/nfc-anticol.c
@@ -33,10 +33,12 @@
 #include <stdbool.h>
 #include <string.h>
 
+#include <sys/endian.h>
+
 #include <nfc/nfc.h>
 
 #include <nfc/nfc-messages.h>
-#include "bitutils.h"
+#include "nfc-utils.h"
 
 #define SAK_FLAG_ATS_SUPPORTED 0x20
 
@@ -200,9 +202,9 @@ int main(int argc,char* argv[])
   printf("\nFound tag with UID: ");
   if (szUidLen == 4)
   {
-    printf("%08x\n",swap_endian32(abtUid));
+    printf("%08x\n", bswap32( *((uint32_t *)&abtUid)));
   } else {
-    printf("%014llx\n",swap_endian64(abtUid)&0x00ffffffffffffffull);
+    printf("%014llx\n",bswap64(*((uint64_t *) &abtUid))&0x00ffffffffffffffull);
   }
 
   nfc_disconnect(pnd);
diff --git a/examples/nfc-emulate.c b/examples/nfc-emulate.c
index 8090603..3e3036e 100644
--- a/examples/nfc-emulate.c
+++ b/examples/nfc-emulate.c
@@ -35,7 +35,7 @@
 #include <nfc/nfc.h>
 
 #include <nfc/nfc-messages.h>
-#include "bitutils.h"
+#include "nfc-utils.h"
 
 #define MAX_FRAME_LEN 264
 
diff --git a/examples/nfc-list.c b/examples/nfc-list.c
index b641bfb..6aae21a 100644
--- a/examples/nfc-list.c
+++ b/examples/nfc-list.c
@@ -42,7 +42,6 @@
 #include <nfc/nfc.h>
 #include <nfc/nfc-messages.h>
 #include "nfc-utils.h"
-#include "bitutils.h"
 
 #define MAX_DEVICE_COUNT 16
 
diff --git a/examples/nfc-mfclassic.c b/examples/nfc-mfclassic.c
index 68285c8..49c249d 100644
--- a/examples/nfc-mfclassic.c
+++ b/examples/nfc-mfclassic.c
@@ -35,10 +35,12 @@
 #include <string.h>
 #include <ctype.h>
 
+#include <sys/endian.h>
+
 #include <nfc/nfc.h>
 
 #include "mifaretag.h"
-#include "bitutils.h"
+#include "nfc-utils.h"
 
 static nfc_device_t* pnd;
 static nfc_target_info_t nti;
@@ -464,14 +466,14 @@ int main(int argc, const char* argv[])
         // Compare if key dump UID is the same as the current tag UID
         if (memcmp(nti.nai.abtUid,pbtUID,4) != 0)
         {
-          printf("Expected MIFARE Classic %cK card with UID: %08x\n",b4K?'4':'1',swap_endian32(pbtUID));
+          printf("Expected MIFARE Classic %cK card with UID: %08x\n",b4K?'4':'1',bswap32(*((uint32_t *)&pbtUID)));
         }
       }
     
       // Get the info from the current tag
       pbtUID = nti.nai.abtUid;
       b4K = (nti.nai.abtAtqa[1] == 0x02);
-      printf("Found MIFARE Classic %cK card with UID: %08x\n",b4K?'4':'1',swap_endian32(pbtUID));
+      printf("Found MIFARE Classic %cK card with UID: %08x\n",b4K?'4':'1',bswap32(*((uint32_t *)&pbtUID)));
     
       uiBlocks = (b4K)?0xff:0x3f;
     
diff --git a/examples/nfc-mfultralight.c b/examples/nfc-mfultralight.c
index 7779ff4..c70c65e 100644
--- a/examples/nfc-mfultralight.c
+++ b/examples/nfc-mfultralight.c
@@ -35,10 +35,12 @@
 #include <string.h>
 #include <ctype.h>
 
+#include <sys/endian.h>
+
 #include <nfc/nfc.h>
 
 #include "mifareultag.h"
-#include "bitutils.h"
+#include "nfc-utils.h"
 
 static nfc_device_t* pnd;
 static nfc_target_info_t nti;
@@ -217,7 +219,7 @@ int main(int argc, const char* argv[])
 
   // Get the info from the current tag
   pbtUID = nti.nai.abtUid;
-  printf("Found MIFARE Ultralight card with uid: %08x\n", swap_endian32(pbtUID));
+  printf("Found MIFARE Ultralight card with uid: %08x\n", bswap32(*((uint32_t *)&pbtUID)));
 
   if (bReadAction)
   {
diff --git a/examples/nfc-poll.c b/examples/nfc-poll.c
index 6baaff3..8cf2833 100644
--- a/examples/nfc-poll.c
+++ b/examples/nfc-poll.c
@@ -35,7 +35,6 @@
 #include <nfc/nfc.h>
 #include <nfc/nfc-types.h>
 #include <nfc/nfc-messages.h>
-#include "bitutils.h"
 #include "nfc-utils.h"
 
 #define MAX_DEVICE_COUNT 16
diff --git a/examples/nfc-relay.c b/examples/nfc-relay.c
index e027601..99dfa71 100644
--- a/examples/nfc-relay.c
+++ b/examples/nfc-relay.c
@@ -35,7 +35,7 @@
 #include <nfc/nfc.h>
 
 #include <nfc/nfc-messages.h>
-#include "bitutils.h"
+#include "nfc-utils.h"
 
 #define MAX_FRAME_LEN 264
 #define MAX_DEVICE_COUNT 2
diff --git a/examples/nfc-utils.c b/examples/nfc-utils.c
index 264e5f3..3b292ea 100644
--- a/examples/nfc-utils.c
+++ b/examples/nfc-utils.c
@@ -1,8 +1,89 @@
 #include <nfc/nfc.h>
 
-#include "bitutils.h"
 #include "nfc-utils.h"
 
+static const byte_t OddParity[256] = {
+  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1
+};
+
+void print_hex(const byte_t* pbtData, const size_t szBytes)
+{
+  size_t szPos;
+
+  for (szPos=0; szPos < szBytes; szPos++)
+  {
+    printf("%02x  ",pbtData[szPos]);
+  }
+  printf("\n");
+}
+
+void print_hex_bits(const byte_t* pbtData, const size_t szBits)
+{
+  uint8_t uRemainder;
+  size_t szPos;
+  size_t szBytes = szBits/8;
+
+  for (szPos=0; szPos < szBytes; szPos++)
+  {
+    printf("%02x  ",pbtData[szPos]);
+  }
+
+  uRemainder = szBits % 8;
+  // Print the rest bits
+  if (uRemainder != 0)
+  {
+    if (uRemainder < 5)
+      printf("%01x (%d bits)",pbtData[szBytes], uRemainder);
+    else
+      printf("%02x (%d bits)",pbtData[szBytes], uRemainder);
+  }
+  printf("\n");
+}
+
+void print_hex_par(const byte_t* pbtData, const size_t szBits, const byte_t* pbtDataPar)
+{
+  uint8_t uRemainder;
+  size_t szPos;
+  size_t szBytes = szBits/8;
+
+  for (szPos=0; szPos < szBytes; szPos++)
+  {
+    printf("%02x",pbtData[szPos]);
+    if (OddParity[pbtData[szPos]] != pbtDataPar[szPos])
+    {
+      printf("! ");
+    } else {
+      printf("  ");
+    }
+  }
+
+  uRemainder = szBits % 8;
+  // Print the rest bits, these cannot have parity bit
+  if (uRemainder != 0)
+  {
+    if (uRemainder < 5)
+      printf("%01x (%d bits)",pbtData[szBytes], uRemainder);
+    else
+      printf("%02x (%d bits)",pbtData[szBytes], uRemainder);
+  }
+  printf("\n");
+}
+
 void print_nfc_iso14443a_info(const nfc_iso14443a_info_t nai)
 {
   printf("    ATQA (SENS_RES): "); print_hex(nai.abtAtqa,2);
@@ -13,3 +94,4 @@ void print_nfc_iso14443a_info(const nfc_iso14443a_info_t nai)
     print_hex(nai.abtAts, nai.szAtsLen);
   }
 }
+
diff --git a/examples/nfc-utils.h b/examples/nfc-utils.h
index 020b470..e7f849f 100644
--- a/examples/nfc-utils.h
+++ b/examples/nfc-utils.h
@@ -24,6 +24,9 @@
 #ifndef _EXAMPLES_NFC_UTILS_H_
 #define _EXAMPLES_NFC_UTILS_H_
 
+void print_hex(const byte_t* pbtData, const size_t szLen);
+void print_hex_bits(const byte_t* pbtData, const size_t szBits);
+void print_hex_par(const byte_t* pbtData, const size_t szBits, const byte_t* pbtDataPar);
 void print_nfc_iso14443a_info(const nfc_iso14443a_info_t nai);
 
 #endif
diff --git a/include/nfc/nfc-messages.h b/include/nfc/nfc-messages.h
index e1b856a..3c460a0 100644
--- a/include/nfc/nfc-messages.h
+++ b/include/nfc/nfc-messages.h
@@ -31,7 +31,10 @@
 // Useful macros
 #ifdef DEBUG
 //   #define DBG(x, args...) printf("DBG %s:%d: " x "\n", __FILE__, __LINE__,## args )
-  #define DBG(x, ...) fprintf(stderr, "DBG %s:%d: " x "\n", __FILE__, __LINE__, ## __VA_ARGS__ )
+  #define DBG(...) do { \
+    warnx ("DBG %s:%d", __FILE__, __LINE__); \
+    warnx ("    " __VA_ARGS__ ); \
+  } while (0)
 #else
   #define DBG(...) {}
 #endif
diff --git a/include/nfc/nfc.h b/include/nfc/nfc.h
index ef412c3..ba920bc 100644
--- a/include/nfc/nfc.h
+++ b/include/nfc/nfc.h
@@ -84,6 +84,7 @@ NFC_EXPORT const char* nfc_device_name(nfc_device_t* pnd);
 
 /* Misc. functions */
 NFC_EXPORT void iso14443a_crc(byte_t* pbtData, size_t szLen, byte_t* pbtCrc);
+NFC_EXPORT void append_iso14443a_crc(byte_t* pbtData, size_t szLen);
 NFC_EXPORT const char* nfc_version(void);
 
 #ifdef __cplusplus 
diff --git a/libnfc/Makefile.am b/libnfc/Makefile.am
index b2a11ad..19aa10b 100644
--- a/libnfc/Makefile.am
+++ b/libnfc/Makefile.am
@@ -3,9 +3,9 @@ SUBDIRS = chips buses drivers .
 # set the include path found by configure
 INCLUDES = $(all_includes) $(LIBNFC_CFLAGS)
 
-noinst_HEADERS =  chips.h buses.h drivers.h bitutils.h
+noinst_HEADERS =  chips.h buses.h drivers.h mirror-subr.h
 lib_LTLIBRARIES = libnfc.la
-libnfc_la_SOURCES = nfc.c bitutils.c
+libnfc_la_SOURCES = nfc.c iso14443-subr.c mirror-subr.c
 libnfc_la_LDFLAGS = -no-undefined -version-info=0:0:0
 libnfc_la_CFLAGS = @DRIVERS_CFLAGS@
 libnfc_la_LIBADD = \
diff --git a/libnfc/bitutils.c b/libnfc/bitutils.c
deleted file mode 100644
index 197a8a2..0000000
--- a/libnfc/bitutils.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/*-
- * Public platform independent Near Field Communication (NFC) library
- * 
- * Copyright (C) 2009, Roel Verdult
- * 
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 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 Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- */
-
- /**
- * @file bitutils.c
- * @brief
- */
-
-#ifdef HAVE_CONFIG_H
-  #include "config.h"
-#endif // HAVE_CONFIG_H
-
-#include <stdio.h>
-
-#include "bitutils.h"
-
-static const byte_t OddParity[256] = {
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1
-};
-
-static const byte_t ByteMirror[256] = {
-  0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, 0x10, 0x90, 0x50, 0xd0, 0x30, 
-  0xb0, 0x70, 0xf0, 0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8, 0x18, 0x98, 
-  0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8, 0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 
-  0xe4, 0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4, 0x0c, 0x8c, 0x4c, 0xcc, 
-  0x2c, 0xac, 0x6c, 0xec, 0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc, 0x02, 
-  0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2, 0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 
-  0x72, 0xf2, 0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea, 0x1a, 0x9a, 0x5a, 
-  0xda, 0x3a, 0xba, 0x7a, 0xfa, 0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6, 
-  0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6, 0x0e, 0x8e, 0x4e, 0xce, 0x2e, 
-  0xae, 0x6e, 0xee, 0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe, 0x01, 0x81, 
-  0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1, 0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 
-  0xf1, 0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9, 0x19, 0x99, 0x59, 0xd9, 
-  0x39, 0xb9, 0x79, 0xf9, 0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5, 0x15, 
-  0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5, 0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 
-  0x6d, 0xed, 0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd, 0x03, 0x83, 0x43, 
-  0xc3, 0x23, 0xa3, 0x63, 0xe3, 0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3, 
-  0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb, 0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 
-  0xbb, 0x7b, 0xfb, 0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7, 0x17, 0x97, 
-  0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7, 0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 
-  0xef, 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff
-};
-
-byte_t oddparity(const byte_t bt)
-{
-  return OddParity[bt];
-}
-
-void oddparity_bytes(const byte_t* pbtData, const size_t szLen, byte_t* pbtPar)
-{
-  size_t szByteNr;
-
-  // Calculate the parity bits for the command
-  for (szByteNr=0; szByteNr<szLen; szByteNr++)
-  {
-    pbtPar[szByteNr] = OddParity[pbtData[szByteNr]];
-  }
-}
-
-byte_t mirror(byte_t bt)
-{
-  return ByteMirror[bt];
-}
-
-void mirror_bytes(byte_t *pbts, size_t szLen)
-{
-  size_t szByteNr;
-
-  for (szByteNr=0; szByteNr<szLen; szByteNr++)
-  {
-    *pbts = ByteMirror[*pbts];
-    pbts++;
-  }
-}
-
-uint32_t mirror32(uint32_t ui32Bits)
-{
-  mirror_bytes((byte_t*)&ui32Bits,4);
-  return ui32Bits;
-}
-
-uint64_t mirror64(uint64_t ui64Bits)
-{
-  mirror_bytes((byte_t*)&ui64Bits,8);
-  return ui64Bits;
-}
-
-uint32_t swap_endian32(const void* pui32)
-{
-  uint32_t ui32N = *((uint32_t*)pui32);
-  return (((ui32N&0xFF)<<24)+((ui32N&0xFF00)<<8)+((ui32N&0xFF0000)>>8)+((ui32N&0xFF000000)>>24));
-}
-
-uint64_t swap_endian64(const void* pui64)
-{
-  uint64_t ui64N = *((uint64_t *)pui64);
-  return (((ui64N&0xFF)<<56)+((ui64N&0xFF00)<<40)+((ui64N&0xFF0000)<<24)+((ui64N&0xFF000000)<<8)+((ui64N&0xFF00000000ull)>>8)+((ui64N&0xFF0000000000ull)>>24)+((ui64N&0xFF000000000000ull)>>40)+((ui64N&0xFF00000000000000ull)>>56));
-}
-
-void iso14443a_crc(byte_t* pbtData, size_t szLen, byte_t* pbtCrc)
-{
-  byte_t bt;
-  uint32_t wCrc = 0x6363;
-
-  do {
-    bt = *pbtData++;
-    bt = (bt^(byte_t)(wCrc & 0x00FF));
-    bt = (bt^(bt<<4));
-    wCrc = (wCrc >> 8)^((uint32_t)bt << 8)^((uint32_t)bt<<3)^((uint32_t)bt>>4);
-  } while (--szLen);
-
-  *pbtCrc++ = (byte_t) (wCrc & 0xFF);
-  *pbtCrc = (byte_t) ((wCrc >> 8) & 0xFF);
-}
-
-void append_iso14443a_crc(byte_t* pbtData, size_t szLen)
-{
-  iso14443a_crc(pbtData, szLen, pbtData + szLen);
-}
-
-void print_hex(const byte_t* pbtData, const size_t szBytes)
-{
-  size_t szPos;
-
-  for (szPos=0; szPos < szBytes; szPos++)
-  {
-    printf("%02x  ",pbtData[szPos]);
-  }
-  printf("\n");
-}
-
-void print_hex_bits(const byte_t* pbtData, const size_t szBits)
-{
-  uint8_t uRemainder;
-  size_t szPos;
-  size_t szBytes = szBits/8;
-
-  for (szPos=0; szPos < szBytes; szPos++)
-  {
-    printf("%02x  ",pbtData[szPos]);
-  }
-
-  uRemainder = szBits % 8;
-  // Print the rest bits
-  if (uRemainder != 0)
-  {
-    if (uRemainder < 5)
-      printf("%01x (%d bits)",pbtData[szBytes], uRemainder);
-    else
-      printf("%02x (%d bits)",pbtData[szBytes], uRemainder);
-  }
-  printf("\n");
-}
-
-void print_hex_par(const byte_t* pbtData, const size_t szBits, const byte_t* pbtDataPar)
-{
-  uint8_t uRemainder;
-  size_t szPos;
-  size_t szBytes = szBits/8;
-
-  for (szPos=0; szPos < szBytes; szPos++)
-  {
-    printf("%02x",pbtData[szPos]);
-    if (OddParity[pbtData[szPos]] != pbtDataPar[szPos])
-    {
-      printf("! ");
-    } else {
-      printf("  ");
-    }
-  }
-
-  uRemainder = szBits % 8;
-  // Print the rest bits, these cannot have parity bit
-  if (uRemainder != 0)
-  {
-    if (uRemainder < 5)
-      printf("%01x (%d bits)",pbtData[szBytes], uRemainder);
-    else
-      printf("%02x (%d bits)",pbtData[szBytes], uRemainder);
-  }
-  printf("\n");
-}
diff --git a/libnfc/bitutils.h b/libnfc/bitutils.h
deleted file mode 100644
index 1a9eea1..0000000
--- a/libnfc/bitutils.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Public platform independent Near Field Communication (NFC) library
- * 
- * Copyright (C) 2009, Roel Verdult
- * 
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 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 Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * 
- * 
- * @file bitutils.h
- * @brief
- */
-
-#ifndef _LIBNFC_BITUTILS_H_
-#define _LIBNFC_BITUTILS_H_
-
-#include <stdint.h>
-
-/*
- * FIXME: There is no place for this here
- */
-#ifdef _WIN32
-  /* Windows platform */
-  #ifndef _WINDLL
-    /* CMake compilation */
-    #ifdef nfc_EXPORTS
-      #define  NFC_EXPORT __declspec(dllexport)
-    #else /* nfc_EXPORTS */
-      #define  NFC_EXPORT __declspec(dllimport)
-    #endif /* nfc_EXPORTS */
-  #else /* _WINDLL */
-    /* Manual makefile */
-    #define NFC_EXPORT
-  #endif /* _WINDLL */
-#else /* _WIN32 */
-  #define NFC_EXPORT
-#endif /* _WIN32 */
-
-#include <nfc/nfc-types.h>
-
-byte_t oddparity(const byte_t bt);
-void oddparity_byte_ts(const byte_t* pbtData, const size_t szLen, byte_t* pbtPar);
-
-NFC_EXPORT byte_t mirror(byte_t bt);
-NFC_EXPORT uint32_t mirror32(uint32_t ui32Bits);
-NFC_EXPORT uint64_t mirror64(uint64_t ui64Bits);
-NFC_EXPORT void mirror_byte_ts(byte_t *pbts, size_t szLen);
-
-NFC_EXPORT uint32_t swap_endian32(const void* pui32);
-NFC_EXPORT uint64_t swap_endian64(const void* pui64);
-
-NFC_EXPORT void append_iso14443a_crc(byte_t* pbtData, size_t szLen);
-
-NFC_EXPORT void print_hex(const byte_t* pbtData, const size_t szLen);
-NFC_EXPORT void print_hex_bits(const byte_t* pbtData, const size_t szBits);
-NFC_EXPORT void print_hex_par(const byte_t* pbtData, const size_t szBits, const byte_t* pbtDataPar);
-
-#endif // _LIBNFC_BITUTILS_H_
-
diff --git a/libnfc/chips/pn53x.c b/libnfc/chips/pn53x.c
index d59fbba..8d28cd1 100644
--- a/libnfc/chips/pn53x.c
+++ b/libnfc/chips/pn53x.c
@@ -30,8 +30,7 @@
 #include <stdio.h>
 
 #include "pn53x.h"
-
-#include "../bitutils.h"
+#include "../mirror-subr.h"
 
 // PN53X configuration
 const byte_t pncmd_get_firmware_version       [  2] = { 0xD4,0x02 };
diff --git a/libnfc/drivers.h b/libnfc/drivers.h
index 2f5a3c4..96bb5c9 100644
--- a/libnfc/drivers.h
+++ b/libnfc/drivers.h
@@ -73,5 +73,21 @@ static const struct driver_callbacks drivers_callbacks_list[] = {
 #endif /* DRIVER_PN532_UART_ENABLED */
 };
 
+#ifdef DEBUG
+  /*
+   * FIXME: Helper macro for dumping drivers messages.
+   * Here is not the best place for such a macro, however, I
+   * can't see any convenient place ATM.
+   */
+#  define PRINT_HEX(pcTag, pbtData, szBytes) do { \
+    size_t __szPos; \
+    printf(" %s: ", pcTag); \
+    for (__szPos=0; __szPos < szBytes; __szPos++) { \
+      printf("%02x  ",pbtData[__szPos]); \
+    } \
+    printf("\n"); \
+  } while (0);
+#endif
+
 #endif // __NFC_DRIVERS_H__
 
diff --git a/libnfc/drivers/acr122.c b/libnfc/drivers/acr122.c
index c2ad6db..f4539be 100644
--- a/libnfc/drivers/acr122.c
+++ b/libnfc/drivers/acr122.c
@@ -35,7 +35,6 @@
 
 #include "acr122.h"
 #include "../drivers.h"
-#include "../bitutils.h"
 
 // Bus
 #include <winscard.h>
@@ -279,8 +278,7 @@ bool acr122_transceive(const nfc_device_spec_t nds, const byte_t* pbtTx, const s
   memcpy(abtTxBuf+5,pbtTx,szTxLen);
   szRxBufLen = sizeof(abtRxBuf);
 #ifdef DEBUG
-  printf(" TX: ");
-  print_hex(abtTxBuf,szTxLen+5);
+  PRINT_HEX("TX", abtTxBuf,szTxLen+5);
 #endif
 
   if (pas->ioCard.dwProtocol == SCARD_PROTOCOL_UNDEFINED)
@@ -305,8 +303,7 @@ bool acr122_transceive(const nfc_device_spec_t nds, const byte_t* pbtTx, const s
   }
 
 #ifdef DEBUG
-  printf(" RX: ");
-  print_hex(abtRxBuf,szRxBufLen);
+  PRINT_HEX("RX", abtRxBuf,szRxBufLen);
 #endif
 
   // When the answer should be ignored, just return a succesful result
diff --git a/libnfc/drivers/arygon.c b/libnfc/drivers/arygon.c
index c323bad..12e6d5a 100644
--- a/libnfc/drivers/arygon.c
+++ b/libnfc/drivers/arygon.c
@@ -32,7 +32,6 @@
 #endif // HAVE_CONFIG_H
 
 #include "../drivers.h"
-#include "../bitutils.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -236,8 +235,7 @@ bool arygon_transceive(const nfc_device_spec_t nds, const byte_t* pbtTx, const s
   abtTxBuf[szTxLen+7] = 0;
 
 #ifdef DEBUG
-  printf(" TX: ");
-  print_hex(abtTxBuf,szTxLen+8);
+  PRINT_HEX("TX", abtTxBuf,szTxLen+8);
 #endif
   if (!uart_send((serial_port)nds,abtTxBuf,szTxLen+8)) {
     ERR("%s", "Unable to transmit data. (TX)");
@@ -250,8 +248,7 @@ bool arygon_transceive(const nfc_device_spec_t nds, const byte_t* pbtTx, const s
   }
 
 #ifdef DEBUG
-  printf(" RX: ");
-  print_hex(abtRxBuf,szRxBufLen);
+  PRINT_HEX("RX", abtRxBuf,szRxBufLen);
 #endif
 
   const byte_t pn53x_ack_frame[] = { 0x00,0x00,0xff,0x00,0xff,0x00 };
@@ -282,10 +279,9 @@ bool arygon_transceive(const nfc_device_spec_t nds, const byte_t* pbtTx, const s
     }
   }
 
-  #ifdef DEBUG
-  printf(" RX: ");
-  print_hex(abtRxBuf,szRxBufLen);
-  #endif
+#ifdef DEBUG
+  PRINT_HEX("RX", abtRxBuf,szRxBufLen);
+#endif
 
   // When the answer should be ignored, just return a successful result
   if(pbtRx == NULL || pszRxLen == NULL) return true;
diff --git a/libnfc/drivers/pn532_uart.c b/libnfc/drivers/pn532_uart.c
index a745a0c..7e7a56d 100644
--- a/libnfc/drivers/pn532_uart.c
+++ b/libnfc/drivers/pn532_uart.c
@@ -29,7 +29,6 @@
 #endif // HAVE_CONFIG_H
 
 #include "../drivers.h"
-#include "../bitutils.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -215,8 +214,7 @@ bool pn532_uart_transceive(const nfc_device_spec_t nds, const byte_t* pbtTx, con
   abtTxBuf[szTxLen+6] = 0;
 
 #ifdef DEBUG
-  printf(" TX: ");
-  print_hex(abtTxBuf,szTxLen+7);
+  PRINT_HEX("TX", abtTxBuf,szTxLen+7);
 #endif
   if (!uart_send((serial_port)nds,abtTxBuf,szTxLen+7)) {
     ERR("%s", "Unable to transmit data. (TX)");
@@ -229,8 +227,7 @@ bool pn532_uart_transceive(const nfc_device_spec_t nds, const byte_t* pbtTx, con
   }
 
 #ifdef DEBUG
-  printf(" RX: ");
-  print_hex(abtRxBuf,szRxBufLen);
+  PRINT_HEX("RX", abtRxBuf,szRxBufLen);
 #endif
 
 
@@ -262,10 +259,9 @@ bool pn532_uart_transceive(const nfc_device_spec_t nds, const byte_t* pbtTx, con
     }
   }
 
-  #ifdef DEBUG
-  printf(" RX: ");
-  print_hex(abtRxBuf,szRxBufLen);
-  #endif
+#ifdef DEBUG
+  PRINT_HEX("RX", abtRxBuf,szRxBufLen);
+#endif
 
   // When the answer should be ignored, just return a successful result
   if(pbtRx == NULL || pszRxLen == NULL) return true;
@@ -293,16 +289,14 @@ pn532_uart_wakeup(const nfc_device_spec_t nds)
 //   const byte_t pncmd_pn532c106_wakeup[] = { 0x00,0x00,0xff,0x09,0xf7,0xd4,0x00,0x00,'l','i','b','n','f','c',0xbe,0x00 };
 
 #ifdef DEBUG
-  printf(" TX: ");
-  print_hex(pncmd_pn532c106_wakeup,sizeof(pncmd_pn532c106_wakeup));
+  PRINT_HEX("TX", pncmd_pn532c106_wakeup,sizeof(pncmd_pn532c106_wakeup));
 #endif
   uart_send((serial_port)nds, pncmd_pn532c106_wakeup, sizeof(pncmd_pn532c106_wakeup));
 
   while (!uart_receive((serial_port)nds,abtRx,&szRxLen)) {
   }
 #ifdef DEBUG
-  printf(" RX: ");
-  print_hex(abtRx,szRxLen);
+  PRINT_HEX("RX", abtRx,szRxLen);
 #endif
 
   const byte_t attempted_result[] = { 0x00,0x00,0xff,0x00,0xff,0x00,0x00,0x00,0xff,0x09,0xf7,0xD5,0x01,0x00,'l','i','b','n','f','c',0xbc,0x00};
diff --git a/libnfc/drivers/pn53x_usb.c b/libnfc/drivers/pn53x_usb.c
index 5ece91c..c821225 100644
--- a/libnfc/drivers/pn53x_usb.c
+++ b/libnfc/drivers/pn53x_usb.c
@@ -38,7 +38,6 @@ Thanks to d18c7db and Okko for example code
 #include <string.h>
 
 #include "../drivers.h"
-#include "../bitutils.h"
 
 #include <nfc/nfc-messages.h>
 
@@ -267,10 +266,9 @@ bool pn53x_usb_transceive(const nfc_device_spec_t nds, const byte_t* pbtTx, cons
   abtTx[szTxLen+6] = 0;
 
   DBG("%s","pn53x_usb_transceive");
-  #ifdef DEBUG
-    printf(" TX: ");
-    print_hex(abtTx,szTxLen+7);
-  #endif
+#ifdef DEBUG
+  PRINT_HEX("TX", abtTx,szTxLen+7);
+#endif
 
   ret = usb_bulk_write(pus->pudh, pus->uiEndPointOut, (char*)abtTx, szTxLen+7, USB_TIMEOUT);
   if( ret < 0 )
@@ -286,10 +284,9 @@ bool pn53x_usb_transceive(const nfc_device_spec_t nds, const byte_t* pbtTx, cons
     return false;
   }
 
-  #ifdef DEBUG
-    printf(" RX: ");
-    print_hex(abtRx,ret);
-  #endif
+#ifdef DEBUG
+  PRINT_HEX("RX", abtRx,ret);
+#endif
 
   if( ret == 6 )
   {
@@ -300,10 +297,9 @@ bool pn53x_usb_transceive(const nfc_device_spec_t nds, const byte_t* pbtTx, cons
       return false;
     }
 
-    #ifdef DEBUG
-      printf(" RX: ");
-      print_hex(abtRx,ret);
-    #endif
+#ifdef DEBUG
+    PRINT_HEX("RX", abtRx,ret);
+#endif
   }
 
   // When the answer should be ignored, just return a succesful result
diff --git a/libnfc/iso14443-subr.c b/libnfc/iso14443-subr.c
new file mode 100644
index 0000000..dfa4f62
--- /dev/null
+++ b/libnfc/iso14443-subr.c
@@ -0,0 +1,52 @@
+/*-
+ * Public platform independent Near Field Communication (NFC) library
+ * 
+ * Copyright (C) 2009, Roel Verdult
+ * 
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 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 Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+ /**
+ * @file iso14443-subr.c
+ * @brief
+ */
+
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif // HAVE_CONFIG_H
+
+#include <stdio.h>
+
+#include <nfc/nfc.h>
+
+void iso14443a_crc(byte_t* pbtData, size_t szLen, byte_t* pbtCrc)
+{
+  byte_t bt;
+  uint32_t wCrc = 0x6363;
+
+  do {
+    bt = *pbtData++;
+    bt = (bt^(byte_t)(wCrc & 0x00FF));
+    bt = (bt^(bt<<4));
+    wCrc = (wCrc >> 8)^((uint32_t)bt << 8)^((uint32_t)bt<<3)^((uint32_t)bt>>4);
+  } while (--szLen);
+
+  *pbtCrc++ = (byte_t) (wCrc & 0xFF);
+  *pbtCrc = (byte_t) ((wCrc >> 8) & 0xFF);
+}
+
+void append_iso14443a_crc(byte_t* pbtData, size_t szLen)
+{
+  iso14443a_crc(pbtData, szLen, pbtData + szLen);
+}
diff --git a/libnfc/mirror-subr.c b/libnfc/mirror-subr.c
new file mode 100644
index 0000000..4685293
--- /dev/null
+++ b/libnfc/mirror-subr.c
@@ -0,0 +1,82 @@
+/*-
+ * Public platform independent Near Field Communication (NFC) library
+ * 
+ * Copyright (C) 2009, Roel Verdult
+ * 
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 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 Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+ /**
+ * @file mirror-subr.c
+ * @brief
+ */
+
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif // HAVE_CONFIG_H
+
+#include <stdio.h>
+
+#include "mirror-subr.h"
+
+static const byte_t ByteMirror[256] = {
+  0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, 0x10, 0x90, 0x50, 0xd0, 0x30, 
+  0xb0, 0x70, 0xf0, 0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8, 0x18, 0x98, 
+  0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8, 0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 
+  0xe4, 0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4, 0x0c, 0x8c, 0x4c, 0xcc, 
+  0x2c, 0xac, 0x6c, 0xec, 0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc, 0x02, 
+  0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2, 0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 
+  0x72, 0xf2, 0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea, 0x1a, 0x9a, 0x5a, 
+  0xda, 0x3a, 0xba, 0x7a, 0xfa, 0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6, 
+  0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6, 0x0e, 0x8e, 0x4e, 0xce, 0x2e, 
+  0xae, 0x6e, 0xee, 0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe, 0x01, 0x81, 
+  0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1, 0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 
+  0xf1, 0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9, 0x19, 0x99, 0x59, 0xd9, 
+  0x39, 0xb9, 0x79, 0xf9, 0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5, 0x15, 
+  0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5, 0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 
+  0x6d, 0xed, 0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd, 0x03, 0x83, 0x43, 
+  0xc3, 0x23, 0xa3, 0x63, 0xe3, 0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3, 
+  0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb, 0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 
+  0xbb, 0x7b, 0xfb, 0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7, 0x17, 0x97, 
+  0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7, 0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 
+  0xef, 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff
+};
+
+byte_t mirror(byte_t bt)
+{
+  return ByteMirror[bt];
+}
+
+void mirror_bytes(byte_t *pbts, size_t szLen)
+{
+  size_t szByteNr;
+
+  for (szByteNr=0; szByteNr<szLen; szByteNr++)
+  {
+    *pbts = ByteMirror[*pbts];
+    pbts++;
+  }
+}
+
+uint32_t mirror32(uint32_t ui32Bits)
+{
+  mirror_bytes((byte_t*)&ui32Bits,4);
+  return ui32Bits;
+}
+
+uint64_t mirror64(uint64_t ui64Bits)
+{
+  mirror_bytes((byte_t*)&ui64Bits,8);
+  return ui64Bits;
+}
diff --git a/libnfc/mirror-subr.h b/libnfc/mirror-subr.h
new file mode 100644
index 0000000..1cc3b72
--- /dev/null
+++ b/libnfc/mirror-subr.h
@@ -0,0 +1,39 @@
+/**
+ * Public platform independent Near Field Communication (NFC) library
+ * 
+ * Copyright (C) 2009, Roel Verdult
+ * 
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 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 Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * 
+ * 
+ * @file mirror-subr.h
+ * @brief
+ */
+
+#ifndef _LIBNFC_MIRROR_SUBR_H_
+#define _LIBNFC_MIRROR_SUBR_H_
+
+#include <stdint.h>
+
+#include <nfc/nfc-types.h>
+
+byte_t oddparity(const byte_t bt);
+void oddparity_byte_ts(const byte_t* pbtData, const size_t szLen, byte_t* pbtPar);
+
+byte_t mirror(byte_t bt);
+uint32_t mirror32(uint32_t ui32Bits);
+uint64_t mirror64(uint64_t ui64Bits);
+void mirror_byte_ts(byte_t *pbts, size_t szLen);
+
+#endif // _LIBNFC_MIRROR_SUBR_H_