diff --git a/plugins/samplesource/airspyhf/airspyhfinput.cpp b/plugins/samplesource/airspyhf/airspyhfinput.cpp
index 9b67930ea..564775a79 100644
--- a/plugins/samplesource/airspyhf/airspyhfinput.cpp
+++ b/plugins/samplesource/airspyhf/airspyhfinput.cpp
@@ -28,7 +28,6 @@
 
 #include "airspyhfinput.h"
 
-#include "airspyhfgui.h"
 #include "airspyhfplugin.h"
 #include "airspyhfsettings.h"
 #include "airspyhfthread.h"
diff --git a/plugins/samplesource/airspyhf/airspyhfplugin.cpp b/plugins/samplesource/airspyhf/airspyhfplugin.cpp
index d2b77c418..aa436df7c 100644
--- a/plugins/samplesource/airspyhf/airspyhfplugin.cpp
+++ b/plugins/samplesource/airspyhf/airspyhfplugin.cpp
@@ -15,14 +15,17 @@
 ///////////////////////////////////////////////////////////////////////////////////
 
 #include <QtPlugin>
-#include <QAction>
 #include <libairspyhf/airspyhf.h>
 
 #include <device/devicesourceapi.h>
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
 #include "airspyhfplugin.h"
+#ifdef SERVER_MODE
+#include "airspyhfinput.h"
+#else
 #include "airspyhfgui.h"
+#endif
 
 
 const PluginDescriptor AirspyHFPlugin::m_pluginDescriptor = {
@@ -95,6 +98,15 @@ PluginInterface::SamplingDevices AirspyHFPlugin::enumSampleSources()
 	return result;
 }
 
+#ifdef SERVER_MODE
+PluginInstanceGUI* AirspyHFPlugin::createSampleSourcePluginInstanceGUI(
+        const QString& sourceId __attribute__((unused)),
+        QWidget **widget __attribute__((unused)),
+        DeviceUISet *deviceUISet __attribute__((unused)))
+{
+    return 0;
+}
+#else
 PluginInstanceGUI* AirspyHFPlugin::createSampleSourcePluginInstanceGUI(
         const QString& sourceId,
         QWidget **widget,
@@ -111,6 +123,7 @@ PluginInstanceGUI* AirspyHFPlugin::createSampleSourcePluginInstanceGUI(
 		return 0;
 	}
 }
+#endif
 
 DeviceSampleSource *AirspyHFPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI)
 {
diff --git a/plugins/samplesource/bladerfinput/bladerfinput.cpp b/plugins/samplesource/bladerfinput/bladerfinput.cpp
index aa0ef0ade..3837f57d8 100644
--- a/plugins/samplesource/bladerfinput/bladerfinput.cpp
+++ b/plugins/samplesource/bladerfinput/bladerfinput.cpp
@@ -30,7 +30,6 @@
 #include "device/devicesourceapi.h"
 #include "device/devicesinkapi.h"
 
-#include "bladerfinputgui.h"
 #include "bladerfinputthread.h"
 
 MESSAGE_CLASS_DEFINITION(BladerfInput::MsgConfigureBladerf, Message)
diff --git a/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp b/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp
index e8c48b3f2..256ff39b3 100644
--- a/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp
+++ b/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp
@@ -14,16 +14,19 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#include "../bladerfinput/bladerfinputplugin.h"
+#include "bladerfinputplugin.h"
 
 #include <QtPlugin>
-#include <QAction>
 #include <libbladeRF.h>
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
 #include <device/devicesourceapi.h>
 
+#ifdef SERVER_MODE
+#include "bladerfinput.h"
+#else
 #include "bladerfinputgui.h"
+#endif
 
 const PluginDescriptor BlderfInputPlugin::m_pluginDescriptor = {
 	QString("BladeRF Input"),
@@ -82,6 +85,15 @@ PluginInterface::SamplingDevices BlderfInputPlugin::enumSampleSources()
 	return result;
 }
 
+#ifdef SERVER_MODE
+PluginInstanceGUI* BlderfInputPlugin::createSampleSourcePluginInstanceGUI(
+        const QString& sourceId __attribute__((unused)),
+        QWidget **widget __attribute__((unused)),
+        DeviceUISet *deviceUISet __attribute__((unused)))
+{
+    return 0;
+}
+#else
 PluginInstanceGUI* BlderfInputPlugin::createSampleSourcePluginInstanceGUI(
         const QString& sourceId,
         QWidget **widget,
@@ -98,6 +110,7 @@ PluginInstanceGUI* BlderfInputPlugin::createSampleSourcePluginInstanceGUI(
 		return 0;
 	}
 }
+#endif
 
 DeviceSampleSource *BlderfInputPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI)
 {
diff --git a/pluginssrv/samplesource/airspyhf/CMakeLists.txt b/pluginssrv/samplesource/airspyhf/CMakeLists.txt
index bc5885a12..17a3ab6a9 100644
--- a/pluginssrv/samplesource/airspyhf/CMakeLists.txt
+++ b/pluginssrv/samplesource/airspyhf/CMakeLists.txt
@@ -59,6 +59,6 @@ target_link_libraries(inputairspyhfsrv
 )
 endif (BUILD_DEBIAN)
 
-qt5_use_modules(inputairspyhfsrv Core Widgets)
+qt5_use_modules(inputairspyhfsrv Core)
 
 install(TARGETS inputairspyhfsrv DESTINATION lib/pluginssrv/samplesource)
diff --git a/pluginssrv/samplesource/bladerfinput/CMakeLists.txt b/pluginssrv/samplesource/bladerfinput/CMakeLists.txt
index d9b1ebfc9..b468ae23b 100644
--- a/pluginssrv/samplesource/bladerfinput/CMakeLists.txt
+++ b/pluginssrv/samplesource/bladerfinput/CMakeLists.txt
@@ -63,6 +63,6 @@ target_link_libraries(inputbladerfsrv
 )
 endif (BUILD_DEBIAN)
 
-qt5_use_modules(inputbladerfsrv Core Widgets)
+qt5_use_modules(inputbladerfsrv Core)
 
 install(TARGETS inputbladerfsrv DESTINATION lib/pluginssrv/samplesource)