diff --git a/src/Mod/Part/App/OpenCascadeAll.h b/src/Mod/Part/App/OpenCascadeAll.h
index ec0ee1a14a..b05ee16169 100644
--- a/src/Mod/Part/App/OpenCascadeAll.h
+++ b/src/Mod/Part/App/OpenCascadeAll.h
@@ -20,11 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef __OpenCascadeAll__
 #define __OpenCascadeAll__
 
 // OpenCASCADE
+
+// Standard*
 #include <Standard_AbortiveTransaction.hxx>
 #include <Standard_Address.hxx>
 #include <Standard_Boolean.hxx>
@@ -79,212 +80,141 @@
 #include <Standard_UUID.hxx>
 #include <Standard_Version.hxx>
 
-#include <gce_MakeLin.hxx>
-#include <BRepIntCurveSurface_Inter.hxx>
-#include <IntCurveSurface_IntersectionPoint.hxx>
-#include <gce_MakeDir.hxx>
-
-#include <TCollection_ExtendedString.hxx>
-#include <TCollection_AsciiString.hxx>
-#include <TColStd_Array1OfReal.hxx>
-#include <TColStd_Array2OfReal.hxx>
-#include <TColStd_Array1OfInteger.hxx>
-#include <TColStd_SequenceOfExtendedString.hxx>
-#include <TColStd_HSequenceOfTransient.hxx>
-#include <TColStd_MapIteratorOfMapOfTransient.hxx>
-#include <TColStd_MapOfTransient.hxx>
-#include <TColStd_HArray1OfBoolean.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
-#include <TColgp_Array2OfPnt.hxx>
-#include <TColgp_HArray1OfPnt2d.hxx>
-#include <TColgp_HArray2OfPnt.hxx>
-#include <TColgp_Array1OfVec.hxx>
-#include <TColgp_SequenceOfXYZ.hxx>
-
-#include <TopAbs_ShapeEnum.hxx>
-
-#include <TopoDS.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Wire.hxx>
-#include <TopoDS_Compound.hxx>
-#include <TopoDS_CompSolid.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Solid.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopoDS_Iterator.hxx>
-#include <TopoDS_Shell.hxx>
-
-#include <TopExp.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TopLoc_Location.hxx>
-
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <TopTools_HSequenceOfShape.hxx>
-#include <TopTools_MapOfShape.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
-#include <TopTools_DataMapOfIntegerShape.hxx>
-#include <TopTools_DataMapOfIntegerListOfShape.hxx>
-
-#include <BSplCLib.hxx>
-
-#include <BRepLib_MakeWire.hxx>
-#include <BRepLib_FuseEdges.hxx>
-#include <BRepBuilderAPI_MakeFace.hxx>
-#include <BRepBuilderAPI_MakeSolid.hxx>
-#include <BRepBuilderAPI_Sewing.hxx>
-#include <Geom_Conic.hxx>
-#include <ShapeBuild_ReShape.hxx>
-#include <ShapeFix_Face.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfIntegerListOfShape.hxx>
-#include <BRep_Builder.hxx>
-#include <Bnd_Box.hxx>
-#include <BRepBndLib.hxx>
-#include <ShapeAnalysis_Edge.hxx>
-#include <ShapeAnalysis_Curve.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <TColgp_SequenceOfPnt.hxx>
-#include <GeomAPI_ProjectPointOnSurf.hxx>
-#include <BRepGProp.hxx>
-#include <GProp_GProps.hxx>
-#include <Standard_Version.hxx>
-
-#include <STEPConstruct_Styles.hxx>
-#include <TColStd_HSequenceOfTransient.hxx>
-#include <STEPConstruct.hxx>
-#include <StepVisual_StyledItem.hxx>
-#include <StepShape_ShapeRepresentation.hxx>
-#include <StepVisual_PresentationStyleByContext.hxx>
-#include <StepVisual_StyleContextSelect.hxx>
-#include <StepVisual_PresentationStyleByContext.hxx>
-#include <Interface_EntityIterator.hxx>
-#include <StepRepr_RepresentedDefinition.hxx>
-#include <StepShape_ShapeDefinitionRepresentation.hxx>
-#include <StepRepr_CharacterizedDefinition.hxx>
-#include <StepRepr_ProductDefinitionShape.hxx>
-#include <StepRepr_AssemblyComponentUsage.hxx>
-#include <StepRepr_AssemblyComponentUsage.hxx>
-#include <StepRepr_SpecifiedHigherUsageOccurrence.hxx>
-#include <Quantity_Color.hxx>
-#include <TCollection_ExtendedString.hxx>
-#include <StepBasic_Product.hxx>
-#include <StepBasic_Product.hxx>
-#include <StepBasic_ProductDefinition.hxx>
-#include <StepBasic_ProductDefinition.hxx>
-#include <StepBasic_ProductDefinitionFormation.hxx>
-
-#include <NCollection_List.hxx>
-
-#include <HLRAppli_ReflectLines.hxx>
-#include <BRepAlgo_NormalProjection.hxx>
-#include <ShapeAnalysis_ShapeTolerance.hxx>
-#include <ShapeFix_ShapeTolerance.hxx>
-
-#include <BRepOffset_MakeOffset.hxx>
-#include <BRepClass3d.hxx>
+// now in alphabetical order
 #if OCC_VERSION_HEX < 0x070600
