diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt
index 6f82da4..1dffda8 100644
--- a/src/examples/CMakeLists.txt
+++ b/src/examples/CMakeLists.txt
@@ -12,10 +12,6 @@ FOREACH(source ${EXAMPLES-SOURCES})
   INSTALL(TARGETS ${source} RUNTIME DESTINATION bin COMPONENT examples)
 ENDFOREACH(source)
 
-# Headers
-FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
-INSTALL(FILES ${headers} DESTINATION ${INCLUDE_INSTALL_DIR}/nfc COMPONENT headers)
-
 # Manuals for the examples
 FILE(GLOB manuals "${CMAKE_CURRENT_SOURCE_DIR}/*.1")
 INSTALL(FILES ${manuals} DESTINATION ${SHARE_INSTALL_PREFIX}/man/man1 COMPONENT manuals)
diff --git a/src/include/CMakeLists.txt b/src/include/CMakeLists.txt
new file mode 100644
index 0000000..da4cb07
--- /dev/null
+++ b/src/include/CMakeLists.txt
@@ -0,0 +1,2 @@
+ADD_SUBDIRECTORY(nfc)
+
diff --git a/src/include/nfc/CMakeLists.txt b/src/include/nfc/CMakeLists.txt
new file mode 100644
index 0000000..c11d479
--- /dev/null
+++ b/src/include/nfc/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Headers
+FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+INSTALL(FILES ${headers} DESTINATION ${INCLUDE_INSTALL_DIR}/nfc COMPONENT headers)
+
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index bf0dd68..81b11cb 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -23,7 +23,7 @@ IF(LIBNFC_USB)
   FIND_PACKAGE(LIBUSB REQUIRED)
   ADD_DEFINITIONS("-DHAVE_LIBUSB=1")
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LIBUSB_CFLAGS_OTHER}")
-  SET(DRIVERS_SOURCES ${DRIVERS_SOURCES} "drivers/pn531_usb" "drivers/pn533_usb")
+  SET(DRIVERS_SOURCES ${DRIVERS_SOURCES} "drivers/pn531_usb" "drivers/pn533_usb" "drivers/pn53x_usb.c")
 ENDIF(LIBNFC_USB)
 
 INCLUDE_DIRECTORIES(${LIBUSB_INCLUDE_DIRS} ${PCSC_INCLUDE_DIRS})