diff --git a/CMakeLists.txt b/CMakeLists.txt
index be28d8ae2..5b25306a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -269,6 +269,14 @@ else()
 endif()
 set(INSTALL_PLUGINS_DIR "${INSTALL_LIB_DIR}/plugins")
 set(INSTALL_PLUGINSSRV_DIR "${INSTALL_LIB_DIR}/pluginssrv")
+
+if(ANDROID)
+  set(PLUGINS_PREFIX    "sdrangel_plugins_")
+  set(PLUGINSSRV_PREFIX "sdrangel_pluginssrv_")
+else()
+  set(PLUGINS_PREFIX    "")
+  set(PLUGINSSRV_PREFIX "")
+endif()
 set(EXTERNAL_BUILD_LIBRARIES "${CMAKE_BINARY_DIR}/external")
 
 # custom libraries
@@ -579,6 +587,7 @@ elseif(ANDROID)
       CACHE INTERNAL ""
     )
   endif()
+  add_compile_definitions(ANDROID)
 endif()
 
 # When building a bundle on MacOS, we want to keep build paths in the library
@@ -659,6 +668,7 @@ if (BUILD_GUI)
         if (ENABLE_QT6)
             find_package(Qt6
                            REQUIRED COMPONENTS
+                            Location
                             OpenGL
                             OpenGLWidgets
                             Quick
diff --git a/devices/soapysdr/CMakeLists.txt b/devices/soapysdr/CMakeLists.txt
index f9e1bbced..3c8bfe948 100644
--- a/devices/soapysdr/CMakeLists.txt
+++ b/devices/soapysdr/CMakeLists.txt
@@ -27,9 +27,14 @@ set_target_properties(soapysdrdevice
 
 target_link_libraries(soapysdrdevice
     ${SOAPYSDR_LINK_LIBRARIES}
+    ${SOAPYSDR_LIBRARIES}
     sdrbase
 )
 
+target_link_directories(soapysdrdevice PRIVATE
+    ${SOAPYSDR_LIBRARY_DIRS}
+)
+
 if(SOAPYSDR_EXTERNAL AND NOT LINUX)
     add_dependencies(soapysdrdevice soapysdr)
 endif()
diff --git a/ft8/ft8.h b/ft8/ft8.h
index 326edc5f2..2e84f3ac3 100644
--- a/ft8/ft8.h
+++ b/ft8/ft8.h
@@ -85,8 +85,9 @@ struct FT8_API cdecode
 // total transmission time is 12.64 seconds
 
 // tunable parameters
-struct FT8_API FT8Params
+class FT8_API FT8Params
 {
+public:
     int nthreads;            // number of parallel threads, for multi-core
     int npasses_one;         // number of spectral subtraction passes
     int npasses_two;         // number of spectral subtraction passes
diff --git a/httpserver/httpconnectionhandlerpool.cpp b/httpserver/httpconnectionhandlerpool.cpp
index 6de3a2e0e..27314ef29 100644
--- a/httpserver/httpconnectionhandlerpool.cpp
+++ b/httpserver/httpconnectionhandlerpool.cpp
@@ -94,7 +94,7 @@ void HttpConnectionHandlerPool::cleanup()
             if (++idleCounter > maxIdleHandlers)
             {
                 pool.removeOne(handler);
-                qDebug("HttpConnectionHandlerPool: Removed connection handler (%p), pool size is now %i",handler,pool.size());
+                qDebug("HttpConnectionHandlerPool: Removed connection handler (%p), pool size is now %i",handler,(int)pool.size());
                 delete handler;
                 break; // remove only one handler in each interval
             }
diff --git a/httpserver/staticfilecontroller.cpp b/httpserver/staticfilecontroller.cpp
index 7db2c9563..686bff1f5 100644
--- a/httpserver/staticfilecontroller.cpp
+++ b/httpserver/staticfilecontroller.cpp
@@ -35,7 +35,7 @@ StaticFileController::StaticFileController(QSettings* settings, QObject* parent)
     maxCachedFileSize=settings->value("maxCachedFileSize","65536").toInt();
     cache.setMaxCost(settings->value("cacheSize","1000000").toInt());
     cacheTimeout=settings->value("cacheTime","60000").toInt();
-    qDebug("StaticFileController: cache timeout=%i, size=%i",cacheTimeout,cache.maxCost());
+    qDebug("StaticFileController: cache timeout=%i, size=%i",cacheTimeout,(int)cache.maxCost());
 }
 
 StaticFileController::StaticFileController(const HttpDocrootSettings& settings, QObject* parent)
@@ -56,7 +56,7 @@ StaticFileController::StaticFileController(const HttpDocrootSettings& settings,
     maxCachedFileSize=settings.maxCachedFileSize;
     cache.setMaxCost(settings.cacheSize);
     cacheTimeout=settings.cacheTime;
-    qDebug("StaticFileController: cache timeout=%i, size=%i",cacheTimeout,cache.maxCost());
+    qDebug("StaticFileController: cache timeout=%i, size=%i",cacheTimeout,(int)cache.maxCost());
 }
 
 void StaticFileController::service(HttpRequest& request, HttpResponse& response)
diff --git a/modemm17/Util.h b/modemm17/Util.h
index c446b6605..81a4a3209 100644
--- a/modemm17/Util.h
+++ b/modemm17/Util.h
@@ -239,7 +239,7 @@ constexpr T to_int(uint8_t v)
 {
     constexpr auto MAX_LOCAL_INPUT = (1 << (n - 1));
     constexpr auto NEGATIVE_OFFSET = std::numeric_limits<typename std::make_unsigned<T>::type>::max() - (MAX_LOCAL_INPUT - 1);
-    T r = v & (1 << (n - 1)) ? NEGATIVE_OFFSET : 0;
+    T r = v & (1 << (n - 1)) ? (T)NEGATIVE_OFFSET : 0;
     return r + (v & (MAX_LOCAL_INPUT - 1));
 }
 
diff --git a/plugins/channelmimo/beamsteeringcwmod/CMakeLists.txt b/plugins/channelmimo/beamsteeringcwmod/CMakeLists.txt
index baa8ba5c6..bcc1a98d1 100644
--- a/plugins/channelmimo/beamsteeringcwmod/CMakeLists.txt
+++ b/plugins/channelmimo/beamsteeringcwmod/CMakeLists.txt
@@ -34,12 +34,12 @@ if (NOT SERVER_MODE)
         beamsteeringcwmodgui.h
     )
 
-    set(TARGET_NAME beamsteeringcwmod)
+    set(TARGET_NAME ${PLUGINS_PREFIX}beamsteeringcwmod)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME beamsteeringcwmodsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}beamsteeringcwmodsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h
index 0c7375d90..e676afc5e 100644
--- a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h
+++ b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h
@@ -155,8 +155,6 @@ private:
     BeamSteeringCWModBaseband* m_basebandSource;
     QMutex m_mutex;
     bool m_running;
-    BasebandSampleSink* m_spectrumSink;
-    BasebandSampleSink* m_scopeSink;
     BeamSteeringCWModSettings m_settings;
 
     QNetworkAccessManager *m_networkManager;
@@ -164,8 +162,6 @@ private:
 
     int64_t m_frequencyOffset;
     uint32_t m_basebandSampleRate;
-    int m_count0;
-    int m_count1;
 
    	bool handleMessage(const Message& cmd) final; //!< Processing of a message. Returns true if message has actually been processed
     void applySettings(const BeamSteeringCWModSettings& settings, bool force = false);
diff --git a/plugins/channelmimo/doa2/CMakeLists.txt b/plugins/channelmimo/doa2/CMakeLists.txt
index b7a0939c8..02e3be16d 100644
--- a/plugins/channelmimo/doa2/CMakeLists.txt
+++ b/plugins/channelmimo/doa2/CMakeLists.txt
@@ -38,12 +38,12 @@ if (NOT SERVER_MODE)
         doa2compass.cpp
     )
 
-    set(TARGET_NAME doa2)
+    set(TARGET_NAME ${PLUGINS_PREFIX}doa2)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME doa2srv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}doa2srv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelmimo/doa2/doa2.h b/plugins/channelmimo/doa2/doa2.h
index 391dcb7a3..418df527a 100644
--- a/plugins/channelmimo/doa2/doa2.h
+++ b/plugins/channelmimo/doa2/doa2.h
@@ -173,8 +173,6 @@ private:
     int64_t m_frequencyOffset;
     uint32_t m_deviceSampleRate;
     qint64 m_deviceCenterFrequency;
-    int m_count0;
-    int m_count1;
 
 	bool handleMessage(const Message& cmd) final; //!< Processing of a message. Returns true if message has actually been processed
     void applySettings(const DOA2Settings& settings, bool force = false);
diff --git a/plugins/channelmimo/doa2/doa2corr.cpp b/plugins/channelmimo/doa2/doa2corr.cpp
index 97098387c..8354be90e 100644
--- a/plugins/channelmimo/doa2/doa2corr.cpp
+++ b/plugins/channelmimo/doa2/doa2corr.cpp
@@ -264,7 +264,7 @@ bool DOA2Correlator::performFFTProd(
             m_fft[0]->out() + m_fftSize,
             m_dataj,
             m_invFFT->in(),
-            [this](std::complex<float>& a, const std::complex<float>& b) -> std::complex<float> {
+            [](std::complex<float>& a, const std::complex<float>& b) -> std::complex<float> {
                 return (a*b);
             }
         );
diff --git a/plugins/channelmimo/doa2/doa2streamsink.h b/plugins/channelmimo/doa2/doa2streamsink.h
index 07612c5b7..61d51d855 100644
--- a/plugins/channelmimo/doa2/doa2streamsink.h
+++ b/plugins/channelmimo/doa2/doa2streamsink.h
@@ -44,9 +44,6 @@ private:
     int m_dataSize;
     int m_bufferSize;
     int m_dataStart;
-
-    uint32_t m_log2Decim;
-    uint32_t m_filterChainHash;
 };
 
 
diff --git a/plugins/channelmimo/interferometer/CMakeLists.txt b/plugins/channelmimo/interferometer/CMakeLists.txt
index e0f2f7e42..7be7fe5f2 100644
--- a/plugins/channelmimo/interferometer/CMakeLists.txt
+++ b/plugins/channelmimo/interferometer/CMakeLists.txt
@@ -36,12 +36,12 @@ if (NOT SERVER_MODE)
         interferometergui.h
     )
 
-    set(TARGET_NAME interferometer)
+    set(TARGET_NAME ${PLUGINS_PREFIX}interferometer)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME interferometersrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}interferometersrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelmimo/interferometer/interferometer.h b/plugins/channelmimo/interferometer/interferometer.h
index 4531fb4a2..81cbb43ec 100644
--- a/plugins/channelmimo/interferometer/interferometer.h
+++ b/plugins/channelmimo/interferometer/interferometer.h
@@ -193,8 +193,6 @@ private:
     uint64_t m_centerFrequency;
     int64_t m_frequencyOffset;
     uint32_t m_deviceSampleRate;
-    int m_count0;
-    int m_count1;
 
     QList<int> m_localInputDeviceIndexes;
 
diff --git a/plugins/channelmimo/interferometer/interferometercorr.cpp b/plugins/channelmimo/interferometer/interferometercorr.cpp
index 1c90c433d..ee95fabad 100644
--- a/plugins/channelmimo/interferometer/interferometercorr.cpp
+++ b/plugins/channelmimo/interferometer/interferometercorr.cpp
@@ -555,7 +555,7 @@ bool InterferometerCorrelator::performFFTProd(
             m_fft2[0]->out() + m_fftSize,
             m_dataj,
             m_invFFT2->in(),
-            [this](std::complex<float>& a, const std::complex<float>& b) -> std::complex<float> {
+            [](std::complex<float>& a, const std::complex<float>& b) -> std::complex<float> {
                 return (a*b);
             }
         );
diff --git a/plugins/channelmimo/interferometer/interferometerstreamsink.h b/plugins/channelmimo/interferometer/interferometerstreamsink.h
index e3cb8af99..43fbe7ea2 100644
--- a/plugins/channelmimo/interferometer/interferometerstreamsink.h
+++ b/plugins/channelmimo/interferometer/interferometerstreamsink.h
@@ -44,9 +44,6 @@ private:
     int m_dataSize;
     int m_bufferSize;
     int m_dataStart;
-
-    uint32_t m_log2Decim;
-    uint32_t m_filterChainHash;
 };
 
 
diff --git a/plugins/channelrx/chanalyzer/CMakeLists.txt b/plugins/channelrx/chanalyzer/CMakeLists.txt
index 62352c1ec..b378e9891 100644
--- a/plugins/channelrx/chanalyzer/CMakeLists.txt
+++ b/plugins/channelrx/chanalyzer/CMakeLists.txt
@@ -26,7 +26,7 @@ include_directories(
 	${Boost_INCLUDE_DIRS}
 )
 
-set(TARGET_NAME chanalyzer)
+set(TARGET_NAME ${PLUGINS_PREFIX}chanalyzer)
 set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 
 add_library(${TARGET_NAME} SHARED
diff --git a/plugins/channelrx/channelpower/CMakeLists.txt b/plugins/channelrx/channelpower/CMakeLists.txt
index d0e3297f4..a878a598f 100644
--- a/plugins/channelrx/channelpower/CMakeLists.txt
+++ b/plugins/channelrx/channelpower/CMakeLists.txt
@@ -33,12 +33,12 @@ if(NOT SERVER_MODE)
         channelpowergui.h
     )
 
