diff --git a/src/Mod/TechDraw/App/DrawViewDimension.cpp b/src/Mod/TechDraw/App/DrawViewDimension.cpp
index 39bc89c8ef..b633fcedc5 100644
--- a/src/Mod/TechDraw/App/DrawViewDimension.cpp
+++ b/src/Mod/TechDraw/App/DrawViewDimension.cpp
@@ -30,13 +30,12 @@
 # include <QString>
 # include <QStringList>
 # include <QRegExp>
-#endif
-
-#include <QLocale>
-
 #include <BRepBuilderAPI_MakeVertex.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRepExtrema_DistShapeShape.hxx>
+#endif
+
+#include <QLocale>
 
 #include <App/Application.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/App/DrawViewPart.cpp b/src/Mod/TechDraw/App/DrawViewPart.cpp
index 12e4a011ac..0f9723bee0 100644
--- a/src/Mod/TechDraw/App/DrawViewPart.cpp
+++ b/src/Mod/TechDraw/App/DrawViewPart.cpp
@@ -26,52 +26,39 @@
 
 #ifndef _PreComp_
 # include <sstream>
-#endif
 
-#include <algorithm>
-//#include <limits>
-
-#include <HLRBRep_Algo.hxx>
-#include <TopoDS_Shape.hxx>
-#include <HLRTopoBRep_OutLiner.hxx>
-#include <HLRAlgo_Projector.hxx>
-#include <HLRBRep_ShapeBounds.hxx>
-#include <HLRBRep_HLRToShape.hxx>
+#include <BRep_Tool.hxx>
+#include <BRepGProp.hxx>
+#include <BRepAdaptor_Curve.hxx>
+#include <BRepBuilderAPI_MakeEdge.hxx>
+#include <BRepBuilderAPI_MakeWire.hxx>
+#include <BRepLProp_CurveTool.hxx>
+#include <BRepLProp_CLProps.hxx>
+#include <BRepExtrema_DistShapeShape.hxx>
+#include <BRepBuilderAPI_MakeFace.hxx>
+#include <BRepBndLib.hxx>
+#include <Bnd_Box.hxx>
+#include <Geom_Curve.hxx>
+#include <GProp_GProps.hxx>
 #include <gp_Ax2.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Dir.hxx>
-#include <Poly_Polygon3D.hxx>
-#include <Poly_Triangulation.hxx>
-#include <Poly_PolygonOnTriangulation.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopExp.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
-#include <BRep_Tool.hxx>
-#include <BRepBndLib.hxx>
-#include <Bnd_Box.hxx>
-#include <TopTools_HSequenceOfShape.hxx>
-#include <ShapeAnalysis_FreeBounds.hxx>
-#include <GProp_GProps.hxx>
-#include <BRepGProp.hxx>
-
-#include <BRepAdaptor_Curve.hxx>
-#include <Geom_Curve.hxx>
-#include <BRepBuilderAPI_MakeEdge.hxx>
-#include <BRepLProp_CurveTool.hxx>
-#include <BRepLProp_CLProps.hxx>
-#include <GeomLib_Tool.hxx>
-#include <BRepLib.hxx>
-#include <BRepExtrema_DistShapeShape.hxx>
-#include <BRepBuilderAPI_MakeFace.hxx>
+#include <HLRBRep_Algo.hxx>
+#include <HLRAlgo_Projector.hxx>
+#include <HLRBRep_ShapeBounds.hxx>
+#include <HLRBRep_HLRToShape.hxx>
 #include <ShapeFix_ShapeTolerance.hxx>
 #include <ShapeExtend_WireData.hxx>
 #include <ShapeFix_Wire.hxx>
-#include <BRepBuilderAPI_MakeWire.hxx>
+#include <TopoDS.hxx>
+#include <TopoDS_Shape.hxx>
+#include <TopoDS_Face.hxx>
+#include <TopExp.hxx>
+#include <TopExp_Explorer.hxx>
+
+#endif
+
+#include <algorithm>
 
 #include <Base/BoundBox.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/App/DrawViewSection.cpp b/src/Mod/TechDraw/App/DrawViewSection.cpp
