diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0895f49..0db5b7e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,6 @@ set(AASDK_PROTO_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 
 include_directories(${AASDK_PROTO_INCLUDE_DIRS}
                         ${Boost_INCLUDE_DIRS}
-                        ${LIBUSB_1_INCLUDE_DIRS}
                         ${PROTOBUF_INCLUDE_DIR}
                         ${OPENSSL_INCLUDE_DIR}
                         ${GTEST_INCLUDE_DIRS}
@@ -66,8 +65,8 @@ add_library(aasdk SHARED
 add_dependencies(aasdk aasdk_proto)
 target_link_libraries(aasdk
                         aasdk_proto
+			libusb
                         ${Boost_LIBRARIES}
-                        ${LIBUSB_1_LIBRARIES}
                         ${PROTOBUF_LIBRARIES}
                         ${OPENSSL_LIBRARIES}
                         ${WINSOCK2_LIBRARIES})
diff --git a/cmake_modules/Findlibusb-1.0.cmake b/cmake_modules/Findlibusb-1.0.cmake
index ec40055..c0bc99d 100644
--- a/cmake_modules/Findlibusb-1.0.cmake
+++ b/cmake_modules/Findlibusb-1.0.cmake
@@ -83,13 +83,16 @@ else (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS)
   if (LIBUSB_1_FOUND)
     if (NOT libusb_1_FIND_QUIETLY)
       message(STATUS "Found libusb-1.0:")
-	  message(STATUS " - Includes: ${LIBUSB_1_INCLUDE_DIRS}")
-	  message(STATUS " - Libraries: ${LIBUSB_1_LIBRARIES}")
+      message(STATUS " - Includes: ${LIBUSB_1_INCLUDE_DIRS}")
+      message(STATUS " - Libraries: ${LIBUSB_1_LIBRARIES}")
+      add_library(libusb INTERFACE)
+      target_include_directories(libusb SYSTEM INTERFACE ${LIBUSB_1_INCLUDE_DIR})
+      target_link_libraries(libusb INTERFACE ${LIBUSB_1_LIBRARY})
     endif (NOT libusb_1_FIND_QUIETLY)
   else (LIBUSB_1_FOUND)
-    if (libusb_1_FIND_REQUIRED)
+    if (libusb-1.0_FIND_REQUIRED)
       message(FATAL_ERROR "Could not find libusb")
-    endif (libusb_1_FIND_REQUIRED)
+    endif (libusb-1.0_FIND_REQUIRED)
   endif (LIBUSB_1_FOUND)
 
   # show the LIBUSB_1_INCLUDE_DIRS and LIBUSB_1_LIBRARIES variables only in the advanced view