-    set(TARGET_NAME channelpower)
+    set(TARGET_NAME ${PLUGINS_PREFIX}channelpower)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME channelpowersrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}channelpowersrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/channelpower/channelpower.cpp b/plugins/channelrx/channelpower/channelpower.cpp
index f86272b05..d3163ae0c 100644
--- a/plugins/channelrx/channelpower/channelpower.cpp
+++ b/plugins/channelrx/channelpower/channelpower.cpp
@@ -49,7 +49,7 @@ ChannelPower::ChannelPower(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new ChannelPowerBaseband(this);
+    m_basebandSink = new ChannelPowerBaseband();
     m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(&m_thread);
 
diff --git a/plugins/channelrx/channelpower/channelpowerbaseband.cpp b/plugins/channelrx/channelpower/channelpowerbaseband.cpp
index 1f9bd38ad..4858dc4a7 100644
--- a/plugins/channelrx/channelpower/channelpowerbaseband.cpp
+++ b/plugins/channelrx/channelpower/channelpowerbaseband.cpp
@@ -25,8 +25,7 @@
 
 MESSAGE_CLASS_DEFINITION(ChannelPowerBaseband::MsgConfigureChannelPowerBaseband, Message)
 
-ChannelPowerBaseband::ChannelPowerBaseband(ChannelPower *channelPower) :
-    m_sink(channelPower),
+ChannelPowerBaseband::ChannelPowerBaseband() :
     m_running(false)
 {
     qDebug("ChannelPowerBaseband::ChannelPowerBaseband");
diff --git a/plugins/channelrx/channelpower/channelpowerbaseband.h b/plugins/channelrx/channelpower/channelpowerbaseband.h
index b0e1bd3cc..d5fc8fa77 100644
--- a/plugins/channelrx/channelpower/channelpowerbaseband.h
+++ b/plugins/channelrx/channelpower/channelpowerbaseband.h
@@ -62,7 +62,7 @@ public:
         { }
     };
 
-    ChannelPowerBaseband(ChannelPower *channelPower);
+    ChannelPowerBaseband();
     ~ChannelPowerBaseband();
     void reset();
     void startWork();
diff --git a/plugins/channelrx/channelpower/channelpowersink.cpp b/plugins/channelrx/channelpower/channelpowersink.cpp
index fa78ce2f1..67606e21e 100644
--- a/plugins/channelrx/channelpower/channelpowersink.cpp
+++ b/plugins/channelrx/channelpower/channelpowersink.cpp
@@ -20,8 +20,7 @@
 
 #include "channelpowersink.h"
 
-ChannelPowerSink::ChannelPowerSink(ChannelPower *channelPower) :
-        m_channelPower(channelPower),
+ChannelPowerSink::ChannelPowerSink() :
         m_channelSampleRate(10000),
         m_channelFrequencyOffset(0),
         m_lowpassFFT(nullptr),
@@ -41,7 +40,6 @@ ChannelPowerSink::~ChannelPowerSink()
 void ChannelPowerSink::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end)
 {
     QMutexLocker mutexLocker(&m_mutex);
-    Complex ci;
 
     for (SampleVector::const_iterator it = begin; it != end; ++it)
     {
diff --git a/plugins/channelrx/channelpower/channelpowersink.h b/plugins/channelrx/channelpower/channelpowersink.h
index 2bfa73714..5111aa084 100644
--- a/plugins/channelrx/channelpower/channelpowersink.h
+++ b/plugins/channelrx/channelpower/channelpowersink.h
@@ -32,7 +32,7 @@ class ChannelPower;
 
 class ChannelPowerSink : public ChannelSampleSink {
 public:
-    ChannelPowerSink(ChannelPower *channelPower);
+    ChannelPowerSink();
     ~ChannelPowerSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
@@ -65,7 +65,6 @@ public:
 
 private:
 
-    ChannelPower *m_channelPower;
     ChannelPowerSettings m_settings;
     ChannelAPI *m_channel;
     int m_channelSampleRate;
diff --git a/plugins/channelrx/demodadsb/CMakeLists.txt b/plugins/channelrx/demodadsb/CMakeLists.txt
index 331630c1d..4c999515f 100644
--- a/plugins/channelrx/demodadsb/CMakeLists.txt
+++ b/plugins/channelrx/demodadsb/CMakeLists.txt
@@ -59,12 +59,12 @@ if(NOT SERVER_MODE)
         osndb.h
     )
 
-    set(TARGET_NAME demodadsb)
+    set(TARGET_NAME ${PLUGINS_PREFIX}demodadsb)
     set(TARGET_LIB Qt::Widgets Qt::Quick Qt::QuickWidgets Qt::Positioning Qt::Location Qt::TextToSpeech)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME demodadsbsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}demodadsbsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/demodadsb/adsbdemodgui.cpp b/plugins/channelrx/demodadsb/adsbdemodgui.cpp
index 40f5b7528..dc958a67f 100644
--- a/plugins/channelrx/demodadsb/adsbdemodgui.cpp
+++ b/plugins/channelrx/demodadsb/adsbdemodgui.cpp
@@ -4991,7 +4991,7 @@ ADSBDemodGUI::ADSBDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb
     m_azEl.setLocation(stationLatitude, stationLongitude, stationAltitude);
 
     // These are the default values in sdrbase/settings/preferences.cpp
-    if ((stationLatitude == 49.012423) && (stationLongitude == 8.418125)) {
+    if ((stationLatitude == (float)49.012423) && (stationLongitude == (float)8.418125)) {
         ui->warning->setText("Please set your antenna location under Preferences > My Position");
     }
 
diff --git a/plugins/channelrx/demodadsb/adsbdemodgui.h b/plugins/channelrx/demodadsb/adsbdemodgui.h
index a05e829bc..d08379857 100644
--- a/plugins/channelrx/demodadsb/adsbdemodgui.h
+++ b/plugins/channelrx/demodadsb/adsbdemodgui.h
@@ -811,6 +811,8 @@ public:
     {
         m_aircraftRegExp.optimize();
     }
+    
+    virtual ~ModelMatch() = default;
 
     virtual bool match(const QString &aircraft, const QString &manufacturer, QString &model)
     {
diff --git a/plugins/channelrx/demodadsb/adsbdemodsink.cpp b/plugins/channelrx/demodadsb/adsbdemodsink.cpp
index eeeaa15ab..6b9da6eae 100644
--- a/plugins/channelrx/demodadsb/adsbdemodsink.cpp
+++ b/plugins/channelrx/demodadsb/adsbdemodsink.cpp
@@ -79,7 +79,6 @@ void ADSBDemodSink::feed(const SampleVector::const_iterator& begin, const Sample
         for (SampleVector::const_iterator it = begin; it != end; ++it)
         {
             Complex c(it->real(), it->imag());
-            Complex ci;
             c *= m_nco.nextIQ();
             processOneSample(complexMagSq(c));
         }
diff --git a/plugins/channelrx/demodais/CMakeLists.txt b/plugins/channelrx/demodais/CMakeLists.txt
index 215165724..00a93b9c6 100644
--- a/plugins/channelrx/demodais/CMakeLists.txt
+++ b/plugins/channelrx/demodais/CMakeLists.txt
@@ -33,12 +33,12 @@ if(NOT SERVER_MODE)
         aisdemodgui.h
     )
 
-    set(TARGET_NAME demodais)
+    set(TARGET_NAME ${PLUGINS_PREFIX}demodais)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME demodaissrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}demodaissrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/demodais/aisdemodsink.cpp b/plugins/channelrx/demodais/aisdemodsink.cpp
index a961201be..55dee3fa1 100644
--- a/plugins/channelrx/demodais/aisdemodsink.cpp
+++ b/plugins/channelrx/demodais/aisdemodsink.cpp
@@ -118,8 +118,6 @@ void AISDemodSink::feed(const SampleVector::const_iterator& begin, const SampleV
 
 void AISDemodSink::processOneSample(Complex &ci)
 {
-    Complex ca;
-
     // FM demodulation
     double magsqRaw;
     Real deviation;
diff --git a/plugins/channelrx/demodam/CMakeLists.txt b/plugins/channelrx/demodam/CMakeLists.txt
index c185ce8d9..669891000 100644
--- a/plugins/channelrx/demodam/CMakeLists.txt
+++ b/plugins/channelrx/demodam/CMakeLists.txt
@@ -37,12 +37,12 @@ if(NOT SERVER_MODE)
         amdemodssbdialog.h
     )
 
-    set(TARGET_NAME demodam)
+    set(TARGET_NAME ${PLUGINS_PREFIX}demodam)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME demodamsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}demodamsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/demodam/amdemodgui.cpp b/plugins/channelrx/demodam/amdemodgui.cpp
index bed687ecf..2f0c0b7da 100644
--- a/plugins/channelrx/demodam/amdemodgui.cpp
+++ b/plugins/channelrx/demodam/amdemodgui.cpp
@@ -663,7 +663,7 @@ void AMDemodGUI::snapClicked()
     {
         applySnap();
 
-        qint64 value;
+        qint64 value = 0;
 
         if (m_settings.m_frequencyMode == AMDemodSettings::Offset) {
             value = m_settings.m_inputFrequencyOffset;
diff --git a/plugins/channelrx/demodapt/CMakeLists.txt b/plugins/channelrx/demodapt/CMakeLists.txt
index 29aa74166..16a76e061 100644
--- a/plugins/channelrx/demodapt/CMakeLists.txt
+++ b/plugins/channelrx/demodapt/CMakeLists.txt
@@ -44,12 +44,12 @@ if(NOT SERVER_MODE)
         aptdemodselectdialog.h
     )
 
-    set(TARGET_NAME demodapt)
+    set(TARGET_NAME ${PLUGINS_PREFIX}demodapt)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME demodaptsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}demodaptsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/demodapt/aptdemod.cpp b/plugins/channelrx/demodapt/aptdemod.cpp
index 625375403..505634dc5 100644
--- a/plugins/channelrx/demodapt/aptdemod.cpp
+++ b/plugins/channelrx/demodapt/aptdemod.cpp
@@ -55,7 +55,7 @@ APTDemod::APTDemod(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new APTDemodBaseband(this);
+    m_basebandSink = new APTDemodBaseband();
     m_basebandSink->moveToThread(&m_thread);
 
     m_imageWorker = new APTDemodImageWorker(this);
diff --git a/plugins/channelrx/demodapt/aptdemodbaseband.cpp b/plugins/channelrx/demodapt/aptdemodbaseband.cpp
index e58384af0..b19a85740 100644
--- a/plugins/channelrx/demodapt/aptdemodbaseband.cpp
+++ b/plugins/channelrx/demodapt/aptdemodbaseband.cpp
@@ -26,8 +26,7 @@
 
 MESSAGE_CLASS_DEFINITION(APTDemodBaseband::MsgConfigureAPTDemodBaseband, Message)
 
-APTDemodBaseband::APTDemodBaseband(APTDemod *packetDemod) :
-    m_sink(packetDemod),
+APTDemodBaseband::APTDemodBaseband() :
     m_running(false)
 {
     qDebug("APTDemodBaseband::APTDemodBaseband");
diff --git a/plugins/channelrx/demodapt/aptdemodbaseband.h b/plugins/channelrx/demodapt/aptdemodbaseband.h
index e9f75156e..72cdce30f 100644
--- a/plugins/channelrx/demodapt/aptdemodbaseband.h
+++ b/plugins/channelrx/demodapt/aptdemodbaseband.h
@@ -58,7 +58,7 @@ public:
         { }
     };
 
-    APTDemodBaseband(APTDemod *packetDemod);
+    APTDemodBaseband();
     ~APTDemodBaseband();
     void reset();
     void startWork();
diff --git a/plugins/channelrx/demodapt/aptdemodsink.cpp b/plugins/channelrx/demodapt/aptdemodsink.cpp
index 13b41f798..dffbcd243 100644
--- a/plugins/channelrx/demodapt/aptdemodsink.cpp
+++ b/plugins/channelrx/demodapt/aptdemodsink.cpp
@@ -23,8 +23,7 @@
 #include "aptdemod.h"
 #include "aptdemodsink.h"
 
-APTDemodSink::APTDemodSink(APTDemod *packetDemod) :
-        m_aptDemod(packetDemod),
+APTDemodSink::APTDemodSink() :
         m_channelSampleRate(APTDEMOD_AUDIO_SAMPLE_RATE),
         m_channelFrequencyOffset(0),
         m_magsqSum(0.0f),
@@ -33,6 +32,7 @@ APTDemodSink::APTDemodSink(APTDemod *packetDemod) :
         m_imageWorkerMessageQueue(nullptr),
         m_samples(nullptr)
 {
+
     m_magsq = 0.0;
 
     applySettings(m_settings, true);
@@ -129,8 +129,6 @@ void APTDemodSink::feed(const SampleVector::const_iterator& begin, const SampleV
 
 void APTDemodSink::processOneSample(Complex &ci)
 {
-    Complex ca;
-
     // FM demodulation
     double magsqRaw;
     Real deviation;
diff --git a/plugins/channelrx/demodapt/aptdemodsink.h b/plugins/channelrx/demodapt/aptdemodsink.h
index e65f903e5..5afd7403e 100644
--- a/plugins/channelrx/demodapt/aptdemodsink.h
+++ b/plugins/channelrx/demodapt/aptdemodsink.h
@@ -44,7 +44,7 @@ class APTDemod;
 
 class APTDemodSink : public ChannelSampleSink {
 public:
-    APTDemodSink(APTDemod *packetDemod);
+    APTDemodSink();
     ~APTDemodSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
@@ -87,7 +87,6 @@ private:
         double m_magsqPeak;
     };
 
-    APTDemod *m_aptDemod;
     APTDemodSettings m_settings;
     int m_channelSampleRate;
     int m_channelFrequencyOffset;
diff --git a/plugins/channelrx/demodatv/CMakeLists.txt b/plugins/channelrx/demodatv/CMakeLists.txt
index 322a55fd6..c7ef3c5d7 100644
--- a/plugins/channelrx/demodatv/CMakeLists.txt
+++ b/plugins/channelrx/demodatv/CMakeLists.txt
@@ -26,7 +26,7 @@ include_directories(
     ${Boost_INCLUDE_DIRS}
 )
 
-set(TARGET_NAME demodatv)
+set(TARGET_NAME ${PLUGINS_PREFIX}demodatv)
 set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 
 add_library(${TARGET_NAME} SHARED
diff --git a/plugins/channelrx/demodatv/atvdemodsettings.h b/plugins/channelrx/demodatv/atvdemodsettings.h
index f25df5b21..db428fddb 100644
--- a/plugins/channelrx/demodatv/atvdemodsettings.h
+++ b/plugins/channelrx/demodatv/atvdemodsettings.h
@@ -101,9 +101,6 @@ struct ATVDemodSettings
     static float getNominalLineTime(int nbLines, int fps);
     static float getRFBandwidthDivisor(ATVModulation modulation);
     static void getBaseValues(int sampleRate, int linesPerSecond, uint32_t& nbPointsPerLine);
-
-private:
-    int m_rfSliderDivisor;
 };
 
 #endif /* PLUGINS_CHANNELRX_DEMODATV_ATVDEMODSETTINGS_H_ */
diff --git a/plugins/channelrx/demodatv/atvdemodsink.h b/plugins/channelrx/demodatv/atvdemodsink.h
index a6b47f024..6af9b58df 100644
--- a/plugins/channelrx/demodatv/atvdemodsink.h
+++ b/plugins/channelrx/demodatv/atvdemodsink.h
@@ -163,7 +163,6 @@ private:
     int m_hSyncErrorCount;
 
     float prevSample;
-    int m_avgColIndex;
 
     SampleVector m_sampleBuffer;
 
diff --git a/plugins/channelrx/demodbfm/CMakeLists.txt b/plugins/channelrx/demodbfm/CMakeLists.txt
index 46af33186..b22b1fc73 100644
--- a/plugins/channelrx/demodbfm/CMakeLists.txt
+++ b/plugins/channelrx/demodbfm/CMakeLists.txt
@@ -44,12 +44,12 @@ if(NOT SERVER_MODE)
         bfmdemodgui.h
     )
 
-    set(TARGET_NAME demodbfm)
+    set(TARGET_NAME ${PLUGINS_PREFIX}demodbfm)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME demodbfmsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}demodbfmsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/demodbfm/rdsparser.cpp b/plugins/channelrx/demodbfm/rdsparser.cpp
index 663d74a19..b02f8742b 100644
--- a/plugins/channelrx/demodbfm/rdsparser.cpp
+++ b/plugins/channelrx/demodbfm/rdsparser.cpp
@@ -467,7 +467,6 @@ void RDSParser::decode_type0(unsigned int *group, bool B)
 {
 	unsigned int af_code_1 = 0;
 	unsigned int af_code_2 = 0;
-	unsigned int  no_af    = 0;
 	double af_1            = 0;
 	double af_2            = 0;
 
@@ -534,7 +533,7 @@ void RDSParser::decode_type0(unsigned int *group, bool B)
             // @TODO: Find proper header or STL on OSX
 			auto res = m_g0_alt_freq.insert(af_1/1e3);
 			m_g0_af_updated = m_g0_af_updated || res.second;
-			no_af += 1;
+			// no_af += 1;
 		}
 
 		if (af_2)
@@ -542,7 +541,7 @@ void RDSParser::decode_type0(unsigned int *group, bool B)
             // @TODO: Find proper header or STL on OSX
             auto res = m_g0_alt_freq.insert(af_2/1e3);
             m_g0_af_updated = m_g0_af_updated || res.second;
-			no_af += 2;
+			// no_af += 2;
 		}
 
 		/*
diff --git a/plugins/channelrx/demodchirpchat/CMakeLists.txt b/plugins/channelrx/demodchirpchat/CMakeLists.txt
index aafc386d1..8898a5bd1 100644
--- a/plugins/channelrx/demodchirpchat/CMakeLists.txt
+++ b/plugins/channelrx/demodchirpchat/CMakeLists.txt
@@ -48,12 +48,12 @@ if(NOT SERVER_MODE)
         ${chirpchat_HEADERS}
         chirpchatdemodgui.h
     )
-    set(TARGET_NAME demodchirpchat)
+    set(TARGET_NAME ${PLUGINS_PREFIX}demodchirpchat)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME demodchirpchatsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}demodchirpchatsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/demoddab/CMakeLists.txt b/plugins/channelrx/demoddab/CMakeLists.txt
index 38311707a..c796a69fe 100644
--- a/plugins/channelrx/demoddab/CMakeLists.txt
+++ b/plugins/channelrx/demoddab/CMakeLists.txt
@@ -38,12 +38,12 @@ if(NOT SERVER_MODE)
         dabdemodgui.h
     )
 
-    set(TARGET_NAME demoddab)
+    set(TARGET_NAME ${PLUGINS_PREFIX}demoddab)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME demoddabsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}demoddabsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/demoddab/dabdemod.cpp b/plugins/channelrx/demoddab/dabdemod.cpp
index 6b51cf664..0599f3b6c 100644
--- a/plugins/channelrx/demoddab/dabdemod.cpp
+++ b/plugins/channelrx/demoddab/dabdemod.cpp
@@ -64,7 +64,7 @@ DABDemod::DABDemod(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new DABDemodBaseband(this);
+    m_basebandSink = new DABDemodBaseband();
     m_basebandSink->setMessageQueueToChannel(getInputMessageQueue());
     m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(&m_thread);
diff --git a/plugins/channelrx/demoddab/dabdemodbaseband.cpp b/plugins/channelrx/demoddab/dabdemodbaseband.cpp
index 985030dbc..db6bee617 100644
--- a/plugins/channelrx/demoddab/dabdemodbaseband.cpp
+++ b/plugins/channelrx/demoddab/dabdemodbaseband.cpp
@@ -28,8 +28,7 @@
 
 MESSAGE_CLASS_DEFINITION(DABDemodBaseband::MsgConfigureDABDemodBaseband, Message)
 
-DABDemodBaseband::DABDemodBaseband(DABDemod *packetDemod) :
-    m_sink(packetDemod),
+DABDemodBaseband::DABDemodBaseband() :
     m_running(false)
 {
     qDebug("DABDemodBaseband::DABDemodBaseband");
diff --git a/plugins/channelrx/demoddab/dabdemodbaseband.h b/plugins/channelrx/demoddab/dabdemodbaseband.h
index dfb6d85a3..90b7eeef8 100644
--- a/plugins/channelrx/demoddab/dabdemodbaseband.h
+++ b/plugins/channelrx/demoddab/dabdemodbaseband.h
@@ -60,7 +60,7 @@ public:
         { }
     };
 
-    DABDemodBaseband(DABDemod *packetDemod);
+    DABDemodBaseband();
     ~DABDemodBaseband();
     void reset();
     void startWork();
diff --git a/plugins/channelrx/demoddab/dabdemodsink.cpp b/plugins/channelrx/demoddab/dabdemodsink.cpp
index 193d00dac..b599c24b5 100644
--- a/plugins/channelrx/demoddab/dabdemodsink.cpp
+++ b/plugins/channelrx/demoddab/dabdemodsink.cpp
@@ -487,8 +487,7 @@ void DABDemodSink::processOneAudioSample(Complex &ci)
     }
 }
 
-DABDemodSink::DABDemodSink(DABDemod *packetDemod) :
-        m_dabDemod(packetDemod),
+DABDemodSink::DABDemodSink() :
         m_audioSampleRate(48000),
         m_dabAudioSampleRate(10000), // Unused value to begin with
         m_channelSampleRate(DABDEMOD_CHANNEL_SAMPLE_RATE),
diff --git a/plugins/channelrx/demoddab/dabdemodsink.h b/plugins/channelrx/demoddab/dabdemodsink.h
index 7f133dea2..a808ccf7b 100644
--- a/plugins/channelrx/demoddab/dabdemodsink.h
+++ b/plugins/channelrx/demoddab/dabdemodsink.h
@@ -43,7 +43,7 @@ class DABDemod;
 
 class DABDemodSink : public ChannelSampleSink {
 public:
-    DABDemodSink(DABDemod *packetDemod);
+    DABDemodSink();
     ~DABDemodSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
@@ -106,7 +106,6 @@ private:
         double m_magsqPeak;
     };
 
-    DABDemod *m_dabDemod;
     DABDemodSettings m_settings;
     ChannelAPI *m_channel;
 
diff --git a/plugins/channelrx/demoddatv/CMakeLists.txt b/plugins/channelrx/demoddatv/CMakeLists.txt
index b8f7fea5b..0e4fd8b6a 100644
--- a/plugins/channelrx/demoddatv/CMakeLists.txt
+++ b/plugins/channelrx/demoddatv/CMakeLists.txt
@@ -68,7 +68,7 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )
 
-set(TARGET_NAME demoddatv)
+set(TARGET_NAME ${PLUGINS_PREFIX}demoddatv)
 set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 
 add_library(${TARGET_NAME} SHARED
diff --git a/plugins/channelrx/demoddatv/datvdemodsink.cpp b/plugins/channelrx/demoddatv/datvdemodsink.cpp
index 42e47170d..7328bdc8f 100644
--- a/plugins/channelrx/demoddatv/datvdemodsink.cpp
+++ b/plugins/channelrx/demoddatv/datvdemodsink.cpp
@@ -1096,12 +1096,12 @@ void DATVDemodSink::InitDATVS2Framework()
     p_vbitcount= new leansdr::pipebuf<int>(m_objScheduler, "Bits processed", BUF_S2PACKETS);
     p_verrcount = new leansdr::pipebuf<int>(m_objScheduler, "Bits corrected", BUF_S2PACKETS);
 
-    bool commandFileValid = false;
+    // bool commandFileValid = false;
 
     if (QFileInfo::exists(m_settings.m_softLDPCToolPath))
     {
         QFileInfo fileInfo = QFileInfo(m_settings.m_softLDPCToolPath);
-        commandFileValid = fileInfo.isExecutable();
+        // commandFileValid = fileInfo.isExecutable();
     }
 
     if (m_settings.m_softLDPC /*&& commandFileValid*/)
@@ -1195,11 +1195,6 @@ void DATVDemodSink::InitDATVS2Framework()
 
 void DATVDemodSink::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end)
 {
-    float fltI;
-    float fltQ;
-    fftfilt::cmplx *objRF;
-    int intRFOut;
-    int lngWritable=0;
     leansdr::s2_frame_receiver<leansdr::f32, leansdr::llr_ss> *objDemodulatorDVBS2 =
         (leansdr::s2_frame_receiver<leansdr::f32, leansdr::llr_ss> *) m_objDemodulatorDVBS2;
 
diff --git a/plugins/channelrx/demoddatv/datvdemodsink.h b/plugins/channelrx/demoddatv/datvdemodsink.h
index 70af99272..b56cb6531 100644
--- a/plugins/channelrx/demoddatv/datvdemodsink.h
+++ b/plugins/channelrx/demoddatv/datvdemodsink.h
@@ -333,8 +333,8 @@ private:
     Interpolator m_interpolator;
     Real m_interpolatorDistance;
     Real m_interpolatorDistanceRemain;
-    static const int m_interpolatorPhaseSteps = 4;      // Higher than these two values will struggle to run in real-time
-    static const int m_interpolatorTapsPerPhase = 3.5f; // without gaining much improvement in PER
+    static constexpr int m_interpolatorPhaseSteps = 4;      // Higher than these two values will struggle to run in real-time
+    static constexpr float m_interpolatorTapsPerPhase = 3.5f; // without gaining much improvement in PER
 
     bool m_blnInitialized;
     bool m_blnRenderingVideo;
diff --git a/plugins/channelrx/demoddatv/datvideorender.cpp b/plugins/channelrx/demoddatv/datvideorender.cpp
index f7f0c6611..b7dd8783d 100644
--- a/plugins/channelrx/demoddatv/datvideorender.cpp
+++ b/plugins/channelrx/demoddatv/datvideorender.cpp
@@ -279,7 +279,11 @@ bool DATVideoRender::preprocessStream()
     m_metaData.Width = m_videoDecoderCtx->width;
     m_metaData.Height = m_videoDecoderCtx->height;
     m_metaData.BitRate = m_videoDecoderCtx->bit_rate;
+#if LIBAVUTIL_VERSION_MAJOR < 59
     m_metaData.Channels = m_videoDecoderCtx->channels;
+#else
+    m_metaData.Channels = m_videoDecoderCtx->ch_layout.nb_channels;
+#endif
     m_metaData.CodecDescription = QString("%1").arg(videoCodec->long_name);
     m_metaData.OK_VideoStream = true;
 
@@ -305,8 +309,13 @@ bool DATVideoRender::preprocessStream()
         //m_audioDecoderCtx = m_formatCtx->streams[m_audioStreamIndex]->codec; // old style
 
         qDebug() << "DATVideoRender::preprocessStream: audio: "
+#if LIBAVUTIL_VERSION_MAJOR < 59
         << " channels: " << m_audioDecoderCtx->channels
         << " channel_layout: " << m_audioDecoderCtx->channel_layout
+#else
+        << " channels: " << m_audioDecoderCtx->ch_layout.nb_channels
+        << " channel_layout: " << m_audioDecoderCtx->ch_layout.u.mask
+#endif
         << " sample_rate: " << m_audioDecoderCtx->sample_rate
         << " sample_fmt: " << m_audioDecoderCtx->sample_fmt
         << " codec_id: "<< m_audioDecoderCtx->codec_id;
@@ -625,10 +634,16 @@ void DATVideoRender::setResampler()
     }
 
     m_audioSWR = swr_alloc();
+#if LIBAVUTIL_VERSION_MAJOR < 59
     av_opt_set_int(m_audioSWR, "in_channel_count",  m_audioDecoderCtx->channels, 0);
     av_opt_set_int(m_audioSWR, "out_channel_count", 2, 0);
     av_opt_set_int(m_audioSWR, "in_channel_layout",  m_audioDecoderCtx->channel_layout, 0);
     av_opt_set_int(m_audioSWR, "out_channel_layout", AV_CH_LAYOUT_STEREO, 0);
+#else
+    AVChannelLayout out_chlayout = AV_CHANNEL_LAYOUT_STEREO;
+    av_opt_set_chlayout(m_audioSWR, "in_chlayout", &m_audioDecoderCtx->ch_layout, 0);
+    av_opt_set_chlayout(m_audioSWR, "out_chlayout",  &out_chlayout, 0);
+#endif
     av_opt_set_int(m_audioSWR, "in_sample_rate", m_audioDecoderCtx->sample_rate, 0);
     av_opt_set_int(m_audioSWR, "out_sample_rate", m_audioSampleRate, 0);
     av_opt_set_sample_fmt(m_audioSWR, "in_sample_fmt",  m_audioDecoderCtx->sample_fmt, 0);
@@ -637,10 +652,17 @@ void DATVideoRender::setResampler()
     swr_init(m_audioSWR);
 
     qDebug() << "DATVideoRender::setResampler: "
+#if LIBAVUTIL_VERSION_MAJOR < 59
         << " in_channel_count: " <<  m_audioDecoderCtx->channels
         << " out_channel_count: " << 2
         << " in_channel_layout: " <<  m_audioDecoderCtx->channel_layout
         << " out_channel_layout: " <<  AV_CH_LAYOUT_STEREO
+#else
+        << " in_channel_count: " <<  m_audioDecoderCtx->ch_layout.nb_channels
+        << " out_channel_count: " << 2
+        << " in_channel_layout: " <<  m_audioDecoderCtx->ch_layout.u.mask
+        << " out_channel_layout: " <<  out_chlayout.u.mask
+#endif
         << " in_sample_rate: " << m_audioDecoderCtx->sample_rate
         << " out_sample_rate: " << m_audioSampleRate
         << " in_sample_fmt: " << m_audioDecoderCtx->sample_fmt
diff --git a/plugins/channelrx/demoddatv/leansdr/discrmath.h b/plugins/channelrx/demoddatv/leansdr/discrmath.h
index f4a0618da..de3835713 100644
--- a/plugins/channelrx/demoddatv/leansdr/discrmath.h
+++ b/plugins/channelrx/demoddatv/leansdr/discrmath.h
@@ -58,7 +58,7 @@ struct bitvect
         for (int i = 0; i < nw; ++i)
             v[i] = a.v[i];
         if (M < N)
-            for (int i = a.NW; i < NW; ++i)
+            for (size_t i = a.NW; i < NW; ++i)
                 v[i] = 0;
         if (M > N)
             truncate_to_N();
diff --git a/plugins/channelrx/demoddatv/leansdr/dvbs2.h b/plugins/channelrx/demoddatv/leansdr/dvbs2.h
index 47c2acf60..69ad0d315 100644
--- a/plugins/channelrx/demoddatv/leansdr/dvbs2.h
+++ b/plugins/channelrx/demoddatv/leansdr/dvbs2.h
@@ -458,6 +458,8 @@ struct s2_frame_transmitter : runnable
         std::complex<T> *pout
     )
     {
+        (void)mcinfo;
+        
         std::complex<T> *pout0 = pout; // For sanity check
         // PLHEADER: SOF AND PLSCODE
         // EN 302 307-1 section 5.5.2 PL signalling
@@ -2584,6 +2586,8 @@ struct s2_deinterleaver : runnable
     static inline void split_symbol(const llr_ss &ps,
                                     hard_sb accs[/*bps*/], int nacc)
     {
+        (void)nacc;
+        
         if (MSB_FIRST)
         {
             for (int b = 0; b < BPS; ++b) {
@@ -3833,10 +3837,6 @@ struct s2_fecdec_helper : runnable
     // Receive a finished job.
     void receive_frame(const helper_job *job)
     {
-        // Read corrected frame from helper
-        const s2_pls *pls = &job->pls;
-        int iosize = (pls->framebits() / 8) * sizeof(ldpc_buf[0]);
-
         // Non blocking read - will do the next time if no adata is available
         if (job->h->m_worker->dataAvailable())
         {
@@ -4267,7 +4267,6 @@ private:
                     // 188     =  waiting for CRC
     uint8_t leftover[188];
     static const int MAX_TS_PER_BBFRAME = fec_info::KBCH_MAX / 8 / 188 + 1;
-    bool locked;
     pipereader<bbframe> in;
     pipewriter<tspacket> out;
     int current_state;
diff --git a/plugins/channelrx/demoddatv/leansdr/generic.h b/plugins/channelrx/demoddatv/leansdr/generic.h
index 6c89701ac..893468ad8 100644
--- a/plugins/channelrx/demoddatv/leansdr/generic.h
+++ b/plugins/channelrx/demoddatv/leansdr/generic.h
@@ -544,6 +544,7 @@ struct serializer : runnable
         in(_in),
         out(_out, nout)
     {
+        (void)sch;
         if (nin * sizeof(Tin) != nout * sizeof(Tout)) {
             fail("serializer: incompatible sizes");
         }
diff --git a/plugins/channelrx/demoddatv/leansdr/sdr.h b/plugins/channelrx/demoddatv/leansdr/sdr.h
index 314f587c3..9ce9cdf5b 100644
--- a/plugins/channelrx/demoddatv/leansdr/sdr.h
+++ b/plugins/channelrx/demoddatv/leansdr/sdr.h
@@ -414,7 +414,6 @@ struct simple_agc : runnable
             float gain = estimated ? out_rms / sqrtf(estimated) : 0;
             pin = in.rd();
             std::complex<T> *pout = out.wr();
-            float bwcomp = 1 - bw;
 
             for (; pin < pend; ++pin, ++pout)
             {
diff --git a/plugins/channelrx/demoddsc/CMakeLists.txt b/plugins/channelrx/demoddsc/CMakeLists.txt
index ed2164296..87b3c13d3 100644
--- a/plugins/channelrx/demoddsc/CMakeLists.txt
+++ b/plugins/channelrx/demoddsc/CMakeLists.txt
@@ -33,12 +33,12 @@ if(NOT SERVER_MODE)
         dscdemodgui.h
     )
 
-    set(TARGET_NAME demoddsc)
+    set(TARGET_NAME ${PLUGINS_PREFIX}demoddsc)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME demoddscsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}demoddscsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/demoddsc/dscdemodgui.cpp b/plugins/channelrx/demoddsc/dscdemodgui.cpp
index de9f2deb6..be5400378 100644
--- a/plugins/channelrx/demoddsc/dscdemodgui.cpp
+++ b/plugins/channelrx/demoddsc/dscdemodgui.cpp
@@ -767,7 +767,7 @@ void DSCDemodGUI::customContextMenuRequested(QPoint pos)
                     QAction* sendAreaToMapAction = new QAction(QString("Display %1 on map").arg(address), tableContextMenu);
                     connect(sendAreaToMapAction, &QAction::triggered, this, [this, name, address, info]()->void {
                         sendAreaToMapFeature(name, address, info);
-                        QTimer::singleShot(500, [this, name] {
+                        QTimer::singleShot(500, [ name] {
                             FeatureWebAPIUtils::mapFind(name);
                         });
                     });
@@ -776,7 +776,7 @@ void DSCDemodGUI::customContextMenuRequested(QPoint pos)
                 else
                 {
                     QAction* findAreaOnMapAction = new QAction(QString("Center map on %1").arg(address), tableContextMenu);
-                    connect(findAreaOnMapAction, &QAction::triggered, this, [this, name]()->void {
+                    connect(findAreaOnMapAction, &QAction::triggered, this, [ name]()->void {
                         FeatureWebAPIUtils::mapFind(name);
                     });
                     tableContextMenu->addAction(findAreaOnMapAction);
@@ -814,7 +814,7 @@ void DSCDemodGUI::customContextMenuRequested(QPoint pos)
                             if (sampleSource)
                             {
                                 QAction* tuneRxAction = new QAction(QString("Tune SSB Demod %1:%2 to %3").arg(deviceSetIndex).arg(chi).arg(rxFormatted), tableContextMenu);
-                                connect(tuneRxAction, &QAction::triggered, this, [this, deviceSetIndex, chi, rxFreq, sampleSource]()->void {
+                                connect(tuneRxAction, &QAction::triggered, this, [deviceSetIndex, chi, rxFreq, sampleSource]()->void {
 
                                     int bw = sampleSource->getSampleRate();
                                     quint64 cf = sampleSource->getCenterFrequency();
diff --git a/plugins/channelrx/demoddsd/CMakeLists.txt b/plugins/channelrx/demoddsd/CMakeLists.txt
index e4205aaec..08b427166 100644
--- a/plugins/channelrx/demoddsd/CMakeLists.txt
+++ b/plugins/channelrx/demoddsd/CMakeLists.txt
@@ -42,12 +42,12 @@ if(NOT SERVER_MODE)
         dsdstatustextdialog.h
     )
 
-    set(TARGET_NAME demoddsd)
+    set(TARGET_NAME ${PLUGINS_PREFIX}demoddsd)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME demoddsdsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}demoddsdsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/demodendoftrain/CMakeLists.txt b/plugins/channelrx/demodendoftrain/CMakeLists.txt
index f3d901783..68703626c 100644
--- a/plugins/channelrx/demodendoftrain/CMakeLists.txt
+++ b/plugins/channelrx/demodendoftrain/CMakeLists.txt
@@ -35,12 +35,12 @@ if(NOT SERVER_MODE)
         endoftraindemodgui.h
     )
 
-    set(TARGET_NAME demodendoftrain)
+    set(TARGET_NAME ${PLUGINS_PREFIX}demodendoftrain)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME demodendoftrainsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}demodendoftrainsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/demodendoftrain/endoftraindemodsink.cpp b/plugins/channelrx/demodendoftrain/endoftraindemodsink.cpp
index 079ff6b10..0bbea6d7f 100644
--- a/plugins/channelrx/demodendoftrain/endoftraindemodsink.cpp
+++ b/plugins/channelrx/demodendoftrain/endoftraindemodsink.cpp
@@ -119,8 +119,6 @@ void EndOfTrainDemodSink::feed(const SampleVector::const_iterator& begin, const
 
 void EndOfTrainDemodSink::processOneSample(Complex &ci)
 {
-    Complex ca;
-
     // FM demodulation
     double magsqRaw;
     Real deviation;
diff --git a/plugins/channelrx/demodfreedv/CMakeLists.txt b/plugins/channelrx/demodfreedv/CMakeLists.txt
index 79a70448a..38c3b98bc 100644
--- a/plugins/channelrx/demodfreedv/CMakeLists.txt
+++ b/plugins/channelrx/demodfreedv/CMakeLists.txt
@@ -33,12 +33,12 @@ if(NOT SERVER_MODE)
         ${freedv_HEADERS}
         freedvdemodgui.h
     )
-    set(TARGET_NAME demodfreedv)
+    set(TARGET_NAME ${PLUGINS_PREFIX}demodfreedv)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME demodfreedvsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}demodfreedvsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/demodft8/CMakeLists.txt b/plugins/channelrx/demodft8/CMakeLists.txt
index 2774169fa..98e2c205c 100644
--- a/plugins/channelrx/demodft8/CMakeLists.txt
+++ b/plugins/channelrx/demodft8/CMakeLists.txt
@@ -43,12 +43,12 @@ if(NOT SERVER_MODE)
         ft8demodfilterproxy.h
         ft8demodsettingsdialog.h
     )
-    set(TARGET_NAME demodft8)
+    set(TARGET_NAME ${PLUGINS_PREFIX}demodft8)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME demodft8srv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}demodft8srv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/demodft8/ft8demod.cpp b/plugins/channelrx/demodft8/ft8demod.cpp
index dccdd3c31..185f8d485 100644
--- a/plugins/channelrx/demodft8/ft8demod.cpp
+++ b/plugins/channelrx/demodft8/ft8demod.cpp
@@ -697,7 +697,7 @@ void FT8Demod::sendChannelSettings(
     const FT8DemodSettings& settings,
     bool force)
 {
-    qDebug("FT8Demod::sendChannelSettings: %d pipes", pipes.size());
+    qDebug("FT8Demod::sendChannelSettings: %d pipes", (int)pipes.size());
 
     for (const auto& pipe : pipes)
     {
diff --git a/plugins/channelrx/demodft8/ft8demodsettings.h b/plugins/channelrx/demodft8/ft8demodsettings.h
index 8e4146f30..25a113eb1 100644
--- a/plugins/channelrx/demodft8/ft8demodsettings.h
+++ b/plugins/channelrx/demodft8/ft8demodsettings.h
@@ -51,8 +51,9 @@ struct FT8DemodBandPreset
     int m_channelOffset;
 };
 
-struct FT8DemodSettings
+class FT8DemodSettings
 {
+public:
     enum MessageCol {
         MESSAGE_COL_UTC,
         MESSAGE_COL_TYPE,
diff --git a/plugins/channelrx/demodft8/ft8demodworker.cpp b/plugins/channelrx/demodft8/ft8demodworker.cpp
index 8b1b1d797..2d63f0ee8 100644
--- a/plugins/channelrx/demodft8/ft8demodworker.cpp
+++ b/plugins/channelrx/demodft8/ft8demodworker.cpp
@@ -40,7 +40,6 @@ FT8DemodWorker::FT8Callback::FT8Callback(
 ) :
     m_packing(packing),
     m_periodTS(periodTS),
-    m_baseFrequency(baseFrequency),
     m_name(name),
     m_validCallsigns(nullptr)
 {
@@ -226,7 +225,7 @@ void FT8DemodWorker::processBuffer(int16_t *buffer, QDateTime periodTS)
 
     m_ft8Decoder.wait(m_decoderTimeBudget + 1.0); // add one second to budget to force quit threads
     qDebug("FT8DemodWorker::processBuffer: done: at %6.3f %d messages",
-        m_baseFrequency / 1000000.0, ft8Callback.getReportMessage()->getFT8Messages().size());
+        m_baseFrequency / 1000000.0, (int)ft8Callback.getReportMessage()->getFT8Messages().size());
 
     if (m_reportingMessageQueue) {
         m_reportingMessageQueue->push(new MsgReportFT8Messages(*ft8Callback.getReportMessage()));
diff --git a/plugins/channelrx/demodft8/ft8demodworker.h b/plugins/channelrx/demodft8/ft8demodworker.h
index 95792646b..358f9e559 100644
--- a/plugins/channelrx/demodft8/ft8demodworker.h
+++ b/plugins/channelrx/demodft8/ft8demodworker.h
@@ -84,7 +84,6 @@ private:
         FT8::Packing& m_packing;
         MsgReportFT8Messages *m_msgReportFT8Messages;
         const QDateTime& m_periodTS;
-        qint64 m_baseFrequency;
         QString m_name;
         const QSet<QString> *m_validCallsigns;
     };
diff --git a/plugins/channelrx/demodils/CMakeLists.txt b/plugins/channelrx/demodils/CMakeLists.txt
index 77b6260aa..43634a187 100644
--- a/plugins/channelrx/demodils/CMakeLists.txt
+++ b/plugins/channelrx/demodils/CMakeLists.txt
@@ -33,12 +33,12 @@ if(NOT SERVER_MODE)
         ilsdemodgui.h
     )
 
-    set(TARGET_NAME demodils)
+    set(TARGET_NAME ${PLUGINS_PREFIX}demodils)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME demodilssrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}demodilssrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/demodils/ilsdemod.cpp b/plugins/channelrx/demodils/ilsdemod.cpp
index 1ca59c2a6..23a17a4a1 100644
--- a/plugins/channelrx/demodils/ilsdemod.cpp
+++ b/plugins/channelrx/demodils/ilsdemod.cpp
@@ -61,7 +61,7 @@ ILSDemod::ILSDemod(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new ILSDemodBaseband(this);
+    m_basebandSink = new ILSDemodBaseband();
     m_basebandSink->setMessageQueueToChannel(getInputMessageQueue());
     m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(&m_thread);
diff --git a/plugins/channelrx/demodils/ilsdemodbaseband.cpp b/plugins/channelrx/demodils/ilsdemodbaseband.cpp
index 201a60883..9f43bee22 100644
--- a/plugins/channelrx/demodils/ilsdemodbaseband.cpp
+++ b/plugins/channelrx/demodils/ilsdemodbaseband.cpp
@@ -27,8 +27,7 @@
 
 MESSAGE_CLASS_DEFINITION(ILSDemodBaseband::MsgConfigureILSDemodBaseband, Message)
 
-ILSDemodBaseband::ILSDemodBaseband(ILSDemod *packetDemod) :
-    m_sink(packetDemod),
+ILSDemodBaseband::ILSDemodBaseband() :
     m_running(false)
 {
     qDebug("ILSDemodBaseband::ILSDemodBaseband");
diff --git a/plugins/channelrx/demodils/ilsdemodbaseband.h b/plugins/channelrx/demodils/ilsdemodbaseband.h
index 18830f9a1..545b6b53c 100644
--- a/plugins/channelrx/demodils/ilsdemodbaseband.h
+++ b/plugins/channelrx/demodils/ilsdemodbaseband.h
@@ -63,7 +63,7 @@ public:
         { }
     };
 
-    ILSDemodBaseband(ILSDemod *packetDemod);
+    ILSDemodBaseband();
     ~ILSDemodBaseband();
     void reset();
     void startWork();
diff --git a/plugins/channelrx/demodils/ilsdemodgui.cpp b/plugins/channelrx/demodils/ilsdemodgui.cpp
index a155a41bb..6b275bade 100644
--- a/plugins/channelrx/demodils/ilsdemodgui.cpp
+++ b/plugins/channelrx/demodils/ilsdemodgui.cpp
@@ -1432,7 +1432,6 @@ void ILSDemodGUI::scanAvailableChannels()
     MessagePipes& messagePipes = mainCore->getMessagePipes();
     std::vector<DeviceSet*>& deviceSets = mainCore->getDeviceSets();
     m_availableChannels.clear();
-    int deviceSetIndex = 0;
 
     for (const auto& deviceSet : deviceSets)
     {
@@ -1465,7 +1464,6 @@ void ILSDemodGUI::scanAvailableChannels()
                 }
             }
         }
-        deviceSetIndex++;
     }
 }
 
diff --git a/plugins/channelrx/demodils/ilsdemodsink.cpp b/plugins/channelrx/demodils/ilsdemodsink.cpp
index 30243f831..939e16fa8 100644
--- a/plugins/channelrx/demodils/ilsdemodsink.cpp
+++ b/plugins/channelrx/demodils/ilsdemodsink.cpp
@@ -28,10 +28,9 @@
 #include "ilsdemod.h"
 #include "ilsdemodsink.h"
 
-ILSDemodSink::ILSDemodSink(ILSDemod *ilsDemod) :
+ILSDemodSink::ILSDemodSink() :
         m_spectrumSink(nullptr),
         m_scopeSink(nullptr),
-        m_ilsDemod(ilsDemod),
         m_channel(nullptr),
         m_channelSampleRate(ILSDemodSettings::ILSDEMOD_CHANNEL_SAMPLE_RATE),
         m_channelFrequencyOffset(0),
diff --git a/plugins/channelrx/demodils/ilsdemodsink.h b/plugins/channelrx/demodils/ilsdemodsink.h
index 5e179d197..9eaeb5bc0 100644
--- a/plugins/channelrx/demodils/ilsdemodsink.h
+++ b/plugins/channelrx/demodils/ilsdemodsink.h
@@ -44,7 +44,7 @@ class SpectrumVis;
 
 class ILSDemodSink : public ChannelSampleSink {
 public:
-    ILSDemodSink(ILSDemod *packetDemod);
+    ILSDemodSink();
     ~ILSDemodSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
@@ -96,7 +96,6 @@ private:
 
 	SpectrumVis* m_spectrumSink;
     ScopeVis* m_scopeSink;    // Scope GUI to display baseband waveform
-    ILSDemod *m_ilsDemod;
     ILSDemodSettings m_settings;
     ChannelAPI *m_channel;
     int m_channelSampleRate;
diff --git a/plugins/channelrx/demodm17/CMakeLists.txt b/plugins/channelrx/demodm17/CMakeLists.txt
index 27918126f..fdb71b6d4 100644
--- a/plugins/channelrx/demodm17/CMakeLists.txt
+++ b/plugins/channelrx/demodm17/CMakeLists.txt
@@ -43,12 +43,12 @@ if(NOT SERVER_MODE)
         m17demodgui.h
         m17statustextdialog.h
     )
-    set(TARGET_NAME demodm17)
+    set(TARGET_NAME ${PLUGINS_PREFIX}demodm17)
     set(TARGET_LIB "Qt::Widgets" Qt::Charts)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME demodm17srv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}demodm17srv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/demodnavtex/CMakeLists.txt b/plugins/channelrx/demodnavtex/CMakeLists.txt
index fbb93f63b..d902c0c54 100644
--- a/plugins/channelrx/demodnavtex/CMakeLists.txt
+++ b/plugins/channelrx/demodnavtex/CMakeLists.txt
@@ -33,12 +33,12 @@ if(NOT SERVER_MODE)
         navtexdemodgui.h
     )
 
-    set(TARGET_NAME demodnavtex)
+    set(TARGET_NAME ${PLUGINS_PREFIX}demodnavtex)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME demodnavtexsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}demodnavtexsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/demodnavtex/navtexdemod.cpp b/plugins/channelrx/demodnavtex/navtexdemod.cpp
index eddb49d4e..49655fefb 100644
--- a/plugins/channelrx/demodnavtex/navtexdemod.cpp
+++ b/plugins/channelrx/demodnavtex/navtexdemod.cpp
@@ -53,7 +53,7 @@ NavtexDemod::NavtexDemod(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new NavtexDemodBaseband(this);
+    m_basebandSink = new NavtexDemodBaseband();
     m_basebandSink->setMessageQueueToChannel(getInputMessageQueue());
     m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(&m_thread);
diff --git a/plugins/channelrx/demodnavtex/navtexdemodbaseband.cpp b/plugins/channelrx/demodnavtex/navtexdemodbaseband.cpp
index 8720ceddf..1187365fe 100644
--- a/plugins/channelrx/demodnavtex/navtexdemodbaseband.cpp
+++ b/plugins/channelrx/demodnavtex/navtexdemodbaseband.cpp
@@ -26,8 +26,7 @@
 
 MESSAGE_CLASS_DEFINITION(NavtexDemodBaseband::MsgConfigureNavtexDemodBaseband, Message)
 
-NavtexDemodBaseband::NavtexDemodBaseband(NavtexDemod *navtexDemod) :
-    m_sink(navtexDemod),
+NavtexDemodBaseband::NavtexDemodBaseband() :
     m_running(false)
 {
     qDebug("NavtexDemodBaseband::NavtexDemodBaseband");
diff --git a/plugins/channelrx/demodnavtex/navtexdemodbaseband.h b/plugins/channelrx/demodnavtex/navtexdemodbaseband.h
index 80d7667b5..c78ed23d8 100644
--- a/plugins/channelrx/demodnavtex/navtexdemodbaseband.h
+++ b/plugins/channelrx/demodnavtex/navtexdemodbaseband.h
@@ -62,7 +62,7 @@ public:
         { }
     };
 
-    NavtexDemodBaseband(NavtexDemod *navtexDemod);
+    NavtexDemodBaseband();
     ~NavtexDemodBaseband();
     void reset();
     void startWork();
diff --git a/plugins/channelrx/demodnavtex/navtexdemodsink.cpp b/plugins/channelrx/demodnavtex/navtexdemodsink.cpp
index f10c8e6ab..c894dc30b 100644
--- a/plugins/channelrx/demodnavtex/navtexdemodsink.cpp
+++ b/plugins/channelrx/demodnavtex/navtexdemodsink.cpp
@@ -27,8 +27,7 @@
 #include "navtexdemod.h"
 #include "navtexdemodsink.h"
 
-NavtexDemodSink::NavtexDemodSink(NavtexDemod *packetDemod) :
-        m_navtexDemod(packetDemod),
+NavtexDemodSink::NavtexDemodSink() :
         m_channelSampleRate(NavtexDemodSettings::NAVTEXDEMOD_CHANNEL_SAMPLE_RATE),
         m_channelFrequencyOffset(0),
         m_magsqSum(0.0f),
diff --git a/plugins/channelrx/demodnavtex/navtexdemodsink.h b/plugins/channelrx/demodnavtex/navtexdemodsink.h
index 4e243b681..0a9ffdd2c 100644
--- a/plugins/channelrx/demodnavtex/navtexdemodsink.h
+++ b/plugins/channelrx/demodnavtex/navtexdemodsink.h
@@ -39,7 +39,7 @@ class ScopeVis;
 
 class NavtexDemodSink : public ChannelSampleSink {
 public:
-    NavtexDemodSink(NavtexDemod *packetDemod);
+    NavtexDemodSink();
     ~NavtexDemodSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
@@ -83,7 +83,6 @@ private:
     };
 
     ScopeVis* m_scopeSink;    // Scope GUI to display baseband waveform
-    NavtexDemod *m_navtexDemod;
     NavtexDemodSettings m_settings;
     ChannelAPI *m_channel;
     int m_channelSampleRate;
diff --git a/plugins/channelrx/demodnfm/CMakeLists.txt b/plugins/channelrx/demodnfm/CMakeLists.txt
index 117f7ae61..a017dfb47 100644
--- a/plugins/channelrx/demodnfm/CMakeLists.txt
+++ b/plugins/channelrx/demodnfm/CMakeLists.txt
@@ -38,12 +38,12 @@ if(NOT SERVER_MODE)
         nfmdemodgui.h
     )
 
-    set(TARGET_NAME demodnfm)
+    set(TARGET_NAME ${PLUGINS_PREFIX}demodnfm)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME demodnfmsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}demodnfmsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/demodpacket/CMakeLists.txt b/plugins/channelrx/demodpacket/CMakeLists.txt
index 1b18efcd1..656f774fe 100644
--- a/plugins/channelrx/demodpacket/CMakeLists.txt
+++ b/plugins/channelrx/demodpacket/CMakeLists.txt
@@ -33,12 +33,12 @@ if(NOT SERVER_MODE)
         packetdemodgui.h
     )
 
-    set(TARGET_NAME demodpacket)
+    set(TARGET_NAME ${PLUGINS_PREFIX}demodpacket)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME demodpacketsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}demodpacketsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/demodpacket/packetdemodsink.cpp b/plugins/channelrx/demodpacket/packetdemodsink.cpp
index 21a971a99..7aab705c9 100644
--- a/plugins/channelrx/demodpacket/packetdemodsink.cpp
+++ b/plugins/channelrx/demodpacket/packetdemodsink.cpp
@@ -88,8 +88,6 @@ void PacketDemodSink::feed(const SampleVector::const_iterator& begin, const Samp
 
 void PacketDemodSink::processOneSample(Complex &ci)
 {
-    Complex ca;
-
     // FM demodulation
     double magsqRaw;
     Real deviation;
diff --git a/plugins/channelrx/demodpager/CMakeLists.txt b/plugins/channelrx/demodpager/CMakeLists.txt
index beb2eefdf..88d4e36a7 100644
--- a/plugins/channelrx/demodpager/CMakeLists.txt
+++ b/plugins/channelrx/demodpager/CMakeLists.txt
@@ -36,12 +36,12 @@ if(NOT SERVER_MODE)
         pagerdemodcharsetdialog.h
     )
 
-    set(TARGET_NAME demodpager)
+    set(TARGET_NAME ${PLUGINS_PREFIX}demodpager)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME demodpagersrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}demodpagersrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/demodpager/pagerdemod.cpp b/plugins/channelrx/demodpager/pagerdemod.cpp
index 49bb2af58..811891d2c 100644
--- a/plugins/channelrx/demodpager/pagerdemod.cpp
+++ b/plugins/channelrx/demodpager/pagerdemod.cpp
@@ -46,7 +46,7 @@ PagerDemod::PagerDemod(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new PagerDemodBaseband(this);
+    m_basebandSink = new PagerDemodBaseband();
     m_basebandSink->setMessageQueueToChannel(getInputMessageQueue());
     m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(&m_thread);
diff --git a/plugins/channelrx/demodpager/pagerdemodbaseband.cpp b/plugins/channelrx/demodpager/pagerdemodbaseband.cpp
index 1e38cce06..07dfbaa00 100644
--- a/plugins/channelrx/demodpager/pagerdemodbaseband.cpp
+++ b/plugins/channelrx/demodpager/pagerdemodbaseband.cpp
@@ -26,8 +26,7 @@
 
 MESSAGE_CLASS_DEFINITION(PagerDemodBaseband::MsgConfigurePagerDemodBaseband, Message)
 
-PagerDemodBaseband::PagerDemodBaseband(PagerDemod *pagerDemod) :
-    m_sink(pagerDemod),
+PagerDemodBaseband::PagerDemodBaseband() :
     m_running(false)
 {
     qDebug("PagerDemodBaseband::PagerDemodBaseband");
diff --git a/plugins/channelrx/demodpager/pagerdemodbaseband.h b/plugins/channelrx/demodpager/pagerdemodbaseband.h
index 33e81ff34..3c8a66735 100644
--- a/plugins/channelrx/demodpager/pagerdemodbaseband.h
+++ b/plugins/channelrx/demodpager/pagerdemodbaseband.h
@@ -62,7 +62,7 @@ public:
         { }
     };
 
-    PagerDemodBaseband(PagerDemod *pagerDemod);
+    PagerDemodBaseband();
     ~PagerDemodBaseband();
     void reset();
     void startWork();
diff --git a/plugins/channelrx/demodpager/pagerdemodsink.cpp b/plugins/channelrx/demodpager/pagerdemodsink.cpp
index 71cb3a62e..1f72d8d89 100644
--- a/plugins/channelrx/demodpager/pagerdemodsink.cpp
+++ b/plugins/channelrx/demodpager/pagerdemodsink.cpp
@@ -28,9 +28,8 @@
 #include "pagerdemod.h"
 #include "pagerdemodsink.h"
 
-PagerDemodSink::PagerDemodSink(PagerDemod *pagerDemod) :
+PagerDemodSink::PagerDemodSink() :
         m_scopeSink(nullptr),
-        m_pagerDemod(pagerDemod),
         m_channelSampleRate(PagerDemodSettings::m_channelSampleRate),
         m_channelFrequencyOffset(0),
         m_magsqSum(0.0f),
diff --git a/plugins/channelrx/demodpager/pagerdemodsink.h b/plugins/channelrx/demodpager/pagerdemodsink.h
index 4a4f6a458..840f547ee 100644
--- a/plugins/channelrx/demodpager/pagerdemodsink.h
+++ b/plugins/channelrx/demodpager/pagerdemodsink.h
@@ -45,7 +45,7 @@ class ScopeVis;
 
 class PagerDemodSink : public ChannelSampleSink {
 public:
-    PagerDemodSink(PagerDemod *pagerDemod);
+    PagerDemodSink();
     ~PagerDemodSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
@@ -88,7 +88,6 @@ private:
     };
 
     ScopeVis* m_scopeSink;              // Scope GUI to display debug waveforms
-    PagerDemod *m_pagerDemod;
     PagerDemodSettings m_settings;
     ChannelAPI *m_channel;
     int m_channelSampleRate;
diff --git a/plugins/channelrx/demodradiosonde/CMakeLists.txt b/plugins/channelrx/demodradiosonde/CMakeLists.txt
index 74b63171a..932926f58 100644
--- a/plugins/channelrx/demodradiosonde/CMakeLists.txt
+++ b/plugins/channelrx/demodradiosonde/CMakeLists.txt
@@ -33,12 +33,12 @@ if(NOT SERVER_MODE)
         radiosondedemodgui.h
     )
 
-    set(TARGET_NAME demodradiosonde)
+    set(TARGET_NAME ${PLUGINS_PREFIX}demodradiosonde)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME demodradiosondesrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}demodradiosondesrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/demodrtty/CMakeLists.txt b/plugins/channelrx/demodrtty/CMakeLists.txt
index 87d5c3a7f..fbdb2f70d 100644
--- a/plugins/channelrx/demodrtty/CMakeLists.txt
+++ b/plugins/channelrx/demodrtty/CMakeLists.txt
@@ -33,12 +33,12 @@ if(NOT SERVER_MODE)
         rttydemodgui.h
     )
 