index c3887191ef..dfaa709426 100644
--- a/src/Mod/TechDraw/App/DrawViewSection.cpp
+++ b/src/Mod/TechDraw/App/DrawViewSection.cpp
@@ -26,56 +26,31 @@
 
 #ifndef _PreComp_
 # include <sstream>
-#endif
 
-#include <HLRBRep_Algo.hxx>
-#include <TopoDS_Shape.hxx>
-#include <HLRTopoBRep_OutLiner.hxx>
-
-#include <BRepBndLib.hxx>
-#include <Bnd_Box.hxx>
-#include <TopTools_HSequenceOfShape.hxx>
-#include <ShapeAnalysis_FreeBounds.hxx>
-#include <GProp_GProps.hxx>
-#include <BRepGProp.hxx>
-
-#include <HLRAlgo_Projector.hxx>
-#include <HLRBRep_ShapeBounds.hxx>
-#include <HLRBRep_HLRToShape.hxx>
+#include <BRepBuilderAPI_MakePolygon.hxx>
+#include <BRepBuilderAPI_Copy.hxx>
+#include <BRepAlgoAPI_Cut.hxx>
+#include <BRepPrimAPI_MakePrism.hxx>
+#include <BRepBuilderAPI_MakeFace.hxx>
+#include <BRepAdaptor_Surface.hxx>
 #include <gp_Ax2.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Dir.hxx>
 #include <Geom_Plane.hxx>
-#include <Poly_Polygon3D.hxx>
-#include <Poly_Triangulation.hxx>
-#include <Poly_PolygonOnTriangulation.hxx>
+#include <HLRBRep_Algo.hxx>
+#include <HLRAlgo_Projector.hxx>
+#include <HLRBRep_HLRToShape.hxx>
+#include <TopoDS_Shape.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
-#include <BRep_Tool.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <BRepMesh.hxx>
 
-#include <BRepBuilderAPI_MakePolygon.hxx>
-#include <BRepBuilderAPI_Copy.hxx>
-#include <BRepAlgoAPI_Cut.hxx>
-#include <BRepPrim_FaceBuilder.hxx>
-#include <BRepPrimAPI_MakePrism.hxx>
-#include <BRepBuilderAPI_MakeFace.hxx>
-#include <BRepMesh_IncrementalMesh.hxx>
-#include <BRepBuilderAPI_MakeEdge.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <Geom_Curve.hxx>
+#endif
 
-#include <boost/concept_check.hpp>
 
 #include <App/Application.h>
 #include <App/Material.h>
@@ -85,7 +60,6 @@
 #include <Base/Parameter.h>
 
 #include <Mod/Part/App/PartFeature.h>
-#include <Mod/Part/App/Geometry.h>
 
 #include "Geometry.h"
 #include "GeometryObject.h"
diff --git a/src/Mod/TechDraw/App/Geometry.cpp b/src/Mod/TechDraw/App/Geometry.cpp
index b95767e6a8..0080df0c19 100644
--- a/src/Mod/TechDraw/App/Geometry.cpp
+++ b/src/Mod/TechDraw/App/Geometry.cpp
@@ -22,52 +22,28 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <BRepAdaptor_Curve.hxx>
-# include <Geom_Circle.hxx>
-# include <gp_Circ.hxx>
-# include <gp_Elips.hxx>
-#endif
-
+#include <Approx_Curve3d.hxx>
 #include <Bnd_Box.hxx>
 #include <BRepBndLib.hxx>
+#include <BRepAdaptor_Curve.hxx>
+#include <BRep_Tool.hxx>
+#include <BRepAdaptor_HCurve.hxx>
 #include <BRepLib.hxx>
