diff --git a/src/Gui/PreCompiled.h b/src/Gui/PreCompiled.h
index 71a79d7009..23e7b31792 100644
--- a/src/Gui/PreCompiled.h
+++ b/src/Gui/PreCompiled.h
@@ -37,9 +37,6 @@
 #pragma warning( disable : 4786 )  // specifier longer then 255 chars
 #endif
 
-// Python
-#include <Python.h>
-
 // standard
 #include <stdio.h>
 #include <assert.h>
@@ -88,6 +85,9 @@
 #include "InventorAll.h"
 #include "Qt4All.h"
 
+// Python
+#include <Python.h>
+
 #elif defined(FC_OS_WIN32)
 #include <windows.h>
 #endif  //_PreComp_
diff --git a/src/Main/FreeCADGuiPy.cpp b/src/Main/FreeCADGuiPy.cpp
index 605403281c..2e28d87795 100644
--- a/src/Main/FreeCADGuiPy.cpp
+++ b/src/Main/FreeCADGuiPy.cpp
@@ -27,6 +27,10 @@
 #   include <config.h>
 #endif // HAVE_CONFIG_H
 
+#ifdef _MSC_VER
+#   pragma warning(disable : 4005)
+#endif
+
 #include <QApplication>
 #include <QIcon>
 #include <QThread>
diff --git a/src/Mod/Drawing/Gui/PreCompiled.h b/src/Mod/Drawing/Gui/PreCompiled.h
index 92df56bdfc..2d4d0ffbe1 100644
--- a/src/Mod/Drawing/Gui/PreCompiled.h
+++ b/src/Mod/Drawing/Gui/PreCompiled.h
@@ -38,6 +38,9 @@
 # define DrawingGuiExport
 #endif
 
+#ifdef _MSC_VER
+#   pragma warning(disable : 4005)
+#endif
 
 #ifdef _PreComp_
 
diff --git a/src/Mod/Fem/Gui/PreCompiled.h b/src/Mod/Fem/Gui/PreCompiled.h
index 3fc41062f8..616dd7c079 100644
--- a/src/Mod/Fem/Gui/PreCompiled.h
+++ b/src/Mod/Fem/Gui/PreCompiled.h
@@ -38,6 +38,7 @@
 #endif
 
 #ifdef _MSC_VER
+# pragma warning(disable : 4005)
 # pragma warning(disable : 4290)
 #endif
 
diff --git a/src/Mod/Image/Gui/PreCompiled.h b/src/Mod/Image/Gui/PreCompiled.h
index 6aa64a4939..91e2ecb6b1 100644
--- a/src/Mod/Image/Gui/PreCompiled.h
+++ b/src/Mod/Image/Gui/PreCompiled.h
@@ -38,9 +38,10 @@
 
 // here get the warnings of too long specifiers disabled (needed for VC6)
 #ifdef _MSC_VER
-# pragma warning( disable : 4251 )
-# pragma warning( disable : 4503 )
-# pragma warning( disable : 4786 )  // specifier longer then 255 chars
+# pragma warning(disable : 4005)
+# pragma warning(disable : 4251)
+# pragma warning(disable : 4503)
+# pragma warning(disable : 4786)  // specifier longer then 255 chars
 #endif
 
 #ifdef _PreComp_
diff --git a/src/Mod/Import/Gui/PreCompiled.h b/src/Mod/Import/Gui/PreCompiled.h
index 769f905f9c..31e3b9e85f 100644
--- a/src/Mod/Import/Gui/PreCompiled.h
+++ b/src/Mod/Import/Gui/PreCompiled.h
@@ -42,9 +42,10 @@
 
 // here get the warnings of too long specifiers disabled (needed for VC6)
 #ifdef _MSC_VER
-# pragma warning( disable : 4251 )
-# pragma warning( disable : 4503 )
-# pragma warning( disable : 4786 )  // specifier longer then 255 chars
+# pragma warning(disable : 4005)
+# pragma warning(disable : 4251)
+# pragma warning(disable : 4503)
+# pragma warning(disable : 4786)  // specifier longer then 255 chars
 #endif
 
 #ifdef _PreComp_
