diff --git a/src/Mod/Raytracing/App/PreCompiled.h b/src/Mod/Raytracing/App/PreCompiled.h
index c190b6bd80..565baa6948 100644
--- a/src/Mod/Raytracing/App/PreCompiled.h
+++ b/src/Mod/Raytracing/App/PreCompiled.h
@@ -27,21 +27,8 @@
 
 #ifdef _PreComp_
 
-// standard
-#include <cstdio>
-#include <cassert>
-
 // STL
-#include <algorithm>
-#include <bitset>
-#include <iostream>
-#include <list>
-#include <map>
-#include <queue>
-#include <set>
 #include <sstream>
-#include <stack>
-#include <string>
 #include <vector>
 
 // OpenCascade View
diff --git a/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp b/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp
index 969ad44c9c..461c50dc1e 100644
--- a/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp
+++ b/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #include <Base/Console.h>
diff --git a/src/Mod/Raytracing/Gui/AppRaytracingGuiPy.cpp b/src/Mod/Raytracing/Gui/AppRaytracingGuiPy.cpp
index 4d66397974..765e5e1e5e 100644
--- a/src/Mod/Raytracing/Gui/AppRaytracingGuiPy.cpp
+++ b/src/Mod/Raytracing/Gui/AppRaytracingGuiPy.cpp
@@ -20,34 +20,29 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp_Vec.hxx>
-# include <QFileInfo>
-# include <Inventor/SoInput.h>
-# include <Inventor/nodes/SoNode.h>
-# include <Inventor/nodes/SoOrthographicCamera.h>
 # include <vector>
-# include <Inventor/nodes/SoPerspectiveCamera.h>
+# include <QFileInfo>
+# include <gp_Vec.hxx>
+
+# include <Inventor/SoInput.h>
+# include <Inventor/nodes/SoCamera.h>
+# include <Inventor/nodes/SoNode.h>
 #endif
 
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
-
-#include <Base/PyObjectBase.h>
 #include <Base/Interpreter.h>
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/EditorView.h>
-#include <Gui/TextEdit.h>
 #include <Gui/MainWindow.h>
-#include <Gui/View.h>
-
+#include <Gui/TextEdit.h>
 #include <Mod/Raytracing/App/PovTools.h>
 #include <Mod/Raytracing/App/LuxTools.h>
+
 #include "PovrayHighlighter.h"
 