-#include <Adaptor3d_HCurve.hxx>
-#include <Adaptor3d_HCurveOnSurface.hxx>
-#include <BRepAdaptor_HCurve.hxx>
-#include <BRepAdaptor_HCompCurve.hxx>
-#include <Geom2dAdaptor_HCurve.hxx>
-#include <GeomAdaptor_HCurve.hxx>
+# include <Adaptor3d_HCurve.hxx>
+# include <Adaptor3d_HCurveOnSurface.hxx>
 #endif
+#include <APIHeaderSection_MakeHeader.hxx>
+#include <Approx_Curve3d.hxx>
+
+#include <BinTools.hxx>
+#include <BinTools_ShapeSet.hxx>
+#include <BOPAlgo_ArgumentAnalyzer.hxx>
+#include <BOPAlgo_ListOfCheckResult.hxx>
+#include <Bnd_Box.hxx>
+
+// BRep*
+#include <BRep_Builder.hxx>
+#include <BRep_Tool.hxx>
 
 #include <BRepAdaptor_CompCurve.hxx>
 #include <BRepAdaptor_Curve.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <BRepAlgoAPI_Common.hxx>
-#include <BRepAlgoAPI_Cut.hxx>
-#include <BRepAlgoAPI_Fuse.hxx>
-#include <BRepAlgoAPI_Section.hxx>
-#if OCC_VERSION_HEX < 0x070300
-#include <BRepAlgo_Fuse.hxx>
+#if OCC_VERSION_HEX < 0x070600
+# include <BRepAdaptor_HCurve.hxx>
+# include <BRepAdaptor_HCompCurve.hxx>
 #endif
-#if OCC_VERSION_HEX >= 0x070300
-#include <BRepAlgoAPI_Defeaturing.hxx>
+#include <BRepAdaptor_Surface.hxx>
+
+#if OCC_VERSION_HEX < 0x070300
+# include <BRepAlgo_Fuse.hxx>
 #endif
 #include <BRepAlgo_NormalProjection.hxx>
+#include <BRepAlgoAPI_Common.hxx>
+#include <BRepAlgoAPI_Cut.hxx>
+#if OCC_VERSION_HEX >= 0x070300
+# include <BRepAlgoAPI_Defeaturing.hxx>
+#endif
+#include <BRepAlgoAPI_Fuse.hxx>
+#include <BRepAlgoAPI_Section.hxx>
+
 #include <BRepBndLib.hxx>
-#include <Bnd_Box.hxx>
-#include <BRep_Builder.hxx>
+
 #include <BRepBuilderAPI.hxx>
