diff --git a/src/Mod/Part/App/AttachEnginePyImp.cpp b/src/Mod/Part/App/AttachEnginePyImp.cpp
index 8784430eba..adee423c4f 100644
--- a/src/Mod/Part/App/AttachEnginePyImp.cpp
+++ b/src/Mod/Part/App/AttachEnginePyImp.cpp
@@ -25,17 +25,15 @@
 # include <Standard_Failure.hxx>
 #endif
 
-#include "Mod/Part/App/Attacher.h"
-#include <Base/PlacementPy.h>
 #include <App/DocumentObjectPy.h>
-#include "AttachExtensionPy.h"
-#include "TopoShapePy.h"
+#include <Base/PlacementPy.h>
 
-#include "OCCError.h"
-
-// inclusion of the generated files (generated out of AttachableObjectPy.xml)
 #include "AttachEnginePy.h"
 #include "AttachEnginePy.cpp"
+#include "AttachExtensionPy.h"
+#include "OCCError.h"
+#include "TopoShapePy.h"
+
 
 using namespace Attacher;
 
diff --git a/src/Mod/Part/App/AttachExtension.cpp b/src/Mod/Part/App/AttachExtension.cpp
index 13c9b126d5..ab2e2eedd8 100644
--- a/src/Mod/Part/App/AttachExtension.cpp
+++ b/src/Mod/Part/App/AttachExtension.cpp
@@ -21,15 +21,10 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
-
-#include "AttachExtension.h"
 
 #include <Base/Console.h>
-#include <App/Application.h>
 
-#include <App/FeaturePythonPyImp.h>
+#include "AttachExtension.h"
 #include "AttachExtensionPy.h"
 
 
diff --git a/src/Mod/Part/App/AttachExtension.h b/src/Mod/Part/App/AttachExtension.h
index c0762160b1..e2d61012cf 100644
--- a/src/Mod/Part/App/AttachExtension.h
+++ b/src/Mod/Part/App/AttachExtension.h
@@ -27,21 +27,16 @@
 #ifndef PARTATTACHABLEOBJECT_H
 #define PARTATTACHABLEOBJECT_H
 
-#include <App/ExtensionPython.h>
-#include <App/PropertyStandard.h>
-#include <App/PropertyLinks.h>
-#include <App/GeoFeature.h>
 #include <App/DocumentObjectExtension.h>
-#include <Base/Vector3D.h>
-#include <Base/Placement.h>
+#include <App/ExtensionPython.h>
+#include <App/PropertyLinks.h>
+#include <App/PropertyStandard.h>
 #include <Base/Exception.h>
+#include <Base/Placement.h>
 
-#include "PartFeature.h"
 #include "Attacher.h"
+#include "PartFeature.h"
 
