diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3279fed..0daee7f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,6 +84,12 @@ IF(NOT MSVC)
   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libnfc.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 ENDIF(NOT MSVC)
 
+ADD_DEFINITIONS(-DDRIVER_ACR122_ENABLED)
+ADD_DEFINITIONS(-DDRIVER_PN531_USB_ENABLED)
+ADD_DEFINITIONS(-DDRIVER_PN533_USB_ENABLED)
+ADD_DEFINITIONS(-DDRIVER_ARYGON_ENABLED)
+#ADD_DEFINITIONS(-DDRIVER_PN532_UART_ENABLED)
+
 ADD_SUBDIRECTORY(libnfc)
 ADD_SUBDIRECTORY(include)
 ADD_SUBDIRECTORY(examples)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 2d1bda3..722d02c 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -6,10 +6,13 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libnfc)
 INCLUDE_DIRECTORIES(${LIBUSB_INCLUDE_DIRS} ${PCSC_INCLUDE_DIRS})
 LINK_DIRECTORIES(${LIBUSB_LIBRARY_DIRS} ${PCSC_LIBRARY_DIRS})
 
+ADD_LIBRARY(nfc-utils nfc-utils)
+
 # Examples
 FOREACH(source ${EXAMPLES-SOURCES})
   ADD_EXECUTABLE(${source} ${source}.c)
   TARGET_LINK_LIBRARIES(${source} nfc)
+  TARGET_LINK_LIBRARIES(${source} nfc-utils)
   INSTALL(TARGETS ${source} RUNTIME DESTINATION bin COMPONENT examples)
 ENDFOREACH(source)
 
diff --git a/libnfc/nfc.c b/libnfc/nfc.c
index c5ac543..debb4ab 100644
--- a/libnfc/nfc.c
+++ b/libnfc/nfc.c
@@ -596,12 +596,13 @@ nfc_initiator_poll_targets(const nfc_device_t* pnd,
   }
 //   byte_t abtInAutoPoll[] = { 0xd4, 0x60, 0x0f, 0x01, 0x00 };
   size_t szTxInAutoPoll = 4 + szTargetTypes;
+  size_t n;
   byte_t *pbtTxInAutoPoll = malloc( szTxInAutoPoll );
   pbtTxInAutoPoll[0] = 0xd4;
   pbtTxInAutoPoll[1] = 0x60;
   pbtTxInAutoPoll[2] = btPollNr;
   pbtTxInAutoPoll[3] = btPeriod;
-  for(size_t n=0; n<szTargetTypes; n++) {
+  for(n=0; n<szTargetTypes; n++) {
     pbtTxInAutoPoll[4+n] = pnttTargetTypes[n];
   }