diff --git a/devices/plutosdr/CMakeLists.txt b/devices/plutosdr/CMakeLists.txt
index 4a58a5b33..db56a61d0 100644
--- a/devices/plutosdr/CMakeLists.txt
+++ b/devices/plutosdr/CMakeLists.txt
@@ -19,6 +19,7 @@ set(plutosdrdevice_HEADERS
 include_directories(
     ${LIBIIO_INCLUDE_DIR}
     ${ICONV_INCLUDE_DIR}
+    ${Boost_INCLUDE_DIRS}
 )
 
 add_library(plutosdrdevice SHARED
diff --git a/devices/usrp/CMakeLists.txt b/devices/usrp/CMakeLists.txt
index ce6fd890f..ec26fc273 100644
--- a/devices/usrp/CMakeLists.txt
+++ b/devices/usrp/CMakeLists.txt
@@ -15,6 +15,7 @@ set(usrpdevice_HEADERS
 
 include_directories(
     ${UHD_INCLUDE_DIR}
+    ${Boost_INCLUDE_DIRS}
 )
 
 add_library(usrpdevice SHARED
@@ -24,6 +25,10 @@ add_library(usrpdevice SHARED
 set_target_properties(usrpdevice
     PROPERTIES DEFINE_SYMBOL "devices_EXPORTS")
 
+if (NOT WIN32)
+    link_directories(${Boost_LIBRARY_DIRS})
+endif()
+
 target_link_libraries(usrpdevice
     ${UHD_LIBRARIES}
     Boost::disable_autolinking
diff --git a/plugins/channelrx/chanalyzer/CMakeLists.txt b/plugins/channelrx/chanalyzer/CMakeLists.txt
index 58f634239..ea6f44267 100644
--- a/plugins/channelrx/chanalyzer/CMakeLists.txt
+++ b/plugins/channelrx/chanalyzer/CMakeLists.txt
@@ -22,7 +22,8 @@ set(chanalyzer_HEADERS
 )
 
 include_directories(
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+	${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+	${Boost_INCLUDE_DIRS}
 )
 
 add_library(chanalyzer SHARED
diff --git a/plugins/channelrx/demodatv/CMakeLists.txt b/plugins/channelrx/demodatv/CMakeLists.txt
index 3760b4e0c..570c6180a 100644
--- a/plugins/channelrx/demodatv/CMakeLists.txt
+++ b/plugins/channelrx/demodatv/CMakeLists.txt
@@ -23,6 +23,7 @@ set(atv_HEADERS
 
 include_directories(
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+    ${Boost_INCLUDE_DIRS}
 )
 
 add_library(demodatv SHARED
diff --git a/plugins/channelrx/demodbfm/CMakeLists.txt b/plugins/channelrx/demodbfm/CMakeLists.txt
index 14611fdf4..7e6f22d25 100644
--- a/plugins/channelrx/demodbfm/CMakeLists.txt
+++ b/plugins/channelrx/demodbfm/CMakeLists.txt
@@ -30,6 +30,7 @@ set(bfm_HEADERS
 
 include_directories(
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+    ${Boost_INCLUDE_DIRS}
 )
 
 if(NOT SERVER_MODE)
diff --git a/plugins/channelrx/filesink/CMakeLists.txt b/plugins/channelrx/filesink/CMakeLists.txt
index b45f7f6af..6f230ca76 100644
--- a/plugins/channelrx/filesink/CMakeLists.txt
+++ b/plugins/channelrx/filesink/CMakeLists.txt
@@ -22,6 +22,7 @@ set(filesink_HEADERS
 
 include_directories(
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+    ${Boost_INCLUDE_DIRS}
 )
 
 if(NOT SERVER_MODE)
diff --git a/plugins/channelrx/localsink/CMakeLists.txt b/plugins/channelrx/localsink/CMakeLists.txt
index 4d6d6f2e0..f03b740aa 100644
--- a/plugins/channelrx/localsink/CMakeLists.txt
+++ b/plugins/channelrx/localsink/CMakeLists.txt
@@ -22,6 +22,7 @@ set(localsink_HEADERS
 
 include_directories(
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+    ${Boost_INCLUDE_DIRS}
 )
 
 if(NOT SERVER_MODE)
diff --git a/plugins/channelrx/remotesink/CMakeLists.txt b/plugins/channelrx/remotesink/CMakeLists.txt
index 3c2faefb4..fe6c61b3f 100644
--- a/plugins/channelrx/remotesink/CMakeLists.txt
+++ b/plugins/channelrx/remotesink/CMakeLists.txt
@@ -35,6 +35,7 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${CM256CC_INCLUDE_DIR}
     ${CUSTOM_WINDOWS_INCLUDE}
+    ${Boost_INCLUDE_DIRS}
 )
 
 if(NOT SERVER_MODE)
diff --git a/plugins/channeltx/localsource/CMakeLists.txt b/plugins/channeltx/localsource/CMakeLists.txt
index f59b00f21..ead523a10 100644
--- a/plugins/channeltx/localsource/CMakeLists.txt
+++ b/plugins/channeltx/localsource/CMakeLists.txt
@@ -22,6 +22,7 @@ set(localsource_HEADERS
 
 include_directories(
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+    ${Boost_INCLUDE_DIRS}
 )
 
 if(NOT SERVER_MODE)
diff --git a/plugins/channeltx/mod802.15.4/CMakeLists.txt b/plugins/channeltx/mod802.15.4/CMakeLists.txt
index 56d2e478e..072a6adb2 100644
--- a/plugins/channeltx/mod802.15.4/CMakeLists.txt
+++ b/plugins/channeltx/mod802.15.4/CMakeLists.txt
@@ -21,6 +21,7 @@ set(mod_ieee_802_15_4_HEADERS
 
 include_directories(
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+    ${Boost_INCLUDE_DIRS}
 )
 
 if(NOT SERVER_MODE)
diff --git a/plugins/channeltx/remotesource/CMakeLists.txt b/plugins/channeltx/remotesource/CMakeLists.txt
index 73fcf2cc5..ec483a4e7 100644
--- a/plugins/channeltx/remotesource/CMakeLists.txt
+++ b/plugins/channeltx/remotesource/CMakeLists.txt
@@ -33,6 +33,7 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${CM256CC_INCLUDE_DIR}
     ${CUSTOM_WINDOWS_INCLUDE}
+    ${Boost_INCLUDE_DIRS}
 )
 
 if(NOT SERVER_MODE)
diff --git a/plugins/samplesink/remoteoutput/CMakeLists.txt b/plugins/samplesink/remoteoutput/CMakeLists.txt
index 455ab0f6e..e731370f2 100644
--- a/plugins/samplesink/remoteoutput/CMakeLists.txt
+++ b/plugins/samplesink/remoteoutput/CMakeLists.txt
@@ -35,6 +35,7 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 	${CMAKE_SOURCE_DIR}/devices
     ${CM256CC_INCLUDE_DIR}
+    ${Boost_INCLUDE_DIRS}
 )
 
 if(NOT SERVER_MODE)
diff --git a/plugins/samplesink/usrpoutput/CMakeLists.txt b/plugins/samplesink/usrpoutput/CMakeLists.txt
index 8bfeece74..3fc09108f 100644
--- a/plugins/samplesink/usrpoutput/CMakeLists.txt
+++ b/plugins/samplesink/usrpoutput/CMakeLists.txt
@@ -20,6 +20,7 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${CMAKE_SOURCE_DIR}/devices
     ${UHD_INCLUDE_DIR}
+    ${Boost_INCLUDE_DIRS}
 )
 
 if(NOT SERVER_MODE)
diff --git a/plugins/samplesource/kiwisdr/CMakeLists.txt b/plugins/samplesource/kiwisdr/CMakeLists.txt
index 0c03fa1b3..272344470 100644
--- a/plugins/samplesource/kiwisdr/CMakeLists.txt
+++ b/plugins/samplesource/kiwisdr/CMakeLists.txt
@@ -18,6 +18,7 @@ set(kiwisdr_HEADERS
 
 include_directories(
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+    ${Boost_INCLUDE_DIRS}
 )
 
 if(NOT SERVER_MODE)
@@ -54,4 +55,4 @@ target_link_libraries(${TARGET_NAME}
 	${TARGET_LIB_GUI}
 )
 
-install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})
\ No newline at end of file
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})
diff --git a/plugins/samplesource/remoteinput/CMakeLists.txt b/plugins/samplesource/remoteinput/CMakeLists.txt
index f6e1a519f..3041e77b5 100644
--- a/plugins/samplesource/remoteinput/CMakeLists.txt
+++ b/plugins/samplesource/remoteinput/CMakeLists.txt
@@ -30,6 +30,7 @@ set(remoteinput_HEADERS
 include_directories(
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${CM256CC_INCLUDE_DIR}
+    ${Boost_INCLUDE_DIRS}
 )
 
 if(NOT SERVER_MODE)
diff --git a/plugins/samplesource/usrpinput/CMakeLists.txt b/plugins/samplesource/usrpinput/CMakeLists.txt
index 1fef67c28..948232fb8 100644
--- a/plugins/samplesource/usrpinput/CMakeLists.txt
+++ b/plugins/samplesource/usrpinput/CMakeLists.txt
@@ -20,6 +20,7 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${CMAKE_SOURCE_DIR}/devices
     ${UHD_INCLUDE_DIR}
+    ${Boost_INCLUDE_DIRS}
 )
 
 if(NOT SERVER_MODE)
diff --git a/sdrbase/CMakeLists.txt b/sdrbase/CMakeLists.txt
index d4fe6dfd7..167cc445c 100644
--- a/sdrbase/CMakeLists.txt
+++ b/sdrbase/CMakeLists.txt
@@ -360,6 +360,7 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/logging
     ${CMAKE_SOURCE_DIR}/qrtplib
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+    ${Boost_INCLUDE_DIRS}
     ${OPUS_INCLUDE_DIRS}
 )
 
@@ -380,7 +381,6 @@ target_link_libraries(sdrbase
     ${sdrbase_FFTW3F_LIB}
     ${sdrbase_SERIALDV_LIB}
     ${sdrbase_LIMERFE_LIB}
-    Boost::headers
     Qt5::Core
     Qt5::Multimedia
     Qt5::WebSockets
diff --git a/sdrgui/CMakeLists.txt b/sdrgui/CMakeLists.txt
index a949b0448..0284b7008 100644
--- a/sdrgui/CMakeLists.txt
+++ b/sdrgui/CMakeLists.txt
@@ -231,7 +231,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/httpserver
   ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
   ${OPENGL_INCLUDE_DIR}
-  )
+  ${Boost_INCLUDE_DIRS}
+)
 
 add_library(sdrgui SHARED
   ${sdrgui_SOURCES}