+#include <BRepBuilderAPI_Copy.hxx>
 #include <BRepBuilderAPI_FindPlane.hxx>
 #include <BRepBuilderAPI_GTransform.hxx>
-#include <BRepBuilderAPI_MakeEdge2d.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
+#include <BRepBuilderAPI_MakeEdge2d.hxx>
 #include <BRepBuilderAPI_MakeFace.hxx>
-#include <BRepBuilderAPI_MakeWire.hxx>
 #include <BRepBuilderAPI_MakePolygon.hxx>
 #include <BRepBuilderAPI_MakeShell.hxx>
 #include <BRepBuilderAPI_MakeSolid.hxx>
 #include <BRepBuilderAPI_MakeVertex.hxx>
+#include <BRepBuilderAPI_MakeWire.hxx>
+#include <BRepBuilderAPI_NurbsConvert.hxx>
 #include <BRepBuilderAPI_Sewing.hxx>
 #include <BRepBuilderAPI_Transform.hxx>
-#include <BRepTopAdaptor_FClass2d.hxx>
-#include <BRepLProp_SurfaceTool.hxx>
-#include <BRepGProp_Face.hxx>
+
+#include <BRepCheck_Analyzer.hxx>
+#include <BRepCheck_ListIteratorOfListOfStatus.hxx>
+#include <BRepCheck_Result.hxx>
 #include <BRepClass_FaceClassifier.hxx>
 #include <BRepClass3d.hxx>
 #include <BRepClass3d_SolidClassifier.hxx>
 #include <BRepExtrema_DistShapeShape.hxx>
 #include <BRepExtrema_MapOfIntegerPackedMapOfInteger.hxx>
 #include <BRepExtrema_ShapeProximity.hxx>
-#include <BRepFeat_SplitShape.hxx>
 #include <BRepFeat_MakePrism.hxx>
-#include <BRepFilletAPI_MakeChamfer.hxx>
-#include <BRepFilletAPI_MakeFillet.hxx>
+#include <BRepFeat_SplitShape.hxx>
 #include <BRepFill.hxx>
 #include <BRepFill_Filling.hxx>
+#include <BRepFilletAPI_MakeChamfer.hxx>
+#include <BRepFilletAPI_MakeFillet.hxx>
 #include <BRepGProp.hxx>
 #include <BRepGProp_Face.hxx>
+#include <BRepIntCurveSurface_Inter.hxx>
 #include <BRepLProp_CLProps.hxx>
-#include <BRepLProp_SLProps.hxx>
 #include <BRepLProp_CurveTool.hxx>
+#include <BRepLProp_SLProps.hxx>
 #include <BRepLib.hxx>
 #include <BRepLib_FindSurface.hxx>
 #include <BRepLib_FuseEdges.hxx>
+#include <BRepLib_MakeWire.hxx>
+#include <BRepLProp_SurfaceTool.hxx>
+
+#if OCC_VERSION_HEX < 0x070400
+# include <BRepMesh.hxx>
+#endif
+#include <BRepMesh_Edge.hxx>
+#include <BRepMesh_IncrementalMesh.hxx>
+#include <BRepMesh_Triangle.hxx>
+
+#include <BRepOffset_MakeOffset.hxx>
+#include <BRepOffsetAPI_DraftAngle.hxx>
 #include <BRepOffsetAPI_MakeOffset.hxx>
 #include <BRepOffsetAPI_MakePipe.hxx>
 #include <BRepOffsetAPI_MakePipeShell.hxx>
 #include <BRepOffsetAPI_MakeThickSolid.hxx>
 #include <BRepOffsetAPI_ThruSections.hxx>
-#include <BRepBuilderAPI_NurbsConvert.hxx>
-#include <BRepOffsetAPI_DraftAngle.hxx>
+
 #include <BRepPrimAPI_MakeBox.hxx>
 #include <BRepPrimAPI_MakeCone.hxx>
 #include <BRepPrimAPI_MakeCylinder.hxx>
 #include <BRepPrimAPI_MakeHalfSpace.hxx>
 #include <BRepPrimAPI_MakeRevol.hxx>