diff --git a/src/Mod/Inspection/Gui/PreCompiled.h b/src/Mod/Inspection/Gui/PreCompiled.h
index 1ccb50dc45..9053e5c404 100644
--- a/src/Mod/Inspection/Gui/PreCompiled.h
+++ b/src/Mod/Inspection/Gui/PreCompiled.h
@@ -43,6 +43,10 @@
 # define NOMINMAX
 #endif
 
+#ifdef _MSC_VER
+#   pragma warning(disable : 4005)
+#endif
+
 #ifdef _PreComp_
 
 // standard
diff --git a/src/Mod/Mesh/Gui/PreCompiled.h b/src/Mod/Mesh/Gui/PreCompiled.h
index 6fdcb809c7..9887c18888 100644
--- a/src/Mod/Mesh/Gui/PreCompiled.h
+++ b/src/Mod/Mesh/Gui/PreCompiled.h
@@ -37,6 +37,7 @@
 
 // here get the warnings of too long specifiers disabled (needed for VC6)
 #ifdef _MSC_VER
+#   pragma warning( disable : 4005 )
 #   pragma warning( disable : 4251 )
 #   pragma warning( disable : 4503 )
 #   pragma warning( disable : 4275 )
diff --git a/src/Mod/Part/Gui/AppPartGui.cpp b/src/Mod/Part/Gui/AppPartGui.cpp
index 2aa6c2535a..66ee441924 100644
--- a/src/Mod/Part/Gui/AppPartGui.cpp
+++ b/src/Mod/Part/Gui/AppPartGui.cpp
@@ -13,6 +13,7 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <Standard_math.hxx>
+# include <Inventor/system/inttypes.h>
 #endif
 
 #include <Base/Console.h>
diff --git a/src/Mod/Part/Gui/DlgExtrusion.cpp b/src/Mod/Part/Gui/DlgExtrusion.cpp
index 8e1c34df02..f67b17bb83 100644
--- a/src/Mod/Part/Gui/DlgExtrusion.cpp
+++ b/src/Mod/Part/Gui/DlgExtrusion.cpp
@@ -31,6 +31,7 @@
 # include <TopoDS_Face.hxx>
 # include <TopExp_Explorer.hxx>
 # include <QMessageBox>
+# include <Inventor/system/inttypes.h>
 #endif
 
 #include "ui_DlgExtrusion.h"
diff --git a/src/Mod/Part/Gui/DlgRevolution.cpp b/src/Mod/Part/Gui/DlgRevolution.cpp
index 80a8113d73..99137d5892 100644
--- a/src/Mod/Part/Gui/DlgRevolution.cpp
+++ b/src/Mod/Part/Gui/DlgRevolution.cpp
@@ -31,6 +31,7 @@
 # include <TopExp_Explorer.hxx>
 # include <TopoDS.hxx>
 # include <TopoDS_Edge.hxx>
+# include <Inventor/system/inttypes.h>
 #endif
 
 #include "ui_DlgRevolution.h"
diff --git a/src/Mod/Part/Gui/DlgSettings3DViewPartImp.cpp b/src/Mod/Part/Gui/DlgSettings3DViewPartImp.cpp
index 54e9db22d9..a721dbe258 100644
--- a/src/Mod/Part/Gui/DlgSettings3DViewPartImp.cpp
+++ b/src/Mod/Part/Gui/DlgSettings3DViewPartImp.cpp
@@ -24,10 +24,10 @@
 #include "PreCompiled.h"
 
 #include <QMessageBox>
+#include "ViewProvider.h"
 #include "DlgSettings3DViewPartImp.h"
 #include "ui_DlgSettings3DViewPart.h"
 
-#include "ViewProvider.h"
 #include <Gui/PrefWidgets.h>
 #include <Gui/Application.h>
 #include <Gui/Document.h>
diff --git a/src/Mod/Part/Gui/Mirroring.cpp b/src/Mod/Part/Gui/Mirroring.cpp
index 9f9cfb4c6d..9e8094e22e 100644
--- a/src/Mod/Part/Gui/Mirroring.cpp
+++ b/src/Mod/Part/Gui/Mirroring.cpp
@@ -30,6 +30,7 @@
 # include <TopExp_Explorer.hxx>
 # include <boost/bind.hpp>
 # include <cfloat>
