diff -r 8f75794f051f src/celeste/svm.cpp
--- a/src/celeste/svm.cpp	Fri Sep 18 19:47:00 2015 +0200
+++ b/src/celeste/svm.cpp	Sat Sep 26 10:26:42 2015 +0200
@@ -43,7 +43,7 @@
 #include <limits.h>
 #include <locale.h>
 #include "svm.h"
-#if _MSC_VER <= 1600
+#ifndef HAVE_LOG1P
 // Visual C++ 2010 and older do not support log1p()
 #define log1p(x) log(1+x)
 #endif
diff -r 8f75794f051f src/hugin1/executor/hugin_executor.cpp
--- a/src/hugin1/executor/hugin_executor.cpp	Fri Sep 18 19:47:00 2015 +0200
+++ b/src/hugin1/executor/hugin_executor.cpp	Sat Sep 26 10:26:42 2015 +0200
@@ -35,6 +35,7 @@
 #include <wx/cmdline.h>
 #include <wx/arrstr.h>
 #include <wx/stdpaths.h>
+#include <vigra/windows.h>   // undefine some macros defined in windows.h (included by wx/app.h)
 #include "base_wx/huginConfig.h"
 #include "base_wx/platform.h"
 #include "panodata/Panorama.h"
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	Sat Sep 26 10:26:42 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/hugin_utils/utils.h
--- a/src/hugin_base/hugin_utils/utils.h	Fri Sep 18 19:47:00 2015 +0200
+++ b/src/hugin_base/hugin_utils/utils.h	Sat Sep 26 10:26:42 2015 +0200
@@ -34,6 +34,10 @@
 #include <cassert>
 #include <vigra/imageinfo.hxx>
 #include <lcms2.h>
+#ifdef __WXMSW__
+#include <wx/string.h>  // wxString and wxConvISO8859_1 (via wx/strconv.h)
+#include <wx/log.h>     // wxLogWarning, wxLogError and wxLogFatalError
+#endif
 
 #include <hugin_utils/platform.h>
 
diff -r 8f75794f051f src/hugin_base/panodata/PanoramaOptions.h
--- a/src/hugin_base/panodata/PanoramaOptions.h	Fri Sep 18 19:47:00 2015 +0200
+++ b/src/hugin_base/panodata/PanoramaOptions.h	Sat Sep 26 10:26:42 2015 +0200
@@ -35,6 +35,14 @@
 #include <vigra/diff2d.hxx>
 
 #include <vigra/windows.h>
+#if defined __WXMSW__ && defined __MINGW32__
+// Undefine GetClassInfo and other stuff defined in windows.h (in fact in winuser.h).
+// It is needed by MinGW gcc - if GetClassInfo is defined, then strange linker
+// errors may occur, eg.: "undefined reference to `wxObject::GetClassInfoW() const'"
+#include <wx/compiler.h>    // wxCHECK_WATCOM_VERSION
+#include <wx/msw/gccpriv.h> // wxCHECK_W32API_VERSION
+#include <wx/msw/winundef.h>
+#endif
 
 extern "C" {
 
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	Sat Sep 26 10:26:42 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	Sat Sep 26 10:26:42 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	Sat Sep 26 10:26:42 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_config.h.in.cmake
--- a/src/hugin_config.h.in.cmake	Fri Sep 18 19:47:00 2015 +0200
+++ b/src/hugin_config.h.in.cmake	Sat Sep 26 10:26:42 2015 +0200
@@ -39,7 +39,10 @@
 #endif
 
 /* Define if you have log2 function */
-#cmakedefine HAVE_LOG2 0
+#cmakedefine HAVE_LOG2 1
+
+/* Define if you have log1p function */
+#cmakedefine HAVE_LOG1P 1
 
 /* locate of the xrc files, as defined during configuration */
 #define INSTALL_LOCALE_DIR "${INSTALL_LOCALE_DIR}"
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	Sat Sep 26 10:26:42 2015 +0200
@@ -22,7 +22,9 @@
 #define __imageimport_h
 
 #ifdef _WIN32
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include "vigra/windows.h"
 #endif