-#include <BRepBuilderAPI_Transform.hxx>
-#include <HLRBRep_Algo.hxx>
-#include <TopoDS_Shape.hxx>
-#include <HLRTopoBRep_OutLiner.hxx>
-//#include <BRepAPI_MakeOutLine.hxx>
-#include <HLRAlgo_Projector.hxx>
-#include <HLRBRep_ShapeBounds.hxx>
-#include <HLRBRep_HLRToShape.hxx>
-#include <gp_Ax2.hxx>
+#include <gp_Circ.hxx>
+#include <gp_Elips.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Vec.hxx>
-#include <Poly_Polygon3D.hxx>
-#include <Poly_Triangulation.hxx>
-#include <Poly_PolygonOnTriangulation.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopExp.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
-#include <BRep_Tool.hxx>
-#include <BRepMesh.hxx>
-
-#include <BRepAdaptor_CompCurve.hxx>
-#include <BRepAdaptor_HCompCurve.hxx>
-#include <Approx_Curve3d.hxx>
-#include <BRepAdaptor_HCurve.hxx>
 #include <Geom_BSplineCurve.hxx>
 #include <Geom_BezierCurve.hxx>
 #include <GeomConvert_BSplineCurveToBezierCurve.hxx>
-#include <GeomConvert_BSplineCurveKnotSplitting.hxx>
-#include <Geom2d_BSplineCurve.hxx>
+#include <Poly_Polygon3D.hxx>
+#include <TopoDS.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopExp.hxx>
+#include <TopExp_Explorer.hxx>
+#include <TColgp_Array1OfPnt2d.hxx>
+#endif  // #ifndef _PreComp_
 
 #include <Base/Console.h>
 #include <Base/Exception.h>
diff --git a/src/Mod/TechDraw/App/GeometryObject.cpp b/src/Mod/TechDraw/App/GeometryObject.cpp
index e5837a6308..174f9b5e3f 100644
--- a/src/Mod/TechDraw/App/GeometryObject.cpp
+++ b/src/Mod/TechDraw/App/GeometryObject.cpp
@@ -20,86 +20,49 @@
  *                                                                         *
  ***************************************************************************/
 
-# include "PreCompiled.h"
+#include "PreCompiled.h"
 #ifndef _PreComp_
 
-# include <gp_Ax2.hxx>
-# include <gp_Circ.hxx>
-# include <gp_Dir.hxx>
-# include <gp_Elips.hxx>
-# include <gp_Pln.hxx>
-# include <gp_Vec.hxx>
-
-# include <Bnd_Box.hxx>
-# include <BRepBndLib.hxx>
-# include <BRepBuilderAPI_Transform.hxx>
-# include <BRepBuilderAPI_MakeFace.hxx>
-
-# include <HLRTopoBRep_OutLiner.hxx>
-# include <HLRBRep.hxx>
-# include <HLRBRep_Algo.hxx>
-# include <HLRBRep_Data.hxx>
-# include <HLRBRep_EdgeData.hxx>
-# include <HLRAlgo_EdgeIterator.hxx>
-# include <HLRBRep_HLRToShape.hxx>
-# include <HLRAlgo_Projector.hxx>
-# include <HLRBRep_ShapeBounds.hxx>
-
-# include <Poly_Polygon3D.hxx>
-# include <Poly_Triangulation.hxx>
-# include <Poly_PolygonOnTriangulation.hxx>
-
-# include <TopoDS.hxx>
-# include <TopoDS_Shape.hxx>
-# include <TopoDS_Vertex.hxx>
-# include <TopoDS_Edge.hxx>
-# include <TopoDS_Wire.hxx>
-# include <TopoDS_Face.hxx>
-# include <TopoDS_Builder.hxx>
-# include <TopExp.hxx>
-# include <TopExp_Explorer.hxx>
-# include <TopTools_ListIteratorOfListOfShape.hxx>
-# include <TopTools_IndexedMapOfShape.hxx>
-# include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-# include <TopTools_ListOfShape.hxx>
-# include <TColgp_Array1OfPnt2d.hxx>
-
-# include <BRep_Tool.hxx>
-# include <BRepMesh.hxx>
-# include <BRepMesh_IncrementalMesh.hxx>
-# include <BRep_Builder.hxx>
-# include <BRepBuilderAPI_MakeEdge.hxx>
-# include <BRepBuilderAPI_MakeWire.hxx>
-# include <BRepTools_WireExplorer.hxx>
-# include <ShapeFix_Wire.hxx>
-# include <BRepProj_Projection.hxx>
+#include <BRep_Tool.hxx>
+#include <BRepMesh_IncrementalMesh.hxx>
 #include <BRepLib.hxx>