-#include <QString>
-
-#include <gp_Vec.hxx>
 
 namespace Part
 {
diff --git a/src/Mod/Part/App/AttachExtensionPyImp.cpp b/src/Mod/Part/App/AttachExtensionPyImp.cpp
index 0bff72da7e..57f7522fa2 100644
--- a/src/Mod/Part/App/AttachExtensionPyImp.cpp
+++ b/src/Mod/Part/App/AttachExtensionPyImp.cpp
@@ -1,14 +1,32 @@
 
+/***************************************************************************
+ *                                                                         *
+ *   This file is part of the FreeCAD CAx development system.              *
+ *                                                                         *
+ *   This library is free software; you can redistribute it and/or         *
+ *   modify it under the terms of the GNU Library General Public           *
+ *   License as published by the Free Software Foundation; either          *
+ *   version 2 of the License, or (at your option) any later version.      *
+ *                                                                         *
+ *   This library  is distributed in the hope that it will be useful,      *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU Library General Public License for more details.                  *
+ *                                                                         *
+ *   You should have received a copy of the GNU Library General Public     *
+ *   License along with this library; see the file COPYING.LIB. If not,    *
+ *   write to the Free Software Foundation, Inc., 59 Temple Place,         *
+ *   Suite 330, Boston, MA  02111-1307, USA                                *
+ *                                                                         *
+ ***************************************************************************/
+
 #include "PreCompiled.h"
 
-#include "Mod/Part/App/AttachExtension.h"
-#include "OCCError.h"
-
-#include "AttachEnginePy.h"
-
-// inclusion of the generated files (generated out of AttachExtensionPy.xml)
 #include "AttachExtensionPy.h"
 #include "AttachExtensionPy.cpp"
+#include "AttachEnginePy.h"
+#include "OCCError.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/Attacher.cpp b/src/Mod/Part/App/Attacher.cpp
index b7269a6c68..888864207d 100644
--- a/src/Mod/Part/App/Attacher.cpp
+++ b/src/Mod/Part/App/Attacher.cpp
@@ -22,51 +22,50 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <TopoDS_Shape.hxx>
-# include <TopoDS_Face.hxx>
-# include <TopoDS_Edge.hxx>
-# include <TopoDS_Vertex.hxx>
-# include <TopoDS_Iterator.hxx>
-# include <TopoDS.hxx>
 # include <BRep_Tool.hxx>
-# include <gp_Pln.hxx>
+# include <BRepAdaptor_Curve.hxx>
+# include <BRepAdaptor_Surface.hxx>
+# include <BRepBuilderAPI_MakeEdge.hxx>
+# include <BRepBuilderAPI_MakeFace.hxx>
+# include <BRepExtrema_DistShapeShape.hxx>
+# include <BRepGProp.hxx>
+# include <BRepIntCurveSurface_Inter.hxx>
+# include <BRepLProp_SLProps.hxx>
+# include <Geom_Plane.hxx>
+# include <GeomAdaptor.hxx>
+# include <GeomAPI.hxx>
+# include <GeomAPI_ProjectPointOnCurve.hxx>
+# include <GeomAPI_ProjectPointOnSurf.hxx>
+# include <GeomLib_IsPlanarSurface.hxx>
 # include <gp_Ax1.hxx>
-# include <gp_Pnt.hxx>
 # include <gp_Dir.hxx>
 # include <gp_Elips.hxx>
-# include <gp_Parab.hxx>
 # include <gp_Hypr.hxx>
-# include <GeomAPI_ProjectPointOnSurf.hxx>
-# include <Geom_Plane.hxx>
-# include <Geom2d_Curve.hxx>
-# include <Geom2dAPI_InterCurveCurve.hxx>
-# include <Geom2dAPI_ProjectPointOnCurve.hxx>
-# include <GeomAPI.hxx>
-# include <GeomAdaptor.hxx>
-# include <BRepAdaptor_Surface.hxx>
-# include <BRepAdaptor_Curve.hxx>
-# include <BRepBuilderAPI_MakeFace.hxx>
-# include <BRepBuilderAPI_MakeEdge.hxx>
-# include <BRepExtrema_DistShapeShape.hxx>
-# include <BRepIntCurveSurface_Inter.hxx>
-# include <TopTools_HSequenceOfShape.hxx>
-# include <ShapeExtend_Explorer.hxx>
+# include <gp_Parab.hxx>
+# include <gp_Pln.hxx>
+# include <gp_Pnt.hxx>
 # include <GProp_GProps.hxx>
 # include <GProp_PGProps.hxx>
 # include <GProp_PrincipalProps.hxx>
-# include <BRepGProp.hxx>
-# include <GeomLib_IsPlanarSurface.hxx>
-# include <BRepLProp_SLProps.hxx>
-# include <GeomAPI_ProjectPointOnCurve.hxx>
+# include <ShapeExtend_Explorer.hxx>
+# include <TopoDS.hxx>
+# include <TopoDS_Edge.hxx>
+# include <TopoDS_Face.hxx>
+# include <TopoDS_Iterator.hxx>
+# include <TopoDS_Shape.hxx>
+# include <TopoDS_Vertex.hxx>
+# include <TopTools_HSequenceOfShape.hxx>
 #endif
 
+#include <App/Application.h>
+#include <App/Document.h>
+#include <App/OriginFeature.h>
+#include <Base/Console.h>
+
 #include "Attacher.h"
 #include "AttachExtension.h"
 #include "Tools.h"
-#include <Base/Console.h>
-#include <App/OriginFeature.h>
-#include <App/Application.h>
-#include <App/Document.h>
+
 
 using namespace Part;
 using namespace Attacher;
diff --git a/src/Mod/Part/App/Attacher.h b/src/Mod/Part/App/Attacher.h
index aabd76a1cc..cc72fdcbd9 100644
--- a/src/Mod/Part/App/Attacher.h
+++ b/src/Mod/Part/App/Attacher.h
@@ -28,17 +28,16 @@
 #ifndef PARTATTACHER_H
 #define PARTATTACHER_H
 
-#include <App/PropertyStandard.h>
-#include <App/PropertyLinks.h>
+#include <gp_Vec.hxx>
+#include <GProp_GProps.hxx>
+
 #include <App/GeoFeature.h>
-#include <Base/Vector3D.h>
-#include <Base/Placement.h>
+#include <App/PropertyLinks.h>
 #include <Base/Exception.h>
+#include <Base/Placement.h>
 
 #include "PartFeature.h"
 
-#include <gp_Vec.hxx>
-#include <GProp_GProps.hxx>
 
 namespace Attacher
 {