diff --git a/CMakeLists.txt b/CMakeLists.txt
index d83455f09..05203f365 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -221,6 +221,7 @@ add_subdirectory(swagger)
 
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/exports
     ${CMAKE_SOURCE_DIR}/sdrbase
     ${CMAKE_SOURCE_DIR}/sdrgui
     ${CMAKE_SOURCE_DIR}/logging
diff --git a/sdrbase/util/export.h b/exports/util/export.h
similarity index 100%
rename from sdrbase/util/export.h
rename to exports/util/export.h
diff --git a/httpserver/CMakeLists.txt b/httpserver/CMakeLists.txt
index 089ae7d9e..72721e406 100644
--- a/httpserver/CMakeLists.txt
+++ b/httpserver/CMakeLists.txt
@@ -33,7 +33,7 @@ set(httpserver_HEADERS
 
 include_directories(
 	.
-    ${CMAKE_SOURCE_DIR}/sdrbase	
+    ${CMAKE_SOURCE_DIR}/exports
 	${CMAKE_CURRENT_BINARY_DIR}
 )
 
diff --git a/logging/CMakeLists.txt b/logging/CMakeLists.txt
index c3e3d18f5..b26835edb 100644
--- a/logging/CMakeLists.txt
+++ b/logging/CMakeLists.txt
@@ -19,7 +19,7 @@ set(httpserver_HEADERS
 
 include_directories(
 	.
-    ${CMAKE_SOURCE_DIR}/sdrbase 
+    ${CMAKE_SOURCE_DIR}/exports 
 	${CMAKE_CURRENT_BINARY_DIR}
 )
 
diff --git a/pluginssrv/samplesink/filesink/CMakeLists.txt b/pluginssrv/samplesink/filesink/CMakeLists.txt
index cfaf7ddfb..b224a7b0b 100644
--- a/pluginssrv/samplesink/filesink/CMakeLists.txt
+++ b/pluginssrv/samplesink/filesink/CMakeLists.txt
@@ -20,6 +20,7 @@ set(filesink_HEADERS
 include_directories(
 	.
 	${CMAKE_CURRENT_BINARY_DIR}
+	${CMAKE_SOURCE_DIR}/exports
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
 )
 
diff --git a/pluginssrv/samplesink/hackrfoutput/CMakeLists.txt b/pluginssrv/samplesink/hackrfoutput/CMakeLists.txt
index e96887267..ab42a142b 100644
--- a/pluginssrv/samplesink/hackrfoutput/CMakeLists.txt
+++ b/pluginssrv/samplesink/hackrfoutput/CMakeLists.txt
@@ -21,6 +21,7 @@ if (BUILD_DEBIAN)
 include_directories(
         .
     ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/exports
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
     ${CMAKE_SOURCE_DIR}/devices    
     ${LIBHACKRFSRC}
@@ -30,6 +31,7 @@ else (BUILD_DEBIAN)
 include_directories(
         .
     ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/exports
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
     ${CMAKE_SOURCE_DIR}/devices    
     ${LIBHACKRF_INCLUDE_DIR}
diff --git a/pluginssrv/samplesink/limesdroutput/CMakeLists.txt b/pluginssrv/samplesink/limesdroutput/CMakeLists.txt
index 1fdde5e2a..e8c5f9113 100644
--- a/pluginssrv/samplesink/limesdroutput/CMakeLists.txt
+++ b/pluginssrv/samplesink/limesdroutput/CMakeLists.txt
@@ -21,6 +21,7 @@ if (BUILD_DEBIAN)
 include_directories(
         .
     ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/exports
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
     ${CMAKE_SOURCE_DIR}/devices    
     ${LIBLIMESUITESRC}/src
@@ -37,6 +38,7 @@ else (BUILD_DEBIAN)
 include_directories(
 	.
 	${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/exports
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 	${CMAKE_SOURCE_DIR}/devices
 	${LIMESUITE_INCLUDE_DIR}
diff --git a/pluginssrv/samplesource/filesource/CMakeLists.txt b/pluginssrv/samplesource/filesource/CMakeLists.txt
index 72c4f4250..0f6e72d72 100644
--- a/pluginssrv/samplesource/filesource/CMakeLists.txt
+++ b/pluginssrv/samplesource/filesource/CMakeLists.txt
@@ -19,6 +19,7 @@ set(filesource_HEADERS
 
 include_directories(
 	.
+	${CMAKE_SOURCE_DIR}/exports
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )
diff --git a/pluginssrv/samplesource/hackrfinput/CMakeLists.txt b/pluginssrv/samplesource/hackrfinput/CMakeLists.txt
index d1c67c8c5..66f9d5673 100644
--- a/pluginssrv/samplesource/hackrfinput/CMakeLists.txt
+++ b/pluginssrv/samplesource/hackrfinput/CMakeLists.txt
@@ -20,6 +20,7 @@ set(hackrfinput_HEADERS
 if (BUILD_DEBIAN)
 include_directories(
         .
+    ${CMAKE_SOURCE_DIR}/exports
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
     ${CMAKE_SOURCE_DIR}/devices    
@@ -29,6 +30,7 @@ include_directories(
 else (BUILD_DEBIAN)
 include_directories(
         .
+    ${CMAKE_SOURCE_DIR}/exports
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
     ${CMAKE_SOURCE_DIR}/devices    
diff --git a/pluginssrv/samplesource/limesdrinput/CMakeLists.txt b/pluginssrv/samplesource/limesdrinput/CMakeLists.txt
index b24dc0d4c..b92ca4b8e 100644
--- a/pluginssrv/samplesource/limesdrinput/CMakeLists.txt
+++ b/pluginssrv/samplesource/limesdrinput/CMakeLists.txt
@@ -21,6 +21,7 @@ if (BUILD_DEBIAN)
 include_directories(
         .
     ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/exports
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
     ${CMAKE_SOURCE_DIR}/devices    
     ${LIBLIMESUITESRC}/src
@@ -36,7 +37,8 @@ include_directories(
 else (BUILD_DEBIAN)
 include_directories(
 	.
-	${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/exports
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client	
 	${CMAKE_SOURCE_DIR}/devices
 	${LIMESUITE_INCLUDE_DIR}
diff --git a/pluginssrv/samplesource/rtlsdr/CMakeLists.txt b/pluginssrv/samplesource/rtlsdr/CMakeLists.txt
index 13462859b..8e15b3095 100644
--- a/pluginssrv/samplesource/rtlsdr/CMakeLists.txt
+++ b/pluginssrv/samplesource/rtlsdr/CMakeLists.txt
@@ -21,6 +21,7 @@ if (BUILD_DEBIAN)
 include_directories(
     .
     ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/exports
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${LIBRTLSDRSRC}/include
     ${LIBRTLSDRSRC}/src
@@ -29,6 +30,7 @@ else (BUILD_DEBIAN)
 include_directories(
     .
     ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/exports
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${LIBRTLSDR_INCLUDE_DIR}
 )
diff --git a/qrtplib/CMakeLists.txt b/qrtplib/CMakeLists.txt
index a5472b153..7bd992492 100644
--- a/qrtplib/CMakeLists.txt
+++ b/qrtplib/CMakeLists.txt
@@ -74,7 +74,7 @@ set(qrtplib_SOURCES
 
 include_directories(
     .
-    ${CMAKE_SOURCE_DIR}/sdrbase
+    ${CMAKE_SOURCE_DIR}/exports
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
diff --git a/sdrbase/CMakeLists.txt b/sdrbase/CMakeLists.txt
index ff2597f76..30699a609 100644
--- a/sdrbase/CMakeLists.txt
+++ b/sdrbase/CMakeLists.txt
@@ -168,7 +168,7 @@ set(sdrbase_HEADERS
     util/CRC64.h
     util/db.h
     util/doublebuffer.h
-    util/export.h
+    #util/export.h
     util/fixedtraits.h
     util/message.h
     util/messagequeue.h
@@ -258,6 +258,7 @@ add_library(sdrbase SHARED
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     .
+    ${CMAKE_SOURCE_DIR}/exports
     ${CMAKE_SOURCE_DIR}/httpserver
     ${CMAKE_SOURCE_DIR}/qrtplib
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
diff --git a/sdrgui/CMakeLists.txt b/sdrgui/CMakeLists.txt
index f8a5874a1..940a75881 100644
--- a/sdrgui/CMakeLists.txt
+++ b/sdrgui/CMakeLists.txt
@@ -160,6 +160,7 @@ add_library(sdrgui SHARED
 
 include_directories(
     .
+    ${CMAKE_SOURCE_DIR}/exports
     ${CMAKE_SOURCE_DIR}/sdrbase
     ${CMAKE_SOURCE_DIR}/logging
     ${CMAKE_SOURCE_DIR}/httpserver
diff --git a/sdrsrv/CMakeLists.txt b/sdrsrv/CMakeLists.txt
index 1dec81abf..db0a2f090 100644
--- a/sdrsrv/CMakeLists.txt
+++ b/sdrsrv/CMakeLists.txt
@@ -27,6 +27,7 @@ add_library(sdrsrv SHARED
 
 include_directories(
     .
+    ${CMAKE_SOURCE_DIR}/exports
     ${CMAKE_SOURCE_DIR}/sdrbase
     ${CMAKE_SOURCE_DIR}/logging
     ${CMAKE_SOURCE_DIR}/httpserver