diff --git a/Makefile.am b/Makefile.am
index 8af863f..72e31ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,3 +15,4 @@ html-am : Doxyfile
 
 .PHONY: html
 endif
+DISTCLEANFILES = Makefile.in
diff --git a/src/Makefile.am b/src/Makefile.am
index 2c50dce..e088442 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,3 +27,4 @@ if LIBUSB_ENABLED
   libnfc_la_LIBADD  += @LIBUSB_LIBS@
 endif
 
+DISTCLEANFILES = Makefile.in
diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt
index 56cf9c1..6093641 100644
--- a/src/examples/CMakeLists.txt
+++ b/src/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(EXAMPLES-SOURCES nfc-list nfc-mftool nfc-mfultool nfcip-initiator nfcip-target nfc-anticol nfc-emulate nfc-relay)
+SET(EXAMPLES-SOURCES nfc-list nfc-mfclassic nfc-mfultralight nfcip-initiator nfcip-target nfc-anticol nfc-emulate nfc-relay)
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../)
 
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 8fed530..54c8b90 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS = nfc-anticol nfc-list nfc-mftool nfc-mfultool nfc-relay nfc-emulate nfcip-target nfcip-initiator
+bin_PROGRAMS = nfc-anticol nfc-list nfc-mfclassic nfc-mfultralight nfc-relay nfc-emulate nfcip-target nfcip-initiator
 
 # set the include path found by configure
 INCLUDES= $(all_includes)
@@ -14,11 +14,11 @@ nfc_anticol_LDADD = $(top_builddir)/src/libnfc.la
 nfc_list_SOURCES = nfc-list.c
 nfc_list_LDADD = $(top_builddir)/src/libnfc.la
 
-nfc_mfultool_SOURCES = nfc-mfultool.c mifareultag.h
-nfc_mfultool_LDADD = $(top_builddir)/src/libnfc.la
+nfc_mfultralight_SOURCES = nfc-mfultralight.c mifareultag.h
+nfc_mfultralight_LDADD = $(top_builddir)/src/libnfc.la
 
-nfc_mftool_SOURCES = nfc-mftool.c mifaretag.h
-nfc_mftool_LDADD = $(top_builddir)/src/libnfc.la
+nfc_mfclassic_SOURCES = nfc-mfclassic.c mifaretag.h
+nfc_mfclassic_LDADD = $(top_builddir)/src/libnfc.la
 
 nfc_relay_SOURCES = nfc-relay.c
 nfc_relay_LDADD = $(top_builddir)/src/libnfc.la
@@ -32,7 +32,8 @@ nfcip_target_LDADD = $(top_builddir)/src/libnfc.la
 nfcip_initiator_SOURCES = nfcip-initiator.c
 nfcip_initiator_LDADD = $(top_builddir)/src/libnfc.la
 
-dist_man_MANS = nfc-anticol.1 nfc-emulate.1 nfc-list.1 nfc-mftool.1 nfc-mfultool.1 nfc-relay.1
+dist_man_MANS = nfc-anticol.1 nfc-emulate.1 nfc-list.1 nfc-mfclassic.1 nfc-mfultralight.1 nfc-relay.1
 #dist_man_MANS = $(man_MANS)
 #EXTRA_DIST = $(man_MANS)
 
+DISTCLEANFILES = Makefile.in
diff --git a/src/examples/nfc-anticol.c b/src/examples/nfc-anticol.c
index f1dd6ea..9e0af10 100644
--- a/src/examples/nfc-anticol.c
+++ b/src/examples/nfc-anticol.c
@@ -31,6 +31,7 @@
 #include "libnfc.h"
 
 #include "messages.h"
+#include "bitutils.h"
 
 #define SAK_FLAG_ATS_SUPPORTED 0x20
 
diff --git a/src/examples/nfc-emulate.c b/src/examples/nfc-emulate.c
index 7aa1d6a..6447cec 100644
--- a/src/examples/nfc-emulate.c
+++ b/src/examples/nfc-emulate.c
@@ -28,7 +28,9 @@
 #include <string.h>
 
 #include "libnfc.h"
+
 #include "messages.h"
+#include "bitutils.h"
 
 static byte_t abtRecv[MAX_FRAME_LEN];
 static size_t szRecvBits;
diff --git a/src/examples/nfc-list.c b/src/examples/nfc-list.c
index 6fafeba..2e48cd8 100644
--- a/src/examples/nfc-list.c
+++ b/src/examples/nfc-list.c
@@ -28,7 +28,9 @@
 #include <string.h>
 
 #include "libnfc.h"
+
 #include "messages.h"