-
-# include <BRepAdaptor_CompCurve.hxx>
-
 #include <BRepLProp_CurveTool.hxx>
 #include <BRepLProp_CLProps.hxx>
+#include <Bnd_Box.hxx>
+#include <BRepBndLib.hxx>
+#include <BRepBuilderAPI_Transform.hxx>
+#include <BRepBuilderAPI_MakeFace.hxx>
+#include <gp_Ax2.hxx>
+#include <gp_Circ.hxx>
+#include <gp_Dir.hxx>
+#include <gp_Elips.hxx>
+#include <gp_Pln.hxx>
+#include <gp_Vec.hxx>
+#include <HLRTopoBRep_OutLiner.hxx>
+#include <HLRBRep.hxx>
+#include <HLRBRep_Algo.hxx>
+#include <HLRBRep_Data.hxx>
+#include <HLRBRep_HLRToShape.hxx>
+#include <HLRAlgo_Projector.hxx>
+#include <TopoDS.hxx>
+#include <TopoDS_Shape.hxx>
+#include <TopoDS_Vertex.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Wire.hxx>
+#include <TopoDS_Face.hxx>
+#include <TopExp.hxx>
+#include <TopExp_Explorer.hxx>
 
-# include <Approx_Curve3d.hxx>
-
-# include <BRepAdaptor_HCurve.hxx>
-# include <Geom_BSplineCurve.hxx>
-# include <Geom_BezierCurve.hxx>
-# include <GeomConvert_BSplineCurveToBezierCurve.hxx>
-# include <GeomConvert_BSplineCurveKnotSplitting.hxx>
-# include <Geom2d_BSplineCurve.hxx>
-
-#include <ProjLib_Plane.hxx>
 #endif  // #ifndef _PreComp_
 
 #include <algorithm>
 
-# include <Base/Console.h>
-# include <Base/Exception.h>
-# include <Base/FileInfo.h>
-# include <Base/Tools.h>
+#include <Base/Console.h>
+#include <Base/Exception.h>
+#include <Base/FileInfo.h>
+#include <Base/Tools.h>
 
-# include <Mod/Part/App/PartFeature.h>
+#include <Mod/Part/App/PartFeature.h>
 
 #include "GeometryObject.h"
 
@@ -113,7 +76,6 @@ struct EdgePoints {
 };
 
 //debugging routine signatures
-void _dumpEdgeData(char* label, int i, HLRBRep_EdgeData& ed);
 const char* _printBool(bool b);
 void _dumpEdge(char* label, int i, TopoDS_Edge e);
 
@@ -693,15 +655,6 @@ TopoDS_Shape TechDrawGeometry::mirrorShape(const TopoDS_Shape &input,
 }
 
 /// debug functions
-void _dumpEdgeData(char* label, int i, HLRBRep_EdgeData& ed)
-{
-    Base::Console().Message("Dump of EdgeData for %s Edge: %d\n",label,i);
-    Base::Console().Message("Selected:%s Smooth(Rg1):%s Sewn(RgN):%s OutSta:%s OutEnd:%s\n",
-                            _printBool(ed.Selected()),_printBool(ed.Rg1Line()),_printBool(ed.RgNLine()),_printBool(ed.OutLVSta()),_printBool(ed.OutLVEnd()));
-    Base::Console().Message("Vertical:%s Simple:%s Used:%s HideCount:%d\n",
-                            _printBool(ed.Vertical()),_printBool(ed.Simple()),_printBool(ed.Used()),ed.HideCount());
-}
-
 /* TODO: Clean this up when faces are actually working properly...
 
 void debugEdge(const TopoDS_Edge &e)