-#include <BRepPrimAPI_MakePrism.hxx>
 #include <BRepPrimAPI_MakeRevolution.hxx>
+#include <BRepPrimAPI_MakePrism.hxx>
 #include <BRepPrimAPI_MakeSphere.hxx>
 #include <BRepPrimAPI_MakeTorus.hxx>
-#if OCC_VERSION_HEX < 0x070400
-#include <BRepMesh.hxx>
-#endif
-#include <BRepMesh_Edge.hxx>
-#include <BRepMesh_IncrementalMesh.hxx>
-#include <BRepMesh_Triangle.hxx>
+
+#include <BRepProj_Projection.hxx>
 #include <BRepTools.hxx>
-#include <BRep_Tool.hxx>
 #include <BRepTools_ShapeSet.hxx>
 #include <BRepTools_WireExplorer.hxx>
 #include <BRepTopAdaptor_FClass2d.hxx>
-#include <BRepBuilderAPI_Copy.hxx>
-#include <BRepCheck_Analyzer.hxx>
-#include <BRepCheck_Result.hxx>
-#include <BRepCheck_ListIteratorOfListOfStatus.hxx>
-#include <BRepProj_Projection.hxx>
-#include <Poly_Connect.hxx>
-#include <Poly_Triangulation.hxx>
-#include <Poly_PolygonOnTriangulation.hxx>
-#include <Poly_Polygon3D.hxx>
 
-#include <GCE2d_MakeSegment.hxx>
+#include <BSplCLib.hxx>
+#include <CSLib.hxx>
+
+// Gc*
+#include <GC_MakeArcOfCircle.hxx>
+#include <GC_MakeArcOfEllipse.hxx>
+#include <GC_MakeArcOfHyperbola.hxx>
+#include <GC_MakeArcOfParabola.hxx>
+#include <GC_MakeCircle.hxx>
+#include <GC_MakeConicalSurface.hxx>
+#include <GC_MakeCylindricalSurface.hxx>
+#include <GC_MakeEllipse.hxx>
+#include <GC_MakeHyperbola.hxx>
+#include <GC_MakeLine.hxx>
+#include <GC_MakePlane.hxx>
+#include <GC_MakeSegment.hxx>
+#include <gce_MakeCirc.hxx>
+#include <gce_MakeDir.hxx>
+#include <gce_MakeLin.hxx>
+#include <gce_MakeParab.hxx>
+#include <gce_MakeParab2d.hxx>
 #include <GCE2d_MakeArcOfCircle.hxx>
 #include <GCE2d_MakeArcOfEllipse.hxx>
 #include <GCE2d_MakeArcOfHyperbola.hxx>
@@ -294,29 +224,42 @@
 #include <GCE2d_MakeHyperbola.hxx>
 #include <GCE2d_MakeLine.hxx>
 #include <GCE2d_MakeParabola.hxx>
+#include <GCE2d_MakeSegment.hxx>
 #include <GCPnts_AbscissaPoint.hxx>
 #include <GCPnts_QuasiUniformAbscissa.hxx>
 #include <GCPnts_QuasiUniformDeflection.hxx>
 #include <GCPnts_TangentialDeflection.hxx>
 #include <GCPnts_UniformAbscissa.hxx>
-#include <GC_MakeArcOfCircle.hxx>
-#include <GC_MakeArcOfEllipse.hxx>
-#include <GC_MakeArcOfParabola.hxx>
-#include <GC_MakeArcOfHyperbola.hxx>
-#include <GC_MakeCircle.hxx>
-#include <GC_MakeConicalSurface.hxx>
-#include <GC_MakeCylindricalSurface.hxx>
-#include <GC_MakeEllipse.hxx>
-#include <GC_MakeHyperbola.hxx>
-#include <GC_MakeLine.hxx>
-#include <GC_MakePlane.hxx>
-#include <GC_MakeSegment.hxx>
 #include <GCPnts_UniformDeflection.hxx>
