diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsink.pro b/plugins/samplesink/sdrdaemonsink/sdrdaemonsink.pro
index 094b3d2a8..e6618fbf8 100644
--- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsink.pro
+++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsink.pro
@@ -11,11 +11,12 @@ QT += core gui widgets multimedia network opengl
 
 TARGET = outputsdrdaemonsink
 
-CONFIG(MINGW32):LIBCM256CCSRC = "D:\softs\cm256cc"
-CONFIG(MINGW64):LIBCM256CCSRC = "D:\softs\cm256cc"
+CONFIG(MINGW32):LIBCM256CCSRC = "C:\softs\cm256cc"
+CONFIG(MINGW64):LIBCM256CCSRC = "C:\softs\cm256cc"
 CONFIG(macx):LIBCM256CCSRC = "../../../../deps/cm256cc"
 
 INCLUDEPATH += $$PWD
+INCLUDEPATH += ../../../exports
 INCLUDEPATH += ../../../sdrbase
 INCLUDEPATH += ../../../sdrgui
 INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
@@ -33,8 +34,8 @@ QMAKE_CXXFLAGS += -std=c++11
 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
 
-CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_58_0"
-CONFIG(MINGW64):INCLUDEPATH += "D:\boost_1_58_0"
+CONFIG(MINGW32):INCLUDEPATH += "C:\boost_1_66_0"
+CONFIG(MINGW64):INCLUDEPATH += "C:\boost_1_66_0"
 CONFIG(macx):INCLUDEPATH += "../../../boost_1_64_0"
 
 SOURCES += sdrdaemonsinkthread.cpp\
diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsource.pro b/plugins/samplesource/sdrdaemonsource/sdrdaemonsource.pro
index b8bffdecc..4bb075cc3 100644
--- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsource.pro
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsource.pro
@@ -11,11 +11,12 @@ QT += core gui widgets multimedia network opengl
 
 TARGET = inputsdrdaemonsource
 
-CONFIG(MINGW32):LIBCM256CCSRC = "D:\softs\cm256cc"
-CONFIG(MINGW64):LIBCM256CCSRC = "D:\softs\cm256cc"
+CONFIG(MINGW32):LIBCM256CCSRC = "C:\softs\cm256cc"
+CONFIG(MINGW64):LIBCM256CCSRC = "C:\softs\cm256cc"
 CONFIG(macx):LIBCM256CCSRC = "../../../../deps/cm256cc"
 
 INCLUDEPATH += $$PWD
+INCLUDEPATH += ../../../exports
 INCLUDEPATH += ../../../sdrbase
 INCLUDEPATH += ../../../sdrgui
 INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
@@ -33,8 +34,8 @@ QMAKE_CXXFLAGS += -std=c++11
 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
 
-CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_58_0"
-CONFIG(MINGW64):INCLUDEPATH += "D:\boost_1_58_0"
+CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0"
+CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0"
 CONFIG(macx):INCLUDEPATH += "../../../boost_1_64_0"
 
 SOURCES += sdrdaemonsourcebuffer.cpp\
diff --git a/sdrangel.windows.pro b/sdrangel.windows.pro
index ab6083f22..f8b6b5e91 100644
--- a/sdrangel.windows.pro
+++ b/sdrangel.windows.pro
@@ -45,7 +45,6 @@ SUBDIRS += plugins/samplesink/bladerfoutput
 SUBDIRS += plugins/samplesink/hackrfoutput
 SUBDIRS += plugins/samplesink/limesdroutput
 SUBDIRS += plugins/samplesink/plutosdroutput
-SUBDIRS += plugins/samplesink/sdrdaemonsink
 SUBDIRS += plugins/channelrx/chanalyzer
 SUBDIRS += plugins/channelrx/demodam
 SUBDIRS += plugins/channelrx/demodatv
@@ -55,7 +54,7 @@ SUBDIRS += plugins/channelrx/demodlora
 SUBDIRS += plugins/channelrx/demodnfm
 SUBDIRS += plugins/channelrx/demodssb
 SUBDIRS += plugins/channelrx/demodwfm
