diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp
index b01825d68..bc0f66d64 100644
--- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp
@@ -26,8 +26,13 @@
 #include <QString>
 #include <QFileDialog>
 
+#ifdef _WIN32
+#include <nn.h>
+#include <pair.h>
+#else
 #include <nanomsg/nn.h>
 #include <nanomsg/pair.h>
+#endif
 
 #include "ui_sdrdaemonsourcegui.h"
 #include "gui/colormapper.h"
diff --git a/sdrangel.windows.pro b/sdrangel.windows.pro
index 0aa8f05e0..e90f378b9 100644
--- a/sdrangel.windows.pro
+++ b/sdrangel.windows.pro
@@ -5,9 +5,10 @@
 #--------------------------------------------------------
 
 TEMPLATE = subdirs
-SUBDIRS = sdrbase
+
+SUBDIRS = serialdv
+SUBDIRS += sdrbase
 CONFIG(MINGW64)SUBDIRS += nanomsg
-SUBDIRS += httpserver
 SUBDIRS += fcdhid
 SUBDIRS += fcdlib
 SUBDIRS += librtlsdr
@@ -20,7 +21,6 @@ SUBDIRS += libiio
 SUBDIRS += devices
 SUBDIRS += mbelib
 SUBDIRS += dsdcc
-SUBDIRS += serialdv
 CONFIG(MINGW64)SUBDIRS += cm256cc
 SUBDIRS += plugins/samplesource/filesource
 CONFIG(MINGW64)SUBDIRS += plugins/samplesource/sdrdaemonsource
diff --git a/sdrbase/dsp/afsquelch.cpp b/sdrbase/dsp/afsquelch.cpp
index 84409ca4d..1a4dec122 100644
--- a/sdrbase/dsp/afsquelch.cpp
+++ b/sdrbase/dsp/afsquelch.cpp
@@ -14,9 +14,12 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#include <cmath>
+#include <math.h>
 #include "dsp/afsquelch.h"
 
+#undef M_PI
+#define M_PI		3.14159265358979323846
+
 AFSquelch::AFSquelch() :
             m_nbAvg(128),
 			m_N(0),
diff --git a/sdrbase/dsp/ctcssdetector.cpp b/sdrbase/dsp/ctcssdetector.cpp
index 2fdc786ab..622930c3a 100644
--- a/sdrbase/dsp/ctcssdetector.cpp
+++ b/sdrbase/dsp/ctcssdetector.cpp
@@ -4,9 +4,12 @@
  *  Created on: Jun 16, 2015
  *      Author: f4exb
  */
-#include <cmath>
+#include <math.h>
 #include "dsp/ctcssdetector.h"
 
+#undef M_PI
+#define M_PI		3.14159265358979323846
+
 CTCSSDetector::CTCSSDetector() :
 			N(0),
 			sampleRate(0),
diff --git a/sdrbase/dsp/lowpass.h b/sdrbase/dsp/lowpass.h
index b7b5e6ed4..d10fe8444 100644
--- a/sdrbase/dsp/lowpass.h
+++ b/sdrbase/dsp/lowpass.h
@@ -5,6 +5,9 @@
 #include <math.h>
 #include "dsp/dsptypes.h"
 
+#undef M_PI
+#define M_PI		3.14159265358979323846
+
 template <class Type> class Lowpass {
 public:
 	Lowpass() : m_ptr(0) { }
diff --git a/sdrbase/dsp/misc.h b/sdrbase/dsp/misc.h
index f0c73f1f0..eb0e411cf 100644
--- a/sdrbase/dsp/misc.h
+++ b/sdrbase/dsp/misc.h
@@ -24,7 +24,10 @@
 #ifndef _MISC_H
 #define _MISC_H
 
-#include <cmath>
+#include <math.h>
+
+#undef M_PI
+#define M_PI		3.14159265358979323846
 
 inline float sinc(float x)
 {
diff --git a/sdrbase/dsp/nco.cpp b/sdrbase/dsp/nco.cpp
index fc0866245..354492749 100644
--- a/sdrbase/dsp/nco.cpp
+++ b/sdrbase/dsp/nco.cpp
@@ -21,6 +21,9 @@
 #include <math.h>
 #include "dsp/nco.h"
 
+#undef M_PI
+#define M_PI		3.14159265358979323846
+
 Real NCO::m_table[NCO::TableSize];
 bool NCO::m_tableInitialized = false;
 
diff --git a/sdrbase/dsp/ncof.cpp b/sdrbase/dsp/ncof.cpp
index 62cf72580..361af4f1e 100644
--- a/sdrbase/dsp/ncof.cpp
+++ b/sdrbase/dsp/ncof.cpp
@@ -20,6 +20,9 @@
 #include <math.h>
 #include "dsp/ncof.h"
 
+#undef M_PI
+#define M_PI		3.14159265358979323846
+
 Real NCOF::m_table[NCOF::TableSize];
 bool NCOF::m_tableInitialized = false;
 
diff --git a/sdrbase/dsp/phaselock.cpp b/sdrbase/dsp/phaselock.cpp
index e6318fc97..ce6c57a97 100644
--- a/sdrbase/dsp/phaselock.cpp
+++ b/sdrbase/dsp/phaselock.cpp
@@ -18,6 +18,9 @@
 #include <math.h>
 #include "dsp/phaselock.h"
 
+#undef M_PI
+#define M_PI		3.14159265358979323846
+
 // Construct phase-locked loop.
 PhaseLock::PhaseLock(Real freq, Real bandwidth, Real minsignal)
 {
diff --git a/sdrbase/dsp/recursivefilters.cpp b/sdrbase/dsp/recursivefilters.cpp
index b52adc68b..2749bfab2 100644
--- a/sdrbase/dsp/recursivefilters.cpp
+++ b/sdrbase/dsp/recursivefilters.cpp
@@ -14,9 +14,12 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#include <cmath>
+#include <math.h>
 #include "recursivefilters.h"
 
+#undef M_PI
+#define M_PI		3.14159265358979323846
+
 SecondOrderRecursiveFilter::SecondOrderRecursiveFilter(float samplingFrequency, float centerFrequency, float r) :
         m_r(r),
         m_frequencyRatio(centerFrequency/samplingFrequency)
diff --git a/sdrbase/dsp/wfir.cpp b/sdrbase/dsp/wfir.cpp
index 14414ebe6..e6df32cd2 100644
--- a/sdrbase/dsp/wfir.cpp
+++ b/sdrbase/dsp/wfir.cpp
@@ -10,7 +10,9 @@
 
 #include "wfir.h"
 
-#define M_2PI  6.28318530717958647692  // M_PI should be in the math.h file
+#undef M_PI
+#define M_PI   3.14159265358979323846
+#define M_2PI  6.28318530717958647692
 
 // This first calculates the impulse response for a rectangular window.
 // It then applies the windowing function of choice to the impulse response.
diff --git a/sdrbase/gui/glscope.cpp b/sdrbase/gui/glscope.cpp
index 5f3f26c6b..9a7b812e6 100644
--- a/sdrbase/gui/glscope.cpp
+++ b/sdrbase/gui/glscope.cpp
@@ -27,6 +27,9 @@
 #include <algorithm>
 #include <QDebug>
 
+#undef M_PI
+#define M_PI  3.14159265358979323846
+
 /*
 #ifdef _WIN32
 static double log2f(double n)