-#include <gce_MakeParab.hxx>
-#include <gce_MakeParab2d.hxx>
-
-#include <CSLib.hxx>
 
+// Geom*
+#include <Geom_Axis2Placement.hxx>
+#include <Geom_BezierCurve.hxx>
+#include <Geom_BezierSurface.hxx>
+#include <Geom_BSplineCurve.hxx>
+#include <Geom_BSplineSurface.hxx>
+#include <Geom_CartesianPoint.hxx>
+#include <Geom_Circle.hxx>
+#include <Geom_Conic.hxx>
+#include <Geom_ConicalSurface.hxx>
+#include <Geom_CylindricalSurface.hxx>
+#include <Geom_Ellipse.hxx>
+#include <Geom_Hyperbola.hxx>
+#include <Geom_Line.hxx>
+#include <Geom_OffsetCurve.hxx>
+#include <Geom_OffsetSurface.hxx>
+#include <Geom_Parabola.hxx>
+#include <Geom_Plane.hxx>
+#include <Geom_RectangularTrimmedSurface.hxx>
+#include <Geom_SphericalSurface.hxx>
+#include <Geom_Surface.hxx>
+#include <Geom_SurfaceOfLinearExtrusion.hxx>
+#include <Geom_SurfaceOfRevolution.hxx>
+#include <Geom_TrimmedCurve.hxx>
+#include <Geom_ToroidalSurface.hxx>
+#if OCC_VERSION_HEX < 0x070600
+# include <Geom2dAdaptor_HCurve.hxx>
+#endif
 #include <Geom2d_BezierCurve.hxx>
 #include <Geom2d_BSplineCurve.hxx>
 #include <Geom2d_Curve.hxx>
@@ -324,6 +267,9 @@
 #include <Geom2d_Line.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
+#if OCC_VERSION_HEX < 0x070600
+# include <GeomAdaptor_HCurve.hxx>
+#endif
 #include <Geom2dAPI_ExtremaCurveCurve.hxx>
 #include <Geom2dAPI_InterCurveCurve.hxx>
 #include <Geom2dAPI_Interpolate.hxx>
@@ -334,43 +280,19 @@
 #include <Geom2dConvert_BSplineCurveToBezierCurve.hxx>
 #include <Geom2dConvert_CompCurveToBSplineCurve.hxx>
 #include <Geom2dLProp_CLProps2d.hxx>
-
-#include <Geom_Axis2Placement.hxx>
-#include <Geom_CartesianPoint.hxx>
-#include <Geom_Line.hxx>
-#include <Geom_OffsetCurve.hxx>
-#include <Geom_RectangularTrimmedSurface.hxx>
-#include <Geom_Surface.hxx>
-#include <Geom_TrimmedCurve.hxx>
-#include <GeomAbs_CurveType.hxx>
 #include <GeomAdaptor_Curve.hxx>
-#include <Geom_BezierCurve.hxx>
-#include <Geom_BezierSurface.hxx>
-#include <Geom_BSplineCurve.hxx>
-#include <Geom_BSplineSurface.hxx>
-#include <Geom_Circle.hxx>
-#include <Geom_ConicalSurface.hxx>
-#include <Geom_CylindricalSurface.hxx>
-#include <Geom_Ellipse.hxx>
-#include <Geom_Hyperbola.hxx>
-#include <Geom_OffsetSurface.hxx>
-#include <Geom_SphericalSurface.hxx>
-#include <Geom_SurfaceOfLinearExtrusion.hxx>
-#include <Geom_SurfaceOfRevolution.hxx>
-#include <Geom_Parabola.hxx>
-#include <Geom_Plane.hxx>
-#include <Geom_ToroidalSurface.hxx>
+#include <GeomAbs_CurveType.hxx>
 #include <GeomAdaptor.hxx>
 #include <GeomAdaptor_Surface.hxx>
 #include <GeomAPI.hxx>
