diff --git a/devices/bladerf1/CMakeLists.txt b/devices/bladerf1/CMakeLists.txt
index 21f6be62c..06039c412 100644
--- a/devices/bladerf1/CMakeLists.txt
+++ b/devices/bladerf1/CMakeLists.txt
@@ -14,7 +14,6 @@ set(bladerf1device_HEADERS
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${LIBBLADERF_INCLUDE_DIRS}
 )
 
diff --git a/devices/bladerf2/CMakeLists.txt b/devices/bladerf2/CMakeLists.txt
index 19f34ddb7..2c35973ed 100644
--- a/devices/bladerf2/CMakeLists.txt
+++ b/devices/bladerf2/CMakeLists.txt
@@ -11,7 +11,6 @@ set(bladerf2device_HEADERS
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${LIBBLADERF_INCLUDE_DIRS}
 )
 
diff --git a/devices/hackrf/CMakeLists.txt b/devices/hackrf/CMakeLists.txt
index 285fa243b..2bac2da03 100644
--- a/devices/hackrf/CMakeLists.txt
+++ b/devices/hackrf/CMakeLists.txt
@@ -14,7 +14,6 @@ set(hackrfdevice_HEADERS
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${LIBHACKRF_INCLUDE_DIR}
 )
 
diff --git a/devices/limesdr/CMakeLists.txt b/devices/limesdr/CMakeLists.txt
index 8391f76f6..c0cdd5fb2 100644
--- a/devices/limesdr/CMakeLists.txt
+++ b/devices/limesdr/CMakeLists.txt
@@ -13,7 +13,6 @@ set(limesdrdevice_HEADERS
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${LIMESUITE_INCLUDE_DIR}
 )
 
diff --git a/devices/perseus/CMakeLists.txt b/devices/perseus/CMakeLists.txt
index 78b123fcc..bd83f6365 100644
--- a/devices/perseus/CMakeLists.txt
+++ b/devices/perseus/CMakeLists.txt
@@ -11,7 +11,6 @@ set(perseusdevice_HEADERS
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${LIBPERSEUS_INCLUDE_DIR}
 )
 
diff --git a/devices/plutosdr/CMakeLists.txt b/devices/plutosdr/CMakeLists.txt
index 02c0cd918..9799dc162 100644
--- a/devices/plutosdr/CMakeLists.txt
+++ b/devices/plutosdr/CMakeLists.txt
@@ -17,7 +17,6 @@ set(plutosdrdevice_HEADERS
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${LIBIIO_INCLUDE_DIR}
     ${ICONV_INCLUDE_DIR}
 )
diff --git a/devices/soapysdr/CMakeLists.txt b/devices/soapysdr/CMakeLists.txt
index df998beb3..08b5f9af2 100644
--- a/devices/soapysdr/CMakeLists.txt
+++ b/devices/soapysdr/CMakeLists.txt
@@ -15,7 +15,6 @@ set(soapysdrdevice_HEADERS
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${SoapySDR_INCLUDE_DIRS}
 )
 
diff --git a/devices/xtrx/CMakeLists.txt b/devices/xtrx/CMakeLists.txt
index ac230d589..d6263911d 100644
--- a/devices/xtrx/CMakeLists.txt
+++ b/devices/xtrx/CMakeLists.txt
@@ -13,7 +13,6 @@ set(xtrxdevice_HEADERS
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${LIBXTRX_INCLUDE_DIRS}
 )
 
diff --git a/fcdhid/CMakeLists.txt b/fcdhid/CMakeLists.txt
index dbd80ccb5..d83660139 100644
--- a/fcdhid/CMakeLists.txt
+++ b/fcdhid/CMakeLists.txt
@@ -14,7 +14,6 @@ set(fcdhid_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
         ${LIBUSB_INCLUDE_DIR}
         ${ICONV_INCLUDE_DIR}
 )
