diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03b3e3a10..5c9d4b925 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -211,7 +211,11 @@ else()
     message(STATUS "Compiling with SIMD instructions for DSP if available")
 endif()
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wvla -Woverloaded-virtual -ffast-math -ftree-vectorize ${EXTRA_FLAGS}")
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wvla -Woverloaded-virtual -ffast-math -ftree-vectorize ${EXTRA_FLAGS}")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W3 -MP ${EXTRA_FLAGS}")
+endif()
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     if (BUILD_DEBIAN)
diff --git a/devices/bladerf1/CMakeLists.txt b/devices/bladerf1/CMakeLists.txt
index ddb327d5f..526530a93 100644
--- a/devices/bladerf1/CMakeLists.txt
+++ b/devices/bladerf1/CMakeLists.txt
@@ -35,6 +35,8 @@ add_library(bladerf1device SHARED
     ${bladerf1device_SOURCES}
 )
 
+set_target_properties(bladerf1device PROPERTIES DEFINE_SYMBOL "devices_EXPORTS")
+
 if (BUILD_DEBIAN)
 target_link_libraries(bladerf1device
     bladerf
diff --git a/devices/bladerf2/CMakeLists.txt b/devices/bladerf2/CMakeLists.txt
index 2b0c96490..428421025 100644
--- a/devices/bladerf2/CMakeLists.txt
+++ b/devices/bladerf2/CMakeLists.txt
@@ -32,6 +32,8 @@ add_library(bladerf2device SHARED
     ${bladerf2device_SOURCES}
 )
 
+set_target_properties(bladerf2device PROPERTIES DEFINE_SYMBOL "devices_EXPORTS")
+
 if (BUILD_DEBIAN)
 target_link_libraries(bladerf2device
     bladerf
diff --git a/devices/hackrf/CMakeLists.txt b/devices/hackrf/CMakeLists.txt
index bef8053ef..073ac89af 100644
--- a/devices/hackrf/CMakeLists.txt
+++ b/devices/hackrf/CMakeLists.txt
@@ -34,6 +34,8 @@ add_library(hackrfdevice SHARED
     ${hackrfdevice_SOURCES}
 )
 
+set_target_properties(hackrfdevice PROPERTIES DEFINE_SYMBOL "devices_EXPORTS")
+
 if (BUILD_DEBIAN)
 target_link_libraries(hackrfdevice
     hackrf
diff --git a/devices/limesdr/CMakeLists.txt b/devices/limesdr/CMakeLists.txt
index f887dadc9..491b98899 100644
--- a/devices/limesdr/CMakeLists.txt
+++ b/devices/limesdr/CMakeLists.txt
@@ -41,6 +41,8 @@ add_library(limesdrdevice SHARED
     ${limesdrdevice_SOURCES}
 )
 
+set_target_properties(limesdrdevice PROPERTIES DEFINE_SYMBOL "devices_EXPORTS")
+
 if (BUILD_DEBIAN)
 target_link_libraries(limesdrdevice
     limesuite
diff --git a/devices/perseus/CMakeLists.txt b/devices/perseus/CMakeLists.txt
index 659af597a..e4615944c 100644
--- a/devices/perseus/CMakeLists.txt
+++ b/devices/perseus/CMakeLists.txt
@@ -33,6 +33,8 @@ add_library(perseusdevice SHARED
     ${perseusdevice_SOURCES}
 )
 
+set_target_properties(perseusdevice PROPERTIES DEFINE_SYMBOL "devices_EXPORTS")
+
 if (BUILD_DEBIAN)
 target_link_libraries(perseusdevice
     perseus
diff --git a/devices/plutosdr/CMakeLists.txt b/devices/plutosdr/CMakeLists.txt
index 6f0a169c1..74f4e5f41 100644
--- a/devices/plutosdr/CMakeLists.txt
+++ b/devices/plutosdr/CMakeLists.txt
@@ -39,6 +39,8 @@ add_library(plutosdrdevice SHARED
     ${plutosdrdevice_SOURCES}
 )
 
+set_target_properties(plutosdrdevice PROPERTIES DEFINE_SYMBOL "devices_EXPORTS")
+
 if (BUILD_DEBIAN)
 target_link_libraries(plutosdrdevice
     iio
diff --git a/devices/soapysdr/CMakeLists.txt b/devices/soapysdr/CMakeLists.txt
index c7902bdde..3fb9f1e84 100644
--- a/devices/soapysdr/CMakeLists.txt
+++ b/devices/soapysdr/CMakeLists.txt
@@ -38,6 +38,8 @@ add_library(soapysdrdevice SHARED
     ${soapysdrdevice_SOURCES}
 )
 
+set_target_properties(soapysdrdevice PROPERTIES DEFINE_SYMBOL "devices_EXPORTS")
+
 if (BUILD_DEBIAN)
 target_link_libraries(soapysdrdevice
     SoapySDR
diff --git a/httpserver/CMakeLists.txt b/httpserver/CMakeLists.txt
index fc1f8e605..2e6365750 100644
--- a/httpserver/CMakeLists.txt
+++ b/httpserver/CMakeLists.txt
@@ -48,6 +48,8 @@ add_library(httpserver SHARED
 	${httpserver_HEADERS_MOC}
 )
 
+set_target_properties(httpserver PROPERTIES DEFINE_SYMBOL "httpserver_EXPORTS")
+
 target_link_libraries(httpserver
 	${QT_LIBRARIES}
 )
diff --git a/logging/CMakeLists.txt b/logging/CMakeLists.txt
index 6b0fbf998..f08965e0f 100644
--- a/logging/CMakeLists.txt
+++ b/logging/CMakeLists.txt
@@ -34,6 +34,8 @@ add_library(logging SHARED
 	${logging_HEADERS_MOC}
 )
 
+set_target_properties(logging PROPERTIES DEFINE_SYMBOL "logging_EXPORTS")
+
 target_link_libraries(logging
 	${QT_LIBRARIES}
 )
diff --git a/plugins/channelrx/chanalyzer/CMakeLists.txt b/plugins/channelrx/chanalyzer/CMakeLists.txt
index e286273dd..f89fdca83 100644
--- a/plugins/channelrx/chanalyzer/CMakeLists.txt
+++ b/plugins/channelrx/chanalyzer/CMakeLists.txt
@@ -23,6 +23,7 @@ set(chanalyzer_FORMS
 include_directories(
 	.
 	${CMAKE_CURRENT_BINARY_DIR}
+	${Boost_INCLUDE_DIRS}
 )
 
 #include(${QT_USE_FILE})
diff --git a/plugins/channelrx/demodatv/CMakeLists.txt b/plugins/channelrx/demodatv/CMakeLists.txt
index 30e835539..5e03a69f4 100644
--- a/plugins/channelrx/demodatv/CMakeLists.txt
+++ b/plugins/channelrx/demodatv/CMakeLists.txt
@@ -23,6 +23,7 @@ set(atv_FORMS
 include_directories(
 	.
 	${CMAKE_CURRENT_BINARY_DIR}
+	${Boost_INCLUDE_DIRS}
 )
 
 #include(${QT_USE_FILE})
diff --git a/plugins/channelrx/demodbfm/CMakeLists.txt b/plugins/channelrx/demodbfm/CMakeLists.txt
index 71721706c..eb6a15bff 100644
--- a/plugins/channelrx/demodbfm/CMakeLists.txt
+++ b/plugins/channelrx/demodbfm/CMakeLists.txt
@@ -36,6 +36,7 @@ include_directories(
 	.
 	${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client	
+    ${Boost_INCLUDE_DIRS}
 )
 
 #include(${QT_USE_FILE})
diff --git a/qrtplib/CMakeLists.txt b/qrtplib/CMakeLists.txt
index ef57c69c2..f194ca43b 100644
--- a/qrtplib/CMakeLists.txt
+++ b/qrtplib/CMakeLists.txt
@@ -88,6 +88,8 @@ add_library(qrtplib SHARED
     ${qrtplib_HEADERS_MOC}
 )
 
+set_target_properties(qrtplib PROPERTIES DEFINE_SYMBOL "qrtplib_EXPORTS")
+
 target_link_libraries(qrtplib
     ${QT_LIBRARIES}
 )
diff --git a/sdrbase/CMakeLists.txt b/sdrbase/CMakeLists.txt
index 13ddb98f6..c8732e590 100644
--- a/sdrbase/CMakeLists.txt
+++ b/sdrbase/CMakeLists.txt
@@ -289,6 +289,7 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/httpserver
     ${CMAKE_SOURCE_DIR}/qrtplib
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+    ${Boost_INCLUDE_DIRS}
 )
 
 target_link_libraries(sdrbase
diff --git a/sdrbase/dsp/downchannelizer.cpp b/sdrbase/dsp/downchannelizer.cpp
index 4d53b3b45..b8fe5f3f3 100644
--- a/sdrbase/dsp/downchannelizer.cpp
+++ b/sdrbase/dsp/downchannelizer.cpp
@@ -295,7 +295,7 @@ void DownChannelizer::freeFilterChain()
 
 void DownChannelizer::debugFilterChain()
 {
-    qDebug("DownChannelizer::debugFilterChain: %u stages", m_filterStages.size());
+    qDebug("DownChannelizer::debugFilterChain: %lu stages", m_filterStages.size());
 
     for(FilterStages::iterator it = m_filterStages.begin(); it != m_filterStages.end(); ++it)
     {
diff --git a/sdrgui/CMakeLists.txt b/sdrgui/CMakeLists.txt
index ecf762126..7eaaaea6f 100644
--- a/sdrgui/CMakeLists.txt
+++ b/sdrgui/CMakeLists.txt
@@ -16,7 +16,7 @@ set(sdrgui_SOURCES
     gui/commanditem.cpp
     gui/commandkeyreceiver.cpp
     gui/commandoutputdialog.cpp
-    gui/comboboxnoarrow.cpp
+#   gui/comboboxnoarrow.cpp
     gui/crightclickenabler.cpp
     gui/cwkeyergui.cpp
     gui/editcommanddialog.cpp
@@ -25,7 +25,7 @@ set(sdrgui_SOURCES
     gui/glscope.cpp
     gui/glscopemulti.cpp
     gui/glscopegui.cpp
-    gui/glscopemultigui.cpp
+#   gui/glscopemultigui.cpp
     gui/glshadersimple.cpp
     gui/glshadertextured.cpp
     gui/glshadertvarray.cpp
@@ -49,7 +49,7 @@ set(sdrgui_SOURCES
     gui/valuedialz.cpp
 
     dsp/scopevis.cpp
-    dsp/scopevismulti.cpp
+#   dsp/scopevismulti.cpp
     dsp/scopevisxy.cpp
     dsp/spectrumvis.cpp
     dsp/spectrumscopecombovis.cpp
@@ -82,7 +82,7 @@ set(sdrgui_HEADERS
     gui/commanditem.h
     gui/commandkeyreceiver.h
     gui/commandoutputdialog.h
-    gui/comboboxnoarrow.h
+#   gui/comboboxnoarrow.h
     gui/crightclickenabler.h
     gui/cwkeyergui.h
     gui/editcommanddialog.h
@@ -91,7 +91,7 @@ set(sdrgui_HEADERS
     gui/glscope.h
     gui/glscopemulti.h
     gui/glscopegui.h
-    gui/glscopemultigui.h
+#   gui/glscopemultigui.h
     gui/glshadersimple.h
     gui/glshadertvarray.h
     gui/glshadertextured.h
@@ -116,7 +116,7 @@ set(sdrgui_HEADERS
     gui/valuedialz.h
 
     dsp/scopevis.h
-    dsp/scopevismulti.h
+#   dsp/scopevismulti.h
     dsp/scopevisxy.h
     dsp/spectrumvis.h
     dsp/spectrumscopecombovis.h
@@ -198,6 +198,7 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${CMAKE_CURRENT_BINARY_DIR}
     ${OPENGL_INCLUDE_DIR}
+    ${Boost_INCLUDE_DIRS}
 )
 
 target_link_libraries(sdrgui
diff --git a/sdrgui/dsp/scopevismulti.h b/sdrgui/dsp/scopevismulti.h
index 8f8447a59..6073c7973 100644
--- a/sdrgui/dsp/scopevismulti.h
+++ b/sdrgui/dsp/scopevismulti.h
@@ -35,6 +35,9 @@
 #include "util/messagequeue.h"
 #include "util/doublebuffer.h"
 
+#undef M_PI
+#define M_PI        3.14159265358979323846
+
 class GLScopeMulti;
 
 class SDRGUI_API ScopeVisMulti : public QObject {
diff --git a/serialdv/CMakeLists.txt b/serialdv/CMakeLists.txt
index f120477be..f02cb35e7 100644
--- a/serialdv/CMakeLists.txt
+++ b/serialdv/CMakeLists.txt
@@ -22,6 +22,8 @@ add_library(serialdv SHARED
     ${serialdv_SOURCES}
 )
 
+set_target_properties(serialdv PROPERTIES DEFINE_SYMBOL "serialdv_EXPORTS")
+
 target_link_libraries(serialdv
     ${LIBUSB_LIBRARIES}
 )
diff --git a/swagger/CMakeLists.txt b/swagger/CMakeLists.txt
index 92cd86f9b..f027ae662 100644
--- a/swagger/CMakeLists.txt
+++ b/swagger/CMakeLists.txt
@@ -25,13 +25,15 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )
 
-set_target_properties(swagger PROPERTIES COMPILE_FLAGS "-Wno-conversion-null -Wno-unused-variable -Wno-unused-parameter")
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+	set_target_properties(swagger PROPERTIES COMPILE_FLAGS "-Wno-conversion-null -Wno-unused-variable -Wno-unused-parameter")
+endif()
 
 target_link_libraries(swagger
     ${QT_LIBRARIES}
 )
 
-set_target_properties(swagger PROPERTIES DEFINE_SYMBOL "sdrangel_EXPORTS")
+set_target_properties(swagger PROPERTIES DEFINE_SYMBOL "swagger_EXPORTS")
 
 target_link_libraries(swagger Qt5::Core Qt5::Network)