diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 7521e784bc..ebb041c33f 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -316,7 +316,12 @@ IF(MSVC)
 		ENDIF()
 	ENDFOREACH()
 ElSE()
-	ADD_DEFINITIONS(-fPIC -Wno-non-virtual-dtor)
+    IF(WIN32)
+        # -fPIC is not relevant on Windows and create pointless warnings
+        ADD_DEFINITIONS(-Wno-non-virtual-dtor)
+    ELSE()
+        ADD_DEFINITIONS(-fPIC -Wno-non-virtual-dtor)
+    ENDIF()
 ENDIF()
 
 INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES} ${OCC_INCLUDE_DIR} ${OPENCOLLADA_INCLUDE_DIRS}
diff --git a/src/ifcgeomserver/IfcGeomServer.cpp b/src/ifcgeomserver/IfcGeomServer.cpp
index eabd601fc9..16e0f95d3a 100644
--- a/src/ifcgeomserver/IfcGeomServer.cpp
+++ b/src/ifcgeomserver/IfcGeomServer.cpp
@@ -27,9 +27,12 @@
 #include <iostream>
 #include <boost/cstdint.hpp>
 
-#if defined(_WIN32) && defined(__CYGWIN__)
+// NB: Streams are only re-opened as binary when compiled with MSVC currently.
+//     It is unclear what the correct behaviour would be compiled with e.g MinGW
+#if defined(_MSC_VER)
 #define SET_BINARY_STREAMS
 #endif
+
 #ifdef SET_BINARY_STREAMS
 #include <io.h>
 #include <fcntl.h>
diff --git a/src/ifcparse/IfcParse.cpp b/src/ifcparse/IfcParse.cpp
index b174984ca0..6b9605c1a1 100644
--- a/src/ifcparse/IfcParse.cpp
+++ b/src/ifcparse/IfcParse.cpp
@@ -47,48 +47,54 @@ using namespace IfcParse;
 // strtod_l() is used and a reference to the "C" locale is obtained here. The alternative is 
 // to use std::istringstream::imbue(std::locale::classic()), but there are subtleties in 
 // parsing in MSVC2010 and it appears to be much slower. 
-#ifdef _MSC_VER
+#if defined(_MSC_VER)
+
 static _locale_t locale = (_locale_t) 0;
 void init_locale() {
 	if (locale == (_locale_t) 0) {
 		locale = _create_locale(LC_NUMERIC, "C");
 	}
 }
-//#else
-#endif
 
-#ifdef __APPLE__
-#include <xlocale.h>
-//#endif
-static locale_t locale = (locale_t) 0;
-void init_locale() {
-	if (locale == (locale_t) 0) {
-		locale = newlocale(LC_NUMERIC_MASK, "C", (locale_t) 0);
-	}
-}
-#endif
+#else
 
-#ifdef __MINGW64__
+#if defined(__MINGW64__) || defined(__MINGW32__)
 #include <locale>
 #include <sstream>
 
 typedef void* locale_t;
-static locale_t locale = (locale_t) 0;
+static locale_t locale = (locale_t)0;
 
 void init_locale() {}
 
 double strtod_l(const char* start, char** end, locale_t loc) {
-    double d;
-    std::stringstream ss;
-    ss.imbue(std::locale::classic());
-    ss << start;
-    ss >> d;
-    size_t nread = ss.tellg();
-    *end = const_cast<char*>(start) + nread;
-    return d;
+	double d;
+	std::stringstream ss;
+	ss.imbue(std::locale::classic());
+	ss << start;
+	ss >> d;
+	size_t nread = ss.tellg();
+	*end = const_cast<char*>(start) + nread;
+	return d;
 }
+
+#else
+
+#ifdef __APPLE__
+#include <xlocale.h>
+#endif
+#include <locale.h>
+
+static locale_t locale = (locale_t)0;
+void init_locale() {
+	if (locale == (locale_t)0) {
+		locale = newlocale(LC_NUMERIC_MASK, "C", (locale_t)0);
+	}
+}
+
 #endif
 
+#endif
 
 // 
 // Opens the file, gets the filesize and reads a chunk in memory