+# include <Inventor/system/inttypes.h>
 #endif
 
 #include "Mirroring.h"
diff --git a/src/Mod/Part/Gui/ViewProvider2DObject.cpp b/src/Mod/Part/Gui/ViewProvider2DObject.cpp
index 1ab4973566..52c51915c2 100644
--- a/src/Mod/Part/Gui/ViewProvider2DObject.cpp
+++ b/src/Mod/Part/Gui/ViewProvider2DObject.cpp
@@ -44,10 +44,6 @@
 #include <Mod/Part/App/PartFeature.h>
 
 
-//#include "Tree.h"
-
-
-
 using namespace PartGui;
 using namespace std;
 
diff --git a/src/Mod/Part/Gui/ViewProviderBox.cpp b/src/Mod/Part/Gui/ViewProviderBox.cpp
index 40ae86a89a..515a7a5721 100644
--- a/src/Mod/Part/Gui/ViewProviderBox.cpp
+++ b/src/Mod/Part/Gui/ViewProviderBox.cpp
@@ -26,14 +26,8 @@
 #ifndef _PreComp_
 #endif
 
-/// Here the FreeCAD includes sorted by Base,App,Gui......
-#include <Base/Parameter.h>
-
 #include "ViewProviderBox.h"
-
-
-//#include "Tree.h"
-
+#include <Base/Parameter.h>
 
 
 using namespace PartGui;
@@ -45,7 +39,7 @@ using namespace std;
 
 PROPERTY_SOURCE(PartGui::ViewProviderBox, PartGui::ViewProviderPart)
 
