diff --git a/cmake/Modules/FindLibMiriSDR.cmake b/cmake/Modules/FindLibMiriSDR.cmake
index 36040dd..cdb673f 100644
--- a/cmake/Modules/FindLibMiriSDR.cmake
+++ b/cmake/Modules/FindLibMiriSDR.cmake
@@ -1,6 +1,6 @@
 if(NOT LIBMIRISDR_FOUND)
   pkg_check_modules (LIBMIRISDR_PKG libmirisdr)
-  find_path(LIBMIRISDR_INCLUDE_DIR NAMES mirisdr.h
+  find_path(LIBMIRISDR_INCLUDE_DIRS NAMES mirisdr.h
     PATHS
     ${LIBMIRISDR_PKG_INCLUDE_DIRS}
     /usr/include
@@ -14,14 +14,14 @@ if(NOT LIBMIRISDR_FOUND)
     /usr/local/lib
   )
 
-if(LIBMIRISDR_INCLUDE_DIR AND LIBMIRISDR_LIBRARIES)
+if(LIBMIRISDR_INCLUDE_DIRS AND LIBMIRISDR_LIBRARIES)
   set(LIBMIRISDR_FOUND TRUE CACHE INTERNAL "libmirisdr found")
-  message(STATUS "Found libmirisdr: ${LIBMIRISDR_INCLUDE_DIR}, ${LIBMIRISDR_LIBRARIES}")
-else(LIBMIRISDR_INCLUDE_DIR AND LIBMIRISDR_LIBRARIES)
+  message(STATUS "Found libmirisdr: ${LIBMIRISDR_INCLUDE_DIRS}, ${LIBMIRISDR_LIBRARIES}")
+else(LIBMIRISDR_INCLUDE_DIRS AND LIBMIRISDR_LIBRARIES)
   set(LIBMIRISDR_FOUND FALSE CACHE INTERNAL "libmirisdr found")
   message(STATUS "libmirisdr not found.")
-endif(LIBMIRISDR_INCLUDE_DIR AND LIBMIRISDR_LIBRARIES)
+endif(LIBMIRISDR_INCLUDE_DIRS AND LIBMIRISDR_LIBRARIES)
 
-mark_as_advanced(LIBMIRISDR_INCLUDE_DIR LIBMIRISDR_LIBRARIES)
+mark_as_advanced(LIBMIRISDR_LIBRARIES LIBMIRISDR_INCLUDE_DIRS)
 
 endif(NOT LIBMIRISDR_FOUND)
diff --git a/cmake/Modules/FindLibOsmoSDR.cmake b/cmake/Modules/FindLibOsmoSDR.cmake
index e898cf9..a772e68 100644
--- a/cmake/Modules/FindLibOsmoSDR.cmake
+++ b/cmake/Modules/FindLibOsmoSDR.cmake
@@ -1,6 +1,6 @@
 if(NOT LIBOSMOSDR_FOUND)
   pkg_check_modules (LIBOSMOSDR_PKG libosmosdr)
-  find_path(LIBOSMOSDR_INCLUDE_DIR NAMES osmosdr.h
+  find_path(LIBOSMOSDR_INCLUDE_DIRS NAMES osmosdr.h
     PATHS
     ${LIBOSMOSDR_PKG_INCLUDE_DIRS}
     /usr/include
@@ -14,14 +14,14 @@ if(NOT LIBOSMOSDR_FOUND)
     /usr/local/lib
   )
 
-if(LIBOSMOSDR_INCLUDE_DIR AND LIBOSMOSDR_LIBRARIES)
+if(LIBOSMOSDR_INCLUDE_DIRS AND LIBOSMOSDR_LIBRARIES)
   set(LIBOSMOSDR_FOUND TRUE CACHE INTERNAL "libosmosdr found")
-  message(STATUS "Found libosmosdr: ${LIBOSMOSDR_INCLUDE_DIR}, ${LIBOSMOSDR_LIBRARIES}")
-else(LIBOSMOSDR_INCLUDE_DIR AND LIBOSMOSDR_LIBRARIES)
+  message(STATUS "Found libosmosdr: ${LIBOSMOSDR_INCLUDE_DIRS}, ${LIBOSMOSDR_LIBRARIES}")
+else(LIBOSMOSDR_INCLUDE_DIRS AND LIBOSMOSDR_LIBRARIES)
   set(LIBOSMOSDR_FOUND FALSE CACHE INTERNAL "libosmosdr found")
   message(STATUS "libosmosdr not found.")
-endif(LIBOSMOSDR_INCLUDE_DIR AND LIBOSMOSDR_LIBRARIES)
+endif(LIBOSMOSDR_INCLUDE_DIRS AND LIBOSMOSDR_LIBRARIES)
 
-mark_as_advanced(LIBOSMOSDR_INCLUDE_DIR LIBOSMOSDR_LIBRARIES)
+mark_as_advanced(LIBOSMOSDR_LIBRARIES LIBOSMOSDR_INCLUDE_DIRS)
 
 endif(NOT LIBOSMOSDR_FOUND)
diff --git a/cmake/Modules/FindLibRTLSDR.cmake b/cmake/Modules/FindLibRTLSDR.cmake
index 4455169..f8ecb0f 100644
--- a/cmake/Modules/FindLibRTLSDR.cmake
+++ b/cmake/Modules/FindLibRTLSDR.cmake
@@ -1,6 +1,6 @@
 if(NOT LIBRTLSDR_FOUND)
   pkg_check_modules (LIBRTLSDR_PKG librtlsdr)
-  find_path(LIBRTLSDR_INCLUDE_DIR NAMES rtl-sdr.h
+  find_path(LIBRTLSDR_INCLUDE_DIRS NAMES rtl-sdr.h
     PATHS
     ${LIBRTLSDR_PKG_INCLUDE_DIRS}
     /usr/include
@@ -14,14 +14,14 @@ if(NOT LIBRTLSDR_FOUND)
     /usr/local/lib
   )
 
-if(LIBRTLSDR_INCLUDE_DIR AND LIBRTLSDR_LIBRARIES)
+if(LIBRTLSDR_INCLUDE_DIRS AND LIBRTLSDR_LIBRARIES)
   set(LIBRTLSDR_FOUND TRUE CACHE INTERNAL "librtlsdr found")
-  message(STATUS "Found librtlsdr: ${LIBRTLSDR_INCLUDE_DIR}, ${LIBRTLSDR_LIBRARIES}")
-else(LIBRTLSDR_INCLUDE_DIR AND LIBRTLSDR_LIBRARIES)
+  message(STATUS "Found librtlsdr: ${LIBRTLSDR_INCLUDE_DIRS}, ${LIBRTLSDR_LIBRARIES}")
+else(LIBRTLSDR_INCLUDE_DIRS AND LIBRTLSDR_LIBRARIES)
   set(LIBRTLSDR_FOUND FALSE CACHE INTERNAL "librtlsdr found")
   message(STATUS "librtlsdr not found.")
-endif(LIBRTLSDR_INCLUDE_DIR AND LIBRTLSDR_LIBRARIES)
+endif(LIBRTLSDR_INCLUDE_DIRS AND LIBRTLSDR_LIBRARIES)
 
-mark_as_advanced(LIBRTLSDR_INCLUDE_DIR LIBRTLSDR_LIBRARIES)
+mark_as_advanced(LIBRTLSDR_LIBRARIES LIBRTLSDR_INCLUDE_DIRS)
 
 endif(NOT LIBRTLSDR_FOUND)
diff --git a/cmake/Modules/FindLibbladeRF.cmake b/cmake/Modules/FindLibbladeRF.cmake
index 36da9fb..0971344 100644
--- a/cmake/Modules/FindLibbladeRF.cmake
+++ b/cmake/Modules/FindLibbladeRF.cmake
@@ -1,6 +1,6 @@
 if(NOT LIBBLADERF_FOUND)
   pkg_check_modules (LIBBLADERF_PKG libbladeRF)
-  find_path(LIBBLADERF_INCLUDE_DIR NAMES libbladeRF.h
+  find_path(LIBBLADERF_INCLUDE_DIRS NAMES libbladeRF.h
     PATHS
     ${LIBBLADERF_PKG_INCLUDE_DIRS}
     /usr/include
@@ -14,14 +14,14 @@ if(NOT LIBBLADERF_FOUND)
     /usr/local/lib
   )
 
-if(LIBBLADERF_INCLUDE_DIR AND LIBBLADERF_LIBRARIES)
+if(LIBBLADERF_INCLUDE_DIRS AND LIBBLADERF_LIBRARIES)
   set(LIBBLADERF_FOUND TRUE CACHE INTERNAL "libbladeRF found")
-  message(STATUS "Found libbladeRF: ${LIBBLADERF_INCLUDE_DIR}, ${LIBBLADERF_LIBRARIES}")
-else(LIBBLADERF_INCLUDE_DIR AND LIBBLADERF_LIBRARIES)
+  message(STATUS "Found libbladeRF: ${LIBBLADERF_INCLUDE_DIRS}, ${LIBBLADERF_LIBRARIES}")
+else(LIBBLADERF_INCLUDE_DIRS AND LIBBLADERF_LIBRARIES)
   set(LIBBLADERF_FOUND FALSE CACHE INTERNAL "libbladeRF found")
   message(STATUS "libbladeRF not found.")
-endif(LIBBLADERF_INCLUDE_DIR AND LIBBLADERF_LIBRARIES)
+endif(LIBBLADERF_INCLUDE_DIRS AND LIBBLADERF_LIBRARIES)
 
-mark_as_advanced(LIBBLADERF_INCLUDE_DIR LIBBLADERF_LIBRARIES)
+mark_as_advanced(LIBBLADERF_LIBRARIES LIBBLADERF_INCLUDE_DIRS)
 
 endif(NOT LIBBLADERF_FOUND)
diff --git a/lib/miri/CMakeLists.txt b/lib/miri/CMakeLists.txt
index 49bd1f0..ddaeb0a 100644
--- a/lib/miri/CMakeLists.txt
+++ b/lib/miri/CMakeLists.txt
@@ -23,7 +23,7 @@
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${LIBMIRISDR_INCLUDE_DIR}
+    ${LIBMIRISDR_INCLUDE_DIRS}
 )
 
 set(mirisdr_srcs
diff --git a/lib/osmosdr/CMakeLists.txt b/lib/osmosdr/CMakeLists.txt
index 350076e..b0872f8 100644
--- a/lib/osmosdr/CMakeLists.txt
+++ b/lib/osmosdr/CMakeLists.txt
@@ -23,7 +23,7 @@
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${LIBOSMOSDR_INCLUDE_DIR}
+    ${LIBOSMOSDR_INCLUDE_DIRS}
 )
 
 set(osmosdr_srcs
diff --git a/lib/rtl/CMakeLists.txt b/lib/rtl/CMakeLists.txt
index f5464ac..f438df5 100644
--- a/lib/rtl/CMakeLists.txt
+++ b/lib/rtl/CMakeLists.txt
@@ -23,7 +23,7 @@
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${LIBRTLSDR_INCLUDE_DIR}
+    ${LIBRTLSDR_INCLUDE_DIRS}
 )
 
 set(rtl_srcs