+#include <GeomAPI_IntCS.hxx>
+#include <GeomAPI_Interpolate.hxx>
+#include <GeomAPI_IntSS.hxx>
 #include <GeomAPI_ExtremaCurveCurve.hxx>
 #include <GeomAPI_PointsToBSpline.hxx>
 #include <GeomAPI_PointsToBSplineSurface.hxx>
 #include <GeomAPI_ProjectPointOnSurf.hxx>
 #include <GeomAPI_ProjectPointOnCurve.hxx>
-#include <GeomAPI_Interpolate.hxx>
-#include <GeomAPI_IntCS.hxx>
-#include <GeomAPI_IntSS.hxx>
 #include <GeomConvert.hxx>
 #include <GeomConvert_ApproxCurve.hxx>
 #include <GeomConvert_ApproxSurface.hxx>
@@ -378,33 +300,30 @@
 #include <GeomConvert_CompCurveToBSplineCurve.hxx>
 #include <GeomFill.hxx>
 #include <GeomFill_AppSurf.hxx>
-#include <GeomFill_Line.hxx>
-#include <GeomFill_SectionGenerator.hxx>
 #include <GeomFill_Generator.hxx>
 #include <GeomFill_ApproxStyle.hxx>
 #include <GeomFill_CorrectedFrenet.hxx>
 #include <GeomFill_CurveAndTrihedron.hxx>
 #include <GeomFill_EvolvedSection.hxx>
+#include <GeomFill_Line.hxx>
 #include <GeomFill_LocationLaw.hxx>
 #include <GeomFill_Pipe.hxx>
-#include <GeomFill_Sweep.hxx>
-#include <GeomFill_AppSurf.hxx>
-#include <GeomFill_Line.hxx>
 #include <GeomFill_SectionGenerator.hxx>
+#include <GeomFill_Sweep.hxx>
 #include <GeomLib.hxx>
 #include <GeomLib_IsPlanarSurface.hxx>
 #include <GeomLProp.hxx>
-#include <GeomLProp_SLProps.hxx>
 #include <GeomLProp_CLProps.hxx>
-#include <GeomPlate_MakeApprox.hxx>
+#include <GeomLProp_SLProps.hxx>
 #include <GeomPlate_BuildPlateSurface.hxx>
 #include <GeomPlate_CurveConstraint.hxx>
+#include <GeomPlate_MakeApprox.hxx>
 #include <GeomPlate_PlateG0Criterion.hxx>
 #include <GeomPlate_PointConstraint.hxx>
 #include <GeomPlate_Surface.hxx>
-#include <Geom_RectangularTrimmedSurface.hxx>
 #include <GeomTools_Curve2dSet.hxx>
 
+// gp*
 #include <gp_Ax1.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Ax2d.hxx>
@@ -429,26 +348,48 @@
 #include <gp_Vec.hxx>
 #include <gp_Vec2d.hxx>
 #include <gp_Quaternion.hxx>
-
-#include <Approx_Curve3d.hxx>
-
-#include <BSplCLib.hxx>
-
+#include <GProp_GProps.hxx>
 #include <GProp_PGProps.hxx>
 #include <GProp_PrincipalProps.hxx>
-#include <LProp_NotDefined.hxx>
 
+// HLR*
 #include <HLRAppli_ReflectLines.hxx>
+#include <HLRBRep_HLRToShape.hxx>
+#include <HLRBRep_PolyAlgo.hxx>
+#include <HLRBRep_PolyHLRToShape.hxx>
+
+#include <Interface_EntityIterator.hxx>
+#include <Interface_Static.hxx>
+
+// Iges*
+#include <IGESData_GlobalSection.hxx>
+#include <IGESData_IGESModel.hxx>
+#include <IGESControl_Controller.hxx>
+#include <IGESControl_Reader.hxx>
+#include <IGESControl_Writer.hxx>
+
+#include <IntCurveSurface_IntersectionPoint.hxx>
 #include <IntTools_FClass2d.hxx>
 #include <Law_Constant.hxx>
+#include <LProp_NotDefined.hxx>
 #include <Message_MsgFile.hxx>