-    set(TARGET_NAME demodrtty)
+    set(TARGET_NAME ${PLUGINS_PREFIX}demodrtty)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME demodrttysrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}demodrttysrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/demodrtty/rttydemod.cpp b/plugins/channelrx/demodrtty/rttydemod.cpp
index 68c71ca09..d35daf14d 100644
--- a/plugins/channelrx/demodrtty/rttydemod.cpp
+++ b/plugins/channelrx/demodrtty/rttydemod.cpp
@@ -53,7 +53,7 @@ RttyDemod::RttyDemod(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new RttyDemodBaseband(this);
+    m_basebandSink = new RttyDemodBaseband();
     m_basebandSink->setMessageQueueToChannel(getInputMessageQueue());
     m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(&m_thread);
diff --git a/plugins/channelrx/demodrtty/rttydemodbaseband.cpp b/plugins/channelrx/demodrtty/rttydemodbaseband.cpp
index f134a1ab8..e07245a51 100644
--- a/plugins/channelrx/demodrtty/rttydemodbaseband.cpp
+++ b/plugins/channelrx/demodrtty/rttydemodbaseband.cpp
@@ -26,8 +26,7 @@
 
 MESSAGE_CLASS_DEFINITION(RttyDemodBaseband::MsgConfigureRttyDemodBaseband, Message)
 
-RttyDemodBaseband::RttyDemodBaseband(RttyDemod *rttyDemod) :
-    m_sink(rttyDemod),
+RttyDemodBaseband::RttyDemodBaseband() :
     m_running(false)
 {
     qDebug("RttyDemodBaseband::RttyDemodBaseband");
diff --git a/plugins/channelrx/demodrtty/rttydemodbaseband.h b/plugins/channelrx/demodrtty/rttydemodbaseband.h
index 3f23df8e5..35344b710 100644
--- a/plugins/channelrx/demodrtty/rttydemodbaseband.h
+++ b/plugins/channelrx/demodrtty/rttydemodbaseband.h
@@ -62,7 +62,7 @@ public:
         { }
     };
 
-    RttyDemodBaseband(RttyDemod *rttyDemod);
+    RttyDemodBaseband();
     ~RttyDemodBaseband();
     void reset();
     void startWork();
diff --git a/plugins/channelrx/demodrtty/rttydemodsink.cpp b/plugins/channelrx/demodrtty/rttydemodsink.cpp
index f0864bcde..324d8c0e0 100644
--- a/plugins/channelrx/demodrtty/rttydemodsink.cpp
+++ b/plugins/channelrx/demodrtty/rttydemodsink.cpp
@@ -28,8 +28,7 @@
 #include "rttydemod.h"
 #include "rttydemodsink.h"
 
-RttyDemodSink::RttyDemodSink(RttyDemod *packetDemod) :
-        m_rttyDemod(packetDemod),
+RttyDemodSink::RttyDemodSink() :
         m_channelSampleRate(RttyDemodSettings::RTTYDEMOD_CHANNEL_SAMPLE_RATE),
         m_channelFrequencyOffset(0),
         m_magsqSum(0.0f),
diff --git a/plugins/channelrx/demodrtty/rttydemodsink.h b/plugins/channelrx/demodrtty/rttydemodsink.h
index 31b4f44e7..96b91bbad 100644
--- a/plugins/channelrx/demodrtty/rttydemodsink.h
+++ b/plugins/channelrx/demodrtty/rttydemodsink.h
@@ -39,7 +39,7 @@ class ScopeVis;
 
 class RttyDemodSink : public ChannelSampleSink {
 public:
-    RttyDemodSink(RttyDemod *packetDemod);
+    RttyDemodSink();
     ~RttyDemodSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
@@ -83,7 +83,6 @@ private:
     };
 
     ScopeVis* m_scopeSink;    // Scope GUI to display baseband waveform
-    RttyDemod *m_rttyDemod;
     RttyDemodSettings m_settings;
     ChannelAPI *m_channel;
     int m_channelSampleRate;
diff --git a/plugins/channelrx/demodssb/CMakeLists.txt b/plugins/channelrx/demodssb/CMakeLists.txt
index f617295af..c44586ad2 100644
--- a/plugins/channelrx/demodssb/CMakeLists.txt
+++ b/plugins/channelrx/demodssb/CMakeLists.txt
@@ -32,12 +32,12 @@ if(NOT SERVER_MODE)
         ${ssb_HEADERS}
         ssbdemodgui.h
     )
