diff -r 8f75794f051f src/hugin_base/hugin_utils/utils.cpp
--- a/src/hugin_base/hugin_utils/utils.cpp	Fri Sep 18 19:47:00 2015 +0200
+++ b/src/hugin_base/hugin_utils/utils.cpp	Sun Sep 27 13:18:06 2015 +0200
@@ -26,26 +26,24 @@
 #include "hugin_version.h"
 
 #ifdef _WIN32
+    #ifndef NOMINMAX
     #define NOMINMAX
+    #endif
     #include <sys/utime.h>
     #include <ShlObj.h>
+    #include <windows.h>
 #else
     #include <sys/time.h>
     #include <cstdlib>
     #include <unistd.h>
     #include <sys/types.h>
     #include <pwd.h>
+    #include <hugin_config.h>
 #endif
 #include <time.h>
 #include <fstream>
 #include <stdio.h>
 #include <cstdio>
-#ifdef _WIN32
-#define NOMINMAX
-#include <windows.h>
-#else
-#include <hugin_config.h>
-#endif
 #include <algorithm>
 #define BOOST_FILESYSTEM_VERSION 3
 #include <boost/filesystem.hpp>
diff -r 8f75794f051f src/hugin_base/panotools/PanoToolsInterface.h
--- a/src/hugin_base/panotools/PanoToolsInterface.h	Fri Sep 18 19:47:00 2015 +0200
+++ b/src/hugin_base/panotools/PanoToolsInterface.h	Sun Sep 27 13:18:06 2015 +0200
@@ -47,7 +47,9 @@
 // named macros all over the place.
 #define _STLP_VERBOSE_AUTO_LINK
 //#define _USE_MATH_DEFINES
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #define VC_EXTRALEAN
 #include <windows.h>
 #undef DIFFERENCE
diff -r 8f75794f051f src/hugin_base/panotools/PanoToolsOptimizerWrapper.cpp
--- a/src/hugin_base/panotools/PanoToolsOptimizerWrapper.cpp	Fri Sep 18 19:47:00 2015 +0200
+++ b/src/hugin_base/panotools/PanoToolsOptimizerWrapper.cpp	Sun Sep 27 13:18:06 2015 +0200
@@ -41,7 +41,9 @@
 // named macros all over the place.
 #define _STLP_VERBOSE_AUTO_LINK
 //#define _USE_MATH_DEFINES
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #define VC_EXTRALEAN
 #include <windows.h>
 #undef DIFFERENCE
diff -r 8f75794f051f src/hugin_base/panotools/PanoToolsUtils.cpp
--- a/src/hugin_base/panotools/PanoToolsUtils.cpp	Fri Sep 18 19:47:00 2015 +0200
+++ b/src/hugin_base/panotools/PanoToolsUtils.cpp	Sun Sep 27 13:18:06 2015 +0200
@@ -39,7 +39,9 @@
 // named macros all over the place.
 #define _STLP_VERBOSE_AUTO_LINK
 //#define _USE_MATH_DEFINES
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #define VC_EXTRALEAN
 #include <windows.h>
 #undef DIFFERENCE
diff -r 8f75794f051f src/hugin_cpfind/cpfind/ImageImport.h
--- a/src/hugin_cpfind/cpfind/ImageImport.h	Fri Sep 18 19:47:00 2015 +0200
+++ b/src/hugin_cpfind/cpfind/ImageImport.h	Sun Sep 27 13:18:06 2015 +0200
@@ -22,7 +22,9 @@
 #define __imageimport_h
 
 #ifdef _WIN32
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include "vigra/windows.h"
 #endif