diff --git a/plugins/samplesource/CMakeLists.txt b/plugins/samplesource/CMakeLists.txt
index ee7866c33..3a2419ee9 100644
--- a/plugins/samplesource/CMakeLists.txt
+++ b/plugins/samplesource/CMakeLists.txt
@@ -8,7 +8,7 @@ if(V4L-RTL)
 #   add_subdirectory(v4l-rtl)
 endif()
 if(V4L-MSI)
-        FIND_LIBRARY (LIBV4L2 v4l2)
+    FIND_LIBRARY (LIBV4L2 v4l2)
     FIND_PATH (LIBV4L2H libv4l2.h)
 #   add_subdirectory(v4l-msi)
 endif()
diff --git a/plugins/samplesource/fcdproplus/fcdproplusinput.cpp b/plugins/samplesource/fcdproplus/fcdproplusinput.cpp
index 8bbc3fac7..a15a0819e 100644
--- a/plugins/samplesource/fcdproplus/fcdproplusinput.cpp
+++ b/plugins/samplesource/fcdproplus/fcdproplusinput.cpp
@@ -30,7 +30,6 @@
 
 #include <device/devicesourceapi.h>
 
-#include "fcdproplusgui.h"
 #include "fcdproplusthread.h"
 #include "fcdtraits.h"
 #include "fcdproplusconst.h"
diff --git a/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp b/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp
index 419563aa6..16207daa0 100644
--- a/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp
+++ b/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp
@@ -15,14 +15,17 @@
 ///////////////////////////////////////////////////////////////////////////////////
 
 #include <QtPlugin>
-#include <QAction>
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
 #include "fcdproplusplugin.h"
 
 #include <device/devicesourceapi.h>
 
+#ifdef SERVER_MODE
+#include "fcdproplusinput.h"
+#else
 #include "fcdproplusgui.h"
+#endif
 #include "fcdtraits.h"
 
 const PluginDescriptor FCDProPlusPlugin::m_pluginDescriptor = {
@@ -80,6 +83,15 @@ PluginInterface::SamplingDevices FCDProPlusPlugin::enumSampleSources()
 	return result;
 }
 
+#ifdef SERVER_MODE
+PluginInstanceGUI* FCDProPlusPlugin::createSampleSourcePluginInstanceGUI(
+        const QString& sourceId __attribute__((unused)),
+        QWidget **widget __attribute__((unused)),
+        DeviceUISet *deviceUISet __attribute__((unused)))
+{
+    return 0;
+}
+#else
 PluginInstanceGUI* FCDProPlusPlugin::createSampleSourcePluginInstanceGUI(
         const QString& sourceId,
         QWidget **widget,
@@ -96,6 +108,7 @@ PluginInstanceGUI* FCDProPlusPlugin::createSampleSourcePluginInstanceGUI(
 		return 0;
 	}
 }
+#endif
 
 DeviceSampleSource *FCDProPlusPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI)
 {
diff --git a/pluginssrv/samplesource/CMakeLists.txt b/pluginssrv/samplesource/CMakeLists.txt
index 4bc82f663..702b153b7 100644
--- a/pluginssrv/samplesource/CMakeLists.txt
+++ b/pluginssrv/samplesource/CMakeLists.txt
@@ -34,7 +34,7 @@ if(LIBUSB_FOUND AND UNIX)
 endif()
 if(LIBASOUND AND ASOUNDH)
     add_subdirectory(fcdpro)
-#    add_subdirectory(fcdproplus)
+    add_subdirectory(fcdproplus)
 endif()
 
 find_package(LibHACKRF)