-    set(TARGET_NAME demodssb)
+    set(TARGET_NAME ${PLUGINS_PREFIX}demodssb)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME demodssbsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}demodssbsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/demodssb/ssbdemod.cpp b/plugins/channelrx/demodssb/ssbdemod.cpp
index 2a5b445b2..e4eb998da 100644
--- a/plugins/channelrx/demodssb/ssbdemod.cpp
+++ b/plugins/channelrx/demodssb/ssbdemod.cpp
@@ -752,7 +752,7 @@ void SSBDemod::sendChannelSettings(
     const SSBDemodSettings& settings,
     bool force)
 {
-    qDebug("SSBDemod::sendChannelSettings: %d pipes", pipes.size());
+    qDebug("SSBDemod::sendChannelSettings: %d pipes", (int)pipes.size());
 
     for (const auto& pipe : pipes)
     {
diff --git a/plugins/channelrx/demodvor/CMakeLists.txt b/plugins/channelrx/demodvor/CMakeLists.txt
index da0bd5eb0..048f263d1 100644
--- a/plugins/channelrx/demodvor/CMakeLists.txt
+++ b/plugins/channelrx/demodvor/CMakeLists.txt
@@ -35,12 +35,12 @@ if(NOT SERVER_MODE)
         vordemodgui.h
     )
 
-    set(TARGET_NAME demodvor)
+    set(TARGET_NAME ${PLUGINS_PREFIX}demodvor)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME demodvorsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}demodvorsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/demodvor/vordemodsink.h b/plugins/channelrx/demodvor/vordemodsink.h
index 92319bd28..6257bb848 100644
--- a/plugins/channelrx/demodvor/vordemodsink.h
+++ b/plugins/channelrx/demodvor/vordemodsink.h
@@ -105,7 +105,6 @@ private:
     MagSqLevelsStore m_magSqLevelStore;
 
     MessageQueue *m_messageQueueToChannel;
-    MessageQueue *m_messageQueueToGUI;
 
     MovingAverageUtil<Real, double, 16> m_movingAverage;
     SimpleAGC<4800> m_volumeAGC;
diff --git a/plugins/channelrx/demodvormc/CMakeLists.txt b/plugins/channelrx/demodvormc/CMakeLists.txt
index 47916407e..9ff536cc2 100644
--- a/plugins/channelrx/demodvormc/CMakeLists.txt
+++ b/plugins/channelrx/demodvormc/CMakeLists.txt
@@ -40,12 +40,12 @@ if(NOT SERVER_MODE)
         ../demodadsb/csv.h
     )
 
-    set(TARGET_NAME demodvormc)
+    set(TARGET_NAME ${PLUGINS_PREFIX}demodvormc)
     set(TARGET_LIB "Qt::Widgets" Qt::Quick Qt::QuickWidgets Qt::Positioning)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME demodvormcsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}demodvormcsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/demodwfm/CMakeLists.txt b/plugins/channelrx/demodwfm/CMakeLists.txt
index d3e227c07..6a5f77e29 100644
--- a/plugins/channelrx/demodwfm/CMakeLists.txt
+++ b/plugins/channelrx/demodwfm/CMakeLists.txt
@@ -33,12 +33,12 @@ if(NOT SERVER_MODE)
         wfmdemodgui.h
     )
 
-    set(TARGET_NAME demodwfm)
+    set(TARGET_NAME ${PLUGINS_PREFIX}demodwfm)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME demodwfmsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}demodwfmsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/filesink/CMakeLists.txt b/plugins/channelrx/filesink/CMakeLists.txt
index c9b375c44..357f62fe6 100644
--- a/plugins/channelrx/filesink/CMakeLists.txt
+++ b/plugins/channelrx/filesink/CMakeLists.txt
@@ -35,12 +35,12 @@ if(NOT SERVER_MODE)
         ${filesink_HEADERS}
         filesinkgui.h
     )
-    set(TARGET_NAME filesink)
+    set(TARGET_NAME ${PLUGINS_PREFIX}filesink)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME filesinksrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}filesinksrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/filesink/filesinksink.h b/plugins/channelrx/filesink/filesinksink.h
index d4a3777e9..529824c1e 100644
--- a/plugins/channelrx/filesink/filesinksink.h
+++ b/plugins/channelrx/filesink/filesinksink.h
@@ -73,7 +73,6 @@ private:
     unsigned int m_nbCaptures;
     SampleSimpleFifo m_preRecordBuffer;
     unsigned int m_preRecordFill;
-    float m_squelchLevel;
     SpectrumVis* m_spectrumSink;
     MessageQueue *m_msgQueueToGUI;
     bool m_recordEnabled;
diff --git a/plugins/channelrx/freqscanner/CMakeLists.txt b/plugins/channelrx/freqscanner/CMakeLists.txt
index b02ad52b0..039df0805 100644
--- a/plugins/channelrx/freqscanner/CMakeLists.txt
+++ b/plugins/channelrx/freqscanner/CMakeLists.txt
@@ -36,12 +36,12 @@ if(NOT SERVER_MODE)
         freqscanneraddrangedialog.h
     )
 
-    set(TARGET_NAME freqscanner)
+    set(TARGET_NAME ${PLUGINS_PREFIX}freqscanner)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME freqscannersrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}freqscannersrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/freqscanner/freqscanner.cpp b/plugins/channelrx/freqscanner/freqscanner.cpp
index e5d62b59f..48708d72a 100644
--- a/plugins/channelrx/freqscanner/freqscanner.cpp
+++ b/plugins/channelrx/freqscanner/freqscanner.cpp
@@ -153,7 +153,7 @@ void FreqScanner::start()
 
     qDebug("FreqScanner::start");
     m_thread = new QThread();
-    m_basebandSink = new FreqScannerBaseband(this);
+    m_basebandSink = new FreqScannerBaseband();
     m_basebandSink->setFifoLabel(QString("%1 [%2:%3]")
         .arg(m_channelId)
         .arg(m_deviceAPI->getDeviceSetIndex())
diff --git a/plugins/channelrx/freqscanner/freqscanner.h b/plugins/channelrx/freqscanner/freqscanner.h
index 3989b00c7..f07046736 100644
--- a/plugins/channelrx/freqscanner/freqscanner.h
+++ b/plugins/channelrx/freqscanner/freqscanner.h
@@ -389,7 +389,6 @@ private:
     qint64 m_activeFrequency;
     QDateTime m_minFFTStartTime;
     int m_scannerSampleRate;
-    bool m_stepping;
     qint64 m_stepStartFrequency;
     qint64 m_stepStopFrequency;
     QList<MsgScanResult::ScanResult> m_scanResults;
diff --git a/plugins/channelrx/freqscanner/freqscannerbaseband.cpp b/plugins/channelrx/freqscanner/freqscannerbaseband.cpp
index 2ddaaa308..4fd211e2b 100644
--- a/plugins/channelrx/freqscanner/freqscannerbaseband.cpp
+++ b/plugins/channelrx/freqscanner/freqscannerbaseband.cpp
@@ -27,9 +27,7 @@
 
 MESSAGE_CLASS_DEFINITION(FreqScannerBaseband::MsgConfigureFreqScannerBaseband, Message)
 
-FreqScannerBaseband::FreqScannerBaseband(FreqScanner *freqScanner) :
-    m_freqScanner(freqScanner),
-    m_sink(freqScanner),
+FreqScannerBaseband::FreqScannerBaseband() :
     m_messageQueueToGUI(nullptr)
 {
     qDebug("FreqScannerBaseband::FreqScannerBaseband");
diff --git a/plugins/channelrx/freqscanner/freqscannerbaseband.h b/plugins/channelrx/freqscanner/freqscannerbaseband.h
index 2fcdc2d7a..5a832ff41 100644
--- a/plugins/channelrx/freqscanner/freqscannerbaseband.h
+++ b/plugins/channelrx/freqscanner/freqscannerbaseband.h
@@ -63,7 +63,7 @@ public:
         { }
     };
 
-    FreqScannerBaseband(FreqScanner *freqScanner);
+    FreqScannerBaseband();
     ~FreqScannerBaseband();
     void reset();
     void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
diff --git a/plugins/channelrx/freqscanner/freqscannersink.cpp b/plugins/channelrx/freqscanner/freqscannersink.cpp
index e38999f5b..a7069162d 100644
--- a/plugins/channelrx/freqscanner/freqscannersink.cpp
+++ b/plugins/channelrx/freqscanner/freqscannersink.cpp
@@ -26,8 +26,7 @@
 #include "freqscanner.h"
 #include "freqscannersink.h"
 
-FreqScannerSink::FreqScannerSink(FreqScanner *ilsDemod) :
-        m_freqScanner(ilsDemod),
+FreqScannerSink::FreqScannerSink() :
         m_channel(nullptr),
         m_channelSampleRate(48000),
         m_channelFrequencyOffset(0),
@@ -41,6 +40,7 @@ FreqScannerSink::FreqScannerSink(FreqScanner *ilsDemod) :
         m_binsPerChannel(16),
         m_averageCount(0)
 {
+   
     applySettings(m_settings, QStringList(), true);
     applyChannelSettings(m_channelSampleRate, m_channelFrequencyOffset, 16, 4, true);
 }
diff --git a/plugins/channelrx/freqscanner/freqscannersink.h b/plugins/channelrx/freqscanner/freqscannersink.h
index 1bff72143..4fe85aeb4 100644
--- a/plugins/channelrx/freqscanner/freqscannersink.h
+++ b/plugins/channelrx/freqscanner/freqscannersink.h
@@ -37,7 +37,7 @@ class FreqScanner;
 
 class FreqScannerSink : public ChannelSampleSink {
 public:
-    FreqScannerSink(FreqScanner *packetDemod);
+    FreqScannerSink();
     ~FreqScannerSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
@@ -50,7 +50,6 @@ public:
 
 private:
 
-    FreqScanner *m_freqScanner;
     FreqScannerSettings m_settings;
     ChannelAPI *m_channel;
     int m_channelSampleRate;
diff --git a/plugins/channelrx/freqtracker/CMakeLists.txt b/plugins/channelrx/freqtracker/CMakeLists.txt
index a6eea37b0..87701a175 100644
--- a/plugins/channelrx/freqtracker/CMakeLists.txt
+++ b/plugins/channelrx/freqtracker/CMakeLists.txt
@@ -36,12 +36,12 @@ if(NOT SERVER_MODE)
         freqtrackergui.h
     )
 
-    set(TARGET_NAME freqtracker)
+    set(TARGET_NAME ${PLUGINS_PREFIX}freqtracker)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME freqtrackersrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}freqtrackersrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/heatmap/CMakeLists.txt b/plugins/channelrx/heatmap/CMakeLists.txt
index 0d86be5bb..4dd550660 100644
--- a/plugins/channelrx/heatmap/CMakeLists.txt
+++ b/plugins/channelrx/heatmap/CMakeLists.txt
@@ -33,12 +33,12 @@ if(NOT SERVER_MODE)
         heatmapgui.h
     )
 
-    set(TARGET_NAME heatmap)
+    set(TARGET_NAME ${PLUGINS_PREFIX}heatmap)
     set(TARGET_LIB "Qt::Widgets" Qt::Charts)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME heatmapsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}heatmapsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/heatmap/heatmap.cpp b/plugins/channelrx/heatmap/heatmap.cpp
index 6695ca864..7b36f0d46 100644
--- a/plugins/channelrx/heatmap/heatmap.cpp
+++ b/plugins/channelrx/heatmap/heatmap.cpp
@@ -46,7 +46,7 @@ HeatMap::HeatMap(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new HeatMapBaseband(this);
+    m_basebandSink = new HeatMapBaseband();
     m_basebandSink->setMessageQueueToChannel(getInputMessageQueue());
     m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(&m_thread);
diff --git a/plugins/channelrx/heatmap/heatmapbaseband.cpp b/plugins/channelrx/heatmap/heatmapbaseband.cpp
index 551f3481a..db6add661 100644
--- a/plugins/channelrx/heatmap/heatmapbaseband.cpp
+++ b/plugins/channelrx/heatmap/heatmapbaseband.cpp
@@ -26,8 +26,7 @@
 
 MESSAGE_CLASS_DEFINITION(HeatMapBaseband::MsgConfigureHeatMapBaseband, Message)
 
-HeatMapBaseband::HeatMapBaseband(HeatMap *heatDemod) :
-    m_sink(heatDemod),
+HeatMapBaseband::HeatMapBaseband() :
     m_running(false)
 {
     qDebug("HeatMapBaseband::HeatMapBaseband");
diff --git a/plugins/channelrx/heatmap/heatmapbaseband.h b/plugins/channelrx/heatmap/heatmapbaseband.h
index 7ba4ff8e1..ef2bcb1e7 100644
--- a/plugins/channelrx/heatmap/heatmapbaseband.h
+++ b/plugins/channelrx/heatmap/heatmapbaseband.h
@@ -62,7 +62,7 @@ public:
         { }
     };
 
-    HeatMapBaseband(HeatMap *heatDemod);
+    HeatMapBaseband();
     ~HeatMapBaseband();
     void reset();
     void startWork();
diff --git a/plugins/channelrx/heatmap/heatmapsink.cpp b/plugins/channelrx/heatmap/heatmapsink.cpp
index 6502b9fce..202e9fb7f 100644
--- a/plugins/channelrx/heatmap/heatmapsink.cpp
+++ b/plugins/channelrx/heatmap/heatmapsink.cpp
@@ -24,9 +24,8 @@
 #include "heatmap.h"
 #include "heatmapsink.h"
 
-HeatMapSink::HeatMapSink(HeatMap *heatMap) :
+HeatMapSink::HeatMapSink() :
         m_scopeSink(nullptr),
-        m_heatMap(heatMap),
         m_channelSampleRate(10000),
         m_channelFrequencyOffset(0),
         m_magsq(0.0),
diff --git a/plugins/channelrx/heatmap/heatmapsink.h b/plugins/channelrx/heatmap/heatmapsink.h
index 02588db6d..66f364315 100644
--- a/plugins/channelrx/heatmap/heatmapsink.h
+++ b/plugins/channelrx/heatmap/heatmapsink.h
@@ -41,7 +41,7 @@ class ScopeVis;
 
 class HeatMapSink : public ChannelSampleSink {
 public:
-    HeatMapSink(HeatMap *heatMap);
+    HeatMapSink();
     ~HeatMapSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
@@ -106,12 +106,10 @@ private:
     };
 
     ScopeVis* m_scopeSink;    // Scope GUI to display filtered power
-    HeatMap *m_heatMap;
     HeatMapSettings m_settings;
     ChannelAPI *m_channel;
     int m_channelSampleRate;
     int m_channelFrequencyOffset;
-    int m_sinkSampleRate;
 
     NCO m_nco;
     Interpolator m_interpolator;
diff --git a/plugins/channelrx/localsink/CMakeLists.txt b/plugins/channelrx/localsink/CMakeLists.txt
index a5bfdd8bb..e053e0a15 100644
--- a/plugins/channelrx/localsink/CMakeLists.txt
+++ b/plugins/channelrx/localsink/CMakeLists.txt
@@ -35,12 +35,12 @@ if(NOT SERVER_MODE)
         ${localsink_HEADERS}
         localsinkgui.h
     )
-    set(TARGET_NAME localsink)
+    set(TARGET_NAME ${PLUGINS_PREFIX}localsink)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME localsinksrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}localsinksrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/localsink/localsinksettings.cpp b/plugins/channelrx/localsink/localsinksettings.cpp
index b6dd3074c..823edcfd2 100644
--- a/plugins/channelrx/localsink/localsinksettings.cpp
+++ b/plugins/channelrx/localsink/localsinksettings.cpp
@@ -53,6 +53,7 @@ void LocalSinkSettings::resetToDefaults()
     m_reverseAPIChannelIndex = 0;
     m_workspaceIndex = 0;
     m_hidden = false;
+    m_maxFFTBands = 20;
 }
 
 QByteArray LocalSinkSettings::serialize() const
@@ -94,7 +95,7 @@ QByteArray LocalSinkSettings::serialize() const
     s.writeBool(24, m_reverseFilter);
 
     s.writeU32(99, m_fftBands.size());
-    int i = 0;
+    uint32_t i = 0;
 
     for (auto fftBand : m_fftBands)
     {
diff --git a/plugins/channelrx/localsink/localsinksettings.h b/plugins/channelrx/localsink/localsinksettings.h
index db0af6a70..990492144 100644
--- a/plugins/channelrx/localsink/localsinksettings.h
+++ b/plugins/channelrx/localsink/localsinksettings.h
@@ -42,7 +42,7 @@ struct LocalSinkSettings
     uint32_t m_log2FFT;
     FFTWindow::Function m_fftWindow;
     bool m_reverseFilter;
-    static const uint32_t m_maxFFTBands = 20;
+    uint32_t m_maxFFTBands;
     std::vector<std::pair<float, float>> m_fftBands;
     int m_streamIndex; //!< MIMO channel. Not relevant when connected to SI (single Rx).
     bool m_useReverseAPI;
diff --git a/plugins/channelrx/noisefigure/CMakeLists.txt b/plugins/channelrx/noisefigure/CMakeLists.txt
index 4c6fbcb0c..2b300d2f6 100644
--- a/plugins/channelrx/noisefigure/CMakeLists.txt
+++ b/plugins/channelrx/noisefigure/CMakeLists.txt
@@ -40,12 +40,12 @@ if(NOT SERVER_MODE)
         noisefigureenrdialog.h
     )
 
-    set(TARGET_NAME noisefigure)
+    set(TARGET_NAME ${PLUGINS_PREFIX}noisefigure)
     set(TARGET_LIB "Qt::Widgets" Qt::Charts)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME noisefiguresrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}noisefiguresrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/noisefigure/noisefigure.cpp b/plugins/channelrx/noisefigure/noisefigure.cpp
index 2c4ff78be..ee06c485d 100644
--- a/plugins/channelrx/noisefigure/noisefigure.cpp
+++ b/plugins/channelrx/noisefigure/noisefigure.cpp
@@ -62,7 +62,7 @@ NoiseFigure::NoiseFigure(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new NoiseFigureBaseband(this);
+    m_basebandSink = new NoiseFigureBaseband();
     m_basebandSink->setMessageQueueToChannel(getInputMessageQueue());
     m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(&m_thread);
diff --git a/plugins/channelrx/noisefigure/noisefigurebaseband.cpp b/plugins/channelrx/noisefigure/noisefigurebaseband.cpp
index 163432a4f..b0268d77a 100644
--- a/plugins/channelrx/noisefigure/noisefigurebaseband.cpp
+++ b/plugins/channelrx/noisefigure/noisefigurebaseband.cpp
@@ -26,8 +26,7 @@
 
 MESSAGE_CLASS_DEFINITION(NoiseFigureBaseband::MsgConfigureNoiseFigureBaseband, Message)
 
-NoiseFigureBaseband::NoiseFigureBaseband(NoiseFigure *aisDemod) :
-    m_sink(aisDemod),
+NoiseFigureBaseband::NoiseFigureBaseband() :
     m_running(false)
 {
     qDebug("NoiseFigureBaseband::NoiseFigureBaseband");
diff --git a/plugins/channelrx/noisefigure/noisefigurebaseband.h b/plugins/channelrx/noisefigure/noisefigurebaseband.h
index 0944ce5fe..816485b19 100644
--- a/plugins/channelrx/noisefigure/noisefigurebaseband.h
+++ b/plugins/channelrx/noisefigure/noisefigurebaseband.h
@@ -60,7 +60,7 @@ public:
         { }
     };
 
-    NoiseFigureBaseband(NoiseFigure *aisDemod);
+    NoiseFigureBaseband();
     ~NoiseFigureBaseband();
     void reset();
     void startWork();
diff --git a/plugins/channelrx/noisefigure/noisefiguresink.cpp b/plugins/channelrx/noisefigure/noisefiguresink.cpp
index 72d7b348c..76c0e4c2a 100644
--- a/plugins/channelrx/noisefigure/noisefiguresink.cpp
+++ b/plugins/channelrx/noisefigure/noisefiguresink.cpp
@@ -25,8 +25,7 @@
 #include "noisefigure.h"
 #include "noisefiguresink.h"
 
-NoiseFigureSink::NoiseFigureSink(NoiseFigure *noiseFigure) :
-        m_noiseFigure(noiseFigure),
+NoiseFigureSink::NoiseFigureSink() :
         m_channelSampleRate(48000),
         m_fftSequence(-1),
         m_fft(nullptr),
diff --git a/plugins/channelrx/noisefigure/noisefiguresink.h b/plugins/channelrx/noisefigure/noisefiguresink.h
index 2bf11bb0f..666215d36 100644
--- a/plugins/channelrx/noisefigure/noisefiguresink.h
+++ b/plugins/channelrx/noisefigure/noisefiguresink.h
@@ -38,7 +38,7 @@ class NoiseFigure;
 
 class NoiseFigureSink : public ChannelSampleSink {
 public:
-    NoiseFigureSink(NoiseFigure *aisDemod);
+    NoiseFigureSink();
     ~NoiseFigureSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
@@ -81,7 +81,6 @@ private:
         double m_magsqPeak;
     };
 
-    NoiseFigure *m_noiseFigure;
     NoiseFigureSettings m_settings;
     ChannelAPI *m_channel;
     int m_channelSampleRate;
diff --git a/plugins/channelrx/radioastronomy/CMakeLists.txt b/plugins/channelrx/radioastronomy/CMakeLists.txt
index 5ac580a00..f378b6706 100644
--- a/plugins/channelrx/radioastronomy/CMakeLists.txt
+++ b/plugins/channelrx/radioastronomy/CMakeLists.txt
@@ -42,12 +42,12 @@ if(NOT SERVER_MODE)
         radioastronomysensordialog.h
     )
 
-    set(TARGET_NAME radioastronomy)
+    set(TARGET_NAME ${PLUGINS_PREFIX}radioastronomy)
     set(TARGET_LIB "Qt::Widgets" Qt::Charts)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME radioastronomysrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}radioastronomysrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/radioastronomy/radioastronomygui.cpp b/plugins/channelrx/radioastronomy/radioastronomygui.cpp