+#include <NCollection_List.hxx>
+#include <OSD_OpenFile.hxx>
 #include <Precision.hxx>
-#include <UnitsAPI.hxx>
+
+// Poly*
+#include <Poly_Connect.hxx>
+#include <Poly_Polygon3D.hxx>
+#include <Poly_PolygonOnTriangulation.hxx>
+#include <Poly_Triangulation.hxx>
+
+// Quan*
+#include <Quantity_Color.hxx>
 #include <Quantity_NameOfColor.hxx>
 #include <Quantity_PhysicalQuantity.hxx>
 #include <Quantity_TypeOfColor.hxx>
 
-// Shape
+// Shape*
 #include <ShapeAlgo_AlgoContainer.hxx>
 #include <ShapeAnalysis.hxx>
 #include <ShapeAnalysis_Curve.hxx>
@@ -456,59 +397,94 @@
 #include <ShapeAnalysis_FreeBounds.hxx>
 #include <ShapeAnalysis_Shell.hxx>
 #include <ShapeAnalysis_Surface.hxx>
+#include <ShapeAnalysis_FreeBoundData.hxx>
 #include <ShapeAnalysis_FreeBoundsProperties.hxx>
 #include <ShapeAnalysis_ShapeTolerance.hxx>
+#include <ShapeBuild_ReShape.hxx>
 #include <ShapeConstruct_Curve.hxx>
 #include <ShapeExtend_Explorer.hxx>
 #include <ShapeFix.hxx>
+#include <ShapeFix_Face.hxx>
 #include <ShapeFix_Shape.hxx>
 #include <ShapeFix_ShapeTolerance.hxx>
 #include <ShapeFix_Wire.hxx>
 #include <ShapeUpgrade_ShellSewing.hxx>
 #include <ShapeUpgrade_RemoveInternalWires.hxx>
 
-// Import
-#include <APIHeaderSection_MakeHeader.hxx>
+// Step*
+#include <StepBasic_Product.hxx>
+#include <StepBasic_ProductDefinition.hxx>
+#include <StepBasic_ProductDefinitionFormation.hxx>
+#include <STEPConstruct.hxx>
+#include <STEPConstruct_Styles.hxx>
 #include <STEPControl_Controller.hxx>
-#include <STEPControl_Writer.hxx>
 #include <STEPControl_Reader.hxx>
+#include <STEPControl_Writer.hxx>
 #include <StepData_StepModel.hxx>
-#include <IGESData_IGESModel.hxx>
-#include <IGESData_GlobalSection.hxx>
-#include <IGESControl_Controller.hxx>
-#include <IGESControl_Writer.hxx>
-#include <IGESControl_Reader.hxx>
-#include <StlAPI_Writer.hxx>
-#include <Interface_Static.hxx>
-#include <Transfer_TransientProcess.hxx>
-#include <XSControl_TransferWriter.hxx>
-#include <XSControl_WorkSession.hxx>
-#include <BinTools.hxx>
-#include <BinTools_ShapeSet.hxx>
+#include <StepRepr_AssemblyComponentUsage.hxx>
+#include <StepRepr_CharacterizedDefinition.hxx>
+#include <StepRepr_ProductDefinitionShape.hxx>
+#include <StepRepr_RepresentedDefinition.hxx>
+#include <StepRepr_SpecifiedHigherUsageOccurrence.hxx>
+#include <StepShape_ShapeDefinitionRepresentation.hxx>
+#include <StepShape_ShapeRepresentation.hxx>
+#include <StepVisual_PresentationStyleByContext.hxx>
+#include <StepVisual_StyleContextSelect.hxx>
+#include <StepVisual_StyledItem.hxx>
 