diff --git a/fcdlib/CMakeLists.txt b/fcdlib/CMakeLists.txt
index 107906cd2..68b621fec 100644
--- a/fcdlib/CMakeLists.txt
+++ b/fcdlib/CMakeLists.txt
@@ -13,7 +13,6 @@ set(fcdlib_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
 )
 
 add_library(fcdlib SHARED
diff --git a/httpserver/CMakeLists.txt b/httpserver/CMakeLists.txt
index 2b787d98e..45c3ad181 100644
--- a/httpserver/CMakeLists.txt
+++ b/httpserver/CMakeLists.txt
@@ -32,7 +32,6 @@ set(httpserver_HEADERS
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/exports
 )
 
diff --git a/libfreedv/CMakeLists.txt b/libfreedv/CMakeLists.txt
index 71348189c..a02bc81d1 100644
--- a/libfreedv/CMakeLists.txt
+++ b/libfreedv/CMakeLists.txt
@@ -65,7 +65,6 @@ set(freedv_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
 	${CODEC2_INCLUDE_DIR}
 )
 
diff --git a/logging/CMakeLists.txt b/logging/CMakeLists.txt
index 75095963b..3c8f92781 100644
--- a/logging/CMakeLists.txt
+++ b/logging/CMakeLists.txt
@@ -18,7 +18,6 @@ set(httpserver_HEADERS
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/exports
 )
 
diff --git a/plugins/channelrx/chanalyzer/CMakeLists.txt b/plugins/channelrx/chanalyzer/CMakeLists.txt
index 8925f6c1e..2bd23494f 100644
--- a/plugins/channelrx/chanalyzer/CMakeLists.txt
+++ b/plugins/channelrx/chanalyzer/CMakeLists.txt
@@ -17,7 +17,6 @@ set(chanalyzer_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
 	${Boost_INCLUDE_DIRS}
 )
 
diff --git a/plugins/channelrx/demodam/CMakeLists.txt b/plugins/channelrx/demodam/CMakeLists.txt
index 8ad1dc0c9..5b0fac90d 100644
--- a/plugins/channelrx/demodam/CMakeLists.txt
+++ b/plugins/channelrx/demodam/CMakeLists.txt
@@ -14,7 +14,6 @@ set(am_HEADERS
 
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )
 
diff --git a/plugins/channelrx/demodatv/CMakeLists.txt b/plugins/channelrx/demodatv/CMakeLists.txt
index 74461bd80..70f3366ad 100644
--- a/plugins/channelrx/demodatv/CMakeLists.txt
+++ b/plugins/channelrx/demodatv/CMakeLists.txt
@@ -17,7 +17,6 @@ set(atv_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
 	${Boost_INCLUDE_DIRS}
 )
 
diff --git a/plugins/channelrx/demodbfm/CMakeLists.txt b/plugins/channelrx/demodbfm/CMakeLists.txt
index accf13c48..a61c61c2e 100644
--- a/plugins/channelrx/demodbfm/CMakeLists.txt
+++ b/plugins/channelrx/demodbfm/CMakeLists.txt
@@ -21,7 +21,6 @@ set(bfm_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
         ${Boost_INCLUDE_DIRS}
 )
diff --git a/plugins/channelrx/demoddatv/CMakeLists.txt b/plugins/channelrx/demoddatv/CMakeLists.txt
index 258f97de8..edf1815f9 100644
--- a/plugins/channelrx/demoddatv/CMakeLists.txt
+++ b/plugins/channelrx/demoddatv/CMakeLists.txt
@@ -32,7 +32,6 @@ set(datv_HEADERS
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${AVCODEC_INCLUDE_DIRS}
     ${AVFORMAT_INCLUDE_DIRS}
     ${AVUTIL_INCLUDE_DIRS}
diff --git a/plugins/channelrx/demoddsd/CMakeLists.txt b/plugins/channelrx/demoddsd/CMakeLists.txt
index 4c7700764..7fecaf382 100644
--- a/plugins/channelrx/demoddsd/CMakeLists.txt
+++ b/plugins/channelrx/demoddsd/CMakeLists.txt
@@ -17,7 +17,6 @@ set(dsddemod_HEADERS
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${LIBDSDCC_INCLUDE_DIR}
     ${LIBMBE_INCLUDE_DIR}
diff --git a/plugins/channelrx/demodfreedv/CMakeLists.txt b/plugins/channelrx/demodfreedv/CMakeLists.txt
index c6e7b0843..da527b269 100644
--- a/plugins/channelrx/demodfreedv/CMakeLists.txt
+++ b/plugins/channelrx/demodfreedv/CMakeLists.txt
@@ -13,7 +13,6 @@ set(freedv_HEADERS
 )
 
 include_directories(
-        ${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
         ${CMAKE_SOURCE_DIR}/libfreedv
         ${CODEC2_INCLUDE_DIR}
diff --git a/plugins/channelrx/demodlora/CMakeLists.txt b/plugins/channelrx/demodlora/CMakeLists.txt
index d0691c46a..c0dc591fd 100644
--- a/plugins/channelrx/demodlora/CMakeLists.txt
+++ b/plugins/channelrx/demodlora/CMakeLists.txt
@@ -17,7 +17,6 @@ set(lora_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
 )
 
 add_library(demodlora SHARED
diff --git a/plugins/channelrx/demodnfm/CMakeLists.txt b/plugins/channelrx/demodnfm/CMakeLists.txt
index 0a8d36d72..3b237bb20 100644
--- a/plugins/channelrx/demodnfm/CMakeLists.txt
+++ b/plugins/channelrx/demodnfm/CMakeLists.txt
@@ -13,7 +13,6 @@ set(nfm_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )
 
diff --git a/plugins/channelrx/demodssb/CMakeLists.txt b/plugins/channelrx/demodssb/CMakeLists.txt
index 966dda54a..c4971d7b8 100644
--- a/plugins/channelrx/demodssb/CMakeLists.txt
+++ b/plugins/channelrx/demodssb/CMakeLists.txt
@@ -13,7 +13,6 @@ set(ssb_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )
 
diff --git a/plugins/channelrx/demodwfm/CMakeLists.txt b/plugins/channelrx/demodwfm/CMakeLists.txt
index cecf4bda1..175225a3e 100644
--- a/plugins/channelrx/demodwfm/CMakeLists.txt
+++ b/plugins/channelrx/demodwfm/CMakeLists.txt
@@ -13,7 +13,6 @@ set(wfm_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )
 
diff --git a/plugins/channelrx/freqtracker/CMakeLists.txt b/plugins/channelrx/freqtracker/CMakeLists.txt
index be7daf7e3..bd0e3512e 100644
--- a/plugins/channelrx/freqtracker/CMakeLists.txt
+++ b/plugins/channelrx/freqtracker/CMakeLists.txt
@@ -13,7 +13,6 @@ set(freqtracker_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )
 
diff --git a/plugins/channelrx/localsink/CMakeLists.txt b/plugins/channelrx/localsink/CMakeLists.txt
index 4a728ea7a..4d35e73a0 100644
--- a/plugins/channelrx/localsink/CMakeLists.txt
+++ b/plugins/channelrx/localsink/CMakeLists.txt
@@ -15,7 +15,6 @@ set(localsink_HEADERS
         )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${Boost_INCLUDE_DIR}
     )
diff --git a/plugins/channelrx/remotesink/CMakeLists.txt b/plugins/channelrx/remotesink/CMakeLists.txt
index f4fae8857..23e73dc14 100644
--- a/plugins/channelrx/remotesink/CMakeLists.txt
+++ b/plugins/channelrx/remotesink/CMakeLists.txt
@@ -24,7 +24,6 @@ set(remotesink_HEADERS
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${CM256CC_INCLUDE_DIR}
 )
diff --git a/plugins/channelrx/udpsink/CMakeLists.txt b/plugins/channelrx/udpsink/CMakeLists.txt
index b83bd7b52..9ca3f29a1 100644
--- a/plugins/channelrx/udpsink/CMakeLists.txt
+++ b/plugins/channelrx/udpsink/CMakeLists.txt
@@ -13,7 +13,6 @@ set(udpsink_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )
 
diff --git a/plugins/channeltx/modam/CMakeLists.txt b/plugins/channeltx/modam/CMakeLists.txt
index bc3db728c..71a367929 100644
--- a/plugins/channeltx/modam/CMakeLists.txt
+++ b/plugins/channeltx/modam/CMakeLists.txt
@@ -13,7 +13,6 @@ set(modam_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )
 
diff --git a/plugins/channeltx/modatv/CMakeLists.txt b/plugins/channeltx/modatv/CMakeLists.txt
index 190b39efd..af35e7660 100644
--- a/plugins/channeltx/modatv/CMakeLists.txt
+++ b/plugins/channeltx/modatv/CMakeLists.txt
@@ -14,7 +14,6 @@ set(modatv_HEADERS
 
 include_directories(
 	${OpenCV_INCLUDE_DIRS}
-	${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )
 
diff --git a/plugins/channeltx/modfreedv/CMakeLists.txt b/plugins/channeltx/modfreedv/CMakeLists.txt
index 0af8549c0..d6b01f85b 100644
--- a/plugins/channeltx/modfreedv/CMakeLists.txt
+++ b/plugins/channeltx/modfreedv/CMakeLists.txt
@@ -13,7 +13,6 @@ set(modfreedv_HEADERS
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${CMAKE_SOURCE_DIR}/libfreedv
     ${CODEC2_INCLUDE_DIR}
diff --git a/plugins/channeltx/modnfm/CMakeLists.txt b/plugins/channeltx/modnfm/CMakeLists.txt
index 86e9ba726..0dac385e3 100644
--- a/plugins/channeltx/modnfm/CMakeLists.txt
+++ b/plugins/channeltx/modnfm/CMakeLists.txt
@@ -13,7 +13,6 @@ set(modnfm_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )
 
diff --git a/plugins/channeltx/modssb/CMakeLists.txt b/plugins/channeltx/modssb/CMakeLists.txt
index 0d65eaecc..c75586093 100644
--- a/plugins/channeltx/modssb/CMakeLists.txt
+++ b/plugins/channeltx/modssb/CMakeLists.txt
@@ -13,7 +13,6 @@ set(modssb_HEADERS
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )
 
diff --git a/plugins/channeltx/modwfm/CMakeLists.txt b/plugins/channeltx/modwfm/CMakeLists.txt
index c7a361f17..cbca303ff 100644
--- a/plugins/channeltx/modwfm/CMakeLists.txt
+++ b/plugins/channeltx/modwfm/CMakeLists.txt
@@ -13,7 +13,6 @@ set(modwfm_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )
 
diff --git a/plugins/channeltx/remotesource/CMakeLists.txt b/plugins/channeltx/remotesource/CMakeLists.txt
index e234ae3a1..9f59f7452 100644
--- a/plugins/channeltx/remotesource/CMakeLists.txt
+++ b/plugins/channeltx/remotesource/CMakeLists.txt
@@ -24,7 +24,6 @@ set(remotesource_HEADERS
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${CM256CC_INCLUDE_DIR}
 )
diff --git a/plugins/channeltx/udpsource/CMakeLists.txt b/plugins/channeltx/udpsource/CMakeLists.txt
index e4eb668f1..edb726b8e 100644
--- a/plugins/channeltx/udpsource/CMakeLists.txt
+++ b/plugins/channeltx/udpsource/CMakeLists.txt
@@ -17,7 +17,6 @@ set(udpsource_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )
 
diff --git a/plugins/samplesink/bladerf1output/CMakeLists.txt b/plugins/samplesink/bladerf1output/CMakeLists.txt
index 5dd2c9ccb..eecebcc13 100644
--- a/plugins/samplesink/bladerf1output/CMakeLists.txt
+++ b/plugins/samplesink/bladerf1output/CMakeLists.txt
@@ -15,7 +15,6 @@ set(bladerf1output_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 	${CMAKE_SOURCE_DIR}/devices
 	${LIBBLADERF_INCLUDE_DIRS}
diff --git a/plugins/samplesink/bladerf2output/CMakeLists.txt b/plugins/samplesink/bladerf2output/CMakeLists.txt
index 4577960b1..fb2e74156 100644
--- a/plugins/samplesink/bladerf2output/CMakeLists.txt
+++ b/plugins/samplesink/bladerf2output/CMakeLists.txt
@@ -15,7 +15,6 @@ set(bladerf2output_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 	${CMAKE_SOURCE_DIR}/devices
 	${LIBBLADERF_INCLUDE_DIRS}
diff --git a/plugins/samplesink/filesink/CMakeLists.txt b/plugins/samplesink/filesink/CMakeLists.txt
index f7f6f200c..d920fc631 100644
--- a/plugins/samplesink/filesink/CMakeLists.txt
+++ b/plugins/samplesink/filesink/CMakeLists.txt
@@ -15,7 +15,6 @@ set(filesink_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )
 
diff --git a/plugins/samplesink/hackrfoutput/CMakeLists.txt b/plugins/samplesink/hackrfoutput/CMakeLists.txt
index 86a123b6f..16103abee 100644
--- a/plugins/samplesink/hackrfoutput/CMakeLists.txt
+++ b/plugins/samplesink/hackrfoutput/CMakeLists.txt
@@ -15,7 +15,6 @@ set(hackrfoutput_HEADERS
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${CMAKE_SOURCE_DIR}/devices
     ${LIBHACKRF_INCLUDE_DIR}
diff --git a/plugins/samplesink/limesdroutput/CMakeLists.txt b/plugins/samplesink/limesdroutput/CMakeLists.txt
index 1a08321fd..8b637de58 100644
--- a/plugins/samplesink/limesdroutput/CMakeLists.txt
+++ b/plugins/samplesink/limesdroutput/CMakeLists.txt
@@ -15,7 +15,6 @@ set(limesdroutput_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 	${CMAKE_SOURCE_DIR}/devices
 	${LIMESUITE_INCLUDE_DIR}
diff --git a/plugins/samplesink/plutosdroutput/CMakeLists.txt b/plugins/samplesink/plutosdroutput/CMakeLists.txt
index a78b55ee6..f4820c642 100644
--- a/plugins/samplesink/plutosdroutput/CMakeLists.txt
+++ b/plugins/samplesink/plutosdroutput/CMakeLists.txt
@@ -15,7 +15,6 @@ set(plutosdroutput_HEADERS
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${CMAKE_SOURCE_DIR}/devices
     ${LIBIIO_INCLUDE_DIR}
diff --git a/plugins/samplesink/soapysdroutput/CMakeLists.txt b/plugins/samplesink/soapysdroutput/CMakeLists.txt
index 86dc18133..11f979f78 100644
--- a/plugins/samplesink/soapysdroutput/CMakeLists.txt
+++ b/plugins/samplesink/soapysdroutput/CMakeLists.txt
@@ -15,7 +15,6 @@ set(soapysdroutput_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 	${CMAKE_SOURCE_DIR}/devices
 	${SoapySDR_INCLUDE_DIRS}
diff --git a/plugins/samplesink/xtrxoutput/CMakeLists.txt b/plugins/samplesink/xtrxoutput/CMakeLists.txt
index 7fdb35136..451e3bc66 100644
--- a/plugins/samplesink/xtrxoutput/CMakeLists.txt
+++ b/plugins/samplesink/xtrxoutput/CMakeLists.txt
@@ -15,7 +15,6 @@ set(xtrxoutput_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 	${CMAKE_SOURCE_DIR}/devices
 	${LIBXTRX_INCLUDE_DIRS}
diff --git a/plugins/samplesource/airspy/CMakeLists.txt b/plugins/samplesource/airspy/CMakeLists.txt
index 54acd9121..1a1936f39 100644
--- a/plugins/samplesource/airspy/CMakeLists.txt
+++ b/plugins/samplesource/airspy/CMakeLists.txt
@@ -15,7 +15,6 @@ set(airspy_HEADERS
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${LIBAIRSPY_INCLUDE_DIR}
 )
diff --git a/plugins/samplesource/airspyhf/CMakeLists.txt b/plugins/samplesource/airspyhf/CMakeLists.txt
index 9f73fede5..4734c8396 100644
--- a/plugins/samplesource/airspyhf/CMakeLists.txt
+++ b/plugins/samplesource/airspyhf/CMakeLists.txt
@@ -15,7 +15,6 @@ set(airspyhf_HEADERS
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${LIBAIRSPYHF_INCLUDE_DIR}
 )
diff --git a/plugins/samplesource/bladerf1input/CMakeLists.txt b/plugins/samplesource/bladerf1input/CMakeLists.txt
index 126b871bd..85e68acd1 100644
--- a/plugins/samplesource/bladerf1input/CMakeLists.txt
+++ b/plugins/samplesource/bladerf1input/CMakeLists.txt
@@ -15,7 +15,6 @@ set(bladerf1input_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 	${CMAKE_SOURCE_DIR}/devices
 	${LIBBLADERF_INCLUDE_DIRS}
diff --git a/plugins/samplesource/bladerf2input/CMakeLists.txt b/plugins/samplesource/bladerf2input/CMakeLists.txt
index 98219ed44..e522c2936 100644
--- a/plugins/samplesource/bladerf2input/CMakeLists.txt
+++ b/plugins/samplesource/bladerf2input/CMakeLists.txt
@@ -15,7 +15,6 @@ set(bladerf2input_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 	${CMAKE_SOURCE_DIR}/devices
 	${LIBBLADERF_INCLUDE_DIRS}
diff --git a/plugins/samplesource/fcdpro/CMakeLists.txt b/plugins/samplesource/fcdpro/CMakeLists.txt
index d1e66ea21..f2f38b2f1 100644
--- a/plugins/samplesource/fcdpro/CMakeLists.txt
+++ b/plugins/samplesource/fcdpro/CMakeLists.txt
@@ -15,7 +15,6 @@ set(fcdpro_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
         ${CMAKE_SOURCE_DIR}/fcdhid
 	${CMAKE_SOURCE_DIR}/fcdlib
diff --git a/plugins/samplesource/fcdproplus/CMakeLists.txt b/plugins/samplesource/fcdproplus/CMakeLists.txt
index 3388ff09e..db8f20dec 100644
--- a/plugins/samplesource/fcdproplus/CMakeLists.txt
+++ b/plugins/samplesource/fcdproplus/CMakeLists.txt
@@ -15,7 +15,6 @@ set(fcdproplus_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 	${CMAKE_SOURCE_DIR}/fcdhid
 	${CMAKE_SOURCE_DIR}/fcdlib
diff --git a/plugins/samplesource/filesource/CMakeLists.txt b/plugins/samplesource/filesource/CMakeLists.txt
index a85ac5e11..62c91a731 100644
--- a/plugins/samplesource/filesource/CMakeLists.txt
+++ b/plugins/samplesource/filesource/CMakeLists.txt
@@ -15,7 +15,6 @@ set(filesource_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )
 
diff --git a/plugins/samplesource/hackrfinput/CMakeLists.txt b/plugins/samplesource/hackrfinput/CMakeLists.txt
index cc7900206..8d4639165 100644
--- a/plugins/samplesource/hackrfinput/CMakeLists.txt
+++ b/plugins/samplesource/hackrfinput/CMakeLists.txt
@@ -15,7 +15,6 @@ set(hackrfinput_HEADERS
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${CMAKE_SOURCE_DIR}/devices
     ${LIBHACKRF_INCLUDE_DIR}
diff --git a/plugins/samplesource/limesdrinput/CMakeLists.txt b/plugins/samplesource/limesdrinput/CMakeLists.txt
index 357df6de2..2f6c36e22 100644
--- a/plugins/samplesource/limesdrinput/CMakeLists.txt
+++ b/plugins/samplesource/limesdrinput/CMakeLists.txt
@@ -15,7 +15,6 @@ set(limesdrinput_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 	${CMAKE_SOURCE_DIR}/devices
 	${LIMESUITE_INCLUDE_DIR}
diff --git a/plugins/samplesource/localinput/CMakeLists.txt b/plugins/samplesource/localinput/CMakeLists.txt
index 4e38e15f6..4c5f91435 100644
--- a/plugins/samplesource/localinput/CMakeLists.txt
+++ b/plugins/samplesource/localinput/CMakeLists.txt
@@ -14,7 +14,6 @@ set(localinput_HEADERS
 
 
 include_directories(
-  ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
   )
 
diff --git a/plugins/samplesource/perseus/CMakeLists.txt b/plugins/samplesource/perseus/CMakeLists.txt
index 85f1346da..572dd5673 100644
--- a/plugins/samplesource/perseus/CMakeLists.txt
+++ b/plugins/samplesource/perseus/CMakeLists.txt
@@ -15,7 +15,6 @@ set(perseus_HEADERS
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${CMAKE_SOURCE_DIR}/devices
     ${LIBPERSEUS_INCLUDE_DIR}
diff --git a/plugins/samplesource/plutosdrinput/CMakeLists.txt b/plugins/samplesource/plutosdrinput/CMakeLists.txt
index 47d11cf96..e1d4d93f7 100644
--- a/plugins/samplesource/plutosdrinput/CMakeLists.txt
+++ b/plugins/samplesource/plutosdrinput/CMakeLists.txt
@@ -15,7 +15,6 @@ set(plutosdrinput_HEADERS
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${CMAKE_SOURCE_DIR}/devices
     ${LIBIIO_INCLUDE_DIR}
diff --git a/plugins/samplesource/remoteinput/CMakeLists.txt b/plugins/samplesource/remoteinput/CMakeLists.txt
index 8c799e2fc..e1285e534 100644
--- a/plugins/samplesource/remoteinput/CMakeLists.txt
+++ b/plugins/samplesource/remoteinput/CMakeLists.txt
@@ -26,7 +26,6 @@ set(remoteinput_HEADERS
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${CM256CC_INCLUDE_DIR}
 )
diff --git a/plugins/samplesource/rtlsdr/CMakeLists.txt b/plugins/samplesource/rtlsdr/CMakeLists.txt
index 73bc7bbd2..a15ea6f60 100644
--- a/plugins/samplesource/rtlsdr/CMakeLists.txt
+++ b/plugins/samplesource/rtlsdr/CMakeLists.txt
@@ -14,7 +14,6 @@ set(rtlsdr_HEADERS
     rtlsdrthread.h
 )
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${LIBRTLSDR_INCLUDE_DIR}
 )
diff --git a/plugins/samplesource/sdrplay/CMakeLists.txt b/plugins/samplesource/sdrplay/CMakeLists.txt
index 3bdbd4b36..f68827f82 100644
--- a/plugins/samplesource/sdrplay/CMakeLists.txt
+++ b/plugins/samplesource/sdrplay/CMakeLists.txt
@@ -15,7 +15,6 @@ set(sdrplay_HEADERS
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${LIBMIRISDR_INCLUDE_DIR}
 )
diff --git a/plugins/samplesource/soapysdrinput/CMakeLists.txt b/plugins/samplesource/soapysdrinput/CMakeLists.txt
index 54924a128..c50d6fcd6 100644
--- a/plugins/samplesource/soapysdrinput/CMakeLists.txt
+++ b/plugins/samplesource/soapysdrinput/CMakeLists.txt
@@ -15,7 +15,6 @@ set(soapysdrinput_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 	${CMAKE_SOURCE_DIR}/devices
 	${SoapySDR_INCLUDE_DIRS}
diff --git a/plugins/samplesource/testsource/CMakeLists.txt b/plugins/samplesource/testsource/CMakeLists.txt
index 98896d673..0aaa86f2c 100644
--- a/plugins/samplesource/testsource/CMakeLists.txt
+++ b/plugins/samplesource/testsource/CMakeLists.txt
@@ -15,7 +15,6 @@ set(testsource_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )
 
diff --git a/plugins/samplesource/xtrxinput/CMakeLists.txt b/plugins/samplesource/xtrxinput/CMakeLists.txt
index ca359b029..e7d57a51d 100644
--- a/plugins/samplesource/xtrxinput/CMakeLists.txt
+++ b/plugins/samplesource/xtrxinput/CMakeLists.txt
@@ -15,7 +15,6 @@ set(xtrxinput_HEADERS
 )
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 	${CMAKE_SOURCE_DIR}/devices
 	${LIBXTRX_INCLUDE_DIRS}
diff --git a/qrtplib/CMakeLists.txt b/qrtplib/CMakeLists.txt
index e3a2e2dfa..072a61d55 100644
--- a/qrtplib/CMakeLists.txt
+++ b/qrtplib/CMakeLists.txt
@@ -76,7 +76,6 @@ set(qrtplib_SOURCES
 
 include_directories(
     ${CMAKE_SOURCE_DIR}/exports
-    ${CMAKE_CURRENT_BINARY_DIR}
 )
 
 add_library(qrtplib SHARED
diff --git a/sdrbase/CMakeLists.txt b/sdrbase/CMakeLists.txt
index c1c5dfcd8..0fb3093f4 100644
--- a/sdrbase/CMakeLists.txt
+++ b/sdrbase/CMakeLists.txt
@@ -273,7 +273,6 @@ set(sdrbase_HEADERS
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/exports
     ${CMAKE_SOURCE_DIR}/httpserver
     ${CMAKE_SOURCE_DIR}/qrtplib
diff --git a/sdrbench/CMakeLists.txt b/sdrbench/CMakeLists.txt
index d7c5b592f..9e79458ab 100644
--- a/sdrbench/CMakeLists.txt
+++ b/sdrbench/CMakeLists.txt
@@ -15,7 +15,6 @@ add_library(sdrbench SHARED
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/exports
     ${CMAKE_SOURCE_DIR}/sdrbase
     ${CMAKE_SOURCE_DIR}/logging
diff --git a/sdrgui/CMakeLists.txt b/sdrgui/CMakeLists.txt
index c6676be3c..a36178b21 100644
--- a/sdrgui/CMakeLists.txt
+++ b/sdrgui/CMakeLists.txt
@@ -171,7 +171,6 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/logging
   ${CMAKE_SOURCE_DIR}/httpserver
   ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
-  ${CMAKE_CURRENT_BINARY_DIR}
   ${OPENGL_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}
   )
diff --git a/sdrsrv/CMakeLists.txt b/sdrsrv/CMakeLists.txt
index e2449c0ea..4be6c8fa9 100644
--- a/sdrsrv/CMakeLists.txt
+++ b/sdrsrv/CMakeLists.txt
@@ -32,7 +32,6 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/logging
     ${CMAKE_SOURCE_DIR}/httpserver
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${OPENGL_INCLUDE_DIR}
 )
 
diff --git a/swagger/CMakeLists.txt b/swagger/CMakeLists.txt
index 3e19d4477..c44a42a30 100644
--- a/swagger/CMakeLists.txt
+++ b/swagger/CMakeLists.txt
@@ -13,7 +13,6 @@ add_library(swagger SHARED
 )
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/exports
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )