diff --git a/src/Mod/Assembly/Gui/PreCompiled.h b/src/Mod/Assembly/Gui/PreCompiled.h
index 62ee8128b2..59d045527d 100644
--- a/src/Mod/Assembly/Gui/PreCompiled.h
+++ b/src/Mod/Assembly/Gui/PreCompiled.h
@@ -41,16 +41,12 @@
 #include <boost/core/ignore_unused.hpp>
 
 // Qt
-#ifndef __QtAll__
 #include <Gui/QtAll.h>
-#endif
 
 #include <QWidgetAction>
 
 // all of Inventor
-#ifndef __InventorAll__
 #include <Gui/InventorAll.h>
-#endif
 
 #endif  //_PreComp_
 
diff --git a/src/Mod/Cloud/Gui/PreCompiled.h b/src/Mod/Cloud/Gui/PreCompiled.h
index 55f8d2ee92..e4ac1e867d 100644
--- a/src/Mod/Cloud/Gui/PreCompiled.h
+++ b/src/Mod/Cloud/Gui/PreCompiled.h
@@ -58,9 +58,7 @@
 #endif
 
 // Qt Toolkit
-#ifndef __QtAll__
 #include <Gui/QtAll.h>
-#endif
 
 #endif  //_PreComp_
 
diff --git a/src/Mod/Import/Gui/PreCompiled.h b/src/Mod/Import/Gui/PreCompiled.h
index 854f2d6324..ea56537c6e 100644
--- a/src/Mod/Import/Gui/PreCompiled.h
+++ b/src/Mod/Import/Gui/PreCompiled.h
@@ -89,9 +89,7 @@
 #endif
 
 // Qt Toolkit
-#ifndef __QtAll__
 #include <Gui/QtAll.h>
-#endif
 
 
 #endif  //_PreComp_
diff --git a/src/Mod/Material/Gui/PreCompiled.h b/src/Mod/Material/Gui/PreCompiled.h
index 2b1db3466b..85b68f8801 100644
--- a/src/Mod/Material/Gui/PreCompiled.h
+++ b/src/Mod/Material/Gui/PreCompiled.h
@@ -53,18 +53,13 @@
 #include <string>
 #include <vector>
 
-// OpenCasCade
-// #include <Mod/Part/App/OpenCascadeAll.h>
 
 // Qt Toolkit
-#ifndef __QtAll__
 #include <Gui/QtAll.h>
-#endif
 
 // Inventor includes OpenGL
-#ifndef __InventorAll__
 # include <Gui/InventorAll.h>
-#endif
+
 
 #endif  //_PreComp_
 
diff --git a/src/Mod/Measure/Gui/PreCompiled.h b/src/Mod/Measure/Gui/PreCompiled.h
index 49d4ca833c..a2a4065edf 100644
--- a/src/Mod/Measure/Gui/PreCompiled.h
+++ b/src/Mod/Measure/Gui/PreCompiled.h
@@ -82,14 +82,10 @@
 #include <Inventor/C/glue/gl.h>
 
 // Qt Toolkit
-#ifndef __QtAll__
 #include <Gui/QtAll.h>
-#endif
 
 // Inventor includes OpenGL
-#ifndef __InventorAll__
 #include <Gui/InventorAll.h>
-#endif
 
 #endif  //_PreComp_
 
diff --git a/src/Mod/Mesh/Gui/Command.cpp b/src/Mod/Mesh/Gui/Command.cpp
index f014aa55c5..6411e6ac8d 100644
--- a/src/Mod/Mesh/Gui/Command.cpp
+++ b/src/Mod/Mesh/Gui/Command.cpp
@@ -35,9 +35,7 @@
 #include <qstringlist.h>
 #endif
 
-#ifndef __InventorAll__
 #include <Gui/InventorAll.h>
-#endif
 
 #include <App/DocumentObject.h>
 #include <App/DocumentObjectGroup.h>