-       
+
 ViewProviderBox::ViewProviderBox()
 {
   sPixmap = "Tree_Part_Box_Parametric.svg";
diff --git a/src/Mod/Part/Gui/ViewProviderCircleParametric.cpp b/src/Mod/Part/Gui/ViewProviderCircleParametric.cpp
index 815bfa46a7..5c2e839fd2 100644
--- a/src/Mod/Part/Gui/ViewProviderCircleParametric.cpp
+++ b/src/Mod/Part/Gui/ViewProviderCircleParametric.cpp
@@ -26,14 +26,8 @@
 #ifndef _PreComp_
 #endif
 
-/// Here the FreeCAD includes sorted by Base,App,Gui......
-#include <Base/Parameter.h>
-
 #include "ViewProviderCircleParametric.h"
-
-
-//#include "Tree.h"
-
+#include <Base/Parameter.h>
 
 
 using namespace PartGui;
@@ -45,7 +39,7 @@ using namespace std;
 
 PROPERTY_SOURCE(PartGui::ViewProviderCircleParametric, PartGui::ViewProviderPart)
 
-       
+
 ViewProviderCircleParametric::ViewProviderCircleParametric()
 {
   sPixmap = "Part_Circle_Parametric.svg";
diff --git a/src/Mod/Part/Gui/ViewProviderCylinderParametric.cpp b/src/Mod/Part/Gui/ViewProviderCylinderParametric.cpp
index f9eb028445..358db8e626 100644
--- a/src/Mod/Part/Gui/ViewProviderCylinderParametric.cpp
+++ b/src/Mod/Part/Gui/ViewProviderCylinderParametric.cpp
@@ -26,14 +26,8 @@
 #ifndef _PreComp_
 #endif
 
-/// Here the FreeCAD includes sorted by Base,App,Gui......
-#include <Base/Parameter.h>
-
 #include "ViewProviderCylinderParametric.h"
-
-
-//#include "Tree.h"
-
+#include <Base/Parameter.h>
 
 
 using namespace PartGui;
@@ -45,7 +39,7 @@ using namespace std;
 
 PROPERTY_SOURCE(PartGui::ViewProviderCylinderParametric, PartGui::ViewProviderPart)
 
-       
+
 ViewProviderCylinderParametric::ViewProviderCylinderParametric()
 {
   sPixmap = "Tree_Part_Cylinder_Parametric.svg";
diff --git a/src/Mod/Part/Gui/ViewProviderEllipseParametric.cpp b/src/Mod/Part/Gui/ViewProviderEllipseParametric.cpp
index bcd7c1704a..d40c57d36f 100644
--- a/src/Mod/Part/Gui/ViewProviderEllipseParametric.cpp
+++ b/src/Mod/Part/Gui/ViewProviderEllipseParametric.cpp
@@ -26,14 +26,8 @@
 #ifndef _PreComp_
 #endif
 
-/// Here the FreeCAD includes sorted by Base,App,Gui......
-#include <Base/Parameter.h>
-
 #include "ViewProviderEllipseParametric.h"
-
-
-//#include "Tree.h"
-
+#include <Base/Parameter.h>
 
 
 using namespace PartGui;
@@ -45,7 +39,7 @@ using namespace std;
 
 PROPERTY_SOURCE(PartGui::ViewProviderEllipseParametric, PartGui::ViewProviderPart)
 
-       
+
 ViewProviderEllipseParametric::ViewProviderEllipseParametric()
 {
   sPixmap = "Part_Ellipse_Parametric.svg";
diff --git a/src/Mod/Part/Gui/ViewProviderLineParametric.cpp b/src/Mod/Part/Gui/ViewProviderLineParametric.cpp
index e5fce0ab5c..1113108928 100644
--- a/src/Mod/Part/Gui/ViewProviderLineParametric.cpp
+++ b/src/Mod/Part/Gui/ViewProviderLineParametric.cpp
@@ -26,14 +26,8 @@
 #ifndef _PreComp_
 #endif
 
-/// Here the FreeCAD includes sorted by Base,App,Gui......
-#include <Base/Parameter.h>
-
 #include "ViewProviderLineParametric.h"
-
-
-//#include "Tree.h"
-
+#include <Base/Parameter.h>
 
 
 using namespace PartGui;
@@ -45,7 +39,7 @@ using namespace std;
 
 PROPERTY_SOURCE(PartGui::ViewProviderLineParametric, PartGui::ViewProviderPart)
 
-       
+
 ViewProviderLineParametric::ViewProviderLineParametric()
 {
   sPixmap = "Part_Line_Parametric.svg";
diff --git a/src/Mod/Part/Gui/ViewProviderPlaneParametric.cpp b/src/Mod/Part/Gui/ViewProviderPlaneParametric.cpp
index 04d2503b9e..3995b90b71 100644
--- a/src/Mod/Part/Gui/ViewProviderPlaneParametric.cpp
+++ b/src/Mod/Part/Gui/ViewProviderPlaneParametric.cpp
@@ -26,9 +26,9 @@
 #ifndef _PreComp_
 #endif
 
+#include "ViewProviderPlaneParametric.h"
 #include <Mod/Part/App/FeatureFace.h>
 #include <Mod/Part/App/Part2DObject.h>
-#include "ViewProviderPlaneParametric.h"
 
 using namespace PartGui;
 
diff --git a/src/Mod/Part/Gui/ViewProviderPointParametric.cpp b/src/Mod/Part/Gui/ViewProviderPointParametric.cpp
index e18182f281..9ae065cf05 100644
--- a/src/Mod/Part/Gui/ViewProviderPointParametric.cpp
+++ b/src/Mod/Part/Gui/ViewProviderPointParametric.cpp
@@ -26,14 +26,8 @@
 #ifndef _PreComp_
 #endif
 
-/// Here the FreeCAD includes sorted by Base,App,Gui......
-#include <Base/Parameter.h>
-
 #include "ViewProviderPointParametric.h"
-
-
-//#include "Tree.h"
-
+#include <Base/Parameter.h>
 
 
 using namespace PartGui;
@@ -45,7 +39,7 @@ using namespace std;
 
 PROPERTY_SOURCE(PartGui::ViewProviderPointParametric, PartGui::ViewProviderPart)
 
-       
+
 ViewProviderPointParametric::ViewProviderPointParametric()
 {
   sPixmap = "Part_Point_Parametric.svg";
diff --git a/src/Mod/Part/Gui/ViewProviderRuledSurface.cpp b/src/Mod/Part/Gui/ViewProviderRuledSurface.cpp
index 6549aa67d3..504a8f8b50 100644
--- a/src/Mod/Part/Gui/ViewProviderRuledSurface.cpp
+++ b/src/Mod/Part/Gui/ViewProviderRuledSurface.cpp
@@ -26,17 +26,11 @@
 #ifndef _PreComp_
 #endif
 
-/// Here the FreeCAD includes sorted by Base,App,Gui......
-#include <Base/Parameter.h>
-
 #include "ViewProviderRuledSurface.h"
 #include <Mod/Part/App/PartFeatures.h>
 
 #include <Gui/Application.h>
-
-
-//#include "Tree.h"
-
+#include <Base/Parameter.h>
 
 
 using namespace PartGui;
@@ -48,7 +42,7 @@ using namespace std;
 
 PROPERTY_SOURCE(PartGui::ViewProviderRuledSurface, PartGui::ViewProviderPart)
 
-       
+
 ViewProviderRuledSurface::ViewProviderRuledSurface()
 {
   sPixmap = "Part_RuledSurface.svg";
diff --git a/src/Mod/PartDesign/Gui/PreCompiled.h b/src/Mod/PartDesign/Gui/PreCompiled.h
index f20dc8ed83..a473c289ae 100644
--- a/src/Mod/PartDesign/Gui/PreCompiled.h
+++ b/src/Mod/PartDesign/Gui/PreCompiled.h
@@ -44,6 +44,10 @@
 #endif
 
 
+#ifdef _MSC_VER
+#   pragma warning(disable : 4005)
+#endif
+
 #ifdef _PreComp_
 
 // Python
diff --git a/src/Mod/Raytracing/Gui/PreCompiled.h b/src/Mod/Raytracing/Gui/PreCompiled.h
index 5e1a8599f1..81ef19e1bb 100644
--- a/src/Mod/Raytracing/Gui/PreCompiled.h
+++ b/src/Mod/Raytracing/Gui/PreCompiled.h
@@ -37,6 +37,9 @@
 # define AppRaytracingGuiExport
 #endif
 
+#ifdef _MSC_VER
+#   pragma warning(disable : 4005)
+#endif
 
 #ifdef _PreComp_
 
diff --git a/src/Mod/Robot/Gui/PreCompiled.h b/src/Mod/Robot/Gui/PreCompiled.h
index 25f92b5d34..9b963bc270 100644
--- a/src/Mod/Robot/Gui/PreCompiled.h
+++ b/src/Mod/Robot/Gui/PreCompiled.h
@@ -41,6 +41,10 @@
 
 #include <Standard_math.hxx>
 
+#ifdef _MSC_VER
+#   pragma warning(disable : 4005)
+#endif
+
 #ifdef _PreComp_
 
 // Python
diff --git a/src/Mod/Sketcher/Gui/PreCompiled.h b/src/Mod/Sketcher/Gui/PreCompiled.h
index de99416784..501c7ac9e6 100644
--- a/src/Mod/Sketcher/Gui/PreCompiled.h
+++ b/src/Mod/Sketcher/Gui/PreCompiled.h
@@ -41,6 +41,10 @@
 #endif
 
 
+#ifdef _MSC_VER
+#   pragma warning(disable : 4005)
+#endif
+
 #ifdef _PreComp_
 
 // standard
diff --git a/src/Mod/Spreadsheet/Gui/PreCompiled.h b/src/Mod/Spreadsheet/Gui/PreCompiled.h
index 2e03aa94dd..6377412114 100644
--- a/src/Mod/Spreadsheet/Gui/PreCompiled.h
+++ b/src/Mod/Spreadsheet/Gui/PreCompiled.h
@@ -39,9 +39,10 @@
 
 // here get the warnings of too long specifiers disabled (needed for VC6)
 #ifdef _MSC_VER
-# pragma warning( disable : 4251 )
-# pragma warning( disable : 4503 )
-# pragma warning( disable : 4786 )  // specifier longer then 255 chars
+# pragma warning(disable : 4005)
+# pragma warning(disable : 4251)
+# pragma warning(disable : 4503)
+# pragma warning(disable : 4786)  // specifier longer then 255 chars
 #endif
 
 #ifdef _PreComp_