diff --git a/app/app.pro b/app/app.pro
index d39bdef7d..f50a7dfd4 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -17,8 +17,8 @@ CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
 
 SOURCES += main.cpp
-LIBS += -L../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../sdrgui/$${build_subdir} -lsdrgui
+LIBS += -L../sdrbase/$${build_subdir} -lsdrbase
 
 CONFIG(ANDROID):CONFIG += mobility
 CONFIG(ANDROID):MOBILITY =
diff --git a/plugins/channelrx/demodwfm/demodwfm.pro b/plugins/channelrx/demodwfm/demodwfm.pro
index a07d4d6b6..c705ff3cb 100644
--- a/plugins/channelrx/demodwfm/demodwfm.pro
+++ b/plugins/channelrx/demodwfm/demodwfm.pro
@@ -18,6 +18,7 @@ QMAKE_CXXFLAGS += -msse4.1
 QMAKE_CXXFLAGS += -std=c++11
 
 INCLUDEPATH += $$PWD
+INCLUDEPATH += ../../../sdrbase
 INCLUDEPATH += ../../../sdrgui
 
 CONFIG(Release):build_subdir = release
diff --git a/sdrgui/sdrgui.pro b/sdrgui/sdrgui.pro
index 9141f8b54..7ec69f3a0 100644
--- a/sdrgui/sdrgui.pro
+++ b/sdrgui/sdrgui.pro
@@ -8,13 +8,13 @@ QT += core gui multimedia opengl
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 TEMPLATE = lib
-TARGET = sdrbase
+TARGET = sdrgui
 INCLUDEPATH += $$PWD
+INCLUDEPATH += ../sdrbase
 
 DEFINES += USE_KISSFFT=1
 win32 {
     DEFINES += __WINDOWS__=1
-    DEFINES += DSD_USE_SERIALDV=1
 }
 DEFINES += USE_SSE2=1
 QMAKE_CXXFLAGS += -msse2
@@ -115,8 +115,6 @@ HEADERS  += mainwindow.h\
         gui/transverterdialog.h\
         gui/valuedial.h\
         gui/valuedialz.h\
-        dsp/devicesamplesource.h\
-        dsp/devicesamplesink.h\
         plugin/pluginapi.h\
         plugin/pluginmanager.h
         
@@ -137,6 +135,8 @@ FORMS    += mainwindow.ui\
         gui/transverterdialog.ui\
         mainwindow.ui
 
+LIBS += -L../sdrbase/$${build_subdir} -lsdrbase
+
 RESOURCES = resources/res.qrc
 
 CONFIG(ANDROID):CONFIG += mobility
diff --git a/windows.install.bat b/windows.install.bat
index 93dc06f7d..0f2c70ad3 100644
--- a/windows.install.bat
+++ b/windows.install.bat
@@ -6,7 +6,8 @@ SET libzlib1dir="D:\softs\zlib-1.2.5"
 
 copy app\%1\sdrangel.exe %2
 copy sdrbase\%1\sdrbase.dll %2
-copy devices\%1\devices.dll %2
+copy sdrgui\%1\sdrgui.dll %2
+	copy devices\%1\devices.dll %2
 copy mbelib\%1\mbelib.dll %2
 copy dsdcc\%1\dsdcc.dll %2
 copy serialdv\%1\serialdv.dll %2
diff --git a/windows64.install.bat b/windows64.install.bat
index 291eaff54..3b29a6e37 100644
--- a/windows64.install.bat
+++ b/windows64.install.bat
@@ -24,6 +24,7 @@ copy "%msys2dir%\mingw64\bin\libwinpthread-1.dll" %2
 copy %msys2dir%\mingw64\bin\libgraphite2.dll %2
 copy app\%1\sdrangel.exe %2
 copy sdrbase\%1\sdrbase.dll %2
+copy sdrgui\%1\sdrgui.dll %2
 copy devices\%1\devices.dll %2
 copy cm256cc\%1\cm256cc.dll %2
 copy mbelib\%1\mbelib.dll %2