index 89633ad55..470b91cfd 100644
--- a/plugins/channelrx/radioastronomy/radioastronomygui.cpp
+++ b/plugins/channelrx/radioastronomy/radioastronomygui.cpp
@@ -378,7 +378,7 @@ void RadioAstronomyGUI::addToPowerSeries(FFTMeasurement *fft, bool skipCalcs)
         && !((m_settings.m_powerYUnits == RadioAstronomySettings::PY_DBM) && (fft->m_tSys == 0.0f))  // dBm value not valid if temp is 0
        )
     {
-        qreal power;
+        qreal power = 0.0;
         switch (m_settings.m_powerYData)
         {
         case RadioAstronomySettings::PY_POWER:
diff --git a/plugins/channelrx/radioclock/CMakeLists.txt b/plugins/channelrx/radioclock/CMakeLists.txt
index 384151cdd..1035dc94e 100644
--- a/plugins/channelrx/radioclock/CMakeLists.txt
+++ b/plugins/channelrx/radioclock/CMakeLists.txt
@@ -33,12 +33,12 @@ if(NOT SERVER_MODE)
         radioclockgui.h
     )
 
-    set(TARGET_NAME radioclock)
+    set(TARGET_NAME ${PLUGINS_PREFIX}radioclock)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME radioclocksrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}radioclocksrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/radioclock/radioclock.cpp b/plugins/channelrx/radioclock/radioclock.cpp
index 9f0420feb..6505bb031 100644
--- a/plugins/channelrx/radioclock/radioclock.cpp
+++ b/plugins/channelrx/radioclock/radioclock.cpp
@@ -51,7 +51,7 @@ RadioClock::RadioClock(DeviceAPI *deviceAPI) :
 {
     setObjectName(m_channelId);
 
-    m_basebandSink = new RadioClockBaseband(this);
+    m_basebandSink = new RadioClockBaseband();
     m_basebandSink->setMessageQueueToChannel(getInputMessageQueue());
     m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(&m_thread);
diff --git a/plugins/channelrx/radioclock/radioclockbaseband.cpp b/plugins/channelrx/radioclock/radioclockbaseband.cpp
index 0a48c688c..03d3ceb2e 100644
--- a/plugins/channelrx/radioclock/radioclockbaseband.cpp
+++ b/plugins/channelrx/radioclock/radioclockbaseband.cpp
@@ -27,8 +27,7 @@
 
 MESSAGE_CLASS_DEFINITION(RadioClockBaseband::MsgConfigureRadioClockBaseband, Message)
 
-RadioClockBaseband::RadioClockBaseband(RadioClock *radioClock) :
-    m_sink(radioClock),
+RadioClockBaseband::RadioClockBaseband() :
     m_running(false)
 {
     qDebug("RadioClockBaseband::RadioClockBaseband");
diff --git a/plugins/channelrx/radioclock/radioclockbaseband.h b/plugins/channelrx/radioclock/radioclockbaseband.h
index 80d813089..410362880 100644
--- a/plugins/channelrx/radioclock/radioclockbaseband.h
+++ b/plugins/channelrx/radioclock/radioclockbaseband.h
@@ -62,7 +62,7 @@ public:
         { }
     };
 
-    RadioClockBaseband(RadioClock *radioClock);
+    RadioClockBaseband();
     ~RadioClockBaseband();
     void reset();
     void startWork();
diff --git a/plugins/channelrx/radioclock/radioclocksink.cpp b/plugins/channelrx/radioclock/radioclocksink.cpp
index 5b449c43b..b23b3e05c 100644
--- a/plugins/channelrx/radioclock/radioclocksink.cpp
+++ b/plugins/channelrx/radioclock/radioclocksink.cpp
@@ -26,9 +26,8 @@
 #include "radioclock.h"
 #include "radioclocksink.h"
 
-RadioClockSink::RadioClockSink(RadioClock *radioClock) :
+RadioClockSink::RadioClockSink() :
         m_scopeSink(nullptr),
-        m_radioClock(radioClock),
         m_channelSampleRate(RadioClockSettings::RADIOCLOCK_CHANNEL_SAMPLE_RATE),
         m_channelFrequencyOffset(0),
         m_magsq(0.0),
@@ -48,7 +47,7 @@ RadioClockSink::RadioClockSink(RadioClock *radioClock) :
         m_zeroCount(0),
         m_sampleBufferIndex(0),
         m_gotMarker(false)
-{
+{   
     m_phaseDiscri.setFMScaling(RadioClockSettings::RADIOCLOCK_CHANNEL_SAMPLE_RATE / (2.0f * 20.0/M_PI));
     applySettings(m_settings, true);
     applyChannelSettings(m_channelSampleRate, m_channelFrequencyOffset, true);
diff --git a/plugins/channelrx/radioclock/radioclocksink.h b/plugins/channelrx/radioclock/radioclocksink.h
index bbd18d39a..316cb9ecd 100644
--- a/plugins/channelrx/radioclock/radioclocksink.h
+++ b/plugins/channelrx/radioclock/radioclocksink.h
@@ -42,7 +42,7 @@ class ScopeVis;
 
 class RadioClockSink : public ChannelSampleSink {
 public:
-    RadioClockSink(RadioClock *radioClock);
+    RadioClockSink();
     ~RadioClockSink();
 
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
@@ -86,7 +86,6 @@ private:
     };
 
     ScopeVis* m_scopeSink;    // Scope GUI to display debug waveforms
-    RadioClock *m_radioClock;
     RadioClockSettings m_settings;
     ChannelAPI *m_channel;
     int m_channelSampleRate;
diff --git a/plugins/channelrx/remotesink/CMakeLists.txt b/plugins/channelrx/remotesink/CMakeLists.txt
index 33a2f974f..343209dd1 100644
--- a/plugins/channelrx/remotesink/CMakeLists.txt
+++ b/plugins/channelrx/remotesink/CMakeLists.txt
@@ -39,12 +39,12 @@ if(NOT SERVER_MODE)
         ${remotesink_HEADERS}
         remotesinkgui.h
     )
-    set(TARGET_NAME remotesink)
+    set(TARGET_NAME ${PLUGINS_PREFIX}remotesink)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME remotesinksrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}remotesinksrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/remotesink/remotesink.h b/plugins/channelrx/remotesink/remotesink.h
index 4fbc49e4d..5c4d2cdf1 100644
--- a/plugins/channelrx/remotesink/remotesink.h
+++ b/plugins/channelrx/remotesink/remotesink.h
@@ -132,7 +132,6 @@ private:
     bool m_running;
     RemoteSinkSettings m_settings;
 
-    uint64_t m_centerFrequency;
     int64_t m_frequencyOffset;
     int m_basebandSampleRate;
 
diff --git a/plugins/channelrx/remotetcpsink/CMakeLists.txt b/plugins/channelrx/remotetcpsink/CMakeLists.txt
index 12fedbdab..2b42dc98e 100644
--- a/plugins/channelrx/remotetcpsink/CMakeLists.txt
+++ b/plugins/channelrx/remotetcpsink/CMakeLists.txt
@@ -33,12 +33,12 @@ if(NOT SERVER_MODE)
         ${remotetcpsink_HEADERS}
         remotetcpsinkgui.h
     )
-    set(TARGET_NAME remotetcpsink)
+    set(TARGET_NAME ${PLUGINS_PREFIX}remotetcpsink)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME remotetcpsinksrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}remotetcpsinksrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/remotetcpsink/remotetcpsink.h b/plugins/channelrx/remotetcpsink/remotetcpsink.h
index edb4e9170..34ce5a6d0 100644
--- a/plugins/channelrx/remotetcpsink/remotetcpsink.h
+++ b/plugins/channelrx/remotetcpsink/remotetcpsink.h
@@ -178,7 +178,6 @@ private:
     RemoteTCPSinkBaseband *m_basebandSink;
     RemoteTCPSinkSettings m_settings;
 
-    uint64_t m_centerFrequency;
     int m_basebandSampleRate;
 
     QNetworkAccessManager *m_networkManager;
diff --git a/plugins/channelrx/remotetcpsink/remotetcpsinkgui.cpp b/plugins/channelrx/remotetcpsink/remotetcpsinkgui.cpp
index 12d6fe11f..3f3ca8ae6 100644
--- a/plugins/channelrx/remotetcpsink/remotetcpsinkgui.cpp
+++ b/plugins/channelrx/remotetcpsink/remotetcpsinkgui.cpp
@@ -88,13 +88,13 @@ QString RemoteTCPSinkGUI::displayScaledF(float value, char type, int precision,
     }
     else
     {
-        if (posValue < 1000) {
+        if (posValue < 1000.0f) {
             return tr("%1").arg(QString::number(value, type, precision));
-        } else if (posValue < 1000000) {
+        } else if (posValue < 1000000.0f) {
             return tr("%1%2").arg(QString::number(value / 1000.0, type, precision)).arg(showMult ? "k" : "");
-        } else if (posValue < 1000000000) {
+        } else if (posValue < 1000000000.0f) {
             return tr("%1%2").arg(QString::number(value / 1000000.0, type, precision)).arg(showMult ? "M" : "");
-        } else if (posValue < 1000000000000) {
+        } else if (posValue < 1000000000000.0f) {
             return tr("%1%2").arg(QString::number(value / 1000000000.0, type, precision)).arg(showMult ? "G" : "");
         } else {
             return tr("%1").arg(QString::number(value, 'e', precision));
diff --git a/plugins/channelrx/sigmffilesink/CMakeLists.txt b/plugins/channelrx/sigmffilesink/CMakeLists.txt
index fb41a3ffb..7fc00de65 100644
--- a/plugins/channelrx/sigmffilesink/CMakeLists.txt
+++ b/plugins/channelrx/sigmffilesink/CMakeLists.txt
@@ -35,12 +35,12 @@ if(NOT SERVER_MODE)
         ${sigmffilesink_HEADERS}
         sigmffilesinkgui.h
     )
-    set(TARGET_NAME sigmffilesink)
+    set(TARGET_NAME ${PLUGINS_PREFIX}sigmffilesink)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME sigmffilesinksrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}sigmffilesinksrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/sigmffilesink/sigmffilesinksink.h b/plugins/channelrx/sigmffilesink/sigmffilesinksink.h
index 444b5577a..e0675deaf 100644
--- a/plugins/channelrx/sigmffilesink/sigmffilesinksink.h
+++ b/plugins/channelrx/sigmffilesink/sigmffilesinksink.h
@@ -71,7 +71,6 @@ private:
     SigMFFileRecord m_fileSink;
     SampleSimpleFifo m_preRecordBuffer;
     unsigned int m_preRecordFill;
-    float m_squelchLevel;
     SpectrumVis* m_spectrumSink;
     MessageQueue *m_msgQueueToGUI;
     bool m_recordEnabled;
diff --git a/plugins/channelrx/udpsink/CMakeLists.txt b/plugins/channelrx/udpsink/CMakeLists.txt
index d6bb2c174..45b4ecfe0 100644
--- a/plugins/channelrx/udpsink/CMakeLists.txt
+++ b/plugins/channelrx/udpsink/CMakeLists.txt
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
         udpsinkgui.h
     )
 
-    set(TARGET_NAME udpsink)
+    set(TARGET_NAME ${PLUGINS_PREFIX}udpsink)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME udpsinksrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}udpsinksrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/wdsprx/CMakeLists.txt b/plugins/channelrx/wdsprx/CMakeLists.txt
index 9af100082..f31c34f27 100644
--- a/plugins/channelrx/wdsprx/CMakeLists.txt
+++ b/plugins/channelrx/wdsprx/CMakeLists.txt
@@ -61,12 +61,12 @@ if(NOT SERVER_MODE)
         wdsprxpandialog.h
         wdsprxsquelchdialog.h
     )
-    set(TARGET_NAME wdsprx)
+    set(TARGET_NAME ${PLUGINS_PREFIX}wdsprx)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME wdsprxsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}wdsprxsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channelrx/wdsprx/wdsprx.cpp b/plugins/channelrx/wdsprx/wdsprx.cpp
index 80f8fef53..0137ae757 100644
--- a/plugins/channelrx/wdsprx/wdsprx.cpp
+++ b/plugins/channelrx/wdsprx/wdsprx.cpp
@@ -895,7 +895,7 @@ void WDSPRx::sendChannelSettings(
     const WDSPRxSettings& settings,
     bool force) const
 {
-    qDebug("WDSPRx::sendChannelSettings: %d pipes", pipes.size());
+    qDebug("WDSPRx::sendChannelSettings: %d pipes", (int)pipes.size());
 
     for (const auto& pipe : pipes)
     {
diff --git a/plugins/channeltx/filesource/CMakeLists.txt b/plugins/channeltx/filesource/CMakeLists.txt
index 20d497ba8..576acf71c 100644
--- a/plugins/channeltx/filesource/CMakeLists.txt
+++ b/plugins/channeltx/filesource/CMakeLists.txt
@@ -35,12 +35,12 @@ if(NOT SERVER_MODE)
         ${filesource_HEADERS}
         filesourcegui.h
     )
-    set(TARGET_NAME filesource)
+    set(TARGET_NAME ${PLUGINS_PREFIX}filesource)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME filesourcesrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}filesourcesrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channeltx/filesource/filesource.cpp b/plugins/channeltx/filesource/filesource.cpp
index 846e07251..9ee6e78e6 100644
--- a/plugins/channeltx/filesource/filesource.cpp
+++ b/plugins/channeltx/filesource/filesource.cpp
@@ -54,8 +54,7 @@ FileSource::FileSource(DeviceAPI *deviceAPI) :
     ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource),
     m_deviceAPI(deviceAPI),
 	m_frequencyOffset(0),
-	m_basebandSampleRate(0),
-    m_linearGain(0.0)
+	m_basebandSampleRate(0)
 {
     setObjectName(m_channelId);
 
diff --git a/plugins/channeltx/filesource/filesource.h b/plugins/channeltx/filesource/filesource.h
index 515fce43f..c2d580f08 100644
--- a/plugins/channeltx/filesource/filesource.h
+++ b/plugins/channeltx/filesource/filesource.h
@@ -235,7 +235,6 @@ private:
     QRecursiveMutex m_settingsMutex;
     uint64_t m_frequencyOffset;
     uint32_t m_basebandSampleRate;
-    double m_linearGain;
 
     QNetworkAccessManager *m_networkManager;
     QNetworkRequest m_networkRequest;
diff --git a/plugins/channeltx/filesource/filesourcesource.cpp b/plugins/channeltx/filesource/filesourcesource.cpp
index c0fe28f76..11d85ca18 100644
--- a/plugins/channeltx/filesource/filesourcesource.cpp
+++ b/plugins/channeltx/filesource/filesourcesource.cpp
@@ -37,11 +37,9 @@ FileSourceSource::FileSourceSource() :
 	m_fileName("..."),
 	m_sampleSize(0),
 	m_centerFrequency(0),
-    m_frequencyOffset(0),
     m_fileSampleRate(0),
     m_samplesCount(0),
 	m_sampleRate(0),
-    m_deviceSampleRate(0),
 	m_recordLengthMuSec(0),
     m_startingTimeStamp(0),
     m_running(false),
diff --git a/plugins/channeltx/filesource/filesourcesource.h b/plugins/channeltx/filesource/filesourcesource.h
index 27801820c..c6ba48392 100644
--- a/plugins/channeltx/filesource/filesourcesource.h
+++ b/plugins/channeltx/filesource/filesourcesource.h
@@ -92,19 +92,15 @@ private:
         double m_magsqPeak;
     };
 
-    int m_channelSampleRate;
-    int m_channelFrequencyOffset;
     FileSourceSettings m_settings;
 
 	std::ifstream m_ifstream;
 	QString m_fileName;
 	quint32 m_sampleSize;
 	quint64 m_centerFrequency;
-    int64_t m_frequencyOffset;
     uint32_t m_fileSampleRate;
     quint64 m_samplesCount;
     uint32_t m_sampleRate;
-    uint32_t m_deviceSampleRate;
     quint64 m_recordLengthMuSec; //!< record length in microseconds computed from file size
     quint64 m_startingTimeStamp;
 	QTimer m_masterTimer;
diff --git a/plugins/channeltx/localsource/CMakeLists.txt b/plugins/channeltx/localsource/CMakeLists.txt
index f75b559ab..689abba5f 100644
--- a/plugins/channeltx/localsource/CMakeLists.txt
+++ b/plugins/channeltx/localsource/CMakeLists.txt
@@ -37,12 +37,12 @@ if(NOT SERVER_MODE)
         localsourcegui.h
     )
 
-    set(TARGET_NAME localsource)
+    set(TARGET_NAME ${PLUGINS_PREFIX}localsource)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME localsourcesrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}localsourcesrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channeltx/mod802.15.4/CMakeLists.txt b/plugins/channeltx/mod802.15.4/CMakeLists.txt
index 574cd4b96..043758db6 100644
--- a/plugins/channeltx/mod802.15.4/CMakeLists.txt
+++ b/plugins/channeltx/mod802.15.4/CMakeLists.txt
@@ -40,12 +40,12 @@ if(NOT SERVER_MODE)
         ieee_802_15_4_modrepeatdialog.h
         ieee_802_15_4_modtxsettingsdialog.h
     )
-    set(TARGET_NAME modieee_802_15_4)
+    set(TARGET_NAME ${PLUGINS_PREFIX}modieee_802_15_4)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME modieee_802_15_4srv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}modieee_802_15_4srv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channeltx/modais/CMakeLists.txt b/plugins/channeltx/modais/CMakeLists.txt
index b5f71ee84..0f8238cc4 100644
--- a/plugins/channeltx/modais/CMakeLists.txt
+++ b/plugins/channeltx/modais/CMakeLists.txt
@@ -38,12 +38,12 @@ if(NOT SERVER_MODE)
         aismodrepeatdialog.h
         aismodtxsettingsdialog.h
     )
-    set(TARGET_NAME modais)
+    set(TARGET_NAME ${PLUGINS_PREFIX}modais)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME modaissrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}modaissrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channeltx/modam/CMakeLists.txt b/plugins/channeltx/modam/CMakeLists.txt
index cd7cb0e05..f2d4eb245 100644
--- a/plugins/channeltx/modam/CMakeLists.txt
+++ b/plugins/channeltx/modam/CMakeLists.txt
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
         ammodgui.h
     )
 
-    set(TARGET_NAME modam)
+    set(TARGET_NAME ${PLUGINS_PREFIX}modam)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME modamsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}modamsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channeltx/modatv/CMakeLists.txt b/plugins/channeltx/modatv/CMakeLists.txt
index 08bbb727c..882298c95 100644
--- a/plugins/channeltx/modatv/CMakeLists.txt
+++ b/plugins/channeltx/modatv/CMakeLists.txt
@@ -37,12 +37,12 @@ if(NOT SERVER_MODE)
         atvmodgui.h
     )
 
-    set(TARGET_NAME modatv)
+    set(TARGET_NAME ${PLUGINS_PREFIX}modatv)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME modatvsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}modatvsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channeltx/modchirpchat/CMakeLists.txt b/plugins/channeltx/modchirpchat/CMakeLists.txt
index ee264b45b..14a10df0f 100644
--- a/plugins/channeltx/modchirpchat/CMakeLists.txt
+++ b/plugins/channeltx/modchirpchat/CMakeLists.txt
@@ -49,12 +49,12 @@ if(NOT SERVER_MODE)
         chirpchatmodgui.h
     )
 
-    set(TARGET_NAME modchirpchat)
+    set(TARGET_NAME ${PLUGINS_PREFIX}modchirpchat)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME modchirpchatsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}modchirpchatsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channeltx/moddatv/CMakeLists.txt b/plugins/channeltx/moddatv/CMakeLists.txt
index cdb955341..b821d8cd4 100644
--- a/plugins/channeltx/moddatv/CMakeLists.txt
+++ b/plugins/channeltx/moddatv/CMakeLists.txt
@@ -58,12 +58,12 @@ if(NOT SERVER_MODE)
         datvmodgui.h
     )
 
-    set(TARGET_NAME moddatv)
+    set(TARGET_NAME ${PLUGINS_PREFIX}moddatv)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME moddatvsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}moddatvsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channeltx/moddatv/dvb-s2/DVB2.cpp b/plugins/channeltx/moddatv/dvb-s2/DVB2.cpp
index bf12f2a3e..66b7c12ae 100644
--- a/plugins/channeltx/moddatv/dvb-s2/DVB2.cpp
+++ b/plugins/channeltx/moddatv/dvb-s2/DVB2.cpp
@@ -273,8 +273,6 @@ int DVB2::next_ts_frame_base( u8 *ts )
 }
 DVB2::DVB2(void)
 {
-    // Clear the transport queue
-    m_tp_q.empty();
     init_bb_randomiser();
     bch_poly_build_tables();
     build_crc8_table();
diff --git a/plugins/channeltx/modfreedv/CMakeLists.txt b/plugins/channeltx/modfreedv/CMakeLists.txt
index d231d0505..61235b66d 100644
--- a/plugins/channeltx/modfreedv/CMakeLists.txt
+++ b/plugins/channeltx/modfreedv/CMakeLists.txt
@@ -33,12 +33,12 @@ if(NOT SERVER_MODE)
         ${modfreedv_HEADERS}
         freedvmodgui.h
     )
-    set(TARGET_NAME modfreedv)
+    set(TARGET_NAME ${PLUGINS_PREFIX}modfreedv)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME modfreedvsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}modfreedvsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channeltx/modm17/CMakeLists.txt b/plugins/channeltx/modm17/CMakeLists.txt
index 090d13c77..5b19ca2b1 100644
--- a/plugins/channeltx/modm17/CMakeLists.txt
+++ b/plugins/channeltx/modm17/CMakeLists.txt
@@ -43,12 +43,12 @@ if(NOT SERVER_MODE)
         m17modgui.h
     )
 
-    set(TARGET_NAME modm17)
+    set(TARGET_NAME ${PLUGINS_PREFIX}modm17)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME modm17srv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}modm17srv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channeltx/modm17/m17modsource.cpp b/plugins/channeltx/modm17/m17modsource.cpp
index 2146d0de0..db223cb76 100644
--- a/plugins/channeltx/modm17/m17modsource.cpp
+++ b/plugins/channeltx/modm17/m17modsource.cpp
@@ -130,7 +130,7 @@ void M17ModSource::pullOne(Sample& sample)
 
 void M17ModSource::prefetch(unsigned int nbSamples)
 {
-    if ((m_settings.m_m17Mode == M17ModSettings::M17ModeFMAudio))
+    if (m_settings.m_m17Mode == M17ModSettings::M17ModeFMAudio)
     {
         unsigned int nbSamplesAudio = nbSamples * ((Real) m_audioSampleRate / (Real) m_channelSampleRate);
         pullAudio(nbSamplesAudio);
diff --git a/plugins/channeltx/modnfm/CMakeLists.txt b/plugins/channeltx/modnfm/CMakeLists.txt
index 5bd9d0f1b..94e984575 100644
--- a/plugins/channeltx/modnfm/CMakeLists.txt
+++ b/plugins/channeltx/modnfm/CMakeLists.txt
@@ -36,12 +36,12 @@ if(NOT SERVER_MODE)
         nfmmodgui.h
     )
 
-    set(TARGET_NAME modnfm)
+    set(TARGET_NAME ${PLUGINS_PREFIX}modnfm)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME modnfmsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}modnfmsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channeltx/modnfm/nfmmoddcs.h b/plugins/channeltx/modnfm/nfmmoddcs.h
index a7934aeb7..1b43095ac 100644
--- a/plugins/channeltx/modnfm/nfmmoddcs.h
+++ b/plugins/channeltx/modnfm/nfmmoddcs.h
@@ -33,7 +33,6 @@ public:
     int next(); //!< +1/-1 sample
 
 private:
-    int m_shift; //!< current frequency shift: -1 or 1
     int m_dcsWord[23]; //!< current DCS word in transmit order including parity and filler 11 + 3 + 9
     float m_step;
     bool m_positive;
diff --git a/plugins/channeltx/modpacket/CMakeLists.txt b/plugins/channeltx/modpacket/CMakeLists.txt
index 8acf95911..d771fcfcb 100644
--- a/plugins/channeltx/modpacket/CMakeLists.txt
+++ b/plugins/channeltx/modpacket/CMakeLists.txt
@@ -41,12 +41,12 @@ if(NOT SERVER_MODE)
         packetmodrepeatdialog.h
         packetmodtxsettingsdialog.h
     )
-    set(TARGET_NAME modpacket)
+    set(TARGET_NAME ${PLUGINS_PREFIX}modpacket)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME modpacketsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}modpacketsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channeltx/modpacket/packetmod.cpp b/plugins/channeltx/modpacket/packetmod.cpp
index 4e25fbf6f..5abc2b3ed 100644
--- a/plugins/channeltx/modpacket/packetmod.cpp
+++ b/plugins/channeltx/modpacket/packetmod.cpp
@@ -59,7 +59,6 @@ PacketMod::PacketMod(DeviceAPI *deviceAPI) :
     ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource),
     m_deviceAPI(deviceAPI),
     m_spectrumVis(SDR_TX_SCALEF),
-    m_sampleRate(48000),
     m_udpSocket(nullptr)
 {
     setObjectName(m_channelId);
diff --git a/plugins/channeltx/modpacket/packetmod.h b/plugins/channeltx/modpacket/packetmod.h
index 66bb7c4ee..74783e636 100644
--- a/plugins/channeltx/modpacket/packetmod.h
+++ b/plugins/channeltx/modpacket/packetmod.h
@@ -229,8 +229,6 @@ private:
     SampleVector m_sampleBuffer;
     QRecursiveMutex m_settingsMutex;
 
-    int m_sampleRate;
-
     QNetworkAccessManager *m_networkManager;
     QNetworkRequest m_networkRequest;
     QUdpSocket *m_udpSocket;
diff --git a/plugins/channeltx/modpsk31/CMakeLists.txt b/plugins/channeltx/modpsk31/CMakeLists.txt
index eb5256800..207fe63b8 100644
--- a/plugins/channeltx/modpsk31/CMakeLists.txt
+++ b/plugins/channeltx/modpsk31/CMakeLists.txt
@@ -38,12 +38,12 @@ if(NOT SERVER_MODE)
         psk31modrepeatdialog.h
         psk31modtxsettingsdialog.h
     )
-    set(TARGET_NAME modpsk31)
+    set(TARGET_NAME ${PLUGINS_PREFIX}modpsk31)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME modpsk31srv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}modpsk31srv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channeltx/modpsk31/psk31mod.cpp b/plugins/channeltx/modpsk31/psk31mod.cpp
index 29538ced3..9e691a131 100644
--- a/plugins/channeltx/modpsk31/psk31mod.cpp
+++ b/plugins/channeltx/modpsk31/psk31mod.cpp
@@ -55,7 +55,6 @@ PSK31::PSK31(DeviceAPI *deviceAPI) :
     ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource),
     m_deviceAPI(deviceAPI),
     m_spectrumVis(SDR_TX_SCALEF),
-    m_sampleRate(48000),
     m_udpSocket(nullptr)
 {
     setObjectName(m_channelId);
diff --git a/plugins/channeltx/modpsk31/psk31mod.h b/plugins/channeltx/modpsk31/psk31mod.h
index b1c569bf4..c9be22276 100644
--- a/plugins/channeltx/modpsk31/psk31mod.h
+++ b/plugins/channeltx/modpsk31/psk31mod.h
@@ -214,8 +214,6 @@ private:
     SampleVector m_sampleBuffer;
     QRecursiveMutex m_settingsMutex;
 
-    int m_sampleRate;
-
     QNetworkAccessManager *m_networkManager;
     QNetworkRequest m_networkRequest;
     QUdpSocket *m_udpSocket;
diff --git a/plugins/channeltx/modrtty/CMakeLists.txt b/plugins/channeltx/modrtty/CMakeLists.txt
index 32ee10bd1..f4d6dc4d5 100644
--- a/plugins/channeltx/modrtty/CMakeLists.txt
+++ b/plugins/channeltx/modrtty/CMakeLists.txt
@@ -38,12 +38,12 @@ if(NOT SERVER_MODE)
         rttymodrepeatdialog.h
         rttymodtxsettingsdialog.h
     )
