diff -r f2e38d537544 src/hugin_base/panodata/PanoramaOptions.h
--- a/src/hugin_base/panodata/PanoramaOptions.h	Tue Sep 29 21:22:17 2015 +0200
+++ b/src/hugin_base/panodata/PanoramaOptions.h	Wed Sep 30 14:30:47 2015 +0200
@@ -25,16 +25,13 @@
 #define _PANODATA_PANORAMAMEMENTO_H
 
 #include <hugin_config.h>
+#include <hugin_shared.h>
 
 #include <string>
 #include <vector>
-//#include <map>
-//#include <algorithm>
-//#include <set>
-//#include <math.h>
+
 #include <vigra/diff2d.hxx>
-
-#include <vigra/windows.h>
+#include <vigra_ext/Interpolators.h>
 
 extern "C" {
 
@@ -43,6 +40,8 @@
     #undef __INTEL__
     #endif
 
+    // Define __NO_SYSTEM__ in order to turn off including of winfows.h in panorama.h
+    #define __NO_SYSTEM__
     #include <pano13/panorama.h>
 
     #ifdef __INTELMEMO__
@@ -68,10 +67,7 @@
 #undef MAX
 #endif
 
-    }
-
-#include <hugin_shared.h>
-#include <vigra_ext/Interpolators.h>
+}
 
 namespace HuginBase {