diff --git a/src/Mod/Mesh/Gui/PreCompiled.h b/src/Mod/Mesh/Gui/PreCompiled.h
index 57b27a3171..de6bf994a1 100644
--- a/src/Mod/Mesh/Gui/PreCompiled.h
+++ b/src/Mod/Mesh/Gui/PreCompiled.h
@@ -52,14 +52,10 @@
 #include <vector>
 
 // Qt Toolkit
-#ifndef __QtAll__
 #include <Gui/QtAll.h>
-#endif
 
 // Inventor
-#ifndef __InventorAll__
-#include <Gui/InventorAll.h>
-#endif
+
 
 #elif defined(FC_OS_WIN32)
 #ifndef NOMINMAX
diff --git a/src/Mod/Part/Gui/PreCompiled.h b/src/Mod/Part/Gui/PreCompiled.h
index 4758d16e94..2f667b09ab 100644
--- a/src/Mod/Part/Gui/PreCompiled.h
+++ b/src/Mod/Part/Gui/PreCompiled.h
@@ -83,14 +83,10 @@
 #include <Inventor/C/glue/gl.h>
 
 // Qt Toolkit
-#ifndef __QtAll__
 # include <Gui/QtAll.h>
-#endif
 
 // Inventor includes OpenGL
-#ifndef __InventorAll__
 # include <Gui/InventorAll.h>
-#endif
 
 #endif  //_PreComp_
 
diff --git a/src/Mod/PartDesign/Gui/PreCompiled.h b/src/Mod/PartDesign/Gui/PreCompiled.h
index 99ed7a3261..20cba24151 100644
--- a/src/Mod/PartDesign/Gui/PreCompiled.h
+++ b/src/Mod/PartDesign/Gui/PreCompiled.h
@@ -56,14 +56,10 @@
 #include <TopTools_IndexedMapOfShape.hxx>
 
 // Qt
-#ifndef __QtAll__
 # include <Gui/QtAll.h>
-#endif
 
 // Inventor
-#ifndef __InventorAll__
 # include <Gui/InventorAll.h>
-#endif
 
 #endif // _PreComp_
 #endif // __PRECOMPILED_GUI__
diff --git a/src/Mod/Sketcher/Gui/PreCompiled.h b/src/Mod/Sketcher/Gui/PreCompiled.h
index 28ff06cedf..8d2c1892ce 100644
--- a/src/Mod/Sketcher/Gui/PreCompiled.h
+++ b/src/Mod/Sketcher/Gui/PreCompiled.h
@@ -71,16 +71,12 @@
 #include <gp_Pnt.hxx>
 
 // Qt
-#ifndef __QtAll__
 #include <Gui/QtAll.h>
-#endif
 
 #include <QWidgetAction>
 
 // all of Inventor
-#ifndef __InventorAll__
 #include <Gui/InventorAll.h>
-#endif
 
 #endif  //_PreComp_
 
diff --git a/src/Mod/Spreadsheet/Gui/PreCompiled.h b/src/Mod/Spreadsheet/Gui/PreCompiled.h
index 3d83053a37..2166289b3f 100644
--- a/src/Mod/Spreadsheet/Gui/PreCompiled.h
+++ b/src/Mod/Spreadsheet/Gui/PreCompiled.h
@@ -47,9 +47,7 @@
 #endif
 
 // Qt Toolkit
-#ifndef __QtAll__
 #include <Gui/QtAll.h>
-#endif
 
 #endif  //_PreComp_
 
diff --git a/src/Tools/_TEMPLATE_/Gui/PreCompiled.h b/src/Tools/_TEMPLATE_/Gui/PreCompiled.h
index 46cef8ca92..1feab1e177 100644
--- a/src/Tools/_TEMPLATE_/Gui/PreCompiled.h
+++ b/src/Tools/_TEMPLATE_/Gui/PreCompiled.h
@@ -61,9 +61,7 @@
 #endif
 
 // Qt Toolkit
-#ifndef __QtAll__
 #include <Gui/QtAll.h>
-#endif
 
 #endif  //_PreComp_