-SUBDIRS += plugins/channelrx/udpsource
+SUBDIRS += plugins/channelrx/udpsink
 SUBDIRS += plugins/channeltx/modam
 SUBDIRS += plugins/channeltx/modnfm
 SUBDIRS += plugins/channeltx/modssb
diff --git a/windows.install.bat b/windows.install.bat
index 481820ebc..a710d6db2 100644
--- a/windows.install.bat
+++ b/windows.install.bat
@@ -38,7 +38,6 @@ mkdir %2\plugins\channeltx
 mkdir %2\plugins\samplesource
 mkdir %2\plugins\samplesink
 copy plugins\channelrx\chanalyzer\%1\chanalyzer.dll %2\plugins\channelrx
-REM copy plugins\channelrx\chanalyzerng\%1\chanalyzerng.dll %2\plugins\channelrx
 copy plugins\channelrx\demodam\%1\demodam.dll %2\plugins\channelrx
 copy plugins\channelrx\demodatv\%1\demodatv.dll %2\plugins\channelrx
 copy plugins\channelrx\demodbfm\%1\demodbfm.dll %2\plugins\channelrx
@@ -47,14 +46,13 @@ copy plugins\channelrx\demodlora\%1\demodlora.dll %2\plugins\channelrx
 copy plugins\channelrx\demodnfm\%1\demodnfm.dll %2\plugins\channelrx
 copy plugins\channelrx\demodssb\%1\demodssb.dll %2\plugins\channelrx
 copy plugins\channelrx\demodwfm\%1\demodwfm.dll %2\plugins\channelrx
-REM copy plugins\channelrx\tcpsrc\%1\tcpsrc.dll %2\plugins\channelrx
-REM copy plugins\channelrx\udpsrc\%1\udpsrc.dll %2\plugins\channelrx
+copy plugins\channelrx\udpsink\%1\udpsink.dll %2\plugins\channelrx
 copy plugins\channeltx\modam\%1\modam.dll %2\plugins\channeltx
 REM copy plugins\channeltx\modatv\%1\modatv.dll %2\plugins\channeltx
 copy plugins\channeltx\modnfm\%1\modnfm.dll %2\plugins\channeltx
 copy plugins\channeltx\modssb\%1\modssb.dll %2\plugins\channeltx
 copy plugins\channeltx\modwfm\%1\modwfm.dll %2\plugins\channeltx
-REM copy plugins\channeltx\udpsink\%1\udpsink.dll %2\plugins\channeltx
+copy plugins\channeltx\udpsource\%1\udpsource.dll %2\plugins\channeltx
 copy plugins\samplesource\filesource\%1\inputfilesource.dll %2\plugins\samplesource
 copy plugins\samplesource\testsource\%1\inputtestsource.dll %2\plugins\samplesource
 copy plugins\samplesource\rtlsdr\%1\inputrtlsdr.dll %2\plugins\samplesource
@@ -64,6 +62,7 @@ copy plugins\samplesource\airspyhf\%1\inputairspyhf.dll %2\plugins\samplesource
 copy plugins\samplesource\bladerfinput\%1\inputbladerf.dll %2\plugins\samplesource
 copy plugins\samplesource\limesdrinput\%1\inputlimesdr.dll %2\plugins\samplesource
 copy plugins\samplesource\plutosdrinput\%1\inputplutosdr.dll %2\plugins\samplesource
+copy plugins\samplesource\sdrdaemonsource\%1\inputsdrdaemonsource.dll %2\plugins\samplesource
 copy plugins\samplesink\filesink\%1\outputfilesink.dll %2\plugins\samplesink
 copy plugins\samplesink\bladerfoutput\%1\outputbladerf.dll %2\plugins\samplesink
 copy plugins\samplesink\hackrfoutput\%1\outputhackrf.dll %2\plugins\samplesink