diff --git a/sdrbase/CMakeLists.txt b/sdrbase/CMakeLists.txt
index 49d3480d9..3641e6418 100644
--- a/sdrbase/CMakeLists.txt
+++ b/sdrbase/CMakeLists.txt
@@ -40,10 +40,12 @@ set(sdrbase_SOURCES
     dsp/threadedbasebandsamplesink.cpp
     dsp/threadedbasebandsamplesource.cpp
     dsp/wfir.cpp
-
     dsp/devicesamplesource.cpp
     dsp/devicesamplesink.cpp
 
+    device/devicesourceapi.cpp
+    device/devicesinkapi.cpp
+
     settings/preferences.cpp
     settings/preset.cpp
     settings/mainsettings.cpp
@@ -57,6 +59,8 @@ set(sdrbase_SOURCES
     util/samplesourceserializer.cpp
     util/simpleserializer.cpp
     #util/spinlock.cpp
+    
+    plugin/plugininterface.cpp    
 )
 
 set(sdrbase_HEADERS
@@ -115,11 +119,14 @@ set(sdrbase_HEADERS
     dsp/threadedbasebandsamplesink.h
     dsp/threadedbasebandsamplesource.h
     dsp/wfir.h
-
     dsp/devicesamplesource.h
     dsp/devicesamplesink.h
 
+    device/devicesourceapi.h
+    device/devicesinkapi.h
+
     plugin/plugininstancegui.h
+    plugin/plugininterface.h
 
     settings/preferences.h
     settings/preset.h
diff --git a/sdrgui/device/devicesinkapi.cpp b/sdrbase/device/devicesinkapi.cpp
similarity index 100%
rename from sdrgui/device/devicesinkapi.cpp
rename to sdrbase/device/devicesinkapi.cpp
diff --git a/sdrgui/device/devicesinkapi.h b/sdrbase/device/devicesinkapi.h
similarity index 100%
rename from sdrgui/device/devicesinkapi.h
rename to sdrbase/device/devicesinkapi.h
diff --git a/sdrgui/device/devicesourceapi.cpp b/sdrbase/device/devicesourceapi.cpp
similarity index 100%
rename from sdrgui/device/devicesourceapi.cpp
rename to sdrbase/device/devicesourceapi.cpp
diff --git a/sdrgui/device/devicesourceapi.h b/sdrbase/device/devicesourceapi.h
similarity index 100%
rename from sdrgui/device/devicesourceapi.h
rename to sdrbase/device/devicesourceapi.h
diff --git a/sdrgui/plugin/plugininterface.cpp b/sdrbase/plugin/plugininterface.cpp
similarity index 100%
rename from sdrgui/plugin/plugininterface.cpp
rename to sdrbase/plugin/plugininterface.cpp
diff --git a/sdrgui/plugin/plugininterface.h b/sdrbase/plugin/plugininterface.h
similarity index 100%
rename from sdrgui/plugin/plugininterface.h
rename to sdrbase/plugin/plugininterface.h
diff --git a/sdrgui/CMakeLists.txt b/sdrgui/CMakeLists.txt
index 08c63e855..caceba76b 100644
--- a/sdrgui/CMakeLists.txt
+++ b/sdrgui/CMakeLists.txt
@@ -43,13 +43,10 @@ set(sdrgui_SOURCES
     dsp/spectrumscopecombovis.cpp
     dsp/spectrumscopengcombovis.cpp
     
-    device/devicesourceapi.cpp
-    device/devicesinkapi.cpp
     device/deviceuiset.cpp
     
     plugin/pluginapi.cpp
     plugin/pluginmanager.cpp    
-    plugin/plugininterface.cpp
 )
 
 set(sdrgui_HEADERS
@@ -95,13 +92,10 @@ set(sdrgui_HEADERS
     dsp/spectrumscopecombovis.h
     dsp/spectrumscopengcombovis.h
     
-    device/devicesourceapi.h
-    device/devicesinkapi.h
     device/deviceuiset.h
     
     plugin/pluginapi.h
     plugin/pluginmanager.h
-    plugin/plugininterface.h
 )
 
 set(sdrgui_SOURCES