-#include <XSControl_WorkSession.hxx>
+#include <StlAPI_Writer.hxx>
+
+// Tcol*
+#include <TColgp_Array1OfPnt2d.hxx>
+#include <TColgp_Array1OfVec.hxx>
+#include <TColgp_Array2OfPnt.hxx>
+#include <TColgp_HArray1OfPnt2d.hxx>
+#include <TColgp_HArray2OfPnt.hxx>
+#include <TColgp_SequenceOfPnt.hxx>
+#include <TColgp_SequenceOfXYZ.hxx>
+#include <TCollection_AsciiString.hxx>
+#include <TCollection_ExtendedString.hxx>
+#include <TColStd_Array1OfReal.hxx>
+#include <TColStd_Array1OfInteger.hxx>
+#include <TColStd_Array2OfReal.hxx>
+#include <TColStd_HArray1OfBoolean.hxx>
+#include <TColStd_HSequenceOfTransient.hxx>
+#include <TColStd_MapIteratorOfMapOfTransient.hxx>
+#include <TColStd_MapOfTransient.hxx>
+#include <TColStd_SequenceOfExtendedString.hxx>
+
+// Top*
+#include <TopAbs_ShapeEnum.hxx>
+#include <TopoDS.hxx>
+#include <TopoDS_Compound.hxx>
+#include <TopoDS_CompSolid.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Face.hxx>
+#include <TopoDS_Iterator.hxx>
+#include <TopoDS_Shape.hxx>
+#include <TopoDS_Shell.hxx>
+#include <TopoDS_Solid.hxx>
+#include <TopoDS_Vertex.hxx>
+#include <TopoDS_Wire.hxx>
+#include <TopExp.hxx>
+#include <TopExp_Explorer.hxx>
+#include <TopLoc_Location.hxx>
+#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
+#include <TopTools_DataMapIteratorOfDataMapOfIntegerListOfShape.hxx>
+#include <TopTools_DataMapOfIntegerListOfShape.hxx>
+#include <TopTools_DataMapOfIntegerShape.hxx>
+#include <TopTools_HSequenceOfShape.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TopTools_MapOfShape.hxx>
+
+#include <Transfer_FinderProcess.hxx>
+#include <Transfer_TransientProcess.hxx>
+#include <UnitsAPI.hxx>
 #include <XSControl_TransferReader.hxx>
 #include <XSControl_TransferWriter.hxx>
-#include <Transfer_TransientProcess.hxx>
-#include <Transfer_FinderProcess.hxx>
-#include <Interface_EntityIterator.hxx>
-#include <Quantity_Color.hxx>
-#include <TCollection_ExtendedString.hxx>
-
-#include <BinTools.hxx>
-#include <BinTools_ShapeSet.hxx>
-#include <APIHeaderSection_MakeHeader.hxx>
-#include <ShapeAnalysis_FreeBoundsProperties.hxx>
-#include <ShapeAnalysis_FreeBoundData.hxx>
-
-# include <BOPAlgo_ArgumentAnalyzer.hxx>
-# include <BOPAlgo_ListOfCheckResult.hxx>
-
-#if OCC_VERSION_HEX >= 0x070300
-# include <BRepAlgoAPI_Defeaturing.hxx>
-#endif
-
-#include <OSD_OpenFile.hxx>
+#include <XSControl_WorkSession.hxx>
 
 #endif // __OpenCascadeAll__
-
diff --git a/src/Mod/TechDraw/App/PreCompiled.h b/src/Mod/TechDraw/App/PreCompiled.h
index acd5ddec64..fe4d11f1a2 100644
--- a/src/Mod/TechDraw/App/PreCompiled.h
+++ b/src/Mod/TechDraw/App/PreCompiled.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef TECHDRAW_PRECOMPILED_H
 #define TECHDRAW_PRECOMPILED_H
 
@@ -74,10 +73,6 @@
 
 // OpenCasCade =====================================================================================
 #include <Mod/Part/App/OpenCascadeAll.h>
-#include <gce_MakeCirc.hxx>
-#include <HLRBRep_HLRToShape.hxx>
-#include <HLRBRep_PolyAlgo.hxx>
-#include <HLRBRep_PolyHLRToShape.hxx>
 
 #endif // _PreComp_
 #endif