diff --git a/dsdcc/dsdcc.pro b/dsdcc/dsdcc.pro
index 7cb2add66..e89ae3230 100644
--- a/dsdcc/dsdcc.pro
+++ b/dsdcc/dsdcc.pro
@@ -11,10 +11,12 @@ TARGET = dsdcc
 
 CONFIG(MINGW32):LIBDSDCCSRC = "C:\softs\dsdcc"
 CONFIG(MINGW64):LIBDSDCCSRC = "C:\softs\dsdcc"
+CONFIG(MSVC):LIBDSDCCSRC = "C:\softs\dsdcc"
 CONFIG(macx):LIBDSDCCSRC = "../../deps/dsdcc"
 
 CONFIG(MINGW32):LIBMBELIBSRC = "C:\softs\mbelib"
 CONFIG(MINGW64):LIBMBELIBSRC = "C:\softs\mbelib"
+CONFIG(MSVC):LIBMBELIBSRC = "C:\softs\mbelib"
 CONFIG(macx):LIBMBELIBSRC = "../../deps/mbelib"
 
 INCLUDEPATH += $$LIBDSDCCSRC
diff --git a/httpserver/httpserver.pro b/httpserver/httpserver.pro
index 9dd999c07..a3f82fb0b 100644
--- a/httpserver/httpserver.pro
+++ b/httpserver/httpserver.pro
@@ -17,6 +17,8 @@ QMAKE_CXXFLAGS += -std=c++11
 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
 
+CONFIG(MSVC):DEFINES += httpserver_EXPORTS
+
 # Enable very detailed debug messages when compiling the debug version
 CONFIG(debug, debug|release) {
     DEFINES += SUPERVERBOSE
diff --git a/sdrangel.windows.pro b/sdrangel.windows.pro
index fae8ea587..b3ca705e6 100644
--- a/sdrangel.windows.pro
+++ b/sdrangel.windows.pro
@@ -15,8 +15,8 @@ SUBDIRS += qrtplib
 SUBDIRS += swagger
 SUBDIRS += sdrbase
 SUBDIRS += sdrgui
-SUBDIRS += fcdhid
-SUBDIRS += fcdlib
+CONFIG(!MSVC):SUBDIRS += fcdhid
+CONFIG(!MSVC):SUBDIRS += fcdlib
 SUBDIRS += libairspy
 SUBDIRS += libairspyhf
 #SUBDIRS += libbladerf
@@ -27,7 +27,7 @@ CONFIG(!MSVC):SUBDIRS += libperseus
 SUBDIRS += librtlsdr
 SUBDIRS += devices
 SUBDIRS += mbelib
-SUBDIRS += dsdcc
+CONFIG(!MSVC):SUBDIRS += dsdcc
 CONFIG(MSVC):SUBDIRS += cm256cc
 SUBDIRS += plugins/samplesource/airspy
 SUBDIRS += plugins/samplesource/airspyhf
@@ -51,8 +51,8 @@ SUBDIRS += plugins/channelrx/chanalyzer
 SUBDIRS += plugins/channelrx/demodam
 SUBDIRS += plugins/channelrx/demodatv
 SUBDIRS += plugins/channelrx/demodbfm
-SUBDIRS += plugins/channelrx/demoddsd
-SUBDIRS += plugins/channelrx/demodlora
+CONFIG(!MSVC):SUBDIRS += plugins/channelrx/demoddsd
+CONFIG(!MSVC):SUBDIRS += plugins/channelrx/demodlora
 SUBDIRS += plugins/channelrx/demodnfm
 SUBDIRS += plugins/channelrx/demodssb
 SUBDIRS += plugins/channelrx/demodwfm
diff --git a/sdrbase/dsp/basebandsamplesink.h b/sdrbase/dsp/basebandsamplesink.h
index 21e122434..e6a85a0d4 100644
--- a/sdrbase/dsp/basebandsamplesink.h
+++ b/sdrbase/dsp/basebandsamplesink.h
@@ -30,7 +30,7 @@ class SDRBASE_API BasebandSampleSink : public QObject {
 	Q_OBJECT
 public:
 	/** Used to notify on which thread the sample sink is now running (with ThreadedSampleSink) */
-    class MsgThreadedSink : public Message {
+    class SDRBASE_API MsgThreadedSink : public Message {
         MESSAGE_CLASS_DECLARATION
 
     public:
diff --git a/sdrbase/dsp/cwkeyer.h b/sdrbase/dsp/cwkeyer.h
index a1c977a0c..3b2718d6f 100644
--- a/sdrbase/dsp/cwkeyer.h
+++ b/sdrbase/dsp/cwkeyer.h
@@ -50,7 +50,7 @@ class SDRBASE_API CWKeyer : public QObject {
     Q_OBJECT
 
 public:
-    class MsgConfigureCWKeyer : public Message {
+    class SDRBASE_API MsgConfigureCWKeyer : public Message {
         MESSAGE_CLASS_DECLARATION
 
     public:
diff --git a/sdrbase/dsp/upchannelizer.h b/sdrbase/dsp/upchannelizer.h
index 63698f334..3a99183a0 100644
--- a/sdrbase/dsp/upchannelizer.h
+++ b/sdrbase/dsp/upchannelizer.h
@@ -36,7 +36,7 @@ class MessageQueue;
 class SDRBASE_API UpChannelizer : public BasebandSampleSource {
     Q_OBJECT
 public:
-    class MsgChannelizerNotification : public Message {
+    class SDRBASE_API MsgChannelizerNotification : public Message {
         MESSAGE_CLASS_DECLARATION
 
     public:
diff --git a/sdrgui/gui/crightclickenabler.h b/sdrgui/gui/crightclickenabler.h
index 6ce92f2d5..f7843b34c 100644
--- a/sdrgui/gui/crightclickenabler.h
+++ b/sdrgui/gui/crightclickenabler.h
@@ -21,7 +21,9 @@
 #include <QAbstractButton>
 #include <QMouseEvent>
 
-class CRightClickEnabler : public QObject {
+#include "export.h"
+
+class SDRGUI_API CRightClickEnabler : public QObject {
     Q_OBJECT
 public:
     CRightClickEnabler(QAbstractButton *button);
diff --git a/sdrgui/gui/levelmeter.h b/sdrgui/gui/levelmeter.h
index e4927e68d..348ee4f93 100644
--- a/sdrgui/gui/levelmeter.h
+++ b/sdrgui/gui/levelmeter.h
@@ -138,7 +138,7 @@ protected:
     }
 };
 
-class LevelMeterVU : public LevelMeter
+class SDRGUI_API LevelMeterVU : public LevelMeter
 {
 public:
     LevelMeterVU(QWidget *parent = 0);
@@ -148,7 +148,7 @@ protected:
     virtual void resized();
 };
 
-class LevelMeterSignalDB : public LevelMeter
+class SDRGUI_API LevelMeterSignalDB : public LevelMeter
 {
 public:
     typedef enum