+#include "bitutils.h"
 
 static dev_info* pdi;
 static byte_t abtFelica[5] = { 0x00, 0xff, 0xff, 0x00, 0x00 };
diff --git a/src/examples/nfc-mftool.1 b/src/examples/nfc-mfclassic.1
similarity index 82%
rename from src/examples/nfc-mftool.1
rename to src/examples/nfc-mfclassic.1
index ff79696..7bcad06 100644
--- a/src/examples/nfc-mftool.1
+++ b/src/examples/nfc-mfclassic.1
@@ -1,22 +1,22 @@
-.TH NFC-MFTOOL 1 "Oct 06, 2009"
+.TH NFC-MFCLASSIC 1 "Nov 02, 2009"
 .SH NAME
-nfc-mftool \- Mifare Classic command line tool based on libnfc
+nfc-mfclassic \- MIFARE Classic command line tool based on libnfc
 .SH SYNOPSIS
-.B nfc-mftool
+.B nfc-mfclassic
 .RI \fR\fBr\fR|\fBw\fR
 .RI \fR\fBa\fR|\fBb\fR
 .IR DUMP
 .IR [KEYS]
 
 .SH DESCRIPTION
-.B nfc-mftool
-is a Mifare Classic tool that allow to read or write
+.B nfc-mfclassic
+is a MIFARE Classic tool that allow to read or write
 .IR DUMP
 file using Mifare keys provide in 
 .IR KEYS
 file.
 
-The Mifare Classic tag is one of the most widely used RFID tags.
+MIFARE Classic tag is one of the most widely used RFID tags.
 The firmware in the NFC controller supports authenticating, reading and writing to/from Mifare Classic tags.
 This tool demonstrate the speed of this library and its easy-of-use.
 It possible to read and write the complete content of a Mifare Classic 4KB tag within 1 second.
diff --git a/src/examples/nfc-mftool.c b/src/examples/nfc-mfclassic.c
similarity index 100%
rename from src/examples/nfc-mftool.c
rename to src/examples/nfc-mfclassic.c
diff --git a/src/examples/nfc-mfultool.1 b/src/examples/nfc-mfultralight.1
similarity index 70%
rename from src/examples/nfc-mfultool.1
rename to src/examples/nfc-mfultralight.1
index bd66311..2537f1d 100644
--- a/src/examples/nfc-mfultool.1
+++ b/src/examples/nfc-mfultralight.1
@@ -1,18 +1,18 @@
-.TH NFC-MFTOOL 1 "Oct 06, 2009"
+.TH NFC-MFULTRALIGHT 1 "Nov 02, 2009"
 .SH NAME
-nfc-mfultool \- Mifare Ultralight command line tool based on libnfc
+nfc-mfultralight \- MIFARE Ultralight command line tool based on libnfc
 .SH SYNOPSIS
-.B nfc-mfultool
+.B nfc-mfultralight
 .RI \fR\fBr\fR|\fBw\fR
 .IR DUMP
 
 .SH DESCRIPTION
-.B nfc-mfultool
-is a Mifare Ultralight tool that allow to read or write
+.B nfc-mfultralight
+is a MIFARE Ultralight tool that allow to read or write
 .IR DUMP
 file.
 
-The Mifare Ultralight tag is one of the most widely used RFID tags for ticketing application.
+MIFARE Ultralight tag is one of the most widely used RFID tags for ticketing application.
 It uses a binary Mifare Dump file (MFD) to store data for all sectors.
 
 .SH OPTIONS
diff --git a/src/examples/nfc-mfultool.c b/src/examples/nfc-mfultralight.c
similarity index 99%
rename from src/examples/nfc-mfultool.c
rename to src/examples/nfc-mfultralight.c
index facf7e8..9f717ba 100644
--- a/src/examples/nfc-mfultool.c
+++ b/src/examples/nfc-mfultralight.c
@@ -31,7 +31,9 @@
 #include <ctype.h>
 
 #include "libnfc.h"
+
 #include "mifareultag.h"
+#include "bitutils.h"
 
 static dev_info* pdi;
 static tag_info ti;
diff --git a/src/examples/nfc-relay.c b/src/examples/nfc-relay.c
index e6de635..a53a3e1 100644
--- a/src/examples/nfc-relay.c
+++ b/src/examples/nfc-relay.c
@@ -27,7 +27,9 @@
 #include <string.h>
 
 #include "libnfc.h"
+
 #include "messages.h"
+#include "bitutils.h"
 
 static byte_t abtReaderRx[MAX_FRAME_LEN];
 static byte_t abtReaderRxPar[MAX_FRAME_LEN];