-    set(TARGET_NAME modrtty)
+    set(TARGET_NAME ${PLUGINS_PREFIX}modrtty)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME modrttysrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}modrttysrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channeltx/modrtty/rttymod.cpp b/plugins/channeltx/modrtty/rttymod.cpp
index 140d62728..b22d30773 100644
--- a/plugins/channeltx/modrtty/rttymod.cpp
+++ b/plugins/channeltx/modrtty/rttymod.cpp
@@ -55,7 +55,6 @@ RttyMod::RttyMod(DeviceAPI *deviceAPI) :
     ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource),
     m_deviceAPI(deviceAPI),
     m_spectrumVis(SDR_TX_SCALEF),
-    m_sampleRate(48000),
     m_udpSocket(nullptr)
 {
     setObjectName(m_channelId);
diff --git a/plugins/channeltx/modrtty/rttymod.h b/plugins/channeltx/modrtty/rttymod.h
index 32353e666..cbc01e639 100644
--- a/plugins/channeltx/modrtty/rttymod.h
+++ b/plugins/channeltx/modrtty/rttymod.h
@@ -214,8 +214,6 @@ private:
     SampleVector m_sampleBuffer;
     QRecursiveMutex m_settingsMutex;
 
-    int m_sampleRate;
-
     QNetworkAccessManager *m_networkManager;
     QNetworkRequest m_networkRequest;
     QUdpSocket *m_udpSocket;
diff --git a/plugins/channeltx/modssb/CMakeLists.txt b/plugins/channeltx/modssb/CMakeLists.txt
index 5156b2e36..491c88f78 100644
--- a/plugins/channeltx/modssb/CMakeLists.txt
+++ b/plugins/channeltx/modssb/CMakeLists.txt
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
         ssbmodgui.h
     )
 
-    set(TARGET_NAME modssb)
+    set(TARGET_NAME ${PLUGINS_PREFIX}modssb)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME modssbsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}modssbsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channeltx/modwfm/CMakeLists.txt b/plugins/channeltx/modwfm/CMakeLists.txt
index d2cc22fc0..4f310f8a8 100644
--- a/plugins/channeltx/modwfm/CMakeLists.txt
+++ b/plugins/channeltx/modwfm/CMakeLists.txt
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
         wfmmodgui.h
     )
 
-    set(TARGET_NAME modwfm)
+    set(TARGET_NAME ${PLUGINS_PREFIX}modwfm)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME modwfmsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}modwfmsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channeltx/remotesource/CMakeLists.txt b/plugins/channeltx/remotesource/CMakeLists.txt
index 1a5ac0b76..19f455c93 100644
--- a/plugins/channeltx/remotesource/CMakeLists.txt
+++ b/plugins/channeltx/remotesource/CMakeLists.txt
@@ -38,12 +38,12 @@ if(NOT SERVER_MODE)
         remotesourcegui.h
     )
 
-    set(TARGET_NAME remotesource)
+    set(TARGET_NAME ${PLUGINS_PREFIX}remotesource)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME remotesourcesrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}remotesourcesrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/channeltx/udpsource/CMakeLists.txt b/plugins/channeltx/udpsource/CMakeLists.txt
index deb682aed..4c5dd6fc9 100644
--- a/plugins/channeltx/udpsource/CMakeLists.txt
+++ b/plugins/channeltx/udpsource/CMakeLists.txt
@@ -38,12 +38,12 @@ if(NOT SERVER_MODE)
         udpsourcegui.h
     )
 
-    set(TARGET_NAME udpsource)
+    set(TARGET_NAME ${PLUGINS_PREFIX}udpsource)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME udpsourcesrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}udpsourcesrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/feature/afc/CMakeLists.txt b/plugins/feature/afc/CMakeLists.txt
index fd64256c2..2939b9c1b 100644
--- a/plugins/feature/afc/CMakeLists.txt
+++ b/plugins/feature/afc/CMakeLists.txt
@@ -33,12 +33,12 @@ if(NOT SERVER_MODE)
 	    afcgui.h
     )
 
-    set(TARGET_NAME featureafc)
+    set(TARGET_NAME ${PLUGINS_PREFIX}featureafc)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME featureafcsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}featureafcsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/feature/ais/CMakeLists.txt b/plugins/feature/ais/CMakeLists.txt
index afdec0c05..792796ed5 100644
--- a/plugins/feature/ais/CMakeLists.txt
+++ b/plugins/feature/ais/CMakeLists.txt
@@ -30,12 +30,12 @@ if(NOT SERVER_MODE)
         aisgui.h
     )
 
-    set(TARGET_NAME featureais)
+    set(TARGET_NAME ${PLUGINS_PREFIX}featureais)
     set(TARGET_LIB Qt::Widgets)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME featureaissrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}featureaissrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/feature/ambe/CMakeLists.txt b/plugins/feature/ambe/CMakeLists.txt
index 82704fb2c..54e6caa4a 100644
--- a/plugins/feature/ambe/CMakeLists.txt
+++ b/plugins/feature/ambe/CMakeLists.txt
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
 	    ambegui.h
     )
 
-    set(TARGET_NAME featureambe)
+    set(TARGET_NAME ${PLUGINS_PREFIX}featureambe)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME featureambesrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}featureambesrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/feature/antennatools/CMakeLists.txt b/plugins/feature/antennatools/CMakeLists.txt
index bcbdccd6e..69cc6dd9d 100644
--- a/plugins/feature/antennatools/CMakeLists.txt
+++ b/plugins/feature/antennatools/CMakeLists.txt
@@ -30,12 +30,12 @@ if(NOT SERVER_MODE)
         antennatoolsgui.h
     )
 
-    set(TARGET_NAME antennatools)
+    set(TARGET_NAME ${PLUGINS_PREFIX}antennatools)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME antennatoolssrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}antennatoolssrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/feature/aprs/CMakeLists.txt b/plugins/feature/aprs/CMakeLists.txt
index 0f67590dd..bccae7d67 100644
--- a/plugins/feature/aprs/CMakeLists.txt
+++ b/plugins/feature/aprs/CMakeLists.txt
@@ -36,12 +36,12 @@ if(NOT SERVER_MODE)
         aprssettingsdialog.h
     )
 
-    set(TARGET_NAME aprs)
+    set(TARGET_NAME ${PLUGINS_PREFIX}aprs)
     set(TARGET_LIB "Qt::Widgets" Qt::Charts)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME aprssrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}aprssrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/feature/demodanalyzer/CMakeLists.txt b/plugins/feature/demodanalyzer/CMakeLists.txt
index c6998f852..cadffe37d 100644
--- a/plugins/feature/demodanalyzer/CMakeLists.txt
+++ b/plugins/feature/demodanalyzer/CMakeLists.txt
@@ -31,12 +31,12 @@ if(NOT SERVER_MODE)
 	    demodanalyzergui.h
     )
 
-    set(TARGET_NAME featuredemodanalyzer)
+    set(TARGET_NAME ${PLUGINS_PREFIX}featuredemodanalyzer)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME featuredemodanalyzersrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}featuredemodanalyzersrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/feature/gs232controller/CMakeLists.txt b/plugins/feature/gs232controller/CMakeLists.txt
index c35195adb..9ae9e7c22 100644
--- a/plugins/feature/gs232controller/CMakeLists.txt
+++ b/plugins/feature/gs232controller/CMakeLists.txt
@@ -48,7 +48,7 @@ if(NOT SERVER_MODE)
         inputcontrollersettings.h
     )
 
-    set(TARGET_NAME featuregs232controller)
+    set(TARGET_NAME ${PLUGINS_PREFIX}featuregs232controller)
     set(TARGET_LIB Qt::Widgets)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
@@ -68,7 +68,7 @@ if(NOT SERVER_MODE)
     endif()
 
 else()
-    set(TARGET_NAME featuregs232controllersrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}featuregs232controllersrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/feature/gs232controller/inputcontroller.cpp b/plugins/feature/gs232controller/inputcontroller.cpp
index 102900988..07269e8ca 100644
--- a/plugins/feature/gs232controller/inputcontroller.cpp
+++ b/plugins/feature/gs232controller/inputcontroller.cpp
@@ -60,6 +60,7 @@ InputController* InputControllerManager::open(const QString& name)
 #ifdef QT_GAMEPAD_FOUND
     return GamepadInputController::open(name);
 #else
+    (void)name;
     return nullptr;
 #endif
 }
diff --git a/plugins/feature/jogdialcontroller/CMakeLists.txt b/plugins/feature/jogdialcontroller/CMakeLists.txt
index 685849487..9b51b06f8 100644
--- a/plugins/feature/jogdialcontroller/CMakeLists.txt
+++ b/plugins/feature/jogdialcontroller/CMakeLists.txt
@@ -29,12 +29,12 @@ if(NOT SERVER_MODE)
         jogdialcontrollergui.h
     )
 
-    set(TARGET_NAME jogdialcontroller)
+    set(TARGET_NAME ${PLUGINS_PREFIX}jogdialcontroller)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME jogdialcontrollersrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}jogdialcontrollersrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/feature/limerfe/CMakeLists.txt b/plugins/feature/limerfe/CMakeLists.txt
index 4cfc776a6..5bdfdeaf4 100644
--- a/plugins/feature/limerfe/CMakeLists.txt
+++ b/plugins/feature/limerfe/CMakeLists.txt
@@ -32,12 +32,12 @@ if(NOT SERVER_MODE)
 	    limerfegui.h
     )
 
-    set(TARGET_NAME featurelimerfe)
+    set(TARGET_NAME ${PLUGINS_PREFIX}featurelimerfe)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME featurelimerfesrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}featurelimerfesrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/feature/map/CMakeLists.txt b/plugins/feature/map/CMakeLists.txt
index 028397eb8..b43cfc270 100644
--- a/plugins/feature/map/CMakeLists.txt
+++ b/plugins/feature/map/CMakeLists.txt
@@ -82,19 +82,20 @@ if(NOT SERVER_MODE)
         czml.h
     )
 
-    set(TARGET_NAME map)
+    set(TARGET_NAME ${PLUGINS_PREFIX}map)
+    set(TARGET_LIB "Qt::Widgets" Qt::Quick Qt::QuickWidgets Qt::Svg Qt::Positioning Qt::Location)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 
     if(Qt${QT_DEFAULT_MAJOR_VERSION}WebEngine_FOUND)
-        set(TARGET_LIB "Qt::Widgets" Qt::Quick Qt::QuickWidgets Qt::Svg Qt::Positioning Qt::Location Qt::WebEngine Qt::WebEngineCore Qt::WebEngineWidgets)
+        set(TARGET_LIB ${TARGET_LIB} Qt::WebEngine Qt::WebEngineCore Qt::WebEngineWidgets)
     elseif(Qt${QT_DEFAULT_MAJOR_VERSION}WebEngineCore_FOUND)
-        set(TARGET_LIB "Qt::Widgets" Qt::Quick Qt::QuickWidgets Qt::Svg Qt::SvgWidgets Qt::Positioning Qt::Location Qt::WebEngineCore Qt::WebEngineWidgets)
-    else()
-        set(TARGET_LIB "Qt::Widgets" Qt::Quick Qt::QuickWidgets Qt::Svg Qt::Positioning Qt::Location)
+        set(TARGET_LIB ${TARGET_LIB} Qt::SvgWidgets Qt::WebEngineCore Qt::WebEngineWidgets)
+    elseif(ANDROID)
+        set(TARGET_LIB ${TARGET_LIB} Qt::SvgWidgets)
     endif()
 else()
-    set(TARGET_NAME mapsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}mapsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/feature/map/mapgui.cpp b/plugins/feature/map/mapgui.cpp
index 91b155e08..e5105c7d9 100644
--- a/plugins/feature/map/mapgui.cpp
+++ b/plugins/feature/map/mapgui.cpp
@@ -1824,6 +1824,7 @@ void MapGUI::applyMap3DSettings(bool reloadMap)
     m_imageMapModel.allUpdated();
     m_polygonMapModel.allUpdated();
     m_polylineMapModel.allUpdated();
+    (void)reloadMap;
 #endif
 }
 
diff --git a/plugins/feature/morsedecoder/CMakeLists.txt b/plugins/feature/morsedecoder/CMakeLists.txt
index 4b8e4a94e..ea9d3d6af 100644
--- a/plugins/feature/morsedecoder/CMakeLists.txt
+++ b/plugins/feature/morsedecoder/CMakeLists.txt
@@ -32,12 +32,12 @@ if(NOT SERVER_MODE)
         morsedecodergui.h
     )
 
-    set(TARGET_NAME featuremorsedecoder)
+    set(TARGET_NAME ${PLUGINS_PREFIX}featuremorsedecoder)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME featuremorsedecodersrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}featuremorsedecodersrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/feature/pertester/CMakeLists.txt b/plugins/feature/pertester/CMakeLists.txt
index 33c2b0116..5dbb10592 100644
--- a/plugins/feature/pertester/CMakeLists.txt
+++ b/plugins/feature/pertester/CMakeLists.txt
@@ -32,12 +32,12 @@ if(NOT SERVER_MODE)
         pertestergui.h
     )
 
-    set(TARGET_NAME featurepertester)
+    set(TARGET_NAME ${PLUGINS_PREFIX}featurepertester)
     set(TARGET_LIB Qt::Widgets)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME featurepertestersrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}featurepertestersrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/feature/radiosonde/CMakeLists.txt b/plugins/feature/radiosonde/CMakeLists.txt
index c8315a826..c5e504fdd 100644
--- a/plugins/feature/radiosonde/CMakeLists.txt
+++ b/plugins/feature/radiosonde/CMakeLists.txt
@@ -33,12 +33,12 @@ if(NOT SERVER_MODE)
         radiosondefeedsettingsdialog.h
     )
 
-    set(TARGET_NAME featureradiosonde)
+    set(TARGET_NAME ${PLUGINS_PREFIX}featureradiosonde)
     set(TARGET_LIB Qt::Widgets Qt::Charts)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME featureradiosondesrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}featureradiosondesrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/feature/remotecontrol/CMakeLists.txt b/plugins/feature/remotecontrol/CMakeLists.txt
index 12f0fb2cf..457e445b2 100644
--- a/plugins/feature/remotecontrol/CMakeLists.txt
+++ b/plugins/feature/remotecontrol/CMakeLists.txt
@@ -41,12 +41,12 @@ if(NOT SERVER_MODE)
         remotecontrolvisacontroldialog.h
     )
 
-    set(TARGET_NAME featureremotecontrol)
+    set(TARGET_NAME ${PLUGINS_PREFIX}featureremotecontrol)
     set(TARGET_LIB Qt::Widgets Qt::Charts)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME featureremotecontrolsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}featureremotecontrolsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/feature/rigctlserver/CMakeLists.txt b/plugins/feature/rigctlserver/CMakeLists.txt
index 25737fa14..f22089101 100644
--- a/plugins/feature/rigctlserver/CMakeLists.txt
+++ b/plugins/feature/rigctlserver/CMakeLists.txt
@@ -31,12 +31,12 @@ if(NOT SERVER_MODE)
 	    rigctlservergui.h
     )
 
-    set(TARGET_NAME featurerigctlserver)
+    set(TARGET_NAME ${PLUGINS_PREFIX}featurerigctlserver)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME featurerigctlserversrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}featurerigctlserversrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/feature/satellitetracker/CMakeLists.txt b/plugins/feature/satellitetracker/CMakeLists.txt
index f6324c8e4..e7f01b973 100644
--- a/plugins/feature/satellitetracker/CMakeLists.txt
+++ b/plugins/feature/satellitetracker/CMakeLists.txt
@@ -47,12 +47,12 @@ if(NOT SERVER_MODE)
         satellitedevicesettingsgui.h
     )
 
-    set(TARGET_NAME featuresatellitetracker)
+    set(TARGET_NAME ${PLUGINS_PREFIX}featuresatellitetracker)
     set(TARGET_LIB Qt::Widgets Qt::Positioning Qt::Charts Qt::TextToSpeech)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME featuresatellitetrackersrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}featuresatellitetrackersrv)
     set(TARGET_LIB Qt::Positioning Qt::Charts)
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/feature/sid/CMakeLists.txt b/plugins/feature/sid/CMakeLists.txt
index 6e0d57f95..70397716c 100644
--- a/plugins/feature/sid/CMakeLists.txt
+++ b/plugins/feature/sid/CMakeLists.txt
@@ -38,12 +38,12 @@ if(NOT SERVER_MODE)
         sidaddchannelsdialog.h
     )
 
-    set(TARGET_NAME featuresid)
+    set(TARGET_NAME ${PLUGINS_PREFIX}featuresid)
     set(TARGET_LIB Qt::Widgets Qt::Charts Qt::Multimedia Qt::MultimediaWidgets)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME featuresidsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}featuresidsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/feature/simpleptt/CMakeLists.txt b/plugins/feature/simpleptt/CMakeLists.txt
index a4caa3c57..9d20185b0 100644
--- a/plugins/feature/simpleptt/CMakeLists.txt
+++ b/plugins/feature/simpleptt/CMakeLists.txt
@@ -40,12 +40,12 @@ if(NOT SERVER_MODE)
         simplepttcommandoutputdialog.h
         )
 
-    set(TARGET_NAME featuresimpleptt)
+    set(TARGET_NAME ${PLUGINS_PREFIX}featuresimpleptt)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME featuresimplepttsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}featuresimplepttsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/feature/skymap/CMakeLists.txt b/plugins/feature/skymap/CMakeLists.txt
index 2466ff69a..d8e93f5ba 100644
--- a/plugins/feature/skymap/CMakeLists.txt
+++ b/plugins/feature/skymap/CMakeLists.txt
@@ -49,7 +49,7 @@ if(NOT SERVER_MODE)
         webview.h
     )
 
-    set(TARGET_NAME featureskymap)
+    set(TARGET_NAME ${PLUGINS_PREFIX}featureskymap)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 
@@ -61,7 +61,7 @@ if(NOT SERVER_MODE)
         set(TARGET_LIB "Qt::Widgets" Qt::Positioning Qt::Location)
     endif()
 else()
-    set(TARGET_NAME featureskymapsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}featureskymapsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/feature/startracker/CMakeLists.txt b/plugins/feature/startracker/CMakeLists.txt
index 3d44af827..85daa89f9 100644
--- a/plugins/feature/startracker/CMakeLists.txt
+++ b/plugins/feature/startracker/CMakeLists.txt
@@ -43,12 +43,12 @@ if(NOT SERVER_MODE)
         startrackersettingsdialog.h
     )
 
-    set(TARGET_NAME featurestartracker)
+    set(TARGET_NAME ${PLUGINS_PREFIX}featurestartracker)
     set(TARGET_LIB Qt::Widgets Qt::Charts)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME featurestartrackersrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}featurestartrackersrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/feature/startracker/startracker.cpp b/plugins/feature/startracker/startracker.cpp
index d7a156a27..1f33d784a 100644
--- a/plugins/feature/startracker/startracker.cpp
+++ b/plugins/feature/startracker/startracker.cpp
@@ -695,7 +695,6 @@ double StarTracker::applyBeam(const FITS *fits, double beamwidth, double ra, dou
         numberOfCoeffsV++;
     }
     double *beam = new double[numberOfCoeffsH*numberOfCoeffsV];
-    double sum = 0.0;
     int y0 = numberOfCoeffsV/2;
     int x0 =  numberOfCoeffsH/2;
     int nonZeroCount = 0;
@@ -709,7 +708,6 @@ double StarTracker::applyBeam(const FITS *fits, double beamwidth, double ra, dou
             if (r < halfBeamwidth)
             {
                 beam[y*numberOfCoeffsH+x] = pow(cos(Units::degreesToRadians(r)), p);
-                sum += beam[y*numberOfCoeffsH+x];
                 nonZeroCount++;
             }
             else
diff --git a/plugins/feature/vorlocalizer/CMakeLists.txt b/plugins/feature/vorlocalizer/CMakeLists.txt
index 599c94481..894f5286c 100644
--- a/plugins/feature/vorlocalizer/CMakeLists.txt
+++ b/plugins/feature/vorlocalizer/CMakeLists.txt
@@ -36,12 +36,12 @@ if(NOT SERVER_MODE)
         vorlocalizergui.h
     )
 
-    set(TARGET_NAME vorlocalizer)
+    set(TARGET_NAME ${PLUGINS_PREFIX}vorlocalizer)
     set(TARGET_LIB "Qt::Widgets" Qt::Quick Qt::QuickWidgets Qt::Positioning)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME vorlocalizersrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}vorlocalizersrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplemimo/audiocatsiso/CMakeLists.txt b/plugins/samplemimo/audiocatsiso/CMakeLists.txt
index c777f93aa..806dabb2f 100644
--- a/plugins/samplemimo/audiocatsiso/CMakeLists.txt
+++ b/plugins/samplemimo/audiocatsiso/CMakeLists.txt
@@ -41,12 +41,12 @@ if (NOT SERVER_MODE)
         audiocatsisogui.h
         audiocatsisocatdialog.h
     )
-    set(TARGET_NAME mimoaudiocatsiso)
+    set(TARGET_NAME ${PLUGINS_PREFIX}mimoaudiocatsiso)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME mimoaudiocatsisosrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}mimoaudiocatsisosrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplemimo/audiocatsiso/audiocatsisosettings.h b/plugins/samplemimo/audiocatsiso/audiocatsisosettings.h
index 10e55689c..d93b6d368 100644
--- a/plugins/samplemimo/audiocatsiso/audiocatsisosettings.h
+++ b/plugins/samplemimo/audiocatsiso/audiocatsisosettings.h
@@ -25,7 +25,8 @@
 #include "audio/audiodeviceinfo.h"
 #include "util/message.h"
 
-struct AudioCATSISOSettings {
+class AudioCATSISOSettings{
+public:
 
     class MsgPTT : public Message {
         MESSAGE_CLASS_DECLARATION
diff --git a/plugins/samplemimo/bladerf2mimo/CMakeLists.txt b/plugins/samplemimo/bladerf2mimo/CMakeLists.txt
index 5e6a086b3..de7f1e109 100644
--- a/plugins/samplemimo/bladerf2mimo/CMakeLists.txt
+++ b/plugins/samplemimo/bladerf2mimo/CMakeLists.txt
@@ -34,12 +34,12 @@ if (NOT SERVER_MODE)
         ${bladerf2mimo_HEADERS}
         bladerf2mimogui.h
     )
-    set(TARGET_NAME mimobladerf2)
+    set(TARGET_NAME ${PLUGINS_PREFIX}mimobladerf2)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME mimobladerf2srv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}mimobladerf2srv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplemimo/limesdrmimo/CMakeLists.txt b/plugins/samplemimo/limesdrmimo/CMakeLists.txt
index 1d73578cc..0826996bc 100644
--- a/plugins/samplemimo/limesdrmimo/CMakeLists.txt
+++ b/plugins/samplemimo/limesdrmimo/CMakeLists.txt
@@ -34,12 +34,12 @@ if (NOT SERVER_MODE)
         ${limesdrmimo_HEADERS}
         limesdrmimogui.h
     )
-    set(TARGET_NAME mimolimesdr)
+    set(TARGET_NAME ${PLUGINS_PREFIX}mimolimesdr)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME mimolimesdrsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}mimolimesdrsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplemimo/metismiso/CMakeLists.txt b/plugins/samplemimo/metismiso/CMakeLists.txt
index b84fcc9c9..ceaac2d54 100644
--- a/plugins/samplemimo/metismiso/CMakeLists.txt
+++ b/plugins/samplemimo/metismiso/CMakeLists.txt
@@ -33,12 +33,12 @@ if (NOT SERVER_MODE)
         ${metismiso_HEADERS}
         metismisogui.h
     )
-    set(TARGET_NAME mimometismiso)
+    set(TARGET_NAME ${PLUGINS_PREFIX}mimometismiso)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME mimometismisosrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}mimometismisosrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplemimo/metismiso/metismisoudphandler.cpp b/plugins/samplemimo/metismiso/metismisoudphandler.cpp
index 3b8741207..0beb168fb 100644
--- a/plugins/samplemimo/metismiso/metismisoudphandler.cpp
+++ b/plugins/samplemimo/metismiso/metismisoudphandler.cpp
@@ -483,7 +483,7 @@ void MetisMISOUDPHandler::processIQBuffer(unsigned char* buffer)
 {
     int b = 0;
     unsigned int r;
-    int sampleI, sampleQ, sampleMic;
+    int sampleI, sampleQ;
 
 
     if (buffer[b++]==0x7F && buffer[b++]==0x7F && buffer[b++]==0x7F)
@@ -622,8 +622,9 @@ void MetisMISOUDPHandler::processIQBuffer(unsigned char* buffer)
                 }
             }
 
-            sampleMic  = (int)((signed char) buffer[b++]) << 8;
-            sampleMic += (int)((unsigned char)buffer[b++]);
+            // sampleMic
+            b+=2;
+
             m_sampleTxCount++;
 
             if (m_sampleTxCount >= 63) // 63 samples per 512 byte Tx block
diff --git a/plugins/samplemimo/plutosdrmimo/CMakeLists.txt b/plugins/samplemimo/plutosdrmimo/CMakeLists.txt
index 63e84b199..c8bdccd25 100644
--- a/plugins/samplemimo/plutosdrmimo/CMakeLists.txt
+++ b/plugins/samplemimo/plutosdrmimo/CMakeLists.txt
@@ -34,12 +34,12 @@ if (NOT SERVER_MODE)
         ${plutosdrmimo_HEADERS}
         plutosdrmimogui.h
     )
-    set(TARGET_NAME mimoplutosdr)
+    set(TARGET_NAME ${PLUGINS_PREFIX}mimoplutosdr)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME mimoplutosdrsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}mimoplutosdrsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplemimo/testmi/CMakeLists.txt b/plugins/samplemimo/testmi/CMakeLists.txt
index dddfe84b9..c3953b149 100644
--- a/plugins/samplemimo/testmi/CMakeLists.txt
+++ b/plugins/samplemimo/testmi/CMakeLists.txt
@@ -30,12 +30,12 @@ if (NOT SERVER_MODE)
         ${testmi_HEADERS}
         testsourcegui.h
     )
