diff --git a/src/Gui/QtAll.h b/src/Gui/QtAll.h
index b22fcfc1c2..f2ab5e6382 100644
--- a/src/Gui/QtAll.h
+++ b/src/Gui/QtAll.h
@@ -63,7 +63,7 @@
 #include <QAbstractItemModel>
 #include <QStandardItemModel>
 #include <QAbstractTextDocumentLayout>
-#include <qaction.h>
+#include <QAction>
 #include <QActionGroup>
 #include <qapplication.h>
 #include <QBitmap>
@@ -104,8 +104,9 @@
 #include <QMainWindow>
 #include <QMdiArea>
 #include <QMdiSubWindow>
+#include <QMenu>
 #include <qmenubar.h>
-#include <qmessagebox.h>
+#include <QMessageBox>
 #include <QMessageLogContext>
 #include <QMimeData>
 #include <qmovie.h>
diff --git a/src/Mod/Part/App/OpenCascadeAll.h b/src/Mod/Part/App/OpenCascadeAll.h
index 0940603e49..d9f8caa56f 100644
--- a/src/Mod/Part/App/OpenCascadeAll.h
+++ b/src/Mod/Part/App/OpenCascadeAll.h
@@ -106,6 +106,7 @@
 #endif
 #include <BRepAdaptor_Surface.hxx>
 
+#include <BRepAlgo.hxx>
 #if OCC_VERSION_HEX < 0x070300
 # include <BRepAlgo_Fuse.hxx>
 #endif
@@ -478,6 +479,7 @@
 #include <TopTools_DataMapOfIntegerListOfShape.hxx>
 #include <TopTools_DataMapOfIntegerShape.hxx>
 #include <TopTools_HSequenceOfShape.hxx>
+#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
diff --git a/src/Mod/PartDesign/App/PreCompiled.h b/src/Mod/PartDesign/App/PreCompiled.h
index 1417f4adf3..7f4ed7207f 100644
--- a/src/Mod/PartDesign/App/PreCompiled.h
+++ b/src/Mod/PartDesign/App/PreCompiled.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef __PRECOMPILED__
 #define __PRECOMPILED__
 
@@ -35,71 +34,9 @@
 
 #ifdef _PreComp_
 
-// standard
-#include <iostream>
-#include <sstream>
-#include <cstdio>
-#include <cassert>
-#include <string>
-#include <map>
-#include <vector>
-#include <set>
-#include <bitset>
-
-#include <cstring>
-#include <cmath>
-
-// QT
-#include <QObject>
-#include <QCoreApplication>
-
-// OpenCasCade =====================================================================================
+// OpenCasCade
 #include <Mod/Part/App/OpenCascadeAll.h>
 
-// Apart from the Part OpenCascadeAll, I need:
-# include <GProp_GProps.hxx>
-
-# include <BRepAlgo.hxx>
-# include <BRepAlgoAPI_Fuse.hxx>
-# include <BRepAlgoAPI_Cut.hxx>
-# include <BRepBuilderAPI_GTransform.hxx>
-# include <BRepBuilderAPI_Transform.hxx>
-# include <BRepFeat_MakePrism.hxx>
-# include <BRepGProp.hxx>
-# include <BRepGProp_Face.hxx>
-# include <BRepLProp_SLProps.hxx>
-# include <BRepProj_Projection.hxx>
-# include <BRepBuilderAPI_MakeSolid.hxx>
-# include <BRepBuilderAPI_MakeWire.hxx>
-# include <BRepBuilderAPI_Sewing.hxx>
-# include <BRepBuilderAPI_MakePolygon.hxx>
-# include <BRepBuilderAPI_MakeFace.hxx>
-# include <BRepClass3d_SolidClassifier.hxx>
-# include <BRepExtrema_DistShapeShape.hxx>
-# include <BRepFilletAPI_MakeChamfer.hxx>
-# include <BRepOffsetAPI_DraftAngle.hxx>
-# include <BRepOffsetAPI_MakeOffset.hxx>
-# include <BRepOffsetAPI_ThruSections.hxx>
-# include <BRepPrimAPI_MakeBox.hxx>
-# include <BRepPrimAPI_MakeCylinder.hxx>
-# include <BRepPrimAPI_MakeSphere.hxx>
-# include <BRepPrimAPI_MakeCone.hxx>
-# include <BRepPrimAPI_MakeTorus.hxx>
-# include <BRepPrimAPI_MakePrism.hxx>
-
-# include <ShapeAnalysis_FreeBounds.hxx>
-# include <ShapeFix_Shape.hxx>
-# include <ShapeFix_ShapeTolerance.hxx>
-
-# include <GeomAPI_IntSS.hxx>
-
-# include <TopExp.hxx>
-# include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-# include <TopoDS.hxx>
-# include <Precision.hxx>
-
-# include <OSD_OpenFile.hxx>
-
 #endif // _PreComp_
 #endif
 
diff --git a/src/Mod/PartDesign/Gui/PreCompiled.h b/src/Mod/PartDesign/Gui/PreCompiled.h
index bb26a57325..4065daab5c 100644
--- a/src/Mod/PartDesign/Gui/PreCompiled.h
+++ b/src/Mod/PartDesign/Gui/PreCompiled.h
@@ -20,71 +20,43 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef __PRECOMPILED_GUI__
 #define __PRECOMPILED_GUI__
 
 #include <FCConfig.h>
 
-
 #ifdef _MSC_VER
 #   pragma warning(disable : 4005)
 #endif
 
 #ifdef _PreComp_
 
-// standard
-#include <algorithm>
-#include <cassert>
-#include <cmath>
-#include <iostream>
-#include <sstream>
-
-// Boost
-#include <boost/bind/bind.hpp>
-#include <boost/core/ignore_unused.hpp>
-
-// OCC
-#include <Standard_math.hxx>
-#include <Standard_Version.hxx>
-#include <Bnd_Box.hxx>
-#include <BRepBndLib.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <BRepMesh_IncrementalMesh.hxx>
-#include <BRep_Tool.hxx>
-#include <GeomLib_IsPlanarSurface.hxx>
-#include <TopoDS.hxx>
-#include <TopExp.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
-#include <BRepAdaptor_Surface.hxx>
-
-// STL
-#include <vector>
-#include <map>
-#include <string>
-#include <list>
-#include <set>
-#include <algorithm>
-#include <stack>
-#include <queue>
-#include <bitset>
-
 #ifdef FC_OS_WIN32
 # include <windows.h>
 #endif
 
+// Boost
+#include <boost/core/ignore_unused.hpp>
 
-// Qt Toolkit
+// OCC
+#include <Standard_Version.hxx>
+#include <Bnd_Box.hxx>
+#include <BRepAdaptor_Curve.hxx>
+#include <BRepAdaptor_Surface.hxx>
+#include <BRepBndLib.hxx>
+#include <BRep_Tool.hxx>
+#include <BRepMesh_IncrementalMesh.hxx>
+#include <GeomLib_IsPlanarSurface.hxx>
+#include <TopExp.hxx>
+#include <TopExp_Explorer.hxx>
+#include <TopoDS.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
+
+// Qt
 #ifndef __QtAll__
 # include <Gui/QtAll.h>
 #endif
 
-#include <QMessageBox>
-#include <QMenu>
-#include <QAction>
-#include <QMessageBox>
-
 // Inventor
 #ifndef __InventorAll__
 # include <Gui/InventorAll.h>