diff --git a/plugins/channeltx/modam/modam.pro b/plugins/channeltx/modam/modam.pro
index 529b82ede..3eb914740 100644
--- a/plugins/channeltx/modam/modam.pro
+++ b/plugins/channeltx/modam/modam.pro
@@ -21,6 +21,7 @@ INCLUDEPATH += $$PWD
 INCLUDEPATH += ../../../exports
 INCLUDEPATH += ../../../sdrbase
 INCLUDEPATH += ../../../sdrgui
+INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
 
 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
@@ -39,5 +40,6 @@ FORMS += ammodgui.ui
 
 LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
+LIBS += -L../../../swagger/$${build_subdir} -lswagger
 
 RESOURCES = ../../../sdrgui/resources/res.qrc
diff --git a/plugins/channeltx/modssb/modssb.pro b/plugins/channeltx/modssb/modssb.pro
index b1378fc83..460fc9dc9 100644
--- a/plugins/channeltx/modssb/modssb.pro
+++ b/plugins/channeltx/modssb/modssb.pro
@@ -21,6 +21,7 @@ INCLUDEPATH += $$PWD
 INCLUDEPATH += ../../../exports
 INCLUDEPATH += ../../../sdrbase
 INCLUDEPATH += ../../../sdrgui
+INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
 
 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
@@ -39,5 +40,6 @@ FORMS += ssbmodgui.ui
 
 LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
+LIBS += -L../../../swagger/$${build_subdir} -lswagger
 
 RESOURCES = ../../../sdrgui/resources/res.qrc
diff --git a/plugins/channeltx/modwfm/modwfm.pro b/plugins/channeltx/modwfm/modwfm.pro
index a2ade1bc1..4ab4b513c 100644
--- a/plugins/channeltx/modwfm/modwfm.pro
+++ b/plugins/channeltx/modwfm/modwfm.pro
@@ -21,6 +21,7 @@ INCLUDEPATH += $$PWD
 INCLUDEPATH += ../../../exports
 INCLUDEPATH += ../../../sdrbase
 INCLUDEPATH += ../../../sdrgui
+INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
 
 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
@@ -39,5 +40,6 @@ FORMS += wfmmodgui.ui
 
 LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
+LIBS += -L../../../swagger/$${build_subdir} -lswagger
 
 RESOURCES = ../../../sdrgui/resources/res.qrc
diff --git a/plugins/channeltx/udpsink/udpsink.pro b/plugins/channeltx/udpsink/udpsink.pro
index dce7d049b..6d93b1ddb 100644
--- a/plugins/channeltx/udpsink/udpsink.pro
+++ b/plugins/channeltx/udpsink/udpsink.pro
@@ -21,6 +21,7 @@ INCLUDEPATH += $$PWD
 INCLUDEPATH += ../../../exports
 INCLUDEPATH += ../../../sdrbase
 INCLUDEPATH += ../../../sdrgui
+INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
 
 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
@@ -43,5 +44,6 @@ FORMS += udpsinkgui.ui
 
 LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
+LIBS += -L../../../swagger/$${build_subdir} -lswagger
 
 RESOURCES = ../../../sdrgui/resources/res.qrc
diff --git a/sdrbase/sdrbase.pro b/sdrbase/sdrbase.pro
index ada4502b9..77571c589 100644
--- a/sdrbase/sdrbase.pro
+++ b/sdrbase/sdrbase.pro
@@ -86,6 +86,7 @@ SOURCES += audio/audiodevicemanager.cpp\
         dsp/nco.cpp\
         dsp/ncof.cpp\
         dsp/phaselock.cpp\
+        dsp/projector.cpp\
         dsp/recursivefilters.cpp\
         dsp/samplesinkfifo.cpp\
         dsp/samplesourcefifo.cpp\
@@ -171,6 +172,7 @@ HEADERS  += audio/audiodevicemanager.h\
         dsp/ncof.h\
         dsp/phasediscri.h\
         dsp/phaselock.h\
+        dsp/projector.h\
         dsp/recursivefilters.h\
         dsp/samplesinkfifo.h\
         dsp/samplesourcefifo.h\
@@ -193,7 +195,6 @@ HEADERS  += audio/audiodevicemanager.h\
         settings/mainsettings.h\
         util/CRC64.h\
         util/db.h\
-        export.h\
         util/message.h\
         util/messagequeue.h\
         util/prettyprint.h\
diff --git a/sdrgui/sdrgui.pro b/sdrgui/sdrgui.pro
index 32d87b8dd..2d50bb7ec 100644
--- a/sdrgui/sdrgui.pro
+++ b/sdrgui/sdrgui.pro
@@ -90,8 +90,6 @@ SOURCES += mainwindow.cpp\
         webapi/webapiadaptergui.cpp
 
 HEADERS  += mainwindow.h\
-        device/devicesourceapi.h\
-        device/devicesinkapi.h\
         device/deviceuiset.h\
         dsp/spectrumscopecombovis.h\
         dsp/spectrumscopengcombovis.h\