diff --git a/sdrbase/CMakeLists.txt b/sdrbase/CMakeLists.txt
index df5ef4d1f..e4c8ba322 100644
--- a/sdrbase/CMakeLists.txt
+++ b/sdrbase/CMakeLists.txt
@@ -134,6 +134,7 @@ set(sdrbase_SOURCES
 
     device/deviceapi.cpp
     device/deviceenumerator.cpp
+    device/deviceset.cpp
     device/deviceuserargs.cpp
     device/deviceutils.cpp
 
@@ -291,6 +292,7 @@ set(sdrbase_HEADERS
 
     device/deviceapi.h
     device/deviceenumerator.h
+    device/deviceset.h
     device/deviceuserargs.h
     device/deviceutils.h
 
diff --git a/sdrsrv/device/deviceset.cpp b/sdrbase/device/deviceset.cpp
similarity index 100%
rename from sdrsrv/device/deviceset.cpp
rename to sdrbase/device/deviceset.cpp
diff --git a/sdrsrv/device/deviceset.h b/sdrbase/device/deviceset.h
similarity index 100%
rename from sdrsrv/device/deviceset.h
rename to sdrbase/device/deviceset.h
diff --git a/sdrgui/device/deviceuiset.h b/sdrgui/device/deviceuiset.h
index 90c5f2ae2..5e1edb561 100644
--- a/sdrgui/device/deviceuiset.h
+++ b/sdrgui/device/deviceuiset.h
@@ -58,12 +58,6 @@ public:
     void addRollupWidget(QWidget *widget);               //!< Add rollup widget to channel window
 
     int getNumberOfChannels() const { return m_channelInstanceRegistrations.size(); }
-    void registerRxChannelInstance(const QString& channelName, PluginInstanceGUI* pluginGUI);
-    void registerTxChannelInstance(const QString& channelName, PluginInstanceGUI* pluginGUI);
-    void registerChannelInstance(const QString& channelName, PluginInstanceGUI* pluginGUI);
-    void removeRxChannelInstance(PluginInstanceGUI* pluginGUI);
-    void removeTxChannelInstance(PluginInstanceGUI* pluginGUI);
-    void removeChannelInstance(PluginInstanceGUI* pluginGUI);
     void freeChannels();
     void deleteChannel(int channelIndex);
     void loadRxChannelSettings(const Preset* preset, PluginAPI *pluginAPI);
@@ -72,6 +66,12 @@ public:
     void saveTxChannelSettings(Preset* preset);
     void loadMIMOChannelSettings(const Preset* preset, PluginAPI *pluginAPI);
     void saveMIMOChannelSettings(Preset* preset);
+    void registerRxChannelInstance(const QString& channelName, PluginInstanceGUI* pluginGUI);
+    void registerTxChannelInstance(const QString& channelName, PluginInstanceGUI* pluginGUI);
+    void registerChannelInstance(const QString& channelName, PluginInstanceGUI* pluginGUI);
+    void removeRxChannelInstance(PluginInstanceGUI* pluginGUI);
+    void removeTxChannelInstance(PluginInstanceGUI* pluginGUI);
+    void removeChannelInstance(PluginInstanceGUI* pluginGUI);
 
     // These are the number of channel types available for selection
     void setNumberOfAvailableRxChannels(int number) { m_nbAvailableRxChannels = number; }
diff --git a/sdrsrv/CMakeLists.txt b/sdrsrv/CMakeLists.txt
index 6fd67d9b3..d8cd8d188 100644
--- a/sdrsrv/CMakeLists.txt
+++ b/sdrsrv/CMakeLists.txt
@@ -2,14 +2,12 @@ project (sdrsrv)
 
 set(sdrsrv_SOURCES
     maincore.cpp
-    device/deviceset.cpp
     feature/featureset.cpp
     webapi/webapiadaptersrv.cpp
 )
 
 set(sdrsrv_HEADERS
     maincore.h
-    device/deviceset.h
     feature/featureset.h
     webapi/webapiadaptersrv.h
 )