-    set(TARGET_NAME mimotestmi)
+    set(TARGET_NAME ${PLUGINS_PREFIX}mimotestmi)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME mimotestmisrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}mimotestmisrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplemimo/testmosync/CMakeLists.txt b/plugins/samplemimo/testmosync/CMakeLists.txt
index 45b9e16ab..1403098d2 100644
--- a/plugins/samplemimo/testmosync/CMakeLists.txt
+++ b/plugins/samplemimo/testmosync/CMakeLists.txt
@@ -29,12 +29,12 @@ if(NOT SERVER_MODE)
         testmosyncgui.h
     )
 
-    set(TARGET_NAME outputtestmosync)
+    set(TARGET_NAME ${PLUGINS_PREFIX}outputtestmosync)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME outputtestmosyncsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}outputtestmosyncsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplemimo/xtrxmimo/CMakeLists.txt b/plugins/samplemimo/xtrxmimo/CMakeLists.txt
index 05a849b14..63c3b23bc 100644
--- a/plugins/samplemimo/xtrxmimo/CMakeLists.txt
+++ b/plugins/samplemimo/xtrxmimo/CMakeLists.txt
@@ -34,12 +34,12 @@ if (NOT SERVER_MODE)
         ${xtrxmimo_HEADERS}
         xtrxmimogui.h
     )
-    set(TARGET_NAME mimoxtrx)
+    set(TARGET_NAME ${PLUGINS_PREFIX}mimoxtrx)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME mimoxtrxsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}mimoxtrxsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesink/aaroniartsaoutput/CMakeLists.txt b/plugins/samplesink/aaroniartsaoutput/CMakeLists.txt
index 23e2f3e66..05cee4b6f 100644
--- a/plugins/samplesink/aaroniartsaoutput/CMakeLists.txt
+++ b/plugins/samplesink/aaroniartsaoutput/CMakeLists.txt
@@ -31,12 +31,12 @@ if(NOT SERVER_MODE)
         aaroniartsaoutputgui.h
     )
 
-    set(TARGET_NAME outputaaroniartsa)
+    set(TARGET_NAME ${PLUGINS_PREFIX}outputaaroniartsa)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME outputaaroniartsasrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}outputaaroniartsasrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesink/audiooutput/CMakeLists.txt b/plugins/samplesink/audiooutput/CMakeLists.txt
index a11ca707d..b53bfe482 100644
--- a/plugins/samplesink/audiooutput/CMakeLists.txt
+++ b/plugins/samplesink/audiooutput/CMakeLists.txt
@@ -31,12 +31,12 @@ if(NOT SERVER_MODE)
         audiooutputgui.h
     )
 
-    set(TARGET_NAME outputaudio)
+    set(TARGET_NAME ${PLUGINS_PREFIX}outputaudio)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME outputaudiosrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}outputaudiosrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesink/bladerf1output/CMakeLists.txt b/plugins/samplesink/bladerf1output/CMakeLists.txt
index 22a71583a..e92f9934c 100644
--- a/plugins/samplesink/bladerf1output/CMakeLists.txt
+++ b/plugins/samplesink/bladerf1output/CMakeLists.txt
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
         bladerf1outputgui.h
     )
 
-    set(TARGET_NAME outputbladerf1)
+    set(TARGET_NAME ${PLUGINS_PREFIX}outputbladerf1)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME outputbladerf1srv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}outputbladerf1srv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesink/bladerf2output/CMakeLists.txt b/plugins/samplesink/bladerf2output/CMakeLists.txt
index 39fc937eb..5e5f2486f 100644
--- a/plugins/samplesink/bladerf2output/CMakeLists.txt
+++ b/plugins/samplesink/bladerf2output/CMakeLists.txt
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
         bladerf2outputgui.h
     )
 
-    set(TARGET_NAME outputbladerf2)
+    set(TARGET_NAME ${PLUGINS_PREFIX}outputbladerf2)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME outputbladerf2srv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}outputbladerf2srv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesink/fileoutput/CMakeLists.txt b/plugins/samplesink/fileoutput/CMakeLists.txt
index 030d2b2f0..2be28c545 100644
--- a/plugins/samplesink/fileoutput/CMakeLists.txt
+++ b/plugins/samplesink/fileoutput/CMakeLists.txt
@@ -31,12 +31,12 @@ if(NOT SERVER_MODE)
         fileoutputgui.h
     )
 
-    set(TARGET_NAME outputfileoutput)
+    set(TARGET_NAME ${PLUGINS_PREFIX}outputfileoutput)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME outputfileoutputsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}outputfileoutputsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesink/hackrfoutput/CMakeLists.txt b/plugins/samplesink/hackrfoutput/CMakeLists.txt
index 000be2a97..b01c49c3f 100644
--- a/plugins/samplesink/hackrfoutput/CMakeLists.txt
+++ b/plugins/samplesink/hackrfoutput/CMakeLists.txt
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
         hackrfoutputgui.h
     )
 
-    set(TARGET_NAME outputhackrf)
+    set(TARGET_NAME ${PLUGINS_PREFIX}outputhackrf)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME outputhackrfsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}outputhackrfsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesink/limesdroutput/CMakeLists.txt b/plugins/samplesink/limesdroutput/CMakeLists.txt
index 321b704ea..3370bcfd1 100644
--- a/plugins/samplesink/limesdroutput/CMakeLists.txt
+++ b/plugins/samplesink/limesdroutput/CMakeLists.txt
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
         limesdroutputgui.h
     )
 
-    set(TARGET_NAME outputlimesdr)
+    set(TARGET_NAME ${PLUGINS_PREFIX}outputlimesdr)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME outputlimesdrsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}outputlimesdrsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesink/localoutput/CMakeLists.txt b/plugins/samplesink/localoutput/CMakeLists.txt
index 3d16f2f3d..8199df95c 100644
--- a/plugins/samplesink/localoutput/CMakeLists.txt
+++ b/plugins/samplesink/localoutput/CMakeLists.txt
@@ -30,12 +30,12 @@ if(NOT SERVER_MODE)
         localoutputgui.h
     )
 
-    set(TARGET_NAME outputlocal)
+    set(TARGET_NAME ${PLUGINS_PREFIX}outputlocal)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME outputlocalsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}outputlocalsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesink/plutosdroutput/CMakeLists.txt b/plugins/samplesink/plutosdroutput/CMakeLists.txt
index 4e0e26389..35fc851ef 100644
--- a/plugins/samplesink/plutosdroutput/CMakeLists.txt
+++ b/plugins/samplesink/plutosdroutput/CMakeLists.txt
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
         plutosdroutputgui.h
     )
 
-    set(TARGET_NAME outputplutosdr)
+    set(TARGET_NAME ${PLUGINS_PREFIX}outputplutosdr)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME outputplutosdrsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}outputplutosdrsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesink/remoteoutput/CMakeLists.txt b/plugins/samplesink/remoteoutput/CMakeLists.txt
index 778a1b5f0..696288192 100644
--- a/plugins/samplesink/remoteoutput/CMakeLists.txt
+++ b/plugins/samplesink/remoteoutput/CMakeLists.txt
@@ -39,12 +39,12 @@ if(NOT SERVER_MODE)
         ${remoteoutput_HEADERS}
         remoteoutputgui.h
     )
-    set(TARGET_NAME outputremote)
+    set(TARGET_NAME ${PLUGINS_PREFIX}outputremote)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME outputremotesrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}outputremotesrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesink/remoteoutput/remoteoutputworker.cpp b/plugins/samplesink/remoteoutput/remoteoutputworker.cpp
index 5dab5876c..e2db10fbf 100644
--- a/plugins/samplesink/remoteoutput/remoteoutputworker.cpp
+++ b/plugins/samplesink/remoteoutput/remoteoutputworker.cpp
@@ -116,8 +116,6 @@ void RemoteOutputWorker::tick()
             m_throttleToggle = !m_throttleToggle;
         }
 
-        SampleVector::iterator readUntil;
-
         SampleVector& data = m_sampleFifo->getData();
         unsigned int iPart1Begin, iPart1End, iPart2Begin, iPart2End;
         m_sampleFifo->read(m_samplesChunkSize, iPart1Begin, iPart1End, iPart2Begin, iPart2End);
diff --git a/plugins/samplesink/soapysdroutput/CMakeLists.txt b/plugins/samplesink/soapysdroutput/CMakeLists.txt
index 030adfee4..2fee26494 100644
--- a/plugins/samplesink/soapysdroutput/CMakeLists.txt
+++ b/plugins/samplesink/soapysdroutput/CMakeLists.txt
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
         soapysdroutputgui.h
     )
 
-    set(TARGET_NAME outputsoapysdr)
+    set(TARGET_NAME ${PLUGINS_PREFIX}outputsoapysdr)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME outputsoapysdrsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}outputsoapysdrsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
@@ -56,9 +56,14 @@ target_link_libraries(${TARGET_NAME}
 	${TARGET_LIB_GUI}
         swagger
         ${SOAPYSDR_LINK_LIBRARIES}
+        ${SOAPYSDR_LIBRARIES}
         soapysdrdevice
 )
 
+target_link_directories(${TARGET_NAME} PRIVATE
+    ${SOAPYSDR_LIBRARY_DIRS}
+)
+
 install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})
 
 # Install debug symbols
diff --git a/plugins/samplesink/testsink/CMakeLists.txt b/plugins/samplesink/testsink/CMakeLists.txt
index d2637127c..c64683e81 100644
--- a/plugins/samplesink/testsink/CMakeLists.txt
+++ b/plugins/samplesink/testsink/CMakeLists.txt
@@ -29,12 +29,12 @@ if(NOT SERVER_MODE)
         testsinkgui.h
     )
 
-    set(TARGET_NAME outputtestsink)
+    set(TARGET_NAME ${PLUGINS_PREFIX}outputtestsink)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME outputtestsinksrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}outputtestsinksrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesink/usrpoutput/CMakeLists.txt b/plugins/samplesink/usrpoutput/CMakeLists.txt
index d679c5c06..330d676cd 100644
--- a/plugins/samplesink/usrpoutput/CMakeLists.txt
+++ b/plugins/samplesink/usrpoutput/CMakeLists.txt
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
         usrpoutputgui.h
     )
 
-    set(TARGET_NAME outputusrp)
+    set(TARGET_NAME ${PLUGINS_PREFIX}outputusrp)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME outputusrpsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}outputusrpsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesink/xtrxoutput/CMakeLists.txt b/plugins/samplesink/xtrxoutput/CMakeLists.txt
index f25f7bfb8..a9da2297d 100644
--- a/plugins/samplesink/xtrxoutput/CMakeLists.txt
+++ b/plugins/samplesink/xtrxoutput/CMakeLists.txt
@@ -33,12 +33,12 @@ if(NOT SERVER_MODE)
         xtrxoutputgui.h
     )
 
-    set(TARGET_NAME outputxtrx)
+    set(TARGET_NAME ${PLUGINS_PREFIX}outputxtrx)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME outputxtrxsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}outputxtrxsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesource/aaroniartsainput/CMakeLists.txt b/plugins/samplesource/aaroniartsainput/CMakeLists.txt
index 8336c83fa..b9f793c63 100644
--- a/plugins/samplesource/aaroniartsainput/CMakeLists.txt
+++ b/plugins/samplesource/aaroniartsainput/CMakeLists.txt
@@ -32,12 +32,12 @@ if(NOT SERVER_MODE)
         aaroniartsainputgui.h
     )
 
-	set(TARGET_NAME inputaaroniartsa)
+	set(TARGET_NAME ${PLUGINS_PREFIX}inputaaroniartsa)
 	set(TARGET_LIB "Qt::Widgets")
 	set(TARGET_LIB_GUI "sdrgui")
 	set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME inputaaroniartsasrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputaaroniartsasrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesource/airspy/CMakeLists.txt b/plugins/samplesource/airspy/CMakeLists.txt
index d72931690..5d134d3dc 100644
--- a/plugins/samplesource/airspy/CMakeLists.txt
+++ b/plugins/samplesource/airspy/CMakeLists.txt
@@ -32,12 +32,12 @@ if(NOT SERVER_MODE)
         airspygui.h
     )
 
-    set(TARGET_NAME inputairspy)
+    set(TARGET_NAME ${PLUGINS_PREFIX}inputairspy)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME inputairspysrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputairspysrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesource/airspyhf/CMakeLists.txt b/plugins/samplesource/airspyhf/CMakeLists.txt
index b90183c33..62872a759 100644
--- a/plugins/samplesource/airspyhf/CMakeLists.txt
+++ b/plugins/samplesource/airspyhf/CMakeLists.txt
@@ -33,12 +33,12 @@ if(NOT SERVER_MODE)
         airspyhfgui.h
     )
 
-    set(TARGET_NAME inputairspyhf)
+    set(TARGET_NAME ${PLUGINS_PREFIX}inputairspyhf)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME inputairspyhfsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputairspyhfsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesource/androidsdrdriverinput/CMakeLists.txt b/plugins/samplesource/androidsdrdriverinput/CMakeLists.txt
index 9fa4683d1..60bbb464d 100644
--- a/plugins/samplesource/androidsdrdriverinput/CMakeLists.txt
+++ b/plugins/samplesource/androidsdrdriverinput/CMakeLists.txt
@@ -31,12 +31,12 @@ if(NOT SERVER_MODE)
         androidsdrdriverinputgui.h
     )
 
-    set(TARGET_NAME inputandroidsdrdriverinput)
+    set(TARGET_NAME ${PLUGINS_PREFIX}inputandroidsdrdriverinput)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME inputandroidsdrdriverinputsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputandroidsdrdriverinputsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesource/androidsdrdriverinput/androidsdrdriverinput.cpp b/plugins/samplesource/androidsdrdriverinput/androidsdrdriverinput.cpp
index 350e4ac54..f14b5b882 100644
--- a/plugins/samplesource/androidsdrdriverinput/androidsdrdriverinput.cpp
+++ b/plugins/samplesource/androidsdrdriverinput/androidsdrdriverinput.cpp
@@ -35,6 +35,9 @@
 
 #include "androidsdrdriverinput.h"
 #include "androidsdrdriverinputtcphandler.h"
+#ifdef ANDROID
+#include "util/android.h"
+#endif
 
 MESSAGE_CLASS_DEFINITION(AndroidSDRDriverInput::MsgConfigureAndroidSDRDriverInput, Message)
 MESSAGE_CLASS_DEFINITION(AndroidSDRDriverInput::MsgStartStop, Message)
diff --git a/plugins/samplesource/androidsdrdriverinput/androidsdrdriverinputtcphandler.h b/plugins/samplesource/androidsdrdriverinput/androidsdrdriverinputtcphandler.h
index 4a65fc9eb..b856f2d28 100644
--- a/plugins/samplesource/androidsdrdriverinput/androidsdrdriverinputtcphandler.h
+++ b/plugins/samplesource/androidsdrdriverinput/androidsdrdriverinputtcphandler.h
@@ -27,6 +27,7 @@
 #include <QDateTime>
 
 #include "util/messagequeue.h"
+#include "util/message.h"
 #include "androidsdrdriverinputsettings.h"
 #include "../../channelrx/remotetcpsink/remotetcpprotocol.h"
 
diff --git a/plugins/samplesource/audioinput/CMakeLists.txt b/plugins/samplesource/audioinput/CMakeLists.txt
index d1c754f1b..d25a492a5 100644
--- a/plugins/samplesource/audioinput/CMakeLists.txt
+++ b/plugins/samplesource/audioinput/CMakeLists.txt
@@ -31,12 +31,12 @@ if(NOT SERVER_MODE)
         audioinputgui.h
     )
 
-    set(TARGET_NAME inputaudio)
+    set(TARGET_NAME ${PLUGINS_PREFIX}inputaudio)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME inputaudiosrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputaudiosrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesource/bladerf1input/CMakeLists.txt b/plugins/samplesource/bladerf1input/CMakeLists.txt
index 0c41e1944..8869c8dec 100644
--- a/plugins/samplesource/bladerf1input/CMakeLists.txt
+++ b/plugins/samplesource/bladerf1input/CMakeLists.txt
@@ -33,12 +33,12 @@ if(NOT SERVER_MODE)
         bladerf1inputgui.h
     )
 
-    set(TARGET_NAME inputbladerf1)
+    set(TARGET_NAME ${PLUGINS_PREFIX}inputbladerf1)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME inputbladerf1srv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputbladerf1srv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesource/bladerf2input/CMakeLists.txt b/plugins/samplesource/bladerf2input/CMakeLists.txt
index 4827ac76b..74194d64f 100644
--- a/plugins/samplesource/bladerf2input/CMakeLists.txt
+++ b/plugins/samplesource/bladerf2input/CMakeLists.txt
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
         bladerf2inputgui.h
     )
 
-    set(TARGET_NAME inputbladerf2)
+    set(TARGET_NAME ${PLUGINS_PREFIX}inputbladerf2)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME inputbladerf2srv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputbladerf2srv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesource/fcdpro/CMakeLists.txt b/plugins/samplesource/fcdpro/CMakeLists.txt
index 4b65abe0d..4fc932d61 100644
--- a/plugins/samplesource/fcdpro/CMakeLists.txt
+++ b/plugins/samplesource/fcdpro/CMakeLists.txt
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
         fcdprogui.h
     )
 
-    set(TARGET_NAME inputfcdpro)
+    set(TARGET_NAME ${PLUGINS_PREFIX}inputfcdpro)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME inputfcdprosrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputfcdprosrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesource/fcdproplus/CMakeLists.txt b/plugins/samplesource/fcdproplus/CMakeLists.txt
index 83bd24f8a..c2cb4daa1 100644
--- a/plugins/samplesource/fcdproplus/CMakeLists.txt
+++ b/plugins/samplesource/fcdproplus/CMakeLists.txt
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
         fcdproplusgui.h
     )
 
-    set(TARGET_NAME inputfcdproplus)
+    set(TARGET_NAME ${PLUGINS_PREFIX}inputfcdproplus)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME inputfcdproplussrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputfcdproplussrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp b/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp
index 37c71cc12..77381bf1d 100644
--- a/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp
+++ b/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp
@@ -40,8 +40,6 @@ const PluginDescriptor FCDProPlusPlugin::m_pluginDescriptor = {
 	QStringLiteral("https://github.com/f4exb/sdrangel")
 };
 
-static constexpr const char* const m_deviceTypeID = FCDPROPLUS_DEVICE_TYPE_ID;
-
 FCDProPlusPlugin::FCDProPlusPlugin(QObject* parent) :
 	QObject(parent)
 {
diff --git a/plugins/samplesource/fileinput/CMakeLists.txt b/plugins/samplesource/fileinput/CMakeLists.txt
index 5042b499a..61ff4a11e 100644
--- a/plugins/samplesource/fileinput/CMakeLists.txt
+++ b/plugins/samplesource/fileinput/CMakeLists.txt
@@ -30,12 +30,12 @@ if(NOT SERVER_MODE)
         ${fileinput_HEADERS}
         fileinputgui.h
     )
-    set(TARGET_NAME inputfileinput)
+    set(TARGET_NAME ${PLUGINS_PREFIX}inputfileinput)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME inputfileinputsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputfileinputsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesource/fileinput/fileinputworker.h b/plugins/samplesource/fileinput/fileinputworker.h
index 6e9cb4a33..985f1803c 100644
--- a/plugins/samplesource/fileinput/fileinputworker.h
+++ b/plugins/samplesource/fileinput/fileinputworker.h
@@ -27,6 +27,9 @@
 #include <iostream>
 #include <fstream>
 #include <cstdlib>
+#ifdef ANDROID
+#include <QFile>
+#endif
 
 #include "util/message.h"
 
diff --git a/plugins/samplesource/hackrfinput/CMakeLists.txt b/plugins/samplesource/hackrfinput/CMakeLists.txt
index e17a3710d..cd5b3adc2 100644
--- a/plugins/samplesource/hackrfinput/CMakeLists.txt
+++ b/plugins/samplesource/hackrfinput/CMakeLists.txt
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
         hackrfinputgui.h
     )
 
-    set(TARGET_NAME inputhackrf)
+    set(TARGET_NAME ${PLUGINS_PREFIX}inputhackrf)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME inputhackrfsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputhackrfsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesource/kiwisdr/CMakeLists.txt b/plugins/samplesource/kiwisdr/CMakeLists.txt
index f6714b79e..351f335e5 100644
--- a/plugins/samplesource/kiwisdr/CMakeLists.txt
+++ b/plugins/samplesource/kiwisdr/CMakeLists.txt
@@ -32,12 +32,12 @@ if(NOT SERVER_MODE)
         kiwisdrgui.h
     )
 
-	set(TARGET_NAME inputkiwisdr)
+	set(TARGET_NAME ${PLUGINS_PREFIX}inputkiwisdr)
 	set(TARGET_LIB "Qt::Widgets")
 	set(TARGET_LIB_GUI "sdrgui")
 	set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME inputkiwisdrsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputkiwisdrsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesource/limesdrinput/CMakeLists.txt b/plugins/samplesource/limesdrinput/CMakeLists.txt
index fcc50b4af..89a75a067 100644
--- a/plugins/samplesource/limesdrinput/CMakeLists.txt
+++ b/plugins/samplesource/limesdrinput/CMakeLists.txt
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
         limesdrinputgui.h
     )
 
-    set(TARGET_NAME inputlimesdr)
+    set(TARGET_NAME ${PLUGINS_PREFIX}inputlimesdr)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME inputlimesdrsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputlimesdrsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesource/localinput/CMakeLists.txt b/plugins/samplesource/localinput/CMakeLists.txt
index a7bd05457..48a511cdc 100644
--- a/plugins/samplesource/localinput/CMakeLists.txt
+++ b/plugins/samplesource/localinput/CMakeLists.txt
@@ -31,12 +31,12 @@ if(NOT SERVER_MODE)
     localinputgui.h
     )
 
-  set(TARGET_NAME inputlocal)
+  set(TARGET_NAME ${PLUGINS_PREFIX}inputlocal)
   set(TARGET_LIB "Qt::Widgets")
   set(TARGET_LIB_GUI "sdrgui")
   set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-  set(TARGET_NAME inputlocalsrv)
+  set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputlocalsrv)
   set(TARGET_LIB "")
   set(TARGET_LIB_GUI "")
   set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesource/perseus/CMakeLists.txt b/plugins/samplesource/perseus/CMakeLists.txt
index d20662f0a..e3e1e0993 100644
--- a/plugins/samplesource/perseus/CMakeLists.txt
+++ b/plugins/samplesource/perseus/CMakeLists.txt
@@ -35,12 +35,12 @@ if(NOT SERVER_MODE)
         perseusgui.h
     )
 
-    set(TARGET_NAME inputperseus)
+    set(TARGET_NAME ${PLUGINS_PREFIX}inputperseus)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME inputperseussrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputperseussrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesource/plutosdrinput/CMakeLists.txt b/plugins/samplesource/plutosdrinput/CMakeLists.txt
index 98ed3045b..65e5080cb 100644
--- a/plugins/samplesource/plutosdrinput/CMakeLists.txt
+++ b/plugins/samplesource/plutosdrinput/CMakeLists.txt
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
         plutosdrinputgui.h
     )
 
-    set(TARGET_NAME inputplutosdr)
+    set(TARGET_NAME ${PLUGINS_PREFIX}inputplutosdr)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME inputplutosdrsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputplutosdrsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesource/remoteinput/CMakeLists.txt b/plugins/samplesource/remoteinput/CMakeLists.txt
index b6f50261c..21b8918f4 100644
--- a/plugins/samplesource/remoteinput/CMakeLists.txt
+++ b/plugins/samplesource/remoteinput/CMakeLists.txt
@@ -35,12 +35,12 @@ if(NOT SERVER_MODE)
         remoteinputgui.h
     )
 
-    set(TARGET_NAME inputremote)
+    set(TARGET_NAME ${PLUGINS_PREFIX}inputremote)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME inputremotesrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputremotesrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesource/remotetcpinput/CMakeLists.txt b/plugins/samplesource/remotetcpinput/CMakeLists.txt
index 9603cb95a..bdcdd640b 100644
--- a/plugins/samplesource/remotetcpinput/CMakeLists.txt
+++ b/plugins/samplesource/remotetcpinput/CMakeLists.txt
@@ -32,12 +32,12 @@ if(NOT SERVER_MODE)
         remotetcpinputgui.h
     )
 
-    set(TARGET_NAME inputtcpremote)
+    set(TARGET_NAME ${PLUGINS_PREFIX}inputtcpremote)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME inputtcpremotesrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputtcpremotesrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesource/rtlsdr/CMakeLists.txt b/plugins/samplesource/rtlsdr/CMakeLists.txt
index b2949ffb1..0f74b3314 100644
--- a/plugins/samplesource/rtlsdr/CMakeLists.txt
+++ b/plugins/samplesource/rtlsdr/CMakeLists.txt
@@ -32,12 +32,12 @@ if(NOT SERVER_MODE)
         rtlsdrgui.h
     )
 
-    set(TARGET_NAME inputrtlsdr)
+    set(TARGET_NAME ${PLUGINS_PREFIX}inputrtlsdr)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME inputrtlsdrsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputrtlsdrsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesource/sdrplay/CMakeLists.txt b/plugins/samplesource/sdrplay/CMakeLists.txt
index 203d42d71..23f0e1d74 100644
--- a/plugins/samplesource/sdrplay/CMakeLists.txt
+++ b/plugins/samplesource/sdrplay/CMakeLists.txt
@@ -33,12 +33,12 @@ if(NOT SERVER_MODE)
         sdrplaygui.h
     )
 
