diff --git a/httpserver/httpserver.pro b/httpserver/httpserver.pro
index 33d84ee65..b244633a0 100644
--- a/httpserver/httpserver.pro
+++ b/httpserver/httpserver.pro
@@ -1,45 +1,46 @@
-#--------------------------------------------------------
-#
-# Pro file for Android and Windows builds with Qt Creator
-#
-#--------------------------------------------------------
-
-QT += core network
-
-TEMPLATE = lib
-TARGET = httpserver
-
-INCLUDEPATH += $$PWD
-
-CONFIG(Release):build_subdir = release
-CONFIG(Debug):build_subdir = debug
-
-# Enable very detailed debug messages when compiling the debug version
-CONFIG(debug, debug|release) {
-    DEFINES += SUPERVERBOSE
-}
-
-HEADERS += $$PWD/httpglobal.h \
-           $$PWD/httplistener.h \
-           $$PWD/httpconnectionhandler.h \
-           $$PWD/httpconnectionhandlerpool.h \
-           $$PWD/httprequest.h \
-           $$PWD/httpresponse.h \
-           $$PWD/httpcookie.h \
-           $$PWD/httprequesthandler.h \
-           $$PWD/httpsession.h \
-           $$PWD/httpsessionstore.h \
-           $$PWD/staticfilecontroller.h
-
-SOURCES += $$PWD/httpglobal.cpp \
-           $$PWD/httplistener.cpp \
-           $$PWD/httpconnectionhandler.cpp \
-           $$PWD/httpconnectionhandlerpool.cpp \
-           $$PWD/httprequest.cpp \
-           $$PWD/httpresponse.cpp \
-           $$PWD/httpcookie.cpp \
-           $$PWD/httprequesthandler.cpp \
-           $$PWD/httpsession.cpp \
-           $$PWD/httpsessionstore.cpp \
-           $$PWD/staticfilecontroller.cpp
-           
\ No newline at end of file
+#--------------------------------------------------------
+#
+# Pro file for Android and Windows builds with Qt Creator
+#
+#--------------------------------------------------------
+
+QT += core network
+
+TEMPLATE = lib
+TARGET = httpserver
+
+INCLUDEPATH += $$PWD
+QMAKE_CXXFLAGS += -std=c++11
+
+CONFIG(Release):build_subdir = release
+CONFIG(Debug):build_subdir = debug
+
+# Enable very detailed debug messages when compiling the debug version
+CONFIG(debug, debug|release) {
+    DEFINES += SUPERVERBOSE
+}
+
+HEADERS += $$PWD/httpglobal.h \
+           $$PWD/httplistener.h \
+           $$PWD/httpconnectionhandler.h \
+           $$PWD/httpconnectionhandlerpool.h \
+           $$PWD/httprequest.h \
+           $$PWD/httpresponse.h \
+           $$PWD/httpcookie.h \
+           $$PWD/httprequesthandler.h \
+           $$PWD/httpsession.h \
+           $$PWD/httpsessionstore.h \
+           $$PWD/staticfilecontroller.h
+
+SOURCES += $$PWD/httpglobal.cpp \
+           $$PWD/httplistener.cpp \
+           $$PWD/httpconnectionhandler.cpp \
+           $$PWD/httpconnectionhandlerpool.cpp \
+           $$PWD/httprequest.cpp \
+           $$PWD/httpresponse.cpp \
+           $$PWD/httpcookie.cpp \
+           $$PWD/httprequesthandler.cpp \
+           $$PWD/httpsession.cpp \
+           $$PWD/httpsessionstore.cpp \
+           $$PWD/staticfilecontroller.cpp
+           
diff --git a/sdrangel.windows.pro b/sdrangel.windows.pro
index 1b1a77d97..5dc2065dc 100644
--- a/sdrangel.windows.pro
+++ b/sdrangel.windows.pro
@@ -1,59 +1,60 @@
-#--------------------------------------------------------
-#
-# Pro file for Android and Windows builds with Qt Creator
-#
-#--------------------------------------------------------
-
-TEMPLATE = subdirs
-
-SUBDIRS = serialdv
-SUBDIRS += sdrbase
-CONFIG(MINGW64)SUBDIRS += nanomsg
-SUBDIRS += fcdhid
-SUBDIRS += fcdlib
-SUBDIRS += librtlsdr
-SUBDIRS += libhackrf
-SUBDIRS += libairspy
-SUBDIRS += libbladerf
-SUBDIRS += libsqlite3
-SUBDIRS += liblimesuite
-SUBDIRS += libiio
-SUBDIRS += devices
-SUBDIRS += mbelib
-SUBDIRS += dsdcc
-CONFIG(MINGW64)SUBDIRS += cm256cc
-SUBDIRS += plugins/samplesource/filesource
-CONFIG(MINGW64)SUBDIRS += plugins/samplesource/sdrdaemonsource
-SUBDIRS += plugins/samplesource/rtlsdr
-SUBDIRS += plugins/samplesource/hackrfinput
-SUBDIRS += plugins/samplesource/airspy
-SUBDIRS += plugins/samplesource/bladerfinput
-SUBDIRS += plugins/samplesource/limesdrinput
-SUBDIRS += plugins/samplesource/plutosdrinput
-SUBDIRS += plugins/samplesink/filesink
-SUBDIRS += plugins/samplesink/bladerfoutput
-SUBDIRS += plugins/samplesink/hackrfoutput
-SUBDIRS += plugins/samplesink/limesdroutput
-SUBDIRS += plugins/samplesink/plutosdroutput
-SUBDIRS += plugins/channelrx/chanalyzer
-SUBDIRS += plugins/channelrx/chanalyzerng
-SUBDIRS += plugins/channelrx/demodam
-SUBDIRS += plugins/channelrx/demodatv
-SUBDIRS += plugins/channelrx/demodbfm
-SUBDIRS += plugins/channelrx/demoddsd
-SUBDIRS += plugins/channelrx/demodlora
-SUBDIRS += plugins/channelrx/demodnfm
-SUBDIRS += plugins/channelrx/demodssb
-SUBDIRS += plugins/channelrx/demodwfm
-SUBDIRS += plugins/channelrx/tcpsrc
-SUBDIRS += plugins/channelrx/udpsrc
-SUBDIRS += plugins/channeltx/modam
-CONFIG(macx)SUBDIRS += plugins/channeltx/modatv
-SUBDIRS += plugins/channeltx/modnfm
-SUBDIRS += plugins/channeltx/modssb
-SUBDIRS += plugins/channeltx/modwfm
-SUBDIRS += plugins/channeltx/udpsink
-
-# Main app must be last
-CONFIG += ordered
-SUBDIRS += app
+#--------------------------------------------------------
+#
+# Pro file for Android and Windows builds with Qt Creator
+#
+#--------------------------------------------------------
+
+TEMPLATE = subdirs
+
+SUBDIRS = serialdv
+SUBDIRS += sdrbase
+CONFIG(MINGW64)SUBDIRS += nanomsg
+SUBDIRS += fcdhid
+SUBDIRS += fcdlib
+SUBDIRS += librtlsdr
+SUBDIRS += libhackrf
+SUBDIRS += libairspy
+SUBDIRS += libbladerf
+SUBDIRS += libsqlite3
+SUBDIRS += liblimesuite
+SUBDIRS += libiio
+SUBDIRS += devices
+SUBDIRS += mbelib
+SUBDIRS += dsdcc
+SUBDIRS += httpserver
+CONFIG(MINGW64)SUBDIRS += cm256cc
+SUBDIRS += plugins/samplesource/filesource
+CONFIG(MINGW64)SUBDIRS += plugins/samplesource/sdrdaemonsource
+SUBDIRS += plugins/samplesource/rtlsdr
+SUBDIRS += plugins/samplesource/hackrfinput
+SUBDIRS += plugins/samplesource/airspy
+SUBDIRS += plugins/samplesource/bladerfinput
+SUBDIRS += plugins/samplesource/limesdrinput
+SUBDIRS += plugins/samplesource/plutosdrinput
+SUBDIRS += plugins/samplesink/filesink
+SUBDIRS += plugins/samplesink/bladerfoutput
+SUBDIRS += plugins/samplesink/hackrfoutput
+SUBDIRS += plugins/samplesink/limesdroutput
+SUBDIRS += plugins/samplesink/plutosdroutput
+SUBDIRS += plugins/channelrx/chanalyzer
+SUBDIRS += plugins/channelrx/chanalyzerng
+SUBDIRS += plugins/channelrx/demodam
+SUBDIRS += plugins/channelrx/demodatv
+SUBDIRS += plugins/channelrx/demodbfm
+SUBDIRS += plugins/channelrx/demoddsd
+SUBDIRS += plugins/channelrx/demodlora
+SUBDIRS += plugins/channelrx/demodnfm
+SUBDIRS += plugins/channelrx/demodssb
+SUBDIRS += plugins/channelrx/demodwfm
+SUBDIRS += plugins/channelrx/tcpsrc
+SUBDIRS += plugins/channelrx/udpsrc
+SUBDIRS += plugins/channeltx/modam
+CONFIG(macx)SUBDIRS += plugins/channeltx/modatv
+SUBDIRS += plugins/channeltx/modnfm
+SUBDIRS += plugins/channeltx/modssb
+SUBDIRS += plugins/channeltx/modwfm
+SUBDIRS += plugins/channeltx/udpsink
+
+# Main app must be last
+CONFIG += ordered
+SUBDIRS += app