diff --git a/src/Mod/Raytracing/App/AppRaytracing.cpp b/src/Mod/Raytracing/App/AppRaytracing.cpp
index 53a6f3dd8e..ba66b72a26 100644
--- a/src/Mod/Raytracing/App/AppRaytracing.cpp
+++ b/src/Mod/Raytracing/App/AppRaytracing.cpp
@@ -23,14 +23,14 @@
 #include "PreCompiled.h"
 
 #include <Base/Console.h>
-#include <Base/PyObjectBase.h>
 #include <Base/Interpreter.h>
+#include <Base/PyObjectBase.h>
 
+#include "LuxFeature.h"
+#include "LuxProject.h"
 #include "RayFeature.h"
 #include "RayProject.h"
 #include "RaySegment.h"
-#include "LuxFeature.h"
-#include "LuxProject.h"
 
 
 namespace Raytracing {
diff --git a/src/Mod/Raytracing/App/AppRaytracingPy.cpp b/src/Mod/Raytracing/App/AppRaytracingPy.cpp
index 20fa6df33e..0e08725f14 100644
--- a/src/Mod/Raytracing/App/AppRaytracingPy.cpp
+++ b/src/Mod/Raytracing/App/AppRaytracingPy.cpp
@@ -22,22 +22,18 @@
 
 #include "PreCompiled.h"
 
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
+#include <App/Application.h>
 
 #include <Base/Console.h>
 #include <Base/FileInfo.h>
 #include <Base/Interpreter.h>
 #include <Base/Stream.h>
-#include "PovTools.h"
+#include <Mod/Part/App/TopoShapePy.h>
+
 #include "LuxTools.h"
 // automatically generated.....
 #include "FreeCADpov.h"
 
-#include <Mod/Part/App/TopoShape.h>
-#include <Mod/Part/App/TopoShapePy.h>
-#include <App/Application.h>
-
 
 using namespace std;
 
diff --git a/src/Mod/Raytracing/App/LuxFeature.cpp b/src/Mod/Raytracing/App/LuxFeature.cpp
index ac9c587b94..e2c0defe7e 100644
--- a/src/Mod/Raytracing/App/LuxFeature.cpp
+++ b/src/Mod/Raytracing/App/LuxFeature.cpp
@@ -20,22 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <ShapeAnalysis_ShapeContents.hxx>
 # include <Standard.hxx>
 #endif
 
-#include <Base/Exception.h>
-#include <Base/FileInfo.h>
 #include <Mod/Part/App/PartFeature.h>
 
 #include "LuxFeature.h"
 #include "LuxTools.h"
 
-#include <ShapeAnalysis_ShapeContents.hxx>
-
 
 using namespace Raytracing;
 using namespace std;
diff --git a/src/Mod/Raytracing/App/LuxFeature.h b/src/Mod/Raytracing/App/LuxFeature.h
index e69248844a..9b73535eb2 100644
--- a/src/Mod/Raytracing/App/LuxFeature.h
+++ b/src/Mod/Raytracing/App/LuxFeature.h
@@ -20,14 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef _LuxFeature_h_
 #define _LuxFeature_h_
 
 #include <App/DocumentObject.h>
 #include <App/PropertyLinks.h>
-#include <App/PropertyFile.h>
-#include <App/PropertyStandard.h>
 
 #include "RaySegment.h"
 
diff --git a/src/Mod/Raytracing/App/LuxProject.cpp b/src/Mod/Raytracing/App/LuxProject.cpp
index 19dcce0cd7..aec6c9cd95 100644
--- a/src/Mod/Raytracing/App/LuxProject.cpp
+++ b/src/Mod/Raytracing/App/LuxProject.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
@@ -28,12 +27,13 @@
 # include <string>
 #endif
 
-#include <Base/FileInfo.h>
-#include <Base/Console.h>
 #include <App/Application.h>
+#include <Base/Console.h>
+#include <Base/FileInfo.h>
+
 #include "LuxProject.h"
 #include "LuxFeature.h"
-#include "LuxTools.h"
+
 
 using namespace Raytracing;
 using namespace std;
diff --git a/src/Mod/Raytracing/App/LuxProject.h b/src/Mod/Raytracing/App/LuxProject.h
index cf850972c2..44e494561b 100644
--- a/src/Mod/Raytracing/App/LuxProject.h
+++ b/src/Mod/Raytracing/App/LuxProject.h
@@ -20,17 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
- 
-
-
 #ifndef _LuxProject_h_
 #define _LuxProject_h_
 
 #include <App/DocumentObjectGroup.h>
-#include <App/PropertyStandard.h>
 #include <App/PropertyFile.h>
 #include <Mod/Raytracing/RaytracingGlobal.h>
 
+
 namespace Raytracing
 {
 
diff --git a/src/Mod/Raytracing/App/LuxTools.cpp b/src/Mod/Raytracing/App/LuxTools.cpp
index 86db2ee16f..7e280965b9 100644
--- a/src/Mod/Raytracing/App/LuxTools.cpp
+++ b/src/Mod/Raytracing/App/LuxTools.cpp
@@ -23,28 +23,22 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <BRep_Tool.hxx>
+# include <sstream>
+
 # include <BRepMesh_IncrementalMesh.hxx>
-# include <GeomAPI_ProjectPointOnSurf.hxx>
-# include <GeomLProp_SLProps.hxx>
-# include <Poly_Triangulation.hxx>
 # include <TopExp_Explorer.hxx>
 # include <TopoDS.hxx>
 # include <TopoDS_Face.hxx>
-# include <sstream>
+
 #endif
 
 #include <Base/Console.h>
-#include <Base/Exception.h>
 #include <Base/Sequencer.h>
-#include <Base/Matrix.h>
-#include <App/ComplexGeoData.h>
-#include <boost/regex.hpp>
-
+#include <Mod/Part/App/Tools.h>
 
 #include "PovTools.h"
 #include "LuxTools.h"
-#include <Mod/Part/App/Tools.h>
+
 
 using Base::Console;
 
diff --git a/src/Mod/Raytracing/App/LuxTools.h b/src/Mod/Raytracing/App/LuxTools.h
index ae7f501a91..ea6a480b9f 100644
--- a/src/Mod/Raytracing/App/LuxTools.h
+++ b/src/Mod/Raytracing/App/LuxTools.h
@@ -20,15 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef _LuxTools_h_
 #define _LuxTools_h_
 
-#include <gp_Vec.hxx>
 #include <vector>
 
 #include "PovTools.h"
 
+
 class TopoDS_Shape;
 class TopoDS_Face;
 
diff --git a/src/Mod/Raytracing/App/PovTools.cpp b/src/Mod/Raytracing/App/PovTools.cpp
index 4dbba9fe5d..3aa6c0a74d 100644
--- a/src/Mod/Raytracing/App/PovTools.cpp
+++ b/src/Mod/Raytracing/App/PovTools.cpp
@@ -23,26 +23,22 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <BRep_Tool.hxx>
+# include <sstream>
+
 # include <BRepMesh_IncrementalMesh.hxx>
-# include <GeomAPI_ProjectPointOnSurf.hxx>
-# include <GeomLProp_SLProps.hxx>
-# include <Poly_Triangulation.hxx>
 # include <TopExp_Explorer.hxx>
 # include <TopoDS.hxx>
 # include <TopoDS_Face.hxx>
-# include <sstream>
 #endif
 
+#include <App/ComplexGeoData.h>
 #include <Base/Console.h>
-#include <Base/Exception.h>
 #include <Base/Sequencer.h>
 #include <Base/Stream.h>
-#include <App/ComplexGeoData.h>
-
+#include <Mod/Part/App/Tools.h>
 
 #include "PovTools.h"
-#include <Mod/Part/App/Tools.h>
+
 
 using Base::Console;
 
diff --git a/src/Mod/Raytracing/App/PovTools.h b/src/Mod/Raytracing/App/PovTools.h
index afcbc50958..ef290abac3 100644
--- a/src/Mod/Raytracing/App/PovTools.h
+++ b/src/Mod/Raytracing/App/PovTools.h
@@ -20,14 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef _PovTools_h_
 #define _PovTools_h_
 
 #include <gp_Vec.hxx>
 #include <vector>
+
 #include <Mod/Raytracing/RaytracingGlobal.h>
 
+
 class TopoDS_Shape;
 class TopoDS_Face;
 
diff --git a/src/Mod/Raytracing/App/PreCompiled.h b/src/Mod/Raytracing/App/PreCompiled.h
index e335cc7b4e..c190b6bd80 100644
--- a/src/Mod/Raytracing/App/PreCompiled.h
+++ b/src/Mod/Raytracing/App/PreCompiled.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef __PRECOMPILED__
 #define __PRECOMPILED__
 
@@ -32,9 +31,9 @@
 #include <cstdio>
 #include <cassert>
 
-
 // STL
 #include <algorithm>
+#include <bitset>
 #include <iostream>
 #include <list>
 #include <map>
@@ -44,60 +43,16 @@
 #include <stack>
 #include <string>
 #include <vector>
-#include <bitset>
 
 // OpenCascade View
-#include <BRep_Builder.hxx>
-#include <BRep_Tool.hxx>
-#include <Bnd_Box.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <BRepBndLib.hxx>
-#include <BRepBuilderAPI_NurbsConvert.hxx>
-#include <BRepMesh.hxx>
-#include <BRepMesh_Edge.hxx>
 #include <BRepMesh_IncrementalMesh.hxx>
-#include <BRepMesh_Triangle.hxx>
-#include <BRepTools.hxx>
-#include <BRepPrimAPI_MakeBox.hxx>
-#include <BRepPrimAPI_MakeSphere.hxx>
-#include <Geom_Axis2Placement.hxx>
-#include <Geom_BSplineSurface.hxx>
-#include <Geom_SphericalSurface.hxx>
-#include <Geom_Surface.hxx>
 #include <gp_Pnt.hxx>
-#include <gp_Sphere.hxx>
-#include <gp_Trsf.hxx>
-#include <OSD_FileIterator.hxx>
-#include <OSD_Timer.hxx>
-#include <Poly_Array1OfTriangle.hxx>
-#include <Poly_Connect.hxx>
-#include <Poly_Triangulation.hxx>
+#include <ShapeAnalysis_ShapeContents.hxx>
 #include <Standard.hxx>
-#include <TColgp_Array1OfPnt.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
-#include <TColgp_Array2OfPnt.hxx>
-#include <TCollection_AsciiString.hxx>
-#include <TColStd_Array1OfReal.hxx>
-#include <TColStd_ListIteratorOfListOfReal.hxx>
-#include <TColStd_ListOfReal.hxx>
-#include <TColStd_SequenceOfInteger.hxx>
 #include <TopExp_Explorer.hxx>
-#include <TopLoc_Location.hxx>
 #include <TopoDS.hxx>
+#include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopoDS_Face.hxx>
-#include <BRepMesh_IncrementalMesh.hxx>
-#include <BRepBuilderAPI_MakeFace.hxx>
-#include <BRep_Tool.hxx>
-#include <GeomAPI_ProjectPointOnSurf.hxx>
-#include <GeomLProp_SLProps.hxx>
-#include <TopoDS_Face.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <TopoDS_Iterator.hxx>
-#include <TopoDS_Edge.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <GCPnts_UniformDeflection.hxx>
-
 
 #endif //_PreComp_
 
diff --git a/src/Mod/Raytracing/App/RayFeature.cpp b/src/Mod/Raytracing/App/RayFeature.cpp
index 4303216f53..511555cda2 100644
--- a/src/Mod/Raytracing/App/RayFeature.cpp
+++ b/src/Mod/Raytracing/App/RayFeature.cpp
@@ -20,15 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <Standard.hxx>
 #endif
 
-#include <Base/Exception.h>
-#include <Base/FileInfo.h>
 #include <Mod/Part/App/PartFeature.h>
 
 #include "RayFeature.h"
diff --git a/src/Mod/Raytracing/App/RayFeature.h b/src/Mod/Raytracing/App/RayFeature.h
index 8d1d757835..1ad4068b8c 100644
--- a/src/Mod/Raytracing/App/RayFeature.h
+++ b/src/Mod/Raytracing/App/RayFeature.h
@@ -20,14 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef _RayFeature_h_
 #define _RayFeature_h_
 
 #include <App/DocumentObject.h>
 #include <App/PropertyLinks.h>
-#include <App/PropertyFile.h>
-#include <App/PropertyStandard.h>
 
 #include "RaySegment.h"
 
diff --git a/src/Mod/Raytracing/App/RayProject.cpp b/src/Mod/Raytracing/App/RayProject.cpp
index 852888649b..5f562d1929 100644
--- a/src/Mod/Raytracing/App/RayProject.cpp
+++ b/src/Mod/Raytracing/App/RayProject.cpp
@@ -20,21 +20,21 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <Standard.hxx>
 # include <string>
 #endif
 
-#include <Base/FileInfo.h>
-#include <Base/Console.h>
-#include <Base/Stream.h>
 #include <App/Application.h>
+#include <Base/Console.h>
+#include <Base/FileInfo.h>
+#include <Base/Stream.h>
+
 #include "RayProject.h"
 #include "RayFeature.h"
 
+
 using namespace Raytracing;
 using namespace std;
 
diff --git a/src/Mod/Raytracing/App/RayProject.h b/src/Mod/Raytracing/App/RayProject.h
index f1f58432e0..de9a654caf 100644
--- a/src/Mod/Raytracing/App/RayProject.h
+++ b/src/Mod/Raytracing/App/RayProject.h
@@ -20,17 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
- 
-
-
 #ifndef _RayProject_h_
 #define _RayProject_h_
 
 #include <App/DocumentObjectGroup.h>
-#include <App/PropertyStandard.h>
 #include <App/PropertyFile.h>
 #include <Mod/Raytracing/RaytracingGlobal.h>
 
+
 namespace Raytracing
 {
 
diff --git a/src/Mod/Raytracing/App/RaySegment.cpp b/src/Mod/Raytracing/App/RaySegment.cpp
index 4cf89dfac2..4f9d18bd6a 100644
--- a/src/Mod/Raytracing/App/RaySegment.cpp
+++ b/src/Mod/Raytracing/App/RaySegment.cpp
@@ -20,23 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <sstream>
 #endif
 
-
-#include <Base/Writer.h>
-#include <Base/Reader.h>
-#include <Base/Exception.h>
-#include <Base/FileInfo.h>
-
 #include "RaySegment.h"
 
-using namespace Raytracing;
 
+using namespace Raytracing;
 
 //===========================================================================
 // RaySegment
@@ -44,8 +36,6 @@ using namespace Raytracing;
 
 PROPERTY_SOURCE(Raytracing::RaySegment, App::DocumentObject)
 
-
-
 RaySegment::RaySegment(void) 
 {
     App::PropertyType type = static_cast<App::PropertyType>((App::Prop_Output|App::Prop_Hidden));
diff --git a/src/Mod/Raytracing/App/RaySegment.h b/src/Mod/Raytracing/App/RaySegment.h
index eac0df6c0f..af983868b5 100644
--- a/src/Mod/Raytracing/App/RaySegment.h
+++ b/src/Mod/Raytracing/App/RaySegment.h
@@ -20,23 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
- 
-
-
 #ifndef _RaySegment_h_
 #define _RaySegment_h_
 
-
 #include <App/DocumentObject.h>
 #include <App/PropertyStandard.h>
-#include <App/PropertyGeo.h>
 #include <Mod/Raytracing/RaytracingGlobal.h>
 
 
 namespace Raytracing
 {
 
-
 /** Base class of all View Features in the drawing module
  */
 class RaytracingExport RaySegment: public App::DocumentObject