-    set(TARGET_NAME inputsdrplay)
+    set(TARGET_NAME ${PLUGINS_PREFIX}inputsdrplay)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME inputsdrplaysrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputsdrplaysrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesource/sdrplayv3/CMakeLists.txt b/plugins/samplesource/sdrplayv3/CMakeLists.txt
index 420f368a3..54a14bea6 100644
--- a/plugins/samplesource/sdrplayv3/CMakeLists.txt
+++ b/plugins/samplesource/sdrplayv3/CMakeLists.txt
@@ -32,12 +32,12 @@ if(NOT SERVER_MODE)
         sdrplayv3gui.h
     )
 
-    set(TARGET_NAME inputsdrplayv3)
+    set(TARGET_NAME ${PLUGINS_PREFIX}inputsdrplayv3)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME inputsdrplayv3srv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputsdrplayv3srv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesource/sigmffileinput/CMakeLists.txt b/plugins/samplesource/sigmffileinput/CMakeLists.txt
index 737bd858d..6d59659c6 100644
--- a/plugins/samplesource/sigmffileinput/CMakeLists.txt
+++ b/plugins/samplesource/sigmffileinput/CMakeLists.txt
@@ -35,12 +35,12 @@ if(NOT SERVER_MODE)
         sigmffileinputgui.h
         recordinfodialog.h
     )
-    set(TARGET_NAME inputsigmffileinput)
+    set(TARGET_NAME ${PLUGINS_PREFIX}inputsigmffileinput)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME inputsigmffileinputsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputsigmffileinputsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesource/sigmffileinput/sigmffiledata.h b/plugins/samplesource/sigmffileinput/sigmffiledata.h
index 5d0c2495d..bc4fccd6b 100644
--- a/plugins/samplesource/sigmffileinput/sigmffiledata.h
+++ b/plugins/samplesource/sigmffileinput/sigmffiledata.h
@@ -64,8 +64,9 @@ struct SigMFFileDataType
     }
 };
 
-struct SigMFFileMetaInfo
+class SigMFFileMetaInfo
 {
+public:
     // core
     QString m_dataTypeStr;
     SigMFFileDataType m_dataType;
@@ -153,8 +154,9 @@ struct SigMFFileMetaInfo
     }
 };
 
-struct SigMFFileCapture
+class SigMFFileCapture
 {
+public:
     uint64_t m_tsms;            //!< Unix timestamp in milliseconds
     uint64_t m_centerFrequency; //!< Center frequency in Hz
     uint64_t m_sampleStart;     //!< Sample index at which capture start
diff --git a/plugins/samplesource/sigmffileinput/sigmffileinputworker.cpp b/plugins/samplesource/sigmffileinput/sigmffileinputworker.cpp
index e04a708ea..ae8225c12 100644
--- a/plugins/samplesource/sigmffileinput/sigmffileinputworker.cpp
+++ b/plugins/samplesource/sigmffileinput/sigmffileinputworker.cpp
@@ -625,8 +625,8 @@ void SigMFFileInputWorker::writeToSampleFifoBAK(const quint8* buf, qint32 nbByte
                 nbSamples = nbBytes / (2 * m_samplebytes);
                 for (int is = 0; is < nbSamples; is++)
                 {
-                    convertBuf[2*is]   = fileBuf[2*is] >> (SDR_RX_SAMP_SZ == 24) ? 8 : 16;
-                    convertBuf[2*is+1] = fileBuf[2*is+1] >> (SDR_RX_SAMP_SZ == 24) ? 8 : 16;
+                    convertBuf[2*is]   = fileBuf[2*is] >> ((SDR_RX_SAMP_SZ == 24) ? 8 : 16);
+                    convertBuf[2*is+1] = fileBuf[2*is+1] >> ((SDR_RX_SAMP_SZ == 24) ? 8 : 16);
                 }
             }
             else
@@ -634,7 +634,7 @@ void SigMFFileInputWorker::writeToSampleFifoBAK(const quint8* buf, qint32 nbByte
                 nbSamples = nbBytes / m_samplebytes;
                 for (int is = 0; is < nbSamples; is++)
                 {
-                    convertBuf[2*is]   = fileBuf[is] >> (SDR_RX_SAMP_SZ == 24) ? 8 : 16;
+                    convertBuf[2*is]   = fileBuf[is] >> ((SDR_RX_SAMP_SZ == 24) ? 8 : 16);
                     convertBuf[2*is+1] = 0;
                 }
             }
@@ -715,9 +715,9 @@ void SigMFFileInputWorker::writeToSampleFifoBAK(const quint8* buf, qint32 nbByte
                 nbSamples = nbBytes / (2 * m_samplebytes);
                 for (int is = 0; is < nbSamples; is++)
                 {
-                    convertBuf[2*is] = (fileBuf[2*is] >> (SDR_RX_SAMP_SZ == 24) ? 8 : 16)
+                    convertBuf[2*is] = (fileBuf[2*is] >> ((SDR_RX_SAMP_SZ == 24) ? 8 : 16))
                         - ((SDR_RX_SAMP_SZ == 24) ? (1<<23) : (1<<15));
-                    convertBuf[2*is+1] = (fileBuf[2*is+1] >> (SDR_RX_SAMP_SZ == 24) ? 8 : 16)
+                    convertBuf[2*is+1] = (fileBuf[2*is+1] >> ((SDR_RX_SAMP_SZ == 24) ? 8 : 16))
                         - ((SDR_RX_SAMP_SZ == 24) ? (1<<23) : (1<<15));;
                 }
             }
@@ -726,7 +726,7 @@ void SigMFFileInputWorker::writeToSampleFifoBAK(const quint8* buf, qint32 nbByte
                 nbSamples = nbBytes / m_samplebytes;
                 for (int is = 0; is < nbSamples; is++)
                 {
-                    convertBuf[2*is] = (fileBuf[is] >> (SDR_RX_SAMP_SZ == 24) ? 8 : 16)
+                    convertBuf[2*is] = (fileBuf[is] >> ((SDR_RX_SAMP_SZ == 24) ? 8 : 16))
                         - ((SDR_RX_SAMP_SZ == 24) ? (1<<23) : (1<<15));
                     convertBuf[2*is+1] = 0;
                 }
diff --git a/plugins/samplesource/soapysdrinput/CMakeLists.txt b/plugins/samplesource/soapysdrinput/CMakeLists.txt
index adbe5262d..3d019f4aa 100644
--- a/plugins/samplesource/soapysdrinput/CMakeLists.txt
+++ b/plugins/samplesource/soapysdrinput/CMakeLists.txt
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
         soapysdrinputgui.h
     )
 
-    set(TARGET_NAME inputsoapysdr)
+    set(TARGET_NAME ${PLUGINS_PREFIX}inputsoapysdr)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME inputsoapysdrsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputsoapysdrsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
@@ -56,9 +56,14 @@ target_link_libraries(${TARGET_NAME}
 	${TARGET_LIB_GUI}
         swagger
         ${SOAPYSDR_LINK_LIBRARIES}
+        ${SOAPYSDR_LIBRARIES}
         soapysdrdevice
 )
 
+target_link_directories(${TARGET_NAME} PRIVATE
+    ${SOAPYSDR_LIBRARY_DIRS}
+)
+
 install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})
 
 # Install debug symbols
diff --git a/plugins/samplesource/testsource/CMakeLists.txt b/plugins/samplesource/testsource/CMakeLists.txt
index a82fb4562..0e0c16ba8 100644
--- a/plugins/samplesource/testsource/CMakeLists.txt
+++ b/plugins/samplesource/testsource/CMakeLists.txt
@@ -32,12 +32,12 @@ if(NOT SERVER_MODE)
         testsourcegui.h
     )
 
-    set(TARGET_NAME inputtestsource)
+    set(TARGET_NAME ${PLUGINS_PREFIX}inputtestsource)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME inputtestsourcesrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputtestsourcesrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesource/usrpinput/CMakeLists.txt b/plugins/samplesource/usrpinput/CMakeLists.txt
index 4a5868b41..0ad544eac 100644
--- a/plugins/samplesource/usrpinput/CMakeLists.txt
+++ b/plugins/samplesource/usrpinput/CMakeLists.txt
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
         usrpinputgui.h
     )
 
-    set(TARGET_NAME inputusrp)
+    set(TARGET_NAME ${PLUGINS_PREFIX}inputusrp)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME inputusrpsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputusrpsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/plugins/samplesource/xtrxinput/CMakeLists.txt b/plugins/samplesource/xtrxinput/CMakeLists.txt
index 93019d83b..10c7049db 100644
--- a/plugins/samplesource/xtrxinput/CMakeLists.txt
+++ b/plugins/samplesource/xtrxinput/CMakeLists.txt
@@ -34,12 +34,12 @@ if(NOT SERVER_MODE)
         xtrxinputgui.h
     )
 
-    set(TARGET_NAME inputxtrx)
+    set(TARGET_NAME ${PLUGINS_PREFIX}inputxtrx)
     set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
-    set(TARGET_NAME inputxtrxsrv)
+    set(TARGET_NAME ${PLUGINSSRV_PREFIX}inputxtrxsrv)
     set(TARGET_LIB "")
     set(TARGET_LIB_GUI "")
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
diff --git a/qrtplib/rtprandom.cpp b/qrtplib/rtprandom.cpp
index 9362649f5..c354e6aa7 100644
--- a/qrtplib/rtprandom.cpp
+++ b/qrtplib/rtprandom.cpp
@@ -66,7 +66,7 @@ uint32_t RTPRandom::PickSeed()
 #else
     x += (uint32_t)clock();
 #endif
-    x ^= (uint32_t)((uint8_t *)this - (uint8_t *)0);
+    x ^= (uint32_t)(size_t)this;
     return x;
 }
 
diff --git a/sdrbase/CMakeLists.txt b/sdrbase/CMakeLists.txt
index 049b827be..d6f351287 100644
--- a/sdrbase/CMakeLists.txt
+++ b/sdrbase/CMakeLists.txt
@@ -709,6 +709,10 @@ if(ANDROID)
     target_link_libraries(sdrbase log)
 endif()
 
+target_compile_definitions(sdrbase PRIVATE
+	-DPLUGIN_PREFIX=\"${PLUGIN_PREFIX}\"
+)
+
 install(TARGETS sdrbase DESTINATION ${INSTALL_LIB_DIR})
 
 if(WIN32 AND Qt6_FOUND)
diff --git a/sdrbase/audio/audioinputdevice.cpp b/sdrbase/audio/audioinputdevice.cpp
index 5ac907a90..955c644c0 100644
--- a/sdrbase/audio/audioinputdevice.cpp
+++ b/sdrbase/audio/audioinputdevice.cpp
@@ -143,7 +143,7 @@ bool AudioInputDevice::start(int device, int rate)
         if (m_audioInput->state() != QAudio::ActiveState) {
             qWarning("AudioInputDevice::start: cannot start");
         } else {
-            qDebug("AudioInputDevice::start: started buffer: %d bytes", m_audioInput->bufferSize());
+            qDebug("AudioInputDevice::start: started buffer: %d bytes", (int)m_audioInput->bufferSize());
         }
 	// }
 
diff --git a/sdrbase/audio/audiooutputdevice.cpp b/sdrbase/audio/audiooutputdevice.cpp
index c168b1f3c..cee5ad1d6 100644
--- a/sdrbase/audio/audiooutputdevice.cpp
+++ b/sdrbase/audio/audiooutputdevice.cpp
@@ -176,7 +176,7 @@ bool AudioOutputDevice::start(int deviceIndex, int sampleRate)
         if (m_audioOutput->state() != QAudio::ActiveState) {
             qWarning() << "AudioOutputDevice::start: cannot start - " << m_audioOutput->error();
         } else {
-            qDebug("AudioOutputDevice::start: started buffer: %d bytes", m_audioOutput->bufferSize());
+            qDebug("AudioOutputDevice::start: started buffer: %d bytes", (int)m_audioOutput->bufferSize());
         }
 
         if (m_managerMessageQueue) {
diff --git a/sdrbase/channel/channelapi.cpp b/sdrbase/channel/channelapi.cpp
index 49eda04d0..17fda8f42 100644
--- a/sdrbase/channel/channelapi.cpp
+++ b/sdrbase/channel/channelapi.cpp
@@ -23,6 +23,7 @@
 #include "util/uid.h"
 #include "util/message.h"
 #include "channelapi.h"
+#include "util/message.h"
 
 ChannelAPI::ChannelAPI(const QString& uri, StreamType streamType) :
     m_guiMessageQueue(nullptr),
diff --git a/sdrbase/maincore.cpp b/sdrbase/maincore.cpp
index 742d2266c..b80407deb 100644
--- a/sdrbase/maincore.cpp
+++ b/sdrbase/maincore.cpp
@@ -423,7 +423,7 @@ void MainCore::positionError(QGeoPositionInfoSource::Error positioningError)
 void MainCore::updateWakeLock()
 {
     bool running = false;
-    for (int i = 0; i < m_deviceSets.size(); i++)
+    for (size_t i = 0; i < m_deviceSets.size(); i++)
     {
         if (m_deviceSets[i]->m_deviceAPI->state() == DeviceAPI::StRunning)
         {
diff --git a/sdrbase/pipes/datafifostore.cpp b/sdrbase/pipes/datafifostore.cpp
index d9248eca0..6a81e40b8 100644
--- a/sdrbase/pipes/datafifostore.cpp
+++ b/sdrbase/pipes/datafifostore.cpp
@@ -34,7 +34,7 @@ QObject *DataFifoStore::createElement()
 {
     DataFifo *fifo = new DataFifo();
     m_dataFifos.push_back(fifo);
-    qDebug("DataFifoStore::createElement: %d added", m_dataFifos.size() - 1);
+    qDebug("DataFifoStore::createElement: %d added", (int)m_dataFifos.size() - 1);
     return fifo;
 }
 
diff --git a/sdrbase/pipes/messagequeuestore.cpp b/sdrbase/pipes/messagequeuestore.cpp
index f93e1283c..8e7c53d27 100644
--- a/sdrbase/pipes/messagequeuestore.cpp
+++ b/sdrbase/pipes/messagequeuestore.cpp
@@ -34,7 +34,7 @@ QObject *MessageQueueStore::createElement()
 {
     MessageQueue *messageQueue = new MessageQueue();
     m_messageQueues.push_back(messageQueue);
-    qDebug("MessageQueueStore::createElement: %d added", m_messageQueues.size() - 1);
+    qDebug("MessageQueueStore::createElement: %d added", (int)m_messageQueues.size() - 1);
     return messageQueue;
 }
 
diff --git a/sdrbase/plugin/pluginmanager.cpp b/sdrbase/plugin/pluginmanager.cpp
index 2bf2b3afd..4f59fa07c 100644
--- a/sdrbase/plugin/pluginmanager.cpp
+++ b/sdrbase/plugin/pluginmanager.cpp
@@ -75,9 +75,15 @@ void PluginManager::loadPluginsPart(const QString& pluginsSubDir)
 {
     QString applicationDirPath = QCoreApplication::instance()->applicationDirPath();
     QStringList PluginsPath;
+    QStringList filter;
 
     // NOTE: not the best solution but for now this is
     // on make install [PREFIX]/bin and [PREFIX]/lib/sdrangel
+#if defined(ANDROID)
+    PluginsPath = QStringList({applicationDirPath});
+    filter = QStringList({"libsdrangel_" + pluginsSubDir + "_*.so"});
+#else
+    filter = QStringList({"*"});
     PluginsPath << applicationDirPath + "/../" + LIB + "/sdrangel/" + pluginsSubDir;
     // on build
     PluginsPath << applicationDirPath + "/" + LIB + "/" + pluginsSubDir;
@@ -90,8 +96,7 @@ void PluginManager::loadPluginsPart(const QString& pluginsSubDir)
     // By default it searches in `$applicationDir/../lib/SoapySDR/`, which on Windows
     // is incorrect as both `bin` and `lib` dir are set to root application dir.
     qputenv("SOAPY_SDR_ROOT", applicationDirPath.toLocal8Bit());
-#elif defined(ANDROID)
-    PluginsPath = QStringList({applicationDirPath});
+#endif
 #endif
 
     // NOTE: exit on the first folder found
@@ -105,7 +110,7 @@ void PluginManager::loadPluginsPart(const QString& pluginsSubDir)
         }
 
         found = true;
-        loadPluginsDir(d);
+        loadPluginsDir(d, filter);
         break;
     }
 
@@ -211,11 +216,11 @@ void PluginManager::registerFeature(const QString& featureIdURI, const QString&
 	m_featureRegistrations.append(PluginAPI::FeatureRegistration(featureIdURI, featureId, plugin));
 }
 
-void PluginManager::loadPluginsDir(const QDir& dir)
+void PluginManager::loadPluginsDir(const QDir& dir, const QStringList& filter)
 {
     QDir pluginsDir(dir);
 
-    foreach (QString fileName, pluginsDir.entryList(QDir::Files))
+    foreach (QString fileName, pluginsDir.entryList(filter, QDir::Files))
     {
         if (QLibrary::isLibrary(fileName))
         {
diff --git a/sdrbase/plugin/pluginmanager.h b/sdrbase/plugin/pluginmanager.h
index 96a9f79a8..e7506d35f 100644
--- a/sdrbase/plugin/pluginmanager.h
+++ b/sdrbase/plugin/pluginmanager.h
@@ -162,7 +162,7 @@ private:
     static const QString m_testMIMOHardwareID;       //!< Test MIMO hardware ID
     static const QString m_testMIMODeviceTypeID;     //!< Test MIMO plugin ID
 
-	void loadPluginsDir(const QDir& dir);
+	void loadPluginsDir(const QDir& dir, const QStringList& filter);
 };
 
 static inline bool operator<(const PluginManager::Plugin& a, const PluginManager::Plugin& b)
diff --git a/sdrbase/util/iot/tplink.cpp b/sdrbase/util/iot/tplink.cpp
index 453e1cdc4..31ce4a32c 100644
--- a/sdrbase/util/iot/tplink.cpp
+++ b/sdrbase/util/iot/tplink.cpp
@@ -519,7 +519,6 @@ void TPLinkDeviceDiscoverer::handleReply(QNetworkReply* reply)
                                     if (sysInfoObj.contains(QStringLiteral("child_num")))
                                     {
                                         QJsonArray children = sysInfoObj.value(QStringLiteral("children")).toArray();
-                                        int child = 1;
                                         for (auto childRef : children)
                                         {
                                             QJsonObject childObj = childRef.toObject();
@@ -530,7 +529,6 @@ void TPLinkDeviceDiscoverer::handleReply(QNetworkReply* reply)
                                             }
                                             controlInfo->m_type = DeviceDiscoverer::BOOL;
                                             info.m_controls.append(controlInfo);
-                                            child++;
                                         }
                                     }
                                     else if (sysInfoObj.contains(QStringLiteral("relay_state")))
diff --git a/sdrgui/gui/featurelayout.cpp b/sdrgui/gui/featurelayout.cpp
index 98b9612ee..9b116fc3a 100644
--- a/sdrgui/gui/featurelayout.cpp
+++ b/sdrgui/gui/featurelayout.cpp
@@ -233,12 +233,6 @@ QSize FeatureLayout::doLayoutVertically(const QRect &rect, bool testOnly) const
     int lineHeight = 0;
     int spaceX = 0;
     int spaceY = 0;
-
-    // Calculate space available for rows of widgets
-    int maxHeightForRows = effectiveRect.height();
-    if (itemList.size() > 0) {
-        maxHeightForRows -= itemList[0]->minimumSize().height();
-    }
     int minWidth = 0;
 
     int i = 0;
diff --git a/sdrgui/gui/glscope.cpp b/sdrgui/gui/glscope.cpp
index 47ba26f26..c2a1c0c9e 100644
--- a/sdrgui/gui/glscope.cpp
+++ b/sdrgui/gui/glscope.cpp
@@ -858,7 +858,6 @@ void GLScope::paintGL()
 void GLScope::drawMarkers()
 {
     QVector4D markerColor(1.0f, 1.0f, 1.0f, 0.3f);
-    QVector4D markerTextColor(1.0f, 1.0f, 1.0f, 0.8f);
 
     if ((m_markers1.size() > 0) && ((m_displayMode == DisplayX) || (m_displayMode == DisplayXYH) || (m_displayMode == DisplayXYV))) // Draw markers1
     {
@@ -2397,13 +2396,13 @@ QString GLScope::displayScaled(float value, char type, int precision)
     }
     else
     {
-        if (posValue < 1000) {
+        if (posValue < 1000.0f) {
             return tr("%1").arg(QString::number(value, type, precision));
-        } else if (posValue < 1000000) {
+        } else if (posValue < 1000000.0f) {
             return tr("%1k").arg(QString::number(value / 1000.0, type, precision));
-        } else if (posValue < 1000000000) {
+        } else if (posValue < 1000000000.0f) {
             return tr("%1M").arg(QString::number(value / 1000000.0, type, precision));
-        } else if (posValue < 1000000000000) {
+        } else if (posValue < 1000000000000.0f) {
             return tr("%1G").arg(QString::number(value / 1000000000.0, type, precision));
         } else {
             return tr("%1").arg(QString::number(value, 'e', precision));
diff --git a/sdrgui/gui/glshaderspectrogram.cpp b/sdrgui/gui/glshaderspectrogram.cpp
index 467f90c30..a79428fe2 100644
--- a/sdrgui/gui/glshaderspectrogram.cpp
+++ b/sdrgui/gui/glshaderspectrogram.cpp
@@ -18,7 +18,11 @@
 
 #include <QOpenGLShaderProgram>
 #include <QOpenGLFunctions>
+#if defined(ANDROID)
+#include <QOpenGLFunctions_ES2>
+#else
 #include <QOpenGLFunctions_3_3_Core>
+#endif
 #include <QOpenGLContext>
 #include <QtOpenGL>
 #include <QImage>
diff --git a/sdrgui/gui/glshadertvarray.h b/sdrgui/gui/glshadertvarray.h
index d6c183e4c..884205827 100644
--- a/sdrgui/gui/glshadertvarray.h
+++ b/sdrgui/gui/glshadertvarray.h
@@ -24,9 +24,13 @@
 
 #include <QString>
 #include <QOpenGLFunctions>
+#if defined(ANDROID)
+#include <QOpenGLFunctions_ES2>
+#else
 #include <QOpenGLFunctions_2_0>
 #include <QOpenGLFunctions_2_1>
 #include <QOpenGLFunctions_3_0>
+#endif
 #include <QOpenGLTexture>
 #include <QOpenGLShaderProgram>
 #include <QOpenGLVertexArrayObject>
diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp
index ed01dfe64..737190b6e 100644
--- a/sdrgui/mainwindow.cpp
+++ b/sdrgui/mainwindow.cpp
@@ -1290,9 +1290,9 @@ void MainWindow::loadConfiguration(const Configuration *configuration, bool from
 	qDebug("MainWindow::loadConfiguration: configuration [%s | %s] %d workspace(s) - %d device set(s) - %d feature(s)",
 		qPrintable(configuration->getGroup()),
 		qPrintable(configuration->getDescription()),
-        configuration->getNumberOfWorkspaceGeometries(),
-        configuration->getDeviceSetPresets().size(),
-        configuration->getFeatureSetPreset().getFeatureCount()
+        (int)configuration->getNumberOfWorkspaceGeometries(),
+        (int)configuration->getDeviceSetPresets().size(),
+        (int)configuration->getFeatureSetPreset().getFeatureCount()
     );
 
     QProgressDialog *waitBox = nullptr;
@@ -1489,7 +1489,7 @@ void MainWindow::saveConfiguration(Configuration *configuration)
 	qDebug("MainWindow::saveConfiguration: configuration [%s | %s] %d workspaces",
 		qPrintable(configuration->getGroup()),
 		qPrintable(configuration->getDescription()),
-        m_workspaces.size()
+        (int)m_workspaces.size()
     );
 
     configuration->clearData();
@@ -3065,7 +3065,7 @@ void MainWindow::keyPressEvent(QKeyEvent* event)
     }
 }
 
-void MainWindow::orientationChanged(Qt::ScreenOrientation orientation) const
+void MainWindow::orientationChanged(Qt::ScreenOrientation orientation)
 {
 #ifdef ANDROID
     // Adjust workspace tab position, to leave max space for MDI windows
diff --git a/sdrgui/mainwindow.h b/sdrgui/mainwindow.h
index edbf94f89..d8e144d81 100644
--- a/sdrgui/mainwindow.h
+++ b/sdrgui/mainwindow.h
@@ -229,7 +229,7 @@ private slots:
     void openDeviceSetPresetsDialog(QPoint p, const DeviceGUI *deviceGUI);
 	void commandKeyPressed(Qt::Key key, Qt::KeyboardModifiers keyModifiers, bool release) const;
 	void fftWisdomProcessFinished(int exitCode, QProcess::ExitStatus exitStatus);
-    void orientationChanged(Qt::ScreenOrientation orientation) const;
+    void orientationChanged(Qt::ScreenOrientation orientation);
 };
 
 #endif // INCLUDE_MAINWINDOW_H
diff --git a/wdsp/gain.hpp b/wdsp/gain.hpp
index 5e6e2e3d0..1f29105a9 100644
--- a/wdsp/gain.hpp
+++ b/wdsp/gain.hpp
@@ -25,7 +25,7 @@ warren@wpratt.com
 
 */
 
-#ifndef wdso_gain_h
+#ifndef wdsp_gain_h
 #define wdsp_gain_h
 
 #include "export.h"