diff --git a/mingw-cross-env.pri b/mingw-cross-env.pri
index 5a6502a2..97ee3814 100644
--- a/mingw-cross-env.pri
+++ b/mingw-cross-env.pri
@@ -19,7 +19,7 @@ CONFIG(mingw-cross-env) {
   LIBS += mingw-cross-env/lib/libexpat.a
   LIBS += mingw-cross-env/lib/libintl.a
   LIBS += mingw-cross-env/lib/libiconv.a
-  QMAKE_CXXFLAGS += -fpermissive
+  QMAKE_CXXFLAGS += -fpermissive -DNOGDI
   WINSTACKSIZE = 8388608 # 8MB # github issue 116
   QMAKE_CXXFLAGS += -Wl,--stack,$$WINSTACKSIZE
   LIBS += -Wl,--stack,$$WINSTACKSIZE 
diff --git a/src/OGL_helper.h b/src/OGL_helper.h
index 488ee133..966657fc 100644
--- a/src/OGL_helper.h
+++ b/src/OGL_helper.h
@@ -44,6 +44,7 @@ const bool cull_backfaces = false;
 const bool color_backfaces = false;
 
 #ifdef _WIN32
+#include <windows.h> // For the CALLBACK macro
 #define CGAL_GLU_TESS_CALLBACK CALLBACK
 #else
 #define CGAL_GLU_TESS_CALLBACK 
diff --git a/src/OffscreenContextWGL.cc b/src/OffscreenContextWGL.cc
index 6e657fe5..b9e0f0e8 100644
--- a/src/OffscreenContextWGL.cc
+++ b/src/OffscreenContextWGL.cc
@@ -11,6 +11,7 @@ For more info:
    http://blogs.msdn.com/b/oldnewthing/archive/2006/12/04/1205831.aspx by Tom
 */
 
+#undef NOGDI
 #include <windows.h>
 #include <vector>
 
diff --git a/src/PlatformUtils-win.cc b/src/PlatformUtils-win.cc
index c94a2a67..c83855d0 100644
--- a/src/PlatformUtils-win.cc
+++ b/src/PlatformUtils-win.cc
@@ -3,6 +3,7 @@
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0501
 #endif
+#undef NOGDI
 #include <windows.h>
 #ifndef _WIN32_IE
 #define _WIN32_IE 0x0501 // SHGFP_TYPE_CURRENT
diff --git a/src/colormap.cc b/src/colormap.cc
index 84cd2a52..51868815 100644
--- a/src/colormap.cc
+++ b/src/colormap.cc
@@ -3,6 +3,8 @@
 #include "printutils.h"
 #include "PlatformUtils.h"
 
+#include <boost/property_tree/json_parser.hpp>
+
 static const char *DEFAULT_COLOR_SCHEME_NAME = "Cornfield";
 
 // See http://lolengine.net/blog/2013/01/13/fast-rgb-to-hsv
@@ -298,4 +300,4 @@ ColorMap::colorscheme_set_t ColorMap::enumerateColorSchemes()
     enumerateColorSchemesInPath(result_set, PlatformUtils::userConfigPath());
     
     return result_set;
-}
\ No newline at end of file
+}
diff --git a/src/colormap.h b/src/colormap.h
index 0f8bc545..bb869dd8 100644
--- a/src/colormap.h
+++ b/src/colormap.h
@@ -8,7 +8,6 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/property_tree/ptree.hpp>
-#include <boost/property_tree/json_parser.hpp>
 
 namespace fs = boost::filesystem;
 
diff --git a/src/system-gl.h b/src/system-gl.h
index 1cabafe5..9d8e6ce0 100644
--- a/src/system-gl.h
+++ b/src/system-gl.h
@@ -8,9 +8,6 @@
 #else
  #include <GL/gl.h>
  #include <GL/glu.h>
- #ifdef _WIN32
-  #include <windows.h> // For the CALLBACK macro
- #endif
 #endif
 
 #else // NULLGL