+
 namespace RaytracingGui {
 class Module : public Py::ExtensionModule<Module>
 {
diff --git a/src/Mod/Raytracing/Gui/Command.cpp b/src/Mod/Raytracing/Gui/Command.cpp
index e2a5e64a0f..bde165ea4f 100644
--- a/src/Mod/Raytracing/Gui/Command.cpp
+++ b/src/Mod/Raytracing/Gui/Command.cpp
@@ -20,59 +20,45 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <BRep_Tool.hxx>
-# include <GeomAPI_ProjectPointOnSurf.hxx>
-# include <GeomLProp_SLProps.hxx>
-# include <Poly_Triangulation.hxx>
-# include <TopoDS_Face.hxx>
-# include <Inventor/SoInput.h>
-# include <Inventor/nodes/SoNode.h>
-# include <Inventor/nodes/SoOrthographicCamera.h>
-# include <Inventor/nodes/SoPerspectiveCamera.h>
+# include <sstream>
+# include <vector>
 # include <QApplication>
 # include <QDir>
 # include <QFile>
 # include <QFileInfo>
 # include <QMessageBox>
-# include <sstream>
-# include <vector>
+
+# include <Inventor/SoInput.h>
+# include <Inventor/nodes/SoCamera.h>
+# include <Inventor/nodes/SoNode.h>
 #endif
 
-#include <Base/Console.h>
-#include <Base/Tools.h>
-#include <Base/Exception.h>
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
-#include <App/Material.h>
+#include <Base/Console.h>
+#include <Base/Exception.h>
+#include <Base/Tools.h>
 #include <Gui/Action.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
-#include <Gui/Document.h>
 #include <Gui/Command.h>
-#include <Gui/FileDialog.h>
-#include <Gui/View.h>
-#include <Gui/ViewProvider.h>
-#include <Gui/Selection.h>
-#include <Gui/SelectionObject.h>
+#include <Gui/Document.h>
 #include <Gui/FileDialog.h>
 #include <Gui/MainWindow.h>
-
-#include <Mod/Raytracing/App/RayFeature.h>
-#include <Mod/Raytracing/App/RaySegment.h>
-#include <Mod/Raytracing/App/RayProject.h>
-#include <Mod/Raytracing/App/LuxProject.h>
+#include <Gui/Selection.h>
+#include <Gui/SelectionObject.h>
+#include <Gui/ViewProvider.h>
 #include <Mod/Part/App/PartFeature.h>
+#include <Mod/Raytracing/App/LuxProject.h>
+#include <Mod/Raytracing/App/RayFeature.h>
+#include <Mod/Raytracing/App/RayProject.h>
 
 #include "FreeCADpov.h"
 
 
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-
 //===========================================================================
 // CmdRaytracingWriteCamera
 //===========================================================================
diff --git a/src/Mod/Raytracing/Gui/DlgSettingsRayImp.cpp b/src/Mod/Raytracing/Gui/DlgSettingsRayImp.cpp
index 7bb0be1695..b798990354 100644
--- a/src/Mod/Raytracing/Gui/DlgSettingsRayImp.cpp
+++ b/src/Mod/Raytracing/Gui/DlgSettingsRayImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <QApplication>
@@ -28,8 +27,7 @@
 
 #include "DlgSettingsRayImp.h"
 #include "ui_DlgSettingsRay.h"
-#include <Gui/PrefWidgets.h>
-#include <Base/Console.h>
+
 
 using namespace RaytracingGui;
 
diff --git a/src/Mod/Raytracing/Gui/DlgSettingsRayImp.h b/src/Mod/Raytracing/Gui/DlgSettingsRayImp.h
index 3a6efce700..a7731f7375 100644
--- a/src/Mod/Raytracing/Gui/DlgSettingsRayImp.h
+++ b/src/Mod/Raytracing/Gui/DlgSettingsRayImp.h
@@ -20,13 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef RAYTRACINGGUI_DLGSETTINGSRAYIMP_H
 #define RAYTRACINGGUI_DLGSETTINGSRAYIMP_H
 
-#include <Gui/PropertyPage.h>
 #include <memory>
 
+#include <Gui/PropertyPage.h>
+
+
 namespace RaytracingGui {
 class Ui_DlgSettingsRay;
 
diff --git a/src/Mod/Raytracing/Gui/PovrayHighlighter.cpp b/src/Mod/Raytracing/Gui/PovrayHighlighter.cpp
index d0eb7ceeca..58619a6746 100644
--- a/src/Mod/Raytracing/Gui/PovrayHighlighter.cpp
+++ b/src/Mod/Raytracing/Gui/PovrayHighlighter.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <QRegularExpression>
@@ -29,6 +28,7 @@
 
 #include "PovrayHighlighter.h"
 
+
 using namespace RaytracingGui;
 
 namespace RaytracingGui {
diff --git a/src/Mod/Raytracing/Gui/PreCompiled.h b/src/Mod/Raytracing/Gui/PreCompiled.h
index 6971ccacc5..6f90966969 100644
--- a/src/Mod/Raytracing/Gui/PreCompiled.h
+++ b/src/Mod/Raytracing/Gui/PreCompiled.h
@@ -31,90 +31,34 @@
 
 #ifdef _PreComp_
 
-// standard
-#include <cstdio>
-#include <cassert>
-
 // STL
-#include <algorithm>
-#include <iostream>
-#include <list>
-#include <map>
-#include <queue>
-#include <set>
 #include <sstream>
-#include <stack>
-#include <string>
 #include <vector>
-#include <bitset>
 
 #ifdef FC_OS_WIN32
 # include <windows.h>
 #endif
 
-
 // OpenCasCade Base
 #include <Standard_Failure.hxx>
 
 // 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 <Poly_Array1OfTriangle.hxx>
-#include <Poly_Connect.hxx>
-#include <Poly_Triangulation.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_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>
+#include <gp_Vec.hxx>
 
 // Qt Toolkit
-#ifndef __QtAll__
-# include <Gui/QtAll.h>
-#endif
+# include <QAction>
+# include <QApplication>
+# include <QDir>
+# include <QFileInfo>
+# include <QInputDialog>
+# include <QMenu>
+# include <QRegularExpression>
+# include <QRegularExpressionMatch>
 
 // Inventor
-#ifndef __InventorAll__
-# include <Gui/InventorAll.h>
-#endif
+#include <Inventor/SoInput.h>
+#include <Inventor/nodes/SoCamera.h>
+#include <Inventor/nodes/SoNode.h>
 
 #endif //_PreComp_
 
diff --git a/src/Mod/Raytracing/Gui/ViewProvider.cpp b/src/Mod/Raytracing/Gui/ViewProvider.cpp
index 768bc6dd07..4259aa4625 100644
--- a/src/Mod/Raytracing/Gui/ViewProvider.cpp
+++ b/src/Mod/Raytracing/Gui/ViewProvider.cpp
@@ -20,30 +20,29 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <QAction>
 # include <QDir>
 # include <QFileInfo>
-# include <QMenu>
 # include <QInputDialog>
+# include <QMenu>
 #endif
 
-#include "ViewProvider.h"
-#include <Mod/Raytracing/App/LuxProject.h>
-#include <Mod/Raytracing/App/RayProject.h>
 #include <App/Application.h>
 #include <App/Document.h>
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/MainWindow.h>
+#include <Mod/Raytracing/App/LuxProject.h>
+#include <Mod/Raytracing/App/RayProject.h>
+
+#include "ViewProvider.h"
 
 
 using namespace RaytracingGui;
 
-
 /* TRANSLATOR RaytracingGui::ViewProviderLux */
 
 PROPERTY_SOURCE(RaytracingGui::ViewProviderLux, Gui::ViewProviderDocumentObjectGroup)
diff --git a/src/Mod/Raytracing/Gui/ViewProvider.h b/src/Mod/Raytracing/Gui/ViewProvider.h
index fdf84eaf30..ebb9527d8a 100644
--- a/src/Mod/Raytracing/Gui/ViewProvider.h
+++ b/src/Mod/Raytracing/Gui/ViewProvider.h
@@ -20,13 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef RAYTRACINGGUI_VIEWPROVIDER_H
 #define RAYTRACINGGUI_VIEWPROVIDER_H
 
+#include <QCoreApplication>
 
 #include <Gui/ViewProviderDocumentObjectGroup.h>
-#include <QCoreApplication>
+
 
 namespace RaytracingGui {
 
diff --git a/src/Mod/Raytracing/Gui/Workbench.cpp b/src/Mod/Raytracing/Gui/Workbench.cpp
index a26452c811..440a37d482 100644
--- a/src/Mod/Raytracing/Gui/Workbench.cpp
+++ b/src/Mod/Raytracing/Gui/Workbench.cpp
@@ -20,16 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-# include <qobject.h>
-#endif
+#include <Gui/MenuManager.h>
+#include <Gui/ToolBarManager.h>
 
 #include "Workbench.h"
-#include <Gui/ToolBarManager.h>
-#include <Gui/MenuManager.h>
+
 
 using namespace RaytracingGui;