diff --git a/src/Mod/TechDraw/App/AppTechDraw.cpp b/src/Mod/TechDraw/App/AppTechDraw.cpp
index da18f26aba..85fcc21fc7 100644
--- a/src/Mod/TechDraw/App/AppTechDraw.cpp
+++ b/src/Mod/TechDraw/App/AppTechDraw.cpp
@@ -18,7 +18,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
diff --git a/src/Mod/TechDraw/App/AppTechDrawPy.cpp b/src/Mod/TechDraw/App/AppTechDrawPy.cpp
index 185d36e43f..da2d0caebb 100644
--- a/src/Mod/TechDraw/App/AppTechDrawPy.cpp
+++ b/src/Mod/TechDraw/App/AppTechDrawPy.cpp
@@ -21,8 +21,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <BRep_Builder.hxx>
 # include <BRepBuilderAPI_Transform.hxx>
 # include <gp_Trsf.hxx>
@@ -32,7 +30,7 @@
 # include <TopoDS_Edge.hxx>
 # include <TopoDS_Face.hxx>
 # include <TopoDS_Wire.hxx>
-#endif
+
 
 #include <boost_regex.hpp>
 
diff --git a/src/Mod/TechDraw/App/ArrowPropEnum.cpp b/src/Mod/TechDraw/App/ArrowPropEnum.cpp
index ee9d86a743..1d5841c49b 100644
--- a/src/Mod/TechDraw/App/ArrowPropEnum.cpp
+++ b/src/Mod/TechDraw/App/ArrowPropEnum.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "ArrowPropEnum.h"
 
diff --git a/src/Mod/TechDraw/App/BalloonPropEnum.cpp b/src/Mod/TechDraw/App/BalloonPropEnum.cpp
index 5ebc8cf388..f029c26095 100644
--- a/src/Mod/TechDraw/App/BalloonPropEnum.cpp
+++ b/src/Mod/TechDraw/App/BalloonPropEnum.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "BalloonPropEnum.h"
 
diff --git a/src/Mod/TechDraw/App/CMakeLists.txt b/src/Mod/TechDraw/App/CMakeLists.txt
index b2d7861269..528298ea61 100644
--- a/src/Mod/TechDraw/App/CMakeLists.txt
+++ b/src/Mod/TechDraw/App/CMakeLists.txt
@@ -131,7 +131,6 @@ SET(TechDraw_SRCS
     DrawDimHelper.h
     HatchLine.cpp
     HatchLine.h
-    PreCompiled.cpp
     PreCompiled.h
     EdgeWalker.cpp
     EdgeWalker.h
@@ -252,13 +251,6 @@ SOURCE_GROUP("Features" FILES ${Draw_SRCS})
 SOURCE_GROUP("Geometry" FILES ${Geometry_SRCS})
 SOURCE_GROUP("Python" FILES ${Python_SRCS})
 
-if(FREECAD_USE_PCH)
-    add_definitions(-D_PreComp_)
-    GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${TechDraw_SRCS} ${Draw_SRCS} ${TechDrawAlgos_SRCS}
-                                                           ${Geometry_SRCS} ${Python_SRCS})
-    ADD_MSVC_PRECOMPILED_HEADER(TechDraw PreCompiled.h PreCompiled.cpp PCH_SRCS)
-endif(FREECAD_USE_PCH)
-
 add_library(TechDraw SHARED
     ${TechDraw_SRCS}
     ${Draw_SRCS}
@@ -267,6 +259,12 @@ add_library(TechDraw SHARED
     ${Python_SRCS}
 )
 
+if(FREECAD_USE_PCH)
+    target_precompile_headers(TechDraw PRIVATE
+            $<$<COMPILE_LANGUAGE:CXX>:"${CMAKE_CURRENT_LIST_DIR}/PreCompiled.h">
+    )
+endif(FREECAD_USE_PCH)
+
 target_include_directories(
     TechDraw
     PRIVATE
diff --git a/src/Mod/TechDraw/App/CenterLine.cpp b/src/Mod/TechDraw/App/CenterLine.cpp
index 52b1b28660..acc47cb7a9 100644
--- a/src/Mod/TechDraw/App/CenterLine.cpp
+++ b/src/Mod/TechDraw/App/CenterLine.cpp
@@ -21,13 +21,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
-    #include <BRepBuilderAPI_MakeEdge.hxx>
-    #include <BRepBndLib.hxx>
-    #include <Bnd_Box.hxx>
-    #include <TopoDS_Shape.hxx>
-#endif
+#include <BRepBuilderAPI_MakeEdge.hxx>
+#include <BRepBndLib.hxx>
+#include <Bnd_Box.hxx>
+#include <TopoDS_Shape.hxx>
 
 #include <BRepTools.hxx>
 
diff --git a/src/Mod/TechDraw/App/CenterLinePyImp.cpp b/src/Mod/TechDraw/App/CenterLinePyImp.cpp
index 8e66c1496e..e647d2147e 100644
--- a/src/Mod/TechDraw/App/CenterLinePyImp.cpp
+++ b/src/Mod/TechDraw/App/CenterLinePyImp.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-
 #include <Base/Console.h>
 #include <Base/PyWrapParseTupleAndKeywords.h>
 
diff --git a/src/Mod/TechDraw/App/Cosmetic.cpp b/src/Mod/TechDraw/App/Cosmetic.cpp
index 9d5635b4bc..4c7d55dc24 100644
--- a/src/Mod/TechDraw/App/Cosmetic.cpp
+++ b/src/Mod/TechDraw/App/Cosmetic.cpp
@@ -21,10 +21,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <BRepBuilderAPI_MakeEdge.hxx>
-#endif
 
 #include <App/Application.h>
 #include <Base/Converter.h>
diff --git a/src/Mod/TechDraw/App/CosmeticEdgePyImp.cpp b/src/Mod/TechDraw/App/CosmeticEdgePyImp.cpp
index c22ac782ee..81a37ae1a7 100644
--- a/src/Mod/TechDraw/App/CosmeticEdgePyImp.cpp
+++ b/src/Mod/TechDraw/App/CosmeticEdgePyImp.cpp
@@ -20,11 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <BRepBuilderAPI_MakeEdge.hxx>
-#endif
 
 #include <Base/PyWrapParseTupleAndKeywords.h>
 
diff --git a/src/Mod/TechDraw/App/CosmeticExtension.cpp b/src/Mod/TechDraw/App/CosmeticExtension.cpp
index 2157024fcc..6354ce7552 100644
--- a/src/Mod/TechDraw/App/CosmeticExtension.cpp
+++ b/src/Mod/TechDraw/App/CosmeticExtension.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Console.h>
 
diff --git a/src/Mod/TechDraw/App/CosmeticExtensionPyImp.cpp b/src/Mod/TechDraw/App/CosmeticExtensionPyImp.cpp
index 01bc8463cc..29bd27a0d8 100644
--- a/src/Mod/TechDraw/App/CosmeticExtensionPyImp.cpp
+++ b/src/Mod/TechDraw/App/CosmeticExtensionPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "Mod/TechDraw/App/CosmeticExtension.h"
 // inclusion of the generated files (generated out of CosmeticExtensionPy.xml)
diff --git a/src/Mod/TechDraw/App/CosmeticVertex.cpp b/src/Mod/TechDraw/App/CosmeticVertex.cpp
index a9a0d4412b..a02bd651aa 100644
--- a/src/Mod/TechDraw/App/CosmeticVertex.cpp
+++ b/src/Mod/TechDraw/App/CosmeticVertex.cpp
@@ -23,8 +23,6 @@
 
 //! CosmeticVertex point is stored in unscaled, unrotated form
 
-#include "PreCompiled.h"
-
 #include <App/Application.h>
 #include <Base/Persistence.h>
 #include <Base/Vector3D.h>
diff --git a/src/Mod/TechDraw/App/CosmeticVertex.h b/src/Mod/TechDraw/App/CosmeticVertex.h
index 94899a3421..21e67315fa 100644
--- a/src/Mod/TechDraw/App/CosmeticVertex.h
+++ b/src/Mod/TechDraw/App/CosmeticVertex.h
@@ -23,8 +23,6 @@
 #ifndef TECHDRAW_COSMETIC_VERTEX_H
 #define TECHDRAW_COSMETIC_VERTEX_H
 
-#include "PreCompiled.h"
-
 #include <App/FeaturePython.h>
 #include <Base/Persistence.h>
 #include <Base/Vector3D.h>
diff --git a/src/Mod/TechDraw/App/CosmeticVertexPyImp.cpp b/src/Mod/TechDraw/App/CosmeticVertexPyImp.cpp
index 5fe31eec25..83218dbf38 100644
--- a/src/Mod/TechDraw/App/CosmeticVertexPyImp.cpp
+++ b/src/Mod/TechDraw/App/CosmeticVertexPyImp.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-
 #include <Base/Console.h>
 #include <Base/GeometryPyCXX.h>
 #include <Base/Vector3D.h>
diff --git a/src/Mod/TechDraw/App/DimensionAutoCorrect.cpp b/src/Mod/TechDraw/App/DimensionAutoCorrect.cpp
index ec74750624..f769331c44 100644
--- a/src/Mod/TechDraw/App/DimensionAutoCorrect.cpp
+++ b/src/Mod/TechDraw/App/DimensionAutoCorrect.cpp
@@ -57,10 +57,6 @@
 //                //we can't fix this
 
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
-
 #include <TopoDS_Shape.hxx>
 
 #include <App/Document.h>
diff --git a/src/Mod/TechDraw/App/DimensionFormatter.cpp b/src/Mod/TechDraw/App/DimensionFormatter.cpp
index 30d350a240..b7e0fec3d6 100644
--- a/src/Mod/TechDraw/App/DimensionFormatter.cpp
+++ b/src/Mod/TechDraw/App/DimensionFormatter.cpp
@@ -20,12 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
-# include <QLocale>
-# include <QRegularExpression>
-# include <QString>
-#endif
+#include <QLocale>
+#include <QRegularExpression>
+#include <QString>
 
 #include <fmt/format.h>
 
diff --git a/src/Mod/TechDraw/App/DimensionGeometry.cpp b/src/Mod/TechDraw/App/DimensionGeometry.cpp
index a6187345e3..22f032ebd2 100644
--- a/src/Mod/TechDraw/App/DimensionGeometry.cpp
+++ b/src/Mod/TechDraw/App/DimensionGeometry.cpp
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <gp_Ax3.hxx>
 # include <gp_Trsf.hxx>
 # include <gp_Vec.hxx>
-#endif
+
 
 #include <Base/Console.h>
 #include <Base/Converter.h>
diff --git a/src/Mod/TechDraw/App/DimensionReferences.cpp b/src/Mod/TechDraw/App/DimensionReferences.cpp
index d5581b2e10..51e54993b8 100644
--- a/src/Mod/TechDraw/App/DimensionReferences.cpp
+++ b/src/Mod/TechDraw/App/DimensionReferences.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <TopoDS_Shape.hxx>
-#endif
+
 
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve.hxx>
diff --git a/src/Mod/TechDraw/App/DrawBrokenView.cpp b/src/Mod/TechDraw/App/DrawBrokenView.cpp
index f2dec32b9f..b6e540381c 100644
--- a/src/Mod/TechDraw/App/DrawBrokenView.cpp
+++ b/src/Mod/TechDraw/App/DrawBrokenView.cpp
@@ -41,10 +41,6 @@
 
 // ??? is option 1 actually working?  Not used in practice?
 
-
-#include "PreCompiled.h"    // NOLINT
-
-#ifndef _PreComp_
 #include <BRepAdaptor_Curve.hxx>
 #include <Mod/Part/App/FCBRepAlgoAPI_Cut.h>
 #include <BRepBndLib.hxx>
@@ -71,7 +67,6 @@
 #include <gp_Dir.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
-#endif
 
 #include <App/Document.h>
 #include <Base/BoundBox.h>
diff --git a/src/Mod/TechDraw/App/DrawBrokenViewPyImp.cpp b/src/Mod/TechDraw/App/DrawBrokenViewPyImp.cpp
index ffadb48bef..ac9a0c6993 100644
--- a/src/Mod/TechDraw/App/DrawBrokenViewPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawBrokenViewPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Console.h>
 #include <Base/Vector3D.h>
diff --git a/src/Mod/TechDraw/App/DrawComplexSection.cpp b/src/Mod/TechDraw/App/DrawComplexSection.cpp
index c58f1a14b4..2846af7ecb 100644
--- a/src/Mod/TechDraw/App/DrawComplexSection.cpp
+++ b/src/Mod/TechDraw/App/DrawComplexSection.cpp
@@ -54,9 +54,6 @@
 //    - align and distribute the intersections along an "effective" section plane
 //      which is a flattened version of the profile
 
-#include "PreCompiled.h"
-
-#ifndef _PreComp_
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepAdaptor_Surface.hxx>
 #include <Mod/Part/App/FCBRepAlgoAPI_Common.h>
@@ -103,7 +100,6 @@
 #include <GeomAdaptor_Surface.hxx>
 #include <BRepBuilderAPI_MakeVertex.hxx>
 #include <GeomLib_IsPlanarSurface.hxx>
-#endif
 
 #include <cmath>
 
diff --git a/src/Mod/TechDraw/App/DrawDimHelper.cpp b/src/Mod/TechDraw/App/DrawDimHelper.cpp
index f5fd78f9d3..a4227f2789 100644
--- a/src/Mod/TechDraw/App/DrawDimHelper.cpp
+++ b/src/Mod/TechDraw/App/DrawDimHelper.cpp
@@ -20,9 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <cstdlib>
 # include <limits>
 # include <sstream>
@@ -35,7 +33,6 @@
 # include <Geom_Line.hxx>
 # include <gp_Pln.hxx>
 # include <TopoDS_Edge.hxx>
-#endif
 
 #include <App/Document.h>
 #include <App/DocumentObject.h>
diff --git a/src/Mod/TechDraw/App/DrawGeomHatch.cpp b/src/Mod/TechDraw/App/DrawGeomHatch.cpp
index 65203e4f0d..e08fe4e0b4 100644
--- a/src/Mod/TechDraw/App/DrawGeomHatch.cpp
+++ b/src/Mod/TechDraw/App/DrawGeomHatch.cpp
@@ -20,9 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <iomanip>
 # include <limits>
 # include <sstream>
@@ -45,7 +43,6 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Compound.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
-#endif
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/TechDraw/App/DrawGeomHatchPyImp.cpp b/src/Mod/TechDraw/App/DrawGeomHatchPyImp.cpp
index fc434573f7..71c3330bd8 100644
--- a/src/Mod/TechDraw/App/DrawGeomHatchPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawGeomHatchPyImp.cpp
@@ -18,7 +18,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "DrawGeomHatch.h"
 // inclusion of the generated files (generated out of DrawGeomHatchPy.xml)
diff --git a/src/Mod/TechDraw/App/DrawHatch.cpp b/src/Mod/TechDraw/App/DrawHatch.cpp
index 904cb10546..d4fa051806 100644
--- a/src/Mod/TechDraw/App/DrawHatch.cpp
+++ b/src/Mod/TechDraw/App/DrawHatch.cpp
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <iomanip>
 # include <sstream>
-#endif
+
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/TechDraw/App/DrawHatchPyImp.cpp b/src/Mod/TechDraw/App/DrawHatchPyImp.cpp
index c80f570659..d06931d4ac 100644
--- a/src/Mod/TechDraw/App/DrawHatchPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawHatchPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "DrawHatch.h"
 // inclusion of the generated files (generated out of DrawHatchPy.xml)
diff --git a/src/Mod/TechDraw/App/DrawLeaderLine.cpp b/src/Mod/TechDraw/App/DrawLeaderLine.cpp
index e2aa00a4a7..7b694fd696 100644
--- a/src/Mod/TechDraw/App/DrawLeaderLine.cpp
+++ b/src/Mod/TechDraw/App/DrawLeaderLine.cpp
@@ -25,7 +25,6 @@
 //! X and Y axes, (0, 0) at lower left).  The first Waypoint is set to (0,0) after the displacements are calculated.
 //! The leader's X,Y position is relative to the parent's origin.  The X,Y position is unrotated and unscaled.
 
-#include "PreCompiled.h"
 
 #include <App/Document.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/App/DrawLeaderLinePyImp.cpp b/src/Mod/TechDraw/App/DrawLeaderLinePyImp.cpp
index bf7f749f4e..a8bb7091fa 100644
--- a/src/Mod/TechDraw/App/DrawLeaderLinePyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawLeaderLinePyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "DrawLeaderLine.h"
 // inclusion of the generated files (generated out of DrawLeaderLinePy.xml)
diff --git a/src/Mod/TechDraw/App/DrawPage.cpp b/src/Mod/TechDraw/App/DrawPage.cpp
index 2c3c982b0c..34407b89d5 100644
--- a/src/Mod/TechDraw/App/DrawPage.cpp
+++ b/src/Mod/TechDraw/App/DrawPage.cpp
@@ -20,12 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <sstream>
 
 # include <Precision.hxx>
-#endif
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/TechDraw/App/DrawPagePyImp.cpp b/src/Mod/TechDraw/App/DrawPagePyImp.cpp
index 15ef2b8e78..d0b4ce140b 100644
--- a/src/Mod/TechDraw/App/DrawPagePyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawPagePyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/DocumentObject.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/App/DrawParametricTemplate.cpp b/src/Mod/TechDraw/App/DrawParametricTemplate.cpp
index a647ee8eca..4c1b91134f 100644
--- a/src/Mod/TechDraw/App/DrawParametricTemplate.cpp
+++ b/src/Mod/TechDraw/App/DrawParametricTemplate.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <sstream>
-#endif
+
 
 #include <Base/Exception.h>
 #include <Base/FileInfo.h>
diff --git a/src/Mod/TechDraw/App/DrawParametricTemplatePyImp.cpp b/src/Mod/TechDraw/App/DrawParametricTemplatePyImp.cpp
index 8c25e56a9d..7fe5b0e865 100644
--- a/src/Mod/TechDraw/App/DrawParametricTemplatePyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawParametricTemplatePyImp.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <sstream>
-#endif
+
 
 #include "DrawParametricTemplate.h"
 // inclusion of the generated files (generated out of DrawParametricTemplateSFPy.xml)
diff --git a/src/Mod/TechDraw/App/DrawProjGroup.cpp b/src/Mod/TechDraw/App/DrawProjGroup.cpp
index 1a8d01c696..c9f815ff8e 100644
--- a/src/Mod/TechDraw/App/DrawProjGroup.cpp
+++ b/src/Mod/TechDraw/App/DrawProjGroup.cpp
@@ -21,9 +21,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <QRectF>
 #include <gp_Ax2.hxx>
 #include <gp_Dir.hxx>
@@ -31,7 +29,7 @@
 #include <gp_Vec.hxx>
 #include <limits>
 #include <sstream>
-#endif
+
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/TechDraw/App/DrawProjGroupItem.cpp b/src/Mod/TechDraw/App/DrawProjGroupItem.cpp
index 1bba85f636..2008547d99 100644
--- a/src/Mod/TechDraw/App/DrawProjGroupItem.cpp
+++ b/src/Mod/TechDraw/App/DrawProjGroupItem.cpp
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <sstream>
 # include <gp_Ax2.hxx>
-#endif
+
 
 #include <App/DocumentObject.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/App/DrawProjGroupItemPyImp.cpp b/src/Mod/TechDraw/App/DrawProjGroupItemPyImp.cpp
index 068baaa25f..0d528c5455 100644
--- a/src/Mod/TechDraw/App/DrawProjGroupItemPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawProjGroupItemPyImp.cpp
@@ -19,7 +19,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "DrawProjGroupItem.h"
 // inclusion of the generated files (generated out of DrawProjGroupItemPy.xml)
diff --git a/src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp b/src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp
index e86a69bd94..b4534915cc 100644
--- a/src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/DocumentObject.h>
 #include <Base/Vector3D.h>
diff --git a/src/Mod/TechDraw/App/DrawProjectSplit.cpp b/src/Mod/TechDraw/App/DrawProjectSplit.cpp
index dbf69c2f21..118c40b82a 100644
--- a/src/Mod/TechDraw/App/DrawProjectSplit.cpp
+++ b/src/Mod/TechDraw/App/DrawProjectSplit.cpp
@@ -20,9 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <algorithm>
 # include <limits>
 # include <sstream>
@@ -43,7 +41,7 @@
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
-#endif
+
 #include <BOPAlgo_Builder.hxx>
 
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/App/DrawRichAnno.cpp b/src/Mod/TechDraw/App/DrawRichAnno.cpp
index 890d664665..755796f6b3 100644
--- a/src/Mod/TechDraw/App/DrawRichAnno.cpp
+++ b/src/Mod/TechDraw/App/DrawRichAnno.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "DrawRichAnno.h"
 #include "DrawRichAnnoPy.h"  // generated from DrawRichAnnoPy.xml
diff --git a/src/Mod/TechDraw/App/DrawRichAnnoPyImp.cpp b/src/Mod/TechDraw/App/DrawRichAnnoPyImp.cpp
index b4736665b2..313be9e710 100644
--- a/src/Mod/TechDraw/App/DrawRichAnnoPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawRichAnnoPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "DrawRichAnno.h"
 // inclusion of the generated files (generated out of DrawRichAnnoPy.xml)
diff --git a/src/Mod/TechDraw/App/DrawSVGTemplate.cpp b/src/Mod/TechDraw/App/DrawSVGTemplate.cpp
index e004bdc555..ed29b5c474 100644
--- a/src/Mod/TechDraw/App/DrawSVGTemplate.cpp
+++ b/src/Mod/TechDraw/App/DrawSVGTemplate.cpp
@@ -21,12 +21,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <sstream>
 # include <QFile>
-#endif
+
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp b/src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp
index 4a0a0f0cd6..88e8a4ee1c 100644
--- a/src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "DrawSVGTemplate.h"
 // inclusion of the generated files (generated out of DrawSVGTemplatePy.xml)
diff --git a/src/Mod/TechDraw/App/DrawTemplate.cpp b/src/Mod/TechDraw/App/DrawTemplate.cpp
index 652d4e5c4d..67b11c63fc 100644
--- a/src/Mod/TechDraw/App/DrawTemplate.cpp
+++ b/src/Mod/TechDraw/App/DrawTemplate.cpp
@@ -20,13 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <sstream>
 # include <QCollator>
 # include <QDateTime>
-#endif
+
 
 #include <Base/Console.h>
 
diff --git a/src/Mod/TechDraw/App/DrawTemplatePyImp.cpp b/src/Mod/TechDraw/App/DrawTemplatePyImp.cpp
index 0b8e52e391..4d5b82a711 100644
--- a/src/Mod/TechDraw/App/DrawTemplatePyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawTemplatePyImp.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <sstream>
-#endif
+
 
 #include "DrawTemplate.h"
 // inclusion of the generated files (generated out of DrawTemplateSFPy.xml)
diff --git a/src/Mod/TechDraw/App/DrawTile.cpp b/src/Mod/TechDraw/App/DrawTile.cpp
index d08be9b314..ad962af2de 100644
--- a/src/Mod/TechDraw/App/DrawTile.cpp
+++ b/src/Mod/TechDraw/App/DrawTile.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "DrawTile.h"
 #include "DrawTilePy.h"  // generated from DrawTilePy.xml
diff --git a/src/Mod/TechDraw/App/DrawTilePyImp.cpp b/src/Mod/TechDraw/App/DrawTilePyImp.cpp
index 789051e315..61b9eab99a 100644
--- a/src/Mod/TechDraw/App/DrawTilePyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawTilePyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "DrawTile.h"
 // inclusion of the generated files (generated out of DrawTilePy.xml)
diff --git a/src/Mod/TechDraw/App/DrawTileWeld.cpp b/src/Mod/TechDraw/App/DrawTileWeld.cpp
index f060344f80..b96c2fbc7d 100644
--- a/src/Mod/TechDraw/App/DrawTileWeld.cpp
+++ b/src/Mod/TechDraw/App/DrawTileWeld.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <sstream>
-#endif
+
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/TechDraw/App/DrawTileWeldPyImp.cpp b/src/Mod/TechDraw/App/DrawTileWeldPyImp.cpp
index 8a70da4838..c21c7d49ac 100644
--- a/src/Mod/TechDraw/App/DrawTileWeldPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawTileWeldPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "DrawTileWeld.h"
 // inclusion of the generated files (generated out of DrawTileWeldPy.xml)
diff --git a/src/Mod/TechDraw/App/DrawUtil.cpp b/src/Mod/TechDraw/App/DrawUtil.cpp
index efeaaef384..414e774fad 100644
--- a/src/Mod/TechDraw/App/DrawUtil.cpp
+++ b/src/Mod/TechDraw/App/DrawUtil.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <cmath>
 #include <cstdlib>
 #include <cstring>
@@ -56,7 +54,6 @@
 #include <gp_Elips.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
-#endif
 
 #include <Base/Console.h>
 #include <Base/Converter.h>
diff --git a/src/Mod/TechDraw/App/DrawView.cpp b/src/Mod/TechDraw/App/DrawView.cpp
index 31e4b95f83..19c0a65f75 100644
--- a/src/Mod/TechDraw/App/DrawView.cpp
+++ b/src/Mod/TechDraw/App/DrawView.cpp
@@ -20,15 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <cmath>
 # include <limits>
 # include <sstream>
 # include <Standard_Failure.hxx>
 # include <Precision.hxx>
-#endif
+
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/TechDraw/App/DrawViewAnnotation.cpp b/src/Mod/TechDraw/App/DrawViewAnnotation.cpp
index 9964bf09e1..7778e2a8c2 100644
--- a/src/Mod/TechDraw/App/DrawViewAnnotation.cpp
+++ b/src/Mod/TechDraw/App/DrawViewAnnotation.cpp
@@ -21,11 +21,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-
-#ifndef _PreComp_
-#endif
-
 #include "DrawViewAnnotation.h"
 #include "Preferences.h"
 
diff --git a/src/Mod/TechDraw/App/DrawViewAnnotationPyImp.cpp b/src/Mod/TechDraw/App/DrawViewAnnotationPyImp.cpp
index 8e884144bd..0d8d1383b3 100644
--- a/src/Mod/TechDraw/App/DrawViewAnnotationPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawViewAnnotationPyImp.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <sstream>
-#endif
+
 
 #include "DrawView.h"
 #include "DrawViewAnnotation.h"
diff --git a/src/Mod/TechDraw/App/DrawViewArch.cpp b/src/Mod/TechDraw/App/DrawViewArch.cpp
index b62ed19756..876b43969e 100644
--- a/src/Mod/TechDraw/App/DrawViewArch.cpp
+++ b/src/Mod/TechDraw/App/DrawViewArch.cpp
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <iomanip>
 # include <sstream>
-#endif
+
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
diff --git a/src/Mod/TechDraw/App/DrawViewBalloon.cpp b/src/Mod/TechDraw/App/DrawViewBalloon.cpp
index f5174ddd17..d1d9b78466 100644
--- a/src/Mod/TechDraw/App/DrawViewBalloon.cpp
+++ b/src/Mod/TechDraw/App/DrawViewBalloon.cpp
@@ -20,15 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <Precision.hxx>
 #include <cstdlib>
 #include <cstring>
 #include <limits>
 #include <sstream>
-#endif
+
 
 #include <App/Application.h>
 #include <Base/Parameter.h>
diff --git a/src/Mod/TechDraw/App/DrawViewClip.cpp b/src/Mod/TechDraw/App/DrawViewClip.cpp
index 6464ba220c..420c5c7593 100644
--- a/src/Mod/TechDraw/App/DrawViewClip.cpp
+++ b/src/Mod/TechDraw/App/DrawViewClip.cpp
@@ -21,7 +21,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/Link.h>
 
diff --git a/src/Mod/TechDraw/App/DrawViewClipPyImp.cpp b/src/Mod/TechDraw/App/DrawViewClipPyImp.cpp
index b4ccfca92c..7497eae01f 100644
--- a/src/Mod/TechDraw/App/DrawViewClipPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawViewClipPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/DocumentObject.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/App/DrawViewCollection.cpp b/src/Mod/TechDraw/App/DrawViewCollection.cpp
index a8f40c0597..e14482d9c9 100644
--- a/src/Mod/TechDraw/App/DrawViewCollection.cpp
+++ b/src/Mod/TechDraw/App/DrawViewCollection.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <sstream>
-#endif
+
 
 #include <App/Document.h>
 #include <App/DocumentObject.h>
diff --git a/src/Mod/TechDraw/App/DrawViewCollectionPyImp.cpp b/src/Mod/TechDraw/App/DrawViewCollectionPyImp.cpp
index d235cb5f95..13ccfe346d 100644
--- a/src/Mod/TechDraw/App/DrawViewCollectionPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawViewCollectionPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "DrawViewCollection.h"
 // inclusion of the generated files (generated out of DrawViewCollectionPy.xml)
diff --git a/src/Mod/TechDraw/App/DrawViewDetail.cpp b/src/Mod/TechDraw/App/DrawViewDetail.cpp
index 32432c1f99..1d5e495ba7 100644
--- a/src/Mod/TechDraw/App/DrawViewDetail.cpp
+++ b/src/Mod/TechDraw/App/DrawViewDetail.cpp
@@ -20,9 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <Mod/Part/App/FCBRepAlgoAPI_Common.h>
 #include <BRepBndLib.hxx>
 #include <BRepBuilderAPI_Copy.hxx>
@@ -47,7 +45,7 @@
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
 #include <sstream>
-#endif
+
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/TechDraw/App/DrawViewDimExtent.cpp b/src/Mod/TechDraw/App/DrawViewDimExtent.cpp
index d5c489e149..aad7030f98 100644
--- a/src/Mod/TechDraw/App/DrawViewDimExtent.cpp
+++ b/src/Mod/TechDraw/App/DrawViewDimExtent.cpp
@@ -20,13 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <cstdlib>
 # include <cstring>
 # include <sstream>
-#endif
+
 
 #include <App/Document.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/App/DrawViewDimExtentPyImp.cpp b/src/Mod/TechDraw/App/DrawViewDimExtentPyImp.cpp
index 36658f106a..7722b2f5fb 100644
--- a/src/Mod/TechDraw/App/DrawViewDimExtentPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawViewDimExtentPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "DrawViewDimExtent.h"
 // inclusion of the generated files (generated out of DrawViewDimExtentPy.xml)
diff --git a/src/Mod/TechDraw/App/DrawViewDimension.cpp b/src/Mod/TechDraw/App/DrawViewDimension.cpp
index 8736a69cf6..093cae894d 100644
--- a/src/Mod/TechDraw/App/DrawViewDimension.cpp
+++ b/src/Mod/TechDraw/App/DrawViewDimension.cpp
@@ -21,8 +21,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <limits>
 #include <sstream>
 
@@ -54,7 +52,6 @@
 #include <TopExp_Explorer.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Shape.hxx>
-#endif
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/TechDraw/App/DrawViewDimensionPyImp.cpp b/src/Mod/TechDraw/App/DrawViewDimensionPyImp.cpp
index 8a18240c29..e172195633 100644
--- a/src/Mod/TechDraw/App/DrawViewDimensionPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawViewDimensionPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Vector3D.h>
 #include <Base/VectorPy.h>
diff --git a/src/Mod/TechDraw/App/DrawViewDraft.cpp b/src/Mod/TechDraw/App/DrawViewDraft.cpp
index 7b98e2f94c..91dc6e2e92 100644
--- a/src/Mod/TechDraw/App/DrawViewDraft.cpp
+++ b/src/Mod/TechDraw/App/DrawViewDraft.cpp
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <iomanip>
 # include <sstream>
-#endif
+
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
diff --git a/src/Mod/TechDraw/App/DrawViewImage.cpp b/src/Mod/TechDraw/App/DrawViewImage.cpp
index 4276ce538c..359c3b9419 100644
--- a/src/Mod/TechDraw/App/DrawViewImage.cpp
+++ b/src/Mod/TechDraw/App/DrawViewImage.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <iomanip>
 # include <sstream>
-#endif
+
 
 #include <App/Document.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/App/DrawViewMulti.cpp b/src/Mod/TechDraw/App/DrawViewMulti.cpp
index 3bebdbd4bc..fae26ee707 100644
--- a/src/Mod/TechDraw/App/DrawViewMulti.cpp
+++ b/src/Mod/TechDraw/App/DrawViewMulti.cpp
@@ -20,16 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <sstream>
 # include <gp_Ax2.hxx>
 # include <gp_Pnt.hxx>
 # include <TopoDS.hxx>
 # include <TopoDS_Compound.hxx>
 # include <TopoDS_Shape.hxx>
-#endif
+
 
 #include <Base/Console.h>
 
diff --git a/src/Mod/TechDraw/App/DrawViewPart.cpp b/src/Mod/TechDraw/App/DrawViewPart.cpp
index f2be301429..3d7cd684a6 100644
--- a/src/Mod/TechDraw/App/DrawViewPart.cpp
+++ b/src/Mod/TechDraw/App/DrawViewPart.cpp
@@ -34,9 +34,7 @@
 // everything else is mostly providing services to other objects, such as the
 // actual drawing routines in Gui
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <BRepAlgo_NormalProjection.hxx>
 #include <BRepBndLib.hxx>
 #include <BRepBuilderAPI_Copy.hxx>
@@ -63,7 +61,7 @@
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
 #include <sstream>
-#endif
+
 
 #include <App/Document.h>
 #include <Base/BoundBox.h>
diff --git a/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp b/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp
index 62ff4bf49b..f557954803 100644
--- a/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp
@@ -20,15 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <BRepBuilderAPI_MakeVertex.hxx>
 # include <gp_Pnt.hxx>
 # include <TopoDS.hxx>
 # include <TopoDS_Edge.hxx>
 # include <TopoDS_Shape.hxx>
-#endif
+
 
 #include <Base/Console.h>
 #include <Base/Vector3D.h>
diff --git a/src/Mod/TechDraw/App/DrawViewPyImp.cpp b/src/Mod/TechDraw/App/DrawViewPyImp.cpp
index 936244f0d1..2419459187 100644
--- a/src/Mod/TechDraw/App/DrawViewPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawViewPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "DrawView.h"
 // inclusion of the generated files (generated out of DrawViewPy.xml)
diff --git a/src/Mod/TechDraw/App/DrawViewSection.cpp b/src/Mod/TechDraw/App/DrawViewSection.cpp
index e2452e5f9e..8ffd29f7c6 100644
--- a/src/Mod/TechDraw/App/DrawViewSection.cpp
+++ b/src/Mod/TechDraw/App/DrawViewSection.cpp
@@ -43,9 +43,7 @@
 //     m_sectionTopoDSFaces = alignSectionFaces(faceIntersections)
 //     m_tdSectionFaces = makeTDSectionFaces(m_sectionTopoDSFaces)
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <BRepAdaptor_Surface.hxx>
 #include <Mod/Part/App/FCBRepAlgoAPI_Cut.h>
 #include <BRepBndLib.hxx>
@@ -73,7 +71,7 @@
 #include <gp_Pnt.hxx>
 #include <limits>
 #include <sstream>
-#endif
+
 
 #include <App/Document.h>
 #include <Base/BoundBox.h>
diff --git a/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp b/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp
index 3b1d7c8d6d..2b076f2ebf 100644
--- a/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp
+++ b/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp
@@ -21,13 +21,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <iomanip>
 #include <sstream>
 #include <boost_regex.hpp>
-#endif
+
 
 #include <App/Property.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/App/DrawViewSymbol.cpp b/src/Mod/TechDraw/App/DrawViewSymbol.cpp
index 66752c7d20..68f078cad3 100644
--- a/src/Mod/TechDraw/App/DrawViewSymbol.cpp
+++ b/src/Mod/TechDraw/App/DrawViewSymbol.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <sstream>
 # include <QDomDocument>
-#endif
+
 
 #include <Base/Console.h>
 
diff --git a/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp b/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp
index d786a747f1..34a8fbb882 100644
--- a/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/FileInfo.h>
 #include <Base/Stream.h>
diff --git a/src/Mod/TechDraw/App/DrawWeldSymbol.cpp b/src/Mod/TechDraw/App/DrawWeldSymbol.cpp
index fe50e74475..103262a2a6 100644
--- a/src/Mod/TechDraw/App/DrawWeldSymbol.cpp
+++ b/src/Mod/TechDraw/App/DrawWeldSymbol.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/Document.h>
 #include <App/DocumentObject.h>
diff --git a/src/Mod/TechDraw/App/DrawWeldSymbolPyImp.cpp b/src/Mod/TechDraw/App/DrawWeldSymbolPyImp.cpp
index c9d1d4eb44..2d99badaaf 100644
--- a/src/Mod/TechDraw/App/DrawWeldSymbolPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawWeldSymbolPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "DrawWeldSymbol.h"
 // inclusion of the generated files (generated out of DrawWeldSymbolPy.xml)
diff --git a/src/Mod/TechDraw/App/EdgeWalker.cpp b/src/Mod/TechDraw/App/EdgeWalker.cpp
index 57e438e659..4482fae354 100644
--- a/src/Mod/TechDraw/App/EdgeWalker.cpp
+++ b/src/Mod/TechDraw/App/EdgeWalker.cpp
@@ -25,9 +25,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //**************************************************************************
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <cmath>
 # include <limits>
 # include <sstream>
@@ -39,7 +37,7 @@
 # include <ShapeFix_Wire.hxx>
 # include <TopExp.hxx>
 # include <boost/graph/boyer_myrvold_planar_test.hpp>
-#endif
+
 
 #include <Base/Console.h>
 
diff --git a/src/Mod/TechDraw/App/FeatureProjection.cpp b/src/Mod/TechDraw/App/FeatureProjection.cpp
index 41d0a7a019..6f158e78ad 100644
--- a/src/Mod/TechDraw/App/FeatureProjection.cpp
+++ b/src/Mod/TechDraw/App/FeatureProjection.cpp
@@ -22,14 +22,12 @@
 //this file originally part of Drawing workbench
 //migrated to TechDraw workbench 2022-01-26 by Wandererfan
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <sstream>
 # include <BRep_Builder.hxx>
 # include <Standard_Failure.hxx>
 # include <TopoDS_Compound.hxx>
-#endif
+
 
 #include "FeatureProjection.h"
 #include "ProjectionAlgos.h"
diff --git a/src/Mod/TechDraw/App/GeomFormatPyImp.cpp b/src/Mod/TechDraw/App/GeomFormatPyImp.cpp
index 4736eb4e77..24d7b90b37 100644
--- a/src/Mod/TechDraw/App/GeomFormatPyImp.cpp
+++ b/src/Mod/TechDraw/App/GeomFormatPyImp.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-
 #include "GeomFormatPy.h"
 #include "GeomFormatPy.cpp"
 
diff --git a/src/Mod/TechDraw/App/Geometry.cpp b/src/Mod/TechDraw/App/Geometry.cpp
index a12e61ab80..fb6d4896b7 100644
--- a/src/Mod/TechDraw/App/Geometry.cpp
+++ b/src/Mod/TechDraw/App/Geometry.cpp
@@ -20,9 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-
-#ifndef _PreComp_
 # include <limits>
 # include <Approx_Curve3d.hxx>
 # include <BRep_Tool.hxx>
@@ -70,7 +67,6 @@
 #if OCC_VERSION_HEX < 0x070600
 # include <BRepAdaptor_HCurve.hxx>
 #endif
-#endif  // #ifndef _PreComp_
 
 #include <Base/Console.h>
 #include <Base/Converter.h>
diff --git a/src/Mod/TechDraw/App/GeometryMatcher.cpp b/src/Mod/TechDraw/App/GeometryMatcher.cpp
index 4002f4151c..55a91ccc83 100644
--- a/src/Mod/TechDraw/App/GeometryMatcher.cpp
+++ b/src/Mod/TechDraw/App/GeometryMatcher.cpp
@@ -24,11 +24,9 @@
 // detects changes in reference geometry (2d & 3d) that would invalidate a dimension
 // identifies replacement view/model geometry
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <BRepGProp.hxx>
 #include <GProp_GProps.hxx>
-#endif
+
 
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepLProp_CLProps.hxx>
diff --git a/src/Mod/TechDraw/App/GeometryObject.cpp b/src/Mod/TechDraw/App/GeometryObject.cpp
index e046f5a7a8..df1b43f8a0 100644
--- a/src/Mod/TechDraw/App/GeometryObject.cpp
+++ b/src/Mod/TechDraw/App/GeometryObject.cpp
@@ -23,9 +23,7 @@
 //! a class to the projection of shapes, removal/identifying hidden lines and
 //! converting the output for OCC HLR into the BaseGeom intermediate representation.
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <BRepAlgo_NormalProjection.hxx>
 #include <BRepBndLib.hxx>
 #include <BRepBuilderAPI_Copy.hxx>
@@ -60,7 +58,6 @@
 #include <gp_Pln.hxx>
 #include <gp_Trsf.hxx>
 #include <gp_Vec.hxx>
-#endif// #ifndef _PreComp_
 
 #include <algorithm>
 #include <chrono>
diff --git a/src/Mod/TechDraw/App/HatchLine.cpp b/src/Mod/TechDraw/App/HatchLine.cpp
index b155943208..5d32ebaa2f 100644
--- a/src/Mod/TechDraw/App/HatchLine.cpp
+++ b/src/Mod/TechDraw/App/HatchLine.cpp
@@ -20,14 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <cmath>
 #include <iomanip>
 #include <sstream>
 #include <stdexcept>
-#endif
+
 
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Edge.hxx>
diff --git a/src/Mod/TechDraw/App/LandmarkDimension.cpp b/src/Mod/TechDraw/App/LandmarkDimension.cpp
index fbe292531c..d7a9b0dae5 100644
--- a/src/Mod/TechDraw/App/LandmarkDimension.cpp
+++ b/src/Mod/TechDraw/App/LandmarkDimension.cpp
@@ -26,14 +26,12 @@
 //* Reference3D features and DVP Vertices are always accessed by tag.
 //* References2D is only used to store the parent DVP
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <gp_Ax2.hxx>
 # include <gp_Pnt.hxx>
 # include <gp_Pnt2d.hxx>
 # include <HLRAlgo_Projector.hxx>
-#endif
+
 
 #include <App/Document.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/App/LineFormat.cpp b/src/Mod/TechDraw/App/LineFormat.cpp
index f1fc7e9a7a..e80a843cea 100644
--- a/src/Mod/TechDraw/App/LineFormat.cpp
+++ b/src/Mod/TechDraw/App/LineFormat.cpp
@@ -22,10 +22,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
-
 #include "LineGroup.h"
 #include "LineGenerator.h"
 #include "Preferences.h"
diff --git a/src/Mod/TechDraw/App/LineGenerator.cpp b/src/Mod/TechDraw/App/LineGenerator.cpp
index ca767c406b..010de042f6 100644
--- a/src/Mod/TechDraw/App/LineGenerator.cpp
+++ b/src/Mod/TechDraw/App/LineGenerator.cpp
@@ -35,10 +35,6 @@
 //! the graphical elements and line definitions are stored in csv files.
 //! these values only change if ISO128.20 or ANSI Y14.2 change
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
-
 #include <QVector>
 
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/App/LineGroup.cpp b/src/Mod/TechDraw/App/LineGroup.cpp
index ea2bded890..88f6412a65 100644
--- a/src/Mod/TechDraw/App/LineGroup.cpp
+++ b/src/Mod/TechDraw/App/LineGroup.cpp
@@ -20,14 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <fstream>
 # include <iomanip>
 # include <sstream>
 # include <stdexcept>
-#endif
+
 
 #include <Base/Console.h>
 #include <Base/FileInfo.h>
diff --git a/src/Mod/TechDraw/App/LineNameEnum.cpp b/src/Mod/TechDraw/App/LineNameEnum.cpp
index ee0b9f9ffc..85b1505881 100644
--- a/src/Mod/TechDraw/App/LineNameEnum.cpp
+++ b/src/Mod/TechDraw/App/LineNameEnum.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "Preferences.h"
 
diff --git a/src/Mod/TechDraw/App/MattingPropEnum.cpp b/src/Mod/TechDraw/App/MattingPropEnum.cpp
index 713c4c7c97..ab0d06a38c 100644
--- a/src/Mod/TechDraw/App/MattingPropEnum.cpp
+++ b/src/Mod/TechDraw/App/MattingPropEnum.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "MattingPropEnum.h"
 
diff --git a/src/Mod/TechDraw/App/PreCompiled.cpp b/src/Mod/TechDraw/App/PreCompiled.cpp
deleted file mode 100644
index bef7d3ea9f..0000000000
--- a/src/Mod/TechDraw/App/PreCompiled.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/***************************************************************************
- *   Copyright (c) 2007 Jürgen Riegel <juergen.riegel@web.de>              *
- *                                                                         *
- *   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"
diff --git a/src/Mod/TechDraw/App/PreCompiled.h b/src/Mod/TechDraw/App/PreCompiled.h
index 26d274b0e3..9d0a0c392e 100644
--- a/src/Mod/TechDraw/App/PreCompiled.h
+++ b/src/Mod/TechDraw/App/PreCompiled.h
@@ -25,8 +25,6 @@
 
 #include <FCConfig.h>
 
-#ifdef _PreComp_
-
 // standard
 #include <algorithm>
 #include <cstdio>
@@ -64,5 +62,4 @@
 // OpenCasCade
 #include <Mod/Part/App/OpenCascadeAll.h>
 
-#endif // _PreComp_
 #endif
diff --git a/src/Mod/TechDraw/App/Preferences.cpp b/src/Mod/TechDraw/App/Preferences.cpp
index 4764625ba2..7c57491fec 100644
--- a/src/Mod/TechDraw/App/Preferences.cpp
+++ b/src/Mod/TechDraw/App/Preferences.cpp
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <string>
 # include <QApplication>
 # include <QString>
-#endif
+
 
 #include <App/Application.h>
 #include <App/Material.h>
diff --git a/src/Mod/TechDraw/App/ProjectionAlgos.cpp b/src/Mod/TechDraw/App/ProjectionAlgos.cpp
index cd88254d11..073bfa80ff 100644
--- a/src/Mod/TechDraw/App/ProjectionAlgos.cpp
+++ b/src/Mod/TechDraw/App/ProjectionAlgos.cpp
@@ -22,9 +22,7 @@
 //this file originally part of TechDraw workbench
 //migrated to TechDraw workbench 2022-01-26 by Wandererfan
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <sstream>
 # include <BRepLib.hxx>
 # include <BRepMesh_IncrementalMesh.hxx>
@@ -37,7 +35,7 @@
 # include <TopExp_Explorer.hxx>
 # include <TopoDS.hxx>
 # include <TopoDS_Shape.hxx>
-#endif
+
 
 #include "ProjectionAlgos.h"
 #include "TechDrawExport.h"
diff --git a/src/Mod/TechDraw/App/PropertyCenterLineList.cpp b/src/Mod/TechDraw/App/PropertyCenterLineList.cpp
index 2d58f45c03..98fe44fdb6 100644
--- a/src/Mod/TechDraw/App/PropertyCenterLineList.cpp
+++ b/src/Mod/TechDraw/App/PropertyCenterLineList.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Console.h>
 #include <Base/Reader.h>
diff --git a/src/Mod/TechDraw/App/PropertyCosmeticEdgeList.cpp b/src/Mod/TechDraw/App/PropertyCosmeticEdgeList.cpp
index 19586db84d..123cb2f4d6 100644
--- a/src/Mod/TechDraw/App/PropertyCosmeticEdgeList.cpp
+++ b/src/Mod/TechDraw/App/PropertyCosmeticEdgeList.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Console.h>
 #include <Base/Reader.h>
diff --git a/src/Mod/TechDraw/App/PropertyCosmeticVertexList.cpp b/src/Mod/TechDraw/App/PropertyCosmeticVertexList.cpp
index d56b32c832..f414587fca 100644
--- a/src/Mod/TechDraw/App/PropertyCosmeticVertexList.cpp
+++ b/src/Mod/TechDraw/App/PropertyCosmeticVertexList.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Console.h>
 #include <Base/Reader.h>
diff --git a/src/Mod/TechDraw/App/PropertyGeomFormatList.cpp b/src/Mod/TechDraw/App/PropertyGeomFormatList.cpp
index 51a0670114..7c02e418a7 100644
--- a/src/Mod/TechDraw/App/PropertyGeomFormatList.cpp
+++ b/src/Mod/TechDraw/App/PropertyGeomFormatList.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Console.h>
 #include <Base/Reader.h>
diff --git a/src/Mod/TechDraw/App/ShapeExtractor.cpp b/src/Mod/TechDraw/App/ShapeExtractor.cpp
index e52ac691f5..f0b973e492 100644
--- a/src/Mod/TechDraw/App/ShapeExtractor.cpp
+++ b/src/Mod/TechDraw/App/ShapeExtractor.cpp
@@ -20,9 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <sstream>
 # include <BRep_Builder.hxx>
 # include <Mod/Part/App/FCBRepAlgoAPI_Fuse.h>
@@ -32,7 +30,7 @@
 # include <TopoDS_Vertex.hxx>
 # include <BRepBuilderAPI_Copy.hxx>
 #include <BRepCheck_Analyzer.hxx>
-#endif
+
 
 #include <App/Document.h>
 #include <App/GroupExtension.h>
diff --git a/src/Mod/TechDraw/App/ShapeUtils.cpp b/src/Mod/TechDraw/App/ShapeUtils.cpp
index e9ccc22472..5d72967b2c 100644
--- a/src/Mod/TechDraw/App/ShapeUtils.cpp
+++ b/src/Mod/TechDraw/App/ShapeUtils.cpp
@@ -23,11 +23,8 @@
 //! a class to contain useful shape manipulations. these methods were originally
 //  in GeometryObject.
 
-
-#include "PreCompiled.h"
-
-#ifndef _PreComp_
 #include <limits>
+
 #include <BRepAlgo_NormalProjection.hxx>
 #include <BRepBndLib.hxx>
 #include <BRepBuilderAPI_Copy.hxx>
@@ -62,7 +59,6 @@
 #include <gp_Pln.hxx>
 #include <gp_Trsf.hxx>
 #include <gp_Vec.hxx>
-#endif// #ifndef _PreComp_
 
 #include <Base/Console.h>
 #include <Base/Tools.h>
diff --git a/src/Mod/TechDraw/App/Tag.cpp b/src/Mod/TechDraw/App/Tag.cpp
index 667762f7ee..e32c7ae85d 100644
--- a/src/Mod/TechDraw/App/Tag.cpp
+++ b/src/Mod/TechDraw/App/Tag.cpp
@@ -21,14 +21,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
-    #include <boost/random.hpp>
-    #include <boost/uuid/uuid_io.hpp>
-    #include <boost/uuid/uuid_generators.hpp>
-    #include <boost/thread/mutex.hpp>
-    #include <boost/thread/lock_guard.hpp>
-#endif
+#include <boost/random.hpp>
+#include <boost/uuid/uuid_io.hpp>
+#include <boost/uuid/uuid_generators.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/lock_guard.hpp>
 
 #include <Base/Reader.h>
 #include <Base/Writer.h>
diff --git a/src/Mod/TechDraw/App/TechDrawExport.cpp b/src/Mod/TechDraw/App/TechDrawExport.cpp
index 8484a66e1c..ea00c013a5 100644
--- a/src/Mod/TechDraw/App/TechDrawExport.cpp
+++ b/src/Mod/TechDraw/App/TechDrawExport.cpp
@@ -22,9 +22,7 @@
 //this file originally part of TechDraw workbench
 //migrated to TechDraw workbench 2022-01-26 by Wandererfan
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <cmath>
 # include <sstream>
 # include <Approx_Curve3d.hxx>
@@ -53,7 +51,6 @@
 # if OCC_VERSION_HEX < 0x070600
 #  include <BRepAdaptor_HCurve.hxx>
 # endif
-#endif
 
 #include <Base/Tools.h>
 
diff --git a/src/Mod/TechDraw/App/XMLQuery.cpp b/src/Mod/TechDraw/App/XMLQuery.cpp
index adae6bac12..ab2add0bd3 100644
--- a/src/Mod/TechDraw/App/XMLQuery.cpp
+++ b/src/Mod/TechDraw/App/XMLQuery.cpp
@@ -21,11 +21,9 @@
  *                                                                         *
  **************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <QDomDocument>
-#endif
+
 
 #include "DrawUtil.h"
 #include "XMLQuery.h"
diff --git a/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp b/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp
index c9300ba3df..0312a0da5a 100644
--- a/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp
+++ b/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QFontDatabase>
-#endif
+
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
diff --git a/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp b/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp
index af59c2f0b3..1e41fd4f7d 100644
--- a/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp
+++ b/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/Document.h>
 #include <App/DocumentObject.h>
diff --git a/src/Mod/TechDraw/Gui/CMakeLists.txt b/src/Mod/TechDraw/Gui/CMakeLists.txt
index 289dfd18b6..3cf4eaa7fa 100644
--- a/src/Mod/TechDraw/Gui/CMakeLists.txt
+++ b/src/Mod/TechDraw/Gui/CMakeLists.txt
@@ -95,7 +95,6 @@ SET(TechDrawGui_SRCS
     DimensionValidators.cpp
     DimensionValidators.h
     Resources/TechDraw.qrc
-    PreCompiled.cpp
     PreCompiled.h
     Workbench.cpp
     Workbench.h
@@ -457,14 +456,6 @@ SET(TechDrawGuiFonts
     Resources/fonts/Y14.5-FreeCAD.ttf
 )
 
-if(FREECAD_USE_PCH)
-    add_definitions(-D_PreComp_)
-    GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${TechDrawGui_SRCS} ${TechDrawGuiView_SRCS}
-                                                           ${TechDrawGuiNav_SRCS}
-                                                           ${TechDrawGuiViewProvider_SRCS} ${MRTE_SRCS})
-    ADD_MSVC_PRECOMPILED_HEADER(TechDrawGui PreCompiled.h PreCompiled.cpp PCH_SRCS)
-endif(FREECAD_USE_PCH)
-
 add_library(TechDrawGui SHARED
     ${TechDrawGui_SRCS}
     ${TechDrawGuiView_SRCS}
@@ -475,6 +466,12 @@ add_library(TechDrawGui SHARED
     ${MRTE_SRCS}
 )
 
+if(FREECAD_USE_PCH)
+    target_precompile_headers(TechDrawGui PRIVATE
+            $<$<COMPILE_LANGUAGE:CXX>:"${CMAKE_CURRENT_LIST_DIR}/PreCompiled.h">
+    )
+endif(FREECAD_USE_PCH)
+
 target_include_directories(
     TechDrawGui
     PRIVATE
diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp
index 1b40037eac..41b07e1b30 100644
--- a/src/Mod/TechDraw/Gui/Command.cpp
+++ b/src/Mod/TechDraw/Gui/Command.cpp
@@ -19,15 +19,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QApplication>
 #include <QFileInfo>
 #include <QMessageBox>
 #include <QCheckBox>
 #include <QPushButton>
 #include <vector>
-#endif
+
 
 #include <App/Document.h>
 #include <App/DocumentObject.h>
diff --git a/src/Mod/TechDraw/Gui/CommandAlign.cpp b/src/Mod/TechDraw/Gui/CommandAlign.cpp
index 8f23ed5b5c..b2827fa9b1 100644
--- a/src/Mod/TechDraw/Gui/CommandAlign.cpp
+++ b/src/Mod/TechDraw/Gui/CommandAlign.cpp
@@ -18,10 +18,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QMessageBox>
-#endif
 
 #include <App/DocumentObject.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/Gui/CommandAnnotate.cpp b/src/Mod/TechDraw/Gui/CommandAnnotate.cpp
index 4302083187..10a97eb9bc 100644
--- a/src/Mod/TechDraw/Gui/CommandAnnotate.cpp
+++ b/src/Mod/TechDraw/Gui/CommandAnnotate.cpp
@@ -20,11 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QApplication>
 # include <QMessageBox>
-#endif
 
 #include <App/DocumentObject.h>
 #include <Gui/Action.h>
diff --git a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp
index 37eb44b8df..dc035a6045 100644
--- a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp
+++ b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp
@@ -21,8 +21,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <cmath>
 #include <limits>
 #include <string>
@@ -34,7 +32,6 @@
 #include <QMouseEvent>
 #include <QPoint>
 #include <QPixmap>
-#endif//#ifndef _PreComp_
 
 #include <App/AutoTransaction.h>
 #include <App/Document.h>
diff --git a/src/Mod/TechDraw/Gui/CommandDecorate.cpp b/src/Mod/TechDraw/Gui/CommandDecorate.cpp
index fa49f34402..bc707aa168 100644
--- a/src/Mod/TechDraw/Gui/CommandDecorate.cpp
+++ b/src/Mod/TechDraw/Gui/CommandDecorate.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QMessageBox>
 # include <sstream>
-#endif
+
 
 #include <App/Document.h>
 #include <App/DocumentObject.h>
diff --git a/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp b/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp
index 0feee202cc..551f50f311 100644
--- a/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp
+++ b/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp
@@ -20,15 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QApplication>
 # include <QMessageBox>
 # include <cmath>
 # include <sstream>
 # include <BRepGProp.hxx>
 # include <GProp_GProps.hxx>
-#endif
+
 
 # include <App/Document.h>
 # include <App/DocumentObject.h>
diff --git a/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp b/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp
index 587302a4c8..f0911eace1 100644
--- a/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp
+++ b/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp
@@ -20,15 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QApplication>
 #include <QMessageBox>
 #include <BRepGProp.hxx>
 #include <GProp_GProps.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <GCPnts_AbscissaPoint.hxx>
-#endif
+
 
 #include <App/Document.h>
 #include <App/DocumentObject.h>
diff --git a/src/Mod/TechDraw/Gui/CommandHelpers.cpp b/src/Mod/TechDraw/Gui/CommandHelpers.cpp
index 7555fd83e7..649ffe86f4 100644
--- a/src/Mod/TechDraw/Gui/CommandHelpers.cpp
+++ b/src/Mod/TechDraw/Gui/CommandHelpers.cpp
@@ -23,9 +23,6 @@
  ***************************************************************************/
 
 //! CommandHelpers is a collection of methods for common actions in commands
-#include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
 
 #include <QMessageBox>
 
diff --git a/src/Mod/TechDraw/Gui/CommandStack.cpp b/src/Mod/TechDraw/Gui/CommandStack.cpp
index 4281123bff..3cee958041 100644
--- a/src/Mod/TechDraw/Gui/CommandStack.cpp
+++ b/src/Mod/TechDraw/Gui/CommandStack.cpp
@@ -18,12 +18,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <QApplication>
 # include <QMessageBox>
-#endif
+
 
 #include <App/DocumentObject.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/Gui/DimensionValidators.cpp b/src/Mod/TechDraw/Gui/DimensionValidators.cpp
index 66f9e661f1..ab37700d48 100644
--- a/src/Mod/TechDraw/Gui/DimensionValidators.cpp
+++ b/src/Mod/TechDraw/Gui/DimensionValidators.cpp
@@ -20,13 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <limits>
+
 #include <BRepAdaptor_Curve.hxx>
 #include <BRep_Tool.hxx>
 #include <TopExp.hxx>
-#endif//#ifndef _PreComp_
 
 #include <App/DocumentObject.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/Gui/DlgPageChooser.cpp b/src/Mod/TechDraw/Gui/DlgPageChooser.cpp
index 60a2918b7e..27cb8b3d80 100644
--- a/src/Mod/TechDraw/Gui/DlgPageChooser.cpp
+++ b/src/Mod/TechDraw/Gui/DlgPageChooser.cpp
@@ -20,12 +20,9 @@
  *                                                                          *
  ****************************************************************************/
 
-#include "PreCompiled.h"    //NOLINT
-#ifndef _PreComp_
 # include <QListWidgetItem>
 # include <QList>
 # include <QPushButton>
-#endif
 
 #include <Base/Console.h> // for FC_LOG_LEVEL_INIT
 
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.cpp
index 369f67a17f..0bed30349e 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.cpp
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.cpp
@@ -22,7 +22,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Mod/TechDraw/App/Preferences.h>
 #include "DlgPrefsTechDrawAdvancedImp.h"
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp
index 955cbc9453..91df17b3d2 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp
@@ -22,10 +22,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <vector>
-#endif
+
 
 #include <Base/Tools.h>
 
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.cpp
index c6ae30d1e7..51e707abd1 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.cpp
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.cpp
@@ -22,7 +22,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "DlgPrefsTechDrawColorsImp.h"
 #include "ui_DlgPrefsTechDrawColors.h"
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.cpp
index f10eefd2ae..b316671b98 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.cpp
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.cpp
@@ -22,7 +22,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/Application.h>
 
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.cpp
index 6cc3c89269..c9bff6f093 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.cpp
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.cpp
@@ -22,7 +22,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "DlgPrefsTechDrawGeneralImp.h"
 #include "ui_DlgPrefsTechDrawGeneral.h"
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.cpp
index 8d5e834c44..4c1b273507 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.cpp
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.cpp
@@ -22,7 +22,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "DlgPrefsTechDrawHLRImp.h"
 #include "ui_DlgPrefsTechDrawHLR.h"
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.cpp
index 010f000f74..e1dc01d70f 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.cpp
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.cpp
@@ -22,7 +22,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "DlgPrefsTechDrawScaleImp.h"
 #include "ui_DlgPrefsTechDrawScale.h"
diff --git a/src/Mod/TechDraw/Gui/DlgTemplateField.cpp b/src/Mod/TechDraw/Gui/DlgTemplateField.cpp
index df7b4b93b4..4788601364 100644
--- a/src/Mod/TechDraw/Gui/DlgTemplateField.cpp
+++ b/src/Mod/TechDraw/Gui/DlgTemplateField.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "DlgTemplateField.h"
 #include "ui_DlgTemplateField.h"
diff --git a/src/Mod/TechDraw/Gui/DrawGuiUtil.cpp b/src/Mod/TechDraw/Gui/DrawGuiUtil.cpp
index 377f556fd4..2f9de559aa 100644
--- a/src/Mod/TechDraw/Gui/DrawGuiUtil.cpp
+++ b/src/Mod/TechDraw/Gui/DrawGuiUtil.cpp
@@ -21,9 +21,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <sstream>
 
 #include <QBitmap>
@@ -39,7 +37,6 @@
 # include <BRepAdaptor_Surface.hxx>
 # include <BRepLProp_SLProps.hxx>
 # include <gp_Dir.hxx>
-#endif
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/TechDraw/Gui/Grabber3d.cpp b/src/Mod/TechDraw/Gui/Grabber3d.cpp
index f63a4095f8..0bb8d0fc46 100644
--- a/src/Mod/TechDraw/Gui/Grabber3d.cpp
+++ b/src/Mod/TechDraw/Gui/Grabber3d.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Console.h>
 #include <Gui/MainWindow.h>
diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.cpp b/src/Mod/TechDraw/Gui/MDIViewPage.cpp
index b34edf494e..7a16b0c32f 100644
--- a/src/Mod/TechDraw/Gui/MDIViewPage.cpp
+++ b/src/Mod/TechDraw/Gui/MDIViewPage.cpp
@@ -21,9 +21,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <QAction>
 #include <QApplication>
 #include <QContextMenuEvent>
@@ -39,7 +37,7 @@
 #include <QPrinter>
 #include <boost/signals2.hpp>
 #include <cmath>
-#endif
+
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/TechDraw/Gui/PATPathMaker.cpp b/src/Mod/TechDraw/Gui/PATPathMaker.cpp
index b17c949734..ca2eefed6c 100644
--- a/src/Mod/TechDraw/Gui/PATPathMaker.cpp
+++ b/src/Mod/TechDraw/Gui/PATPathMaker.cpp
@@ -20,15 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cmath>
 # include <QPainter>
 # include <QPainterPath>
 # include <QPointF>
 # include <QRectF>
 # include <QTransform>
-#endif
+
 #include <QByteArrayMatcher>
 
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/Gui/PagePrinter.cpp b/src/Mod/TechDraw/Gui/PagePrinter.cpp
index c0f540eb54..c0f33c026a 100644
--- a/src/Mod/TechDraw/Gui/PagePrinter.cpp
+++ b/src/Mod/TechDraw/Gui/PagePrinter.cpp
@@ -20,9 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <QApplication>
 #include <QMessageBox>
 #include <QPageLayout>
@@ -33,7 +31,7 @@
 #include <QPrintDialog>
 #include <QPrintPreviewDialog>
 #include <QPrinter>
-#endif
+
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/TechDraw/Gui/PathBuilder.cpp b/src/Mod/TechDraw/Gui/PathBuilder.cpp
index 44c2f202c5..1965e68e72 100644
--- a/src/Mod/TechDraw/Gui/PathBuilder.cpp
+++ b/src/Mod/TechDraw/Gui/PathBuilder.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <qmath.h>
-#endif
+
 
 #include <Base/Console.h>
 
diff --git a/src/Mod/TechDraw/Gui/PreCompiled.cpp b/src/Mod/TechDraw/Gui/PreCompiled.cpp
deleted file mode 100644
index 95d724aa47..0000000000
--- a/src/Mod/TechDraw/Gui/PreCompiled.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/***************************************************************************
- *   Copyright (c) 2007 Jürgen Riegel <juergen.riegel@web.de>              *
- *                                                                         *
- *   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"
diff --git a/src/Mod/TechDraw/Gui/PreCompiled.h b/src/Mod/TechDraw/Gui/PreCompiled.h
index d5a479dc8a..ee31732a50 100644
--- a/src/Mod/TechDraw/Gui/PreCompiled.h
+++ b/src/Mod/TechDraw/Gui/PreCompiled.h
@@ -28,8 +28,6 @@
 #ifdef FC_OS_WIN32
 #endif
 
-#ifdef _PreComp_
-
 // standard
 #include <cassert>
 #include <cmath>
@@ -67,6 +65,4 @@
 // Open Inventor
 #include <Inventor/SbVec3f.h>
 
-#endif //_PreComp_
-
 #endif // DRAWINGGUI_PRECOMPILED_H
diff --git a/src/Mod/TechDraw/Gui/PreferencesGui.cpp b/src/Mod/TechDraw/Gui/PreferencesGui.cpp
index 77080c40ca..ce207cc9b1 100644
--- a/src/Mod/TechDraw/Gui/PreferencesGui.cpp
+++ b/src/Mod/TechDraw/Gui/PreferencesGui.cpp
@@ -20,14 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <string>
 # include <QColor>
 # include <QFont>
 # include <QString>
-#endif
+
 
 #include <App/Application.h>
 #include <App/Material.h>
diff --git a/src/Mod/TechDraw/Gui/QGCustomBorder.cpp b/src/Mod/TechDraw/Gui/QGCustomBorder.cpp
index 5f9b53df58..312605e7f8 100644
--- a/src/Mod/TechDraw/Gui/QGCustomBorder.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomBorder.cpp
@@ -20,14 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cassert>
 
 #include <QPainter>
 #include <QRectF>
 #include <QStyleOptionGraphicsItem>
-#endif
 
 #include "QGCustomBorder.h"
 
diff --git a/src/Mod/TechDraw/Gui/QGCustomClip.cpp b/src/Mod/TechDraw/Gui/QGCustomClip.cpp
index ae44d90251..23ca40a1dc 100644
--- a/src/Mod/TechDraw/Gui/QGCustomClip.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomClip.cpp
@@ -20,13 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cassert>
 
 # include <QPainter>
 # include <QStyleOptionGraphicsItem>
-#endif
 
 #include "QGCustomClip.h"
 #include "QGICMark.h"
diff --git a/src/Mod/TechDraw/Gui/QGCustomImage.cpp b/src/Mod/TechDraw/Gui/QGCustomImage.cpp
index 4d06a36f30..772fbc4031 100644
--- a/src/Mod/TechDraw/Gui/QGCustomImage.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomImage.cpp
@@ -20,13 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QPainter>
 # include <QPixmap>
 # include <QRectF>
 # include <QStyleOptionGraphicsItem>
-#endif
+
 
 #include "QGCustomImage.h"
 
diff --git a/src/Mod/TechDraw/Gui/QGCustomLabel.cpp b/src/Mod/TechDraw/Gui/QGCustomLabel.cpp
index b74d4ce972..a192b8cae5 100644
--- a/src/Mod/TechDraw/Gui/QGCustomLabel.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomLabel.cpp
@@ -20,14 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cassert>
 
 # include <QPainter>
 # include <QRectF>
 # include <QStyleOptionGraphicsItem>
-#endif
 
 #include "QGCustomLabel.h"
 
diff --git a/src/Mod/TechDraw/Gui/QGCustomRect.cpp b/src/Mod/TechDraw/Gui/QGCustomRect.cpp
index 43e0846d7c..1dd85301f4 100644
--- a/src/Mod/TechDraw/Gui/QGCustomRect.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomRect.cpp
@@ -20,14 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cassert>
 
 # include <QPainter>
 # include <QRectF>
 # include <QStyleOptionGraphicsItem>
-#endif
 
 #include "QGCustomRect.h"
 
diff --git a/src/Mod/TechDraw/Gui/QGCustomSvg.cpp b/src/Mod/TechDraw/Gui/QGCustomSvg.cpp
index b49b8b11ad..dea0978efc 100644
--- a/src/Mod/TechDraw/Gui/QGCustomSvg.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomSvg.cpp
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QPainter>
 # include <QRectF>
 # include <QStyleOptionGraphicsItem>
-#endif
+
 
 #include "QGCustomSvg.h"
 
diff --git a/src/Mod/TechDraw/Gui/QGCustomText.cpp b/src/Mod/TechDraw/Gui/QGCustomText.cpp
index b40693a2e2..e1a057d652 100644
--- a/src/Mod/TechDraw/Gui/QGCustomText.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomText.cpp
@@ -20,15 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cassert>
 
 # include <QGraphicsSceneHoverEvent>
 # include <QPainter>
 # include <QRectF>
 # include <QStyleOptionGraphicsItem>
-#endif
 
 #include <Base/Console.h>
 #include <Base/Parameter.h>
diff --git a/src/Mod/TechDraw/Gui/QGDisplayArea.cpp b/src/Mod/TechDraw/Gui/QGDisplayArea.cpp
index 0ab5fe59e9..46b6b41a0a 100644
--- a/src/Mod/TechDraw/Gui/QGDisplayArea.cpp
+++ b/src/Mod/TechDraw/Gui/QGDisplayArea.cpp
@@ -20,13 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cassert>
 
 # include <QPainter>
 # include <QStyleOptionGraphicsItem>
-#endif
 
 #include "QGDisplayArea.h"
 
diff --git a/src/Mod/TechDraw/Gui/QGEPath.cpp b/src/Mod/TechDraw/Gui/QGEPath.cpp
index 5c89dea90e..003679a6a7 100644
--- a/src/Mod/TechDraw/Gui/QGEPath.cpp
+++ b/src/Mod/TechDraw/Gui/QGEPath.cpp
@@ -20,14 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QGraphicsScene>
 # include <QGraphicsSceneHoverEvent>
 # include <QKeyEvent>
 # include <QPainterPath>
 # include <QPainterPathStroker>
-#endif
+
 
 #include <Base/Console.h>
 #include <Mod/TechDraw/App/DrawLeaderLine.h>
diff --git a/src/Mod/TechDraw/Gui/QGIArrow.cpp b/src/Mod/TechDraw/Gui/QGIArrow.cpp
index 1b38f98074..7b401d943a 100644
--- a/src/Mod/TechDraw/Gui/QGIArrow.cpp
+++ b/src/Mod/TechDraw/Gui/QGIArrow.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cassert>
 # include <QPainterPath>
-#endif
+
 
 #include <Mod/TechDraw/App/ArrowPropEnum.h>
 
diff --git a/src/Mod/TechDraw/Gui/QGIBreakLine.cpp b/src/Mod/TechDraw/Gui/QGIBreakLine.cpp
index 9f04ed3a27..1dc38ccc09 100644
--- a/src/Mod/TechDraw/Gui/QGIBreakLine.cpp
+++ b/src/Mod/TechDraw/Gui/QGIBreakLine.cpp
@@ -22,13 +22,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QGraphicsScene>
 # include <QPainter>
 # include <QPainterPath>
 # include <QStyleOptionGraphicsItem>
-#endif
+
 
 #include <App/Application.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/Gui/QGICMark.cpp b/src/Mod/TechDraw/Gui/QGICMark.cpp
index 881d4f75c7..577f9bf40a 100644
--- a/src/Mod/TechDraw/Gui/QGICMark.cpp
+++ b/src/Mod/TechDraw/Gui/QGICMark.cpp
@@ -20,14 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cassert>
 
 # include <QPainter>
 # include <QPainterPath>
 # include <QStyleOptionGraphicsItem>
-#endif
 
 #include <App/Material.h>
 #include <Base/Parameter.h>
diff --git a/src/Mod/TechDraw/Gui/QGICaption.cpp b/src/Mod/TechDraw/Gui/QGICaption.cpp
index 4ae7438d65..9b46e04563 100644
--- a/src/Mod/TechDraw/Gui/QGICaption.cpp
+++ b/src/Mod/TechDraw/Gui/QGICaption.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cassert>
-#endif
+
 
 #include "QGICaption.h"
 
diff --git a/src/Mod/TechDraw/Gui/QGICenterLine.cpp b/src/Mod/TechDraw/Gui/QGICenterLine.cpp
index 9da9023e4d..918bf56e7e 100644
--- a/src/Mod/TechDraw/Gui/QGICenterLine.cpp
+++ b/src/Mod/TechDraw/Gui/QGICenterLine.cpp
@@ -20,14 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cmath>
 
 # include <QPainter>
 # include <QPainterPath>
 # include <QStyleOptionGraphicsItem>
-#endif
 
 #include <Base/Parameter.h>
 #include <Mod/TechDraw/App/Preferences.h>
diff --git a/src/Mod/TechDraw/Gui/QGIDatumLabel.cpp b/src/Mod/TechDraw/Gui/QGIDatumLabel.cpp
index efa82d82d3..3b22d7220c 100644
--- a/src/Mod/TechDraw/Gui/QGIDatumLabel.cpp
+++ b/src/Mod/TechDraw/Gui/QGIDatumLabel.cpp
@@ -20,11 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QApplication>
 #include <QGraphicsSceneMouseEvent>
-#endif
 
 #include <Gui/Application.h>
 #include <Mod/TechDraw/App/DimensionFormatter.h>
diff --git a/src/Mod/TechDraw/Gui/QGIDecoration.cpp b/src/Mod/TechDraw/Gui/QGIDecoration.cpp
index fcf00bc731..b1066dc1e8 100644
--- a/src/Mod/TechDraw/Gui/QGIDecoration.cpp
+++ b/src/Mod/TechDraw/Gui/QGIDecoration.cpp
@@ -20,13 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cassert>
 
 # include <QPainter>
 # include <QStyleOptionGraphicsItem>
-#endif
 
 #include "QGIDecoration.h"
 #include "QGICMark.h"
diff --git a/src/Mod/TechDraw/Gui/QGIDimLines.cpp b/src/Mod/TechDraw/Gui/QGIDimLines.cpp
index ef4f47a0ed..802011e34c 100644
--- a/src/Mod/TechDraw/Gui/QGIDimLines.cpp
+++ b/src/Mod/TechDraw/Gui/QGIDimLines.cpp
@@ -20,13 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cassert>
 
 # include <QPainterPath>
 # include <QPainterPathStroker>
-#endif
 
 #include "QGIDimLines.h"
 #include "PreferencesGui.h"
diff --git a/src/Mod/TechDraw/Gui/QGIDrawingTemplate.cpp b/src/Mod/TechDraw/Gui/QGIDrawingTemplate.cpp
index 9cf2699e91..18d7a76ea9 100644
--- a/src/Mod/TechDraw/Gui/QGIDrawingTemplate.cpp
+++ b/src/Mod/TechDraw/Gui/QGIDrawingTemplate.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QPainterPath>
-#endif
+
 
 #include <Mod/TechDraw/App/Geometry.h>
 #include <Mod/TechDraw/App/DrawParametricTemplate.h>
diff --git a/src/Mod/TechDraw/Gui/QGIEdge.cpp b/src/Mod/TechDraw/Gui/QGIEdge.cpp
index dabdf7b85b..e4bb49ede5 100644
--- a/src/Mod/TechDraw/Gui/QGIEdge.cpp
+++ b/src/Mod/TechDraw/Gui/QGIEdge.cpp
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <QPainterPath>
 # include <QPainterPathStroker>
-#endif
+
 
 #include <App/Application.h>
 #include <App/Material.h>
diff --git a/src/Mod/TechDraw/Gui/QGIFace.cpp b/src/Mod/TechDraw/Gui/QGIFace.cpp
index b75d7dc2e2..bd0e6d639f 100644
--- a/src/Mod/TechDraw/Gui/QGIFace.cpp
+++ b/src/Mod/TechDraw/Gui/QGIFace.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cmath>
 
 # include <QFileInfo>
@@ -31,7 +29,6 @@
 # include <QPointF>
 # include <QRectF>
 # include <QTransform>
-#endif
 
 #include <App/Application.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/Gui/QGIGhostHighlight.cpp b/src/Mod/TechDraw/Gui/QGIGhostHighlight.cpp
index 71620938ff..bb89c4b85a 100644
--- a/src/Mod/TechDraw/Gui/QGIGhostHighlight.cpp
+++ b/src/Mod/TechDraw/Gui/QGIGhostHighlight.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QGraphicsSceneEvent>
-#endif
+
 
 #include <Mod/TechDraw/App/DrawUtil.h>
 
diff --git a/src/Mod/TechDraw/Gui/QGIHighlight.cpp b/src/Mod/TechDraw/Gui/QGIHighlight.cpp
index 9fb0bc2e32..b80bdc7026 100644
--- a/src/Mod/TechDraw/Gui/QGIHighlight.cpp
+++ b/src/Mod/TechDraw/Gui/QGIHighlight.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QPainter>
 # include <QStyleOptionGraphicsItem>
-#endif
+
 
 #include <Base/Tools.h>
 #include <Mod/TechDraw/App/DrawUtil.h>
diff --git a/src/Mod/TechDraw/Gui/QGILeaderLine.cpp b/src/Mod/TechDraw/Gui/QGILeaderLine.cpp
index 923a17e29d..6dfaf47b29 100644
--- a/src/Mod/TechDraw/Gui/QGILeaderLine.cpp
+++ b/src/Mod/TechDraw/Gui/QGILeaderLine.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cmath>
 
 # include <QGraphicsScene>
@@ -29,7 +27,6 @@
 # include <QPainter>
 # include <QPainterPath>
 # include <QVector2D>
-#endif
 
 #include <App/Document.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/Gui/QGIMatting.cpp b/src/Mod/TechDraw/Gui/QGIMatting.cpp
index ea531d01b2..0a49af97b5 100644
--- a/src/Mod/TechDraw/Gui/QGIMatting.cpp
+++ b/src/Mod/TechDraw/Gui/QGIMatting.cpp
@@ -20,15 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cassert>
 
 # include <QPainter>
 # include <QPainterPath>
 # include <QRectF>
 # include <QStyleOptionGraphicsItem>
-#endif
 
 #include <Mod/TechDraw/App/LineGroup.h>
 #include <Mod/TechDraw/App/Preferences.h>
diff --git a/src/Mod/TechDraw/Gui/QGIPrimPath.cpp b/src/Mod/TechDraw/Gui/QGIPrimPath.cpp
index ff6a664c63..dbd356d32d 100644
--- a/src/Mod/TechDraw/Gui/QGIPrimPath.cpp
+++ b/src/Mod/TechDraw/Gui/QGIPrimPath.cpp
@@ -20,15 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cassert>
 
 # include <QGraphicsScene>
 # include <QGraphicsSceneHoverEvent>
 # include <QPainter>
 # include <QStyleOptionGraphicsItem>
-#endif
 
 #include <App/Application.h>
 
diff --git a/src/Mod/TechDraw/Gui/QGIProjGroup.cpp b/src/Mod/TechDraw/Gui/QGIProjGroup.cpp
index fbb1ae973b..beb2c425eb 100644
--- a/src/Mod/TechDraw/Gui/QGIProjGroup.cpp
+++ b/src/Mod/TechDraw/Gui/QGIProjGroup.cpp
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QGraphicsScene>
 # include <QGraphicsSceneMouseEvent>
 # include <QList>
-#endif
+
 
 #include <App/Document.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/Gui/QGIRichAnno.cpp b/src/Mod/TechDraw/Gui/QGIRichAnno.cpp
index 09e96333d7..49658f1799 100644
--- a/src/Mod/TechDraw/Gui/QGIRichAnno.cpp
+++ b/src/Mod/TechDraw/Gui/QGIRichAnno.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cmath>
 
 # include <QDialog>
@@ -33,7 +31,6 @@
 # include <QTextBlock>
 # include <QTextCursor>
 # include <QTextDocumentFragment>
-#endif
 
 #include <App/Application.h>
 #include <Mod/TechDraw/App/DrawRichAnno.h>
diff --git a/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp b/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp
index 3e80f6010d..9f795652e1 100644
--- a/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp
+++ b/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QDomDocument>
 # include <QFile>
 # include <QFontMetrics>
@@ -32,7 +30,6 @@
 # include <QSvgRenderer>
 # include <QRegularExpression>
 # include <QRegularExpressionMatch>
-#endif// #ifndef _PreComp_
 
 #include <App/Application.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/Gui/QGISectionLine.cpp b/src/Mod/TechDraw/Gui/QGISectionLine.cpp
index 68a66ea1a8..290b1ce05c 100644
--- a/src/Mod/TechDraw/Gui/QGISectionLine.cpp
+++ b/src/Mod/TechDraw/Gui/QGISectionLine.cpp
@@ -20,13 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QGraphicsScene>
 # include <QPainter>
 # include <QPainterPath>
 # include <QStyleOptionGraphicsItem>
-#endif
+
 
 #include <App/Application.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/Gui/QGITemplate.cpp b/src/Mod/TechDraw/Gui/QGITemplate.cpp
index dbc971c216..f11b325d75 100644
--- a/src/Mod/TechDraw/Gui/QGITemplate.cpp
+++ b/src/Mod/TechDraw/Gui/QGITemplate.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Mod/TechDraw/App/DrawTemplate.h>
 
diff --git a/src/Mod/TechDraw/Gui/QGITile.cpp b/src/Mod/TechDraw/Gui/QGITile.cpp
index 52cac650ca..809bd1d6c0 100644
--- a/src/Mod/TechDraw/Gui/QGITile.cpp
+++ b/src/Mod/TechDraw/Gui/QGITile.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QGraphicsItem>
-#endif
+
 
 #include <App/Application.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/Gui/QGIVertex.cpp b/src/Mod/TechDraw/Gui/QGIVertex.cpp
index ac2505dd87..d1e25a7d6e 100644
--- a/src/Mod/TechDraw/Gui/QGIVertex.cpp
+++ b/src/Mod/TechDraw/Gui/QGIVertex.cpp
@@ -21,14 +21,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cassert>
 
 # include <QPainter>
 # include <QPainterPath>
 # include <QStyleOptionGraphicsItem>
-#endif
 
 #include <Base/Tools2D.h>
 
diff --git a/src/Mod/TechDraw/Gui/QGIView.cpp b/src/Mod/TechDraw/Gui/QGIView.cpp
index 00a0073a4c..d659774fcb 100644
--- a/src/Mod/TechDraw/Gui/QGIView.cpp
+++ b/src/Mod/TechDraw/Gui/QGIView.cpp
@@ -21,15 +21,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QApplication>
 # include <QGraphicsSceneHoverEvent>
 # include <QGraphicsSceneMouseEvent>
 # include <QPainter>
 # include <QStyleOptionGraphicsItem>
 # include <QTransform>
-#endif
+
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp b/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp
index 3eea3607aa..41a9f714a5 100644
--- a/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp
@@ -21,8 +21,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <cmath>
 #include <regex>
 #include <sstream>
@@ -35,7 +33,6 @@
 #include <QGraphicsTextItem>
 #include <QString>
 #include <QVBoxLayout>
-#endif
 
 #include "ViewProviderAnnotation.h"
 #include <App/Application.h>
diff --git a/src/Mod/TechDraw/Gui/QGIViewBalloon.cpp b/src/Mod/TechDraw/Gui/QGIViewBalloon.cpp
index 3060f1212f..7f26c6dd2e 100644
--- a/src/Mod/TechDraw/Gui/QGIViewBalloon.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewBalloon.cpp
@@ -21,8 +21,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cmath>
 # include <string>
 
@@ -33,7 +31,6 @@
 # include <QPainter>
 # include <QPainterPath>
 # include <QSvgGenerator>
-#endif
 
 #include <App/Application.h>
 #include <Base/Parameter.h>
diff --git a/src/Mod/TechDraw/Gui/QGIViewClip.cpp b/src/Mod/TechDraw/Gui/QGIViewClip.cpp
index be1a03f738..bc23855f50 100644
--- a/src/Mod/TechDraw/Gui/QGIViewClip.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewClip.cpp
@@ -21,12 +21,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <algorithm>    // std::find
 # include <QGraphicsScene>
 # include <QKeyEvent>
-#endif
+
 #include <Gui/Selection/Selection.h>
 #include <Gui/Selection/SelectionObject.h>
 
diff --git a/src/Mod/TechDraw/Gui/QGIViewCollection.cpp b/src/Mod/TechDraw/Gui/QGIViewCollection.cpp
index 0ff8856323..7dee7fca7e 100644
--- a/src/Mod/TechDraw/Gui/QGIViewCollection.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewCollection.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "QGIViewCollection.h"
 
diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp
index 6bc127547d..715590b33a 100644
--- a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp
@@ -20,9 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-
-#ifndef _PreComp_
 # include <cmath>
 # include <limits>
 
@@ -34,7 +31,6 @@
 # include <QPainter>
 # include <QPainterPath>
 # include <QSvgGenerator>
-#endif
 
 #include <App/Application.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/Gui/QGIViewImage.cpp b/src/Mod/TechDraw/Gui/QGIViewImage.cpp
index 46545d0f35..fc1e5478bc 100644
--- a/src/Mod/TechDraw/Gui/QGIViewImage.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewImage.cpp
@@ -20,15 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cmath>
 # include <sstream>
 
 # include <QGraphicsItem>
 # include <QRectF>
 # include <QString>
-#endif
 
 #include <Mod/TechDraw/App/DrawViewImage.h>
 
diff --git a/src/Mod/TechDraw/Gui/QGIViewPart.cpp b/src/Mod/TechDraw/Gui/QGIViewPart.cpp
index 863aa12050..fc23c17b43 100644
--- a/src/Mod/TechDraw/Gui/QGIViewPart.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewPart.cpp
@@ -20,14 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
-
 #include <QPainterPath>
 #include <QKeyEvent>
 #include <cstdio>
 #include <qmath.h>
-#endif// #ifndef _PreComp_
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/TechDraw/Gui/QGIViewSection.cpp b/src/Mod/TechDraw/Gui/QGIViewSection.cpp
index 11f812eb5c..310e38078f 100644
--- a/src/Mod/TechDraw/Gui/QGIViewSection.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewSection.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cmath>
-#endif
+
 
 #include <Mod/TechDraw/App/DrawViewSection.h>
 
diff --git a/src/Mod/TechDraw/Gui/QGIViewSpreadsheet.cpp b/src/Mod/TechDraw/Gui/QGIViewSpreadsheet.cpp
index 5bbb2a68e2..1d768b8fd2 100644
--- a/src/Mod/TechDraw/Gui/QGIViewSpreadsheet.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewSpreadsheet.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Mod/TechDraw/App/DrawViewSpreadsheet.h>
 
diff --git a/src/Mod/TechDraw/Gui/QGIViewSymbol.cpp b/src/Mod/TechDraw/Gui/QGIViewSymbol.cpp
index ddaaa66fad..bd72715ecb 100644
--- a/src/Mod/TechDraw/Gui/QGIViewSymbol.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewSymbol.cpp
@@ -21,8 +21,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cmath>
 
 # include <QGraphicsColorizeEffect>
@@ -30,7 +28,6 @@
 # include <QRectF>
 # include <QRegularExpression>
 # include <QRegularExpressionMatch>
-#endif
 
 #include <Base/Console.h>
 #include <Mod/TechDraw/App/DrawViewArch.h>
diff --git a/src/Mod/TechDraw/Gui/QGIWeldSymbol.cpp b/src/Mod/TechDraw/Gui/QGIWeldSymbol.cpp
index 790abcce55..d891d5f1db 100644
--- a/src/Mod/TechDraw/Gui/QGIWeldSymbol.cpp
+++ b/src/Mod/TechDraw/Gui/QGIWeldSymbol.cpp
@@ -20,13 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 #include <qpainter.h>
-#ifndef _PreComp_
 # include <cmath>
 # include <QGraphicsScene>
 # include <QPainterPath>
-#endif
+
 
 #include <Base/Console.h>
 #include <Base/Tools.h>
diff --git a/src/Mod/TechDraw/Gui/QGMText.cpp b/src/Mod/TechDraw/Gui/QGMText.cpp
index dea98e9a01..8dcb6cb886 100644
--- a/src/Mod/TechDraw/Gui/QGMText.cpp
+++ b/src/Mod/TechDraw/Gui/QGMText.cpp
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QGraphicsScene>
 # include <QPainter>
 # include <QStyleOptionGraphicsItem>
-#endif
+
 
 #include "QGMText.h"
 
diff --git a/src/Mod/TechDraw/Gui/QGSPage.cpp b/src/Mod/TechDraw/Gui/QGSPage.cpp
index 696555ed58..ba60876331 100644
--- a/src/Mod/TechDraw/Gui/QGSPage.cpp
+++ b/src/Mod/TechDraw/Gui/QGSPage.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QApplication>
 #include <QDomDocument>
 #include <QFile>
@@ -30,7 +28,7 @@
 #include <QSvgGenerator>
 #include <QTemporaryFile>
 #include <QTextStream>
-#endif
+
 
 #include <App/Document.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/Gui/QGTracker.cpp b/src/Mod/TechDraw/Gui/QGTracker.cpp
index 80be154b8a..99040c575a 100644
--- a/src/Mod/TechDraw/Gui/QGTracker.cpp
+++ b/src/Mod/TechDraw/Gui/QGTracker.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cassert>
 # include <limits>
 
@@ -33,7 +31,6 @@
 # include <QPainterPath>
 # include <QStyleOptionGraphicsItem>
 # include <QTransform>
-#endif
 
 #include <Base/Console.h>
 #include <Mod/TechDraw/App/DrawUtil.h>
diff --git a/src/Mod/TechDraw/Gui/QGVNavStyle.cpp b/src/Mod/TechDraw/Gui/QGVNavStyle.cpp
index 35280cdf94..99d0ccdc35 100644
--- a/src/Mod/TechDraw/Gui/QGVNavStyle.cpp
+++ b/src/Mod/TechDraw/Gui/QGVNavStyle.cpp
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QContextMenuEvent>
 #include <QKeyEvent>
 #include <QScrollBar>
-#endif
+
 
 #include <App/Application.h>
 #include <Base/Parameter.h>
diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleBlender.cpp b/src/Mod/TechDraw/Gui/QGVNavStyleBlender.cpp
index 0892ec74ef..21d7ecc047 100644
--- a/src/Mod/TechDraw/Gui/QGVNavStyleBlender.cpp
+++ b/src/Mod/TechDraw/Gui/QGVNavStyleBlender.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QGuiApplication>
 # include <QMouseEvent>
-#endif
+
 
 #include "QGVNavStyleBlender.h"
 #include "QGVPage.h"
diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleCAD.cpp b/src/Mod/TechDraw/Gui/QGVNavStyleCAD.cpp
index 87587a3da0..f0a983925f 100644
--- a/src/Mod/TechDraw/Gui/QGVNavStyleCAD.cpp
+++ b/src/Mod/TechDraw/Gui/QGVNavStyleCAD.cpp
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QApplication>
 # include <QGuiApplication>
 # include <QMouseEvent>
-#endif
+
 
 #include "QGVNavStyleCAD.h"
 #include "QGVPage.h"
diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleGesture.cpp b/src/Mod/TechDraw/Gui/QGVNavStyleGesture.cpp
index da6f3fb1e3..6c33d54d45 100644
--- a/src/Mod/TechDraw/Gui/QGVNavStyleGesture.cpp
+++ b/src/Mod/TechDraw/Gui/QGVNavStyleGesture.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QGuiApplication>
 # include <QMouseEvent>
-#endif
+
 
 #include "QGVNavStyleGesture.h"
 #include "QGVPage.h"
diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleInventor.cpp b/src/Mod/TechDraw/Gui/QGVNavStyleInventor.cpp
index cc31f29950..fc4f5840d1 100644
--- a/src/Mod/TechDraw/Gui/QGVNavStyleInventor.cpp
+++ b/src/Mod/TechDraw/Gui/QGVNavStyleInventor.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QGuiApplication>
 # include <QMouseEvent>
-#endif
+
 
 #include "QGVNavStyleInventor.h"
 #include "QGVPage.h"
diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleMaya.cpp b/src/Mod/TechDraw/Gui/QGVNavStyleMaya.cpp
index 4b62b8add5..b3ce27de35 100644
--- a/src/Mod/TechDraw/Gui/QGVNavStyleMaya.cpp
+++ b/src/Mod/TechDraw/Gui/QGVNavStyleMaya.cpp
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QApplication>
 # include <QGuiApplication>
 # include <QMouseEvent>
-#endif
+
 
 #include "QGVNavStyleMaya.h"
 #include "QGVPage.h"
diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleOCC.cpp b/src/Mod/TechDraw/Gui/QGVNavStyleOCC.cpp
index 6aa360ac3c..71e052f491 100644
--- a/src/Mod/TechDraw/Gui/QGVNavStyleOCC.cpp
+++ b/src/Mod/TechDraw/Gui/QGVNavStyleOCC.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QGuiApplication>
 # include <QMouseEvent>
-#endif
+
 
 #include "QGVNavStyleOCC.h"
 #include "QGVPage.h"
diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleOpenSCAD.cpp b/src/Mod/TechDraw/Gui/QGVNavStyleOpenSCAD.cpp
index 06edacf6a5..828a025f2a 100644
--- a/src/Mod/TechDraw/Gui/QGVNavStyleOpenSCAD.cpp
+++ b/src/Mod/TechDraw/Gui/QGVNavStyleOpenSCAD.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QGuiApplication>
 # include <QMouseEvent>
-#endif
+
 
 #include "QGVNavStyleOpenSCAD.h"
 #include "QGVPage.h"
diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleRevit.cpp b/src/Mod/TechDraw/Gui/QGVNavStyleRevit.cpp
index 271bb6df3e..e06dd3eb32 100644
--- a/src/Mod/TechDraw/Gui/QGVNavStyleRevit.cpp
+++ b/src/Mod/TechDraw/Gui/QGVNavStyleRevit.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QGuiApplication>
 # include <QMouseEvent>
-#endif
+
 
 #include "QGVNavStyleRevit.h"
 #include "QGVPage.h"
diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleSolidWorks.cpp b/src/Mod/TechDraw/Gui/QGVNavStyleSolidWorks.cpp
index f7e46e0cee..270530d4e5 100644
--- a/src/Mod/TechDraw/Gui/QGVNavStyleSolidWorks.cpp
+++ b/src/Mod/TechDraw/Gui/QGVNavStyleSolidWorks.cpp
@@ -20,11 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QGuiApplication>
 # include <QMouseEvent>
-#endif
 
 #include "QGVNavStyleSolidWorks.h"
 #include "QGVPage.h"
diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleTinkerCAD.cpp b/src/Mod/TechDraw/Gui/QGVNavStyleTinkerCAD.cpp
index 4a8c4c34bc..87f89ddce4 100644
--- a/src/Mod/TechDraw/Gui/QGVNavStyleTinkerCAD.cpp
+++ b/src/Mod/TechDraw/Gui/QGVNavStyleTinkerCAD.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QGuiApplication>
 # include <QMouseEvent>
-#endif
+
 
 #include "QGVNavStyleTinkerCAD.h"
 #include "QGVPage.h"
diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleTouchpad.cpp b/src/Mod/TechDraw/Gui/QGVNavStyleTouchpad.cpp
index 2c48acb866..61d1773195 100644
--- a/src/Mod/TechDraw/Gui/QGVNavStyleTouchpad.cpp
+++ b/src/Mod/TechDraw/Gui/QGVNavStyleTouchpad.cpp
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QApplication>
 # include <QGuiApplication>
 # include <QMouseEvent>
-#endif
+
 
 #include "QGVNavStyleTouchpad.h"
 #include "QGVPage.h"
diff --git a/src/Mod/TechDraw/Gui/QGVPage.cpp b/src/Mod/TechDraw/Gui/QGVPage.cpp
index da2c817edc..a421783c27 100644
--- a/src/Mod/TechDraw/Gui/QGVPage.cpp
+++ b/src/Mod/TechDraw/Gui/QGVPage.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <cmath>
 
 #include <QApplication>
@@ -34,7 +32,6 @@
 #include <QPainter>
 #include <QScrollBar>
 #include <QWheelEvent>
-#endif
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/TechDraw/Gui/Rez.cpp b/src/Mod/TechDraw/Gui/Rez.cpp
index 4b14f415f9..7437d3bfb7 100644
--- a/src/Mod/TechDraw/Gui/Rez.cpp
+++ b/src/Mod/TechDraw/Gui/Rez.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Parameter.h>
 #include <Mod/TechDraw/App/Preferences.h>
diff --git a/src/Mod/TechDraw/Gui/SymbolChooser.cpp b/src/Mod/TechDraw/Gui/SymbolChooser.cpp
index e46628f37a..e6491bb4c7 100644
--- a/src/Mod/TechDraw/Gui/SymbolChooser.cpp
+++ b/src/Mod/TechDraw/Gui/SymbolChooser.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QListWidget>
-#endif
+
 
 #include <App/Application.h>
 
diff --git a/src/Mod/TechDraw/Gui/TaskActiveView.cpp b/src/Mod/TechDraw/Gui/TaskActiveView.cpp
index a6b0742c6e..b9af1c1bc3 100644
--- a/src/Mod/TechDraw/Gui/TaskActiveView.cpp
+++ b/src/Mod/TechDraw/Gui/TaskActiveView.cpp
@@ -20,13 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <regex>
 
 # include <QMessageBox>
 # include <QPushButton>
-#endif // #ifndef _PreComp_
 
 #include <App/Document.h>
 #include <App/DocumentObject.h>
diff --git a/src/Mod/TechDraw/Gui/TaskBalloon.cpp b/src/Mod/TechDraw/Gui/TaskBalloon.cpp
index 9bdb4efc9c..ec1e3af195 100644
--- a/src/Mod/TechDraw/Gui/TaskBalloon.cpp
+++ b/src/Mod/TechDraw/Gui/TaskBalloon.cpp
@@ -21,10 +21,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cmath>
-#endif // #ifndef _PreComp_
 
 #include <App/Document.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.cpp b/src/Mod/TechDraw/Gui/TaskCenterLine.cpp
index f5a7933a4f..ade5e2a94e 100644
--- a/src/Mod/TechDraw/Gui/TaskCenterLine.cpp
+++ b/src/Mod/TechDraw/Gui/TaskCenterLine.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Console.h>
 #include <Base/UnitsApi.h>
diff --git a/src/Mod/TechDraw/Gui/TaskComplexSection.cpp b/src/Mod/TechDraw/Gui/TaskComplexSection.cpp
index db436150de..76b8206ad1 100644
--- a/src/Mod/TechDraw/Gui/TaskComplexSection.cpp
+++ b/src/Mod/TechDraw/Gui/TaskComplexSection.cpp
@@ -20,11 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QMessageBox>
 #include <gp_Pnt.hxx>
-#endif// #ifndef _PreComp_
 
 #include <App/Document.h>
 #include <App/Link.h>
diff --git a/src/Mod/TechDraw/Gui/TaskCosVertex.cpp b/src/Mod/TechDraw/Gui/TaskCosVertex.cpp
index 4f99d6c0f2..47d02fb841 100644
--- a/src/Mod/TechDraw/Gui/TaskCosVertex.cpp
+++ b/src/Mod/TechDraw/Gui/TaskCosVertex.cpp
@@ -20,11 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cmath>
 # include <QStatusBar>
-#endif // #ifndef _PreComp_
 
 #include <Base/Console.h>
 #include <Base/UnitsApi.h>
diff --git a/src/Mod/TechDraw/Gui/TaskCosmeticCircle.cpp b/src/Mod/TechDraw/Gui/TaskCosmeticCircle.cpp
index d00fea667b..11e976d42f 100644
--- a/src/Mod/TechDraw/Gui/TaskCosmeticCircle.cpp
+++ b/src/Mod/TechDraw/Gui/TaskCosmeticCircle.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <BRepBuilderAPI_MakeEdge.hxx>
-#endif
+
 
 #include <QMessageBox>
 
diff --git a/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp b/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp
index f35a5d96c7..5152c846c2 100644
--- a/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp
+++ b/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cmath>
 # include <BRepBuilderAPI_MakeEdge.hxx>
-#endif
+
 
 #include <Base/Console.h>
 #include <Gui/BitmapFactory.h>
diff --git a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.cpp b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.cpp
index 9128392050..8ad5c3a586 100644
--- a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.cpp
+++ b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cmath>
-#endif
+
 
 #include <App/DocumentObject.h>
 #include <Gui/BitmapFactory.h>
diff --git a/src/Mod/TechDraw/Gui/TaskDetail.cpp b/src/Mod/TechDraw/Gui/TaskDetail.cpp
index e41f7e218b..b36d9ca1e4 100644
--- a/src/Mod/TechDraw/Gui/TaskDetail.cpp
+++ b/src/Mod/TechDraw/Gui/TaskDetail.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/Document.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/Gui/TaskDimRepair.cpp b/src/Mod/TechDraw/Gui/TaskDimRepair.cpp
index 9f4d6dcdbf..af48764e99 100644
--- a/src/Mod/TechDraw/Gui/TaskDimRepair.cpp
+++ b/src/Mod/TechDraw/Gui/TaskDimRepair.cpp
@@ -20,14 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <string>
 #include <vector>
 
 #include <QMessageBox>
 #include <QTableWidgetItem>
-#endif// #ifndef _PreComp_
 
 #include <App/Document.h>
 #include <Gui/BitmapFactory.h>
diff --git a/src/Mod/TechDraw/Gui/TaskDimension.cpp b/src/Mod/TechDraw/Gui/TaskDimension.cpp
index 2cbda8b5ef..c0244d3ff8 100644
--- a/src/Mod/TechDraw/Gui/TaskDimension.cpp
+++ b/src/Mod/TechDraw/Gui/TaskDimension.cpp
@@ -20,13 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cmath>
 # include <limits>
 # include <QMessageBox>
 # include <regex>
-#endif // #ifndef _PreComp_
 
 #include <App/Document.h>
 #include <Base/Tools.h>
@@ -238,7 +235,7 @@ void TaskDimension::recomputeFeature()
 void TaskDimension::onNumDecChanged(int decimals)
 {
     std::string currentFormat = ui->leFormatSpecifier->text().toUtf8().constData();
-    
+
     std::smatch match;
     std::regex specRegex("%\\.([0-9]+)([fFrRgGwWeE])");
 
@@ -278,7 +275,7 @@ void TaskDimension::onReferenceChanged()
     std::regex specRegex("%\\.([0-9]+)([fFrRgGwWeE])");
     // Find a reference format specifier
     std::regex refRegex("\\((%\\.([0-9]+)([fFrRgGwWeE]))\\)");
-    
+
     if (isChecked) {
         newFormat = std::regex_replace(currentFormat, specRegex, "($&)");
     } else {
@@ -289,7 +286,7 @@ void TaskDimension::onReferenceChanged()
     ui->leFormatSpecifier->blockSignals(true);
     ui->leFormatSpecifier->setText(QString::fromStdString(newFormat));
     ui->leFormatSpecifier->blockSignals(false);
-    
+
     onFormatSpecifierChanged();
 }
 
diff --git a/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp b/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp
index 05b7a6f4cf..121e96bee6 100644
--- a/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp
+++ b/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp
@@ -20,10 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cmath>
-#endif // #ifndef _PreComp_
 
 #include <App/Document.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/Gui/TaskHatch.cpp b/src/Mod/TechDraw/Gui/TaskHatch.cpp
index 000e9c35d4..e4a7ede000 100644
--- a/src/Mod/TechDraw/Gui/TaskHatch.cpp
+++ b/src/Mod/TechDraw/Gui/TaskHatch.cpp
@@ -21,10 +21,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cmath>
-#endif // #ifndef _PreComp_
 
 #include <App/Document.h>
 #include <App/DocumentObject.h>
diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
index 382198d8bc..6cb1e3a94a 100644
--- a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
+++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QStatusBar>
-#endif
+
 
 #include <App/Document.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/Gui/TaskLineDecor.cpp b/src/Mod/TechDraw/Gui/TaskLineDecor.cpp
index 3295363506..b222a01a41 100644
--- a/src/Mod/TechDraw/Gui/TaskLineDecor.cpp
+++ b/src/Mod/TechDraw/Gui/TaskLineDecor.cpp
@@ -20,10 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
-#endif // #ifndef _PreComp_
-
 #include <Base/Console.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
diff --git a/src/Mod/TechDraw/Gui/TaskLinkDim.cpp b/src/Mod/TechDraw/Gui/TaskLinkDim.cpp
index afc00010a9..1783f0e3b9 100644
--- a/src/Mod/TechDraw/Gui/TaskLinkDim.cpp
+++ b/src/Mod/TechDraw/Gui/TaskLinkDim.cpp
@@ -20,11 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cmath>
 # include <QTreeWidget>
-#endif // #ifndef _PreComp_
 
 #include <App/Document.h>
 #include <App/DocumentObject.h>
diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp
index 5155f554db..2a33d6f05d 100644
--- a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp
+++ b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp
@@ -21,13 +21,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QMessageBox>
 # include <QGroupBox>
 # include <QLabel>
 # include <QScreen>
-#endif // #ifndef _PreComp_
 
 #include <QVBoxLayout>
 #include <QHBoxLayout>
diff --git a/src/Mod/TechDraw/Gui/TaskProjection.cpp b/src/Mod/TechDraw/Gui/TaskProjection.cpp
index bff679120c..d2277c6e2a 100644
--- a/src/Mod/TechDraw/Gui/TaskProjection.cpp
+++ b/src/Mod/TechDraw/Gui/TaskProjection.cpp
@@ -22,10 +22,8 @@
 //this file originally part of TechDraw workbench
 //migrated to TechDraw workbench 2022-01-26 by Wandererfan
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QMessageBox>
-#endif
+
 
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
diff --git a/src/Mod/TechDraw/Gui/TaskRichAnno.cpp b/src/Mod/TechDraw/Gui/TaskRichAnno.cpp
index 1ba6d728a5..c3ab0af3f3 100644
--- a/src/Mod/TechDraw/Gui/TaskRichAnno.cpp
+++ b/src/Mod/TechDraw/Gui/TaskRichAnno.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cmath>
 # include <QDialog>
-#endif
+
 
 #include <App/Document.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/Gui/TaskSectionView.cpp b/src/Mod/TechDraw/Gui/TaskSectionView.cpp
index 78c44451bd..5cafa69d08 100644
--- a/src/Mod/TechDraw/Gui/TaskSectionView.cpp
+++ b/src/Mod/TechDraw/Gui/TaskSectionView.cpp
@@ -20,11 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QMessageBox>
 #include <cmath>
-#endif// #ifndef _PreComp_
 
 #include "Widgets/CompassWidget.h"
 #include "Widgets/VectorEditWidget.h"
diff --git a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.cpp b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.cpp
index 82863371bc..4bfb3258de 100644
--- a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.cpp
+++ b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Gui/BitmapFactory.h>
 
diff --git a/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.cpp b/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.cpp
index 9740d3dc65..bb785be769 100644
--- a/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.cpp
+++ b/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.cpp
@@ -20,13 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <boost/algorithm/string/predicate.hpp>
 # include <QComboBox>
 # include <QGraphicsProxyWidget>
 # include <QLineEdit>
-#endif
+
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp
index ec5503d4ae..216053efe2 100644
--- a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp
+++ b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp
@@ -20,11 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cmath>
 # include <QPushButton>
-#endif // #ifndef _PreComp_
 
 #include <App/Document.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/Gui/TechDrawHandler.cpp b/src/Mod/TechDraw/Gui/TechDrawHandler.cpp
index 9e06322220..13e059a4ea 100644
--- a/src/Mod/TechDraw/Gui/TechDrawHandler.cpp
+++ b/src/Mod/TechDraw/Gui/TechDrawHandler.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <cmath>
 
 #include <QGuiApplication>
@@ -31,7 +29,6 @@
 #include <QTimer>
 
 #include <Inventor/events/SoKeyboardEvent.h>
-#endif  // #ifndef _PreComp_
 
 #include <Base/Console.h>
 #include <Base/Exception.h>
diff --git a/src/Mod/TechDraw/Gui/TemplateTextField.cpp b/src/Mod/TechDraw/Gui/TemplateTextField.cpp
index 5516d73282..3252a7d311 100644
--- a/src/Mod/TechDraw/Gui/TemplateTextField.cpp
+++ b/src/Mod/TechDraw/Gui/TemplateTextField.cpp
@@ -20,14 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
   #include <QGraphicsSceneMouseEvent>
   #include <QInputDialog>
   #include <QLineEdit>
   #include <QTextDocument>
-#endif // #ifndef _PreCmp_
 
 #include <Base/Console.h>
 #include <Gui/MainWindow.h>
diff --git a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp
index 30ec57c234..de93de76a4 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp
@@ -21,10 +21,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QPushButton>
-#endif
 
 #include <App/DocumentObject.h>
 #include <Gui/ComboView.h>
diff --git a/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp b/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp
index 0edd57cbdf..9deefd6c37 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp
@@ -23,14 +23,12 @@
  ***************************************************************************/
 
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <QAction>
 # include <QMenu>
 #include <QTextStream>
 #include <QMessageBox>
-#endif
+
 
 #include <App/DocumentObject.h>
 #include <Gui/ActionFunction.h>
diff --git a/src/Mod/TechDraw/Gui/ViewProviderCosmeticExtension.cpp b/src/Mod/TechDraw/Gui/ViewProviderCosmeticExtension.cpp
index 6a18181eb5..12d1cbec33 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderCosmeticExtension.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderCosmeticExtension.cpp
@@ -20,12 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-
-#include "PreCompiled.h"
-
-#ifndef _PreComp_
 # include <cmath>
-#endif
 
 #include <Mod/TechDraw/App/CosmeticExtension.h>
 #include "ViewProviderCosmeticExtension.h"
diff --git a/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp b/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp
index 68963809c5..98377ee8f5 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp
@@ -22,13 +22,11 @@
  ***************************************************************************/
 
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <QAction>
 # include <QColor>
 # include <QMenu>
-#endif
+
 
 #include <QMessageBox>
 
diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp
index b67f7ea2a8..51906c2273 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp
@@ -21,14 +21,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-
-#ifndef _PreComp_
 #include <limits>
 #include <boost/signals2.hpp>
 #include <boost/signals2/connection.hpp>
-#endif
-
 
 #include <App/DocumentObject.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.cpp b/src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.cpp
index 18112b968f..5ef25a025f 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/Document.h>
 
diff --git a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp
index 4b6b40961b..24ea6c8c75 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp
@@ -21,12 +21,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
-#include "PreCompiled.h"
-
-#ifndef _PreComp_
-#endif
-
 #include <App/DocumentObject.h>
 #include <Base/Parameter.h>
 #include <Gui/Application.h>
diff --git a/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp b/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp
index 3b2f90c72d..00b3b7e4b0 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp
@@ -22,11 +22,9 @@
  ***************************************************************************/
 
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <Precision.hxx>
-#endif
+
 
 #include <App/DocumentObject.h>
 #include <Base/UnitsApi.h>
diff --git a/src/Mod/TechDraw/Gui/ViewProviderImage.cpp b/src/Mod/TechDraw/Gui/ViewProviderImage.cpp
index 0d3f123264..7fac1b629a 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderImage.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderImage.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/DocumentObject.h>
 
diff --git a/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp b/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp
index fcd471d082..a5eac2bcf6 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp
@@ -22,12 +22,10 @@
  ***************************************************************************/
 
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <QMessageBox>
 # include <QTextStream>
-#endif
+
 
 #include <App/DocumentObject.h>
 #include <Gui/Application.h>
diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp
index 600d7a8cd9..6bfa6531dd 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp
@@ -21,8 +21,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <QAction>
 # include <QList>
 # include <QMenu>
@@ -32,7 +30,6 @@
 
 # include <boost/signals2.hpp>
 # include <boost/signals2/connection.hpp>
-#endif
 
 #include <App/Document.h>
 #include <App/DocumentObject.h>
diff --git a/src/Mod/TechDraw/Gui/ViewProviderPageExtension.cpp b/src/Mod/TechDraw/Gui/ViewProviderPageExtension.cpp
index a7110d20e5..3e852d810c 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderPageExtension.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderPageExtension.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/DocumentObject.h>
 #include <App/Link.h>
diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp
index edf5503436..f179f4e6dc 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp
@@ -20,15 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <FCConfig.h>
+
 # ifdef FC_OS_WIN32
 #  include <windows.h>
 # endif
 # include <QMenu>
 # include <QMessageBox>
 # include <QTextStream>
-#endif
 
 #include <App/DocumentObject.h>
 #include <Gui/Control.h>
diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp
index e15b734d54..8c70aa092f 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
  #include <QMessageBox>
  #include <QTextStream>
-#endif
+
 
 #include <App/DocumentObject.h>
 #include <Gui/Control.h>
diff --git a/src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp b/src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp
index 773ca636c9..f9e8eb47c4 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp
@@ -21,7 +21,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/DocumentObject.h>
 #include <Gui/Control.h>
diff --git a/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.cpp b/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.cpp
index b8fc4878a6..6d76880e05 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/DocumentObject.h>
 #include "ViewProviderSpreadsheet.h"
diff --git a/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp b/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp
index 4dadf03991..5532d5dd5c 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp
@@ -21,7 +21,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/DocumentObject.h>
 
diff --git a/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp b/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp
index 88b45e0462..4c81ff5668 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp
@@ -21,15 +21,15 @@
  ***************************************************************************/
 
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <QMessageBox>
 #include <QTextStream>
+
+#include <FCConfig.h>
+
 #ifdef FC_OS_WIN32
 #include <windows.h>
 #endif
-#endif
 
 #include <App/DocumentObject.h>
 #include <Gui/Application.h>
diff --git a/src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.cpp b/src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.cpp
index bebdf0cb31..d234c76c0e 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/DocumentObject.h>
 
diff --git a/src/Mod/TechDraw/Gui/ViewProviderTile.cpp b/src/Mod/TechDraw/Gui/ViewProviderTile.cpp
index 885300e727..afad457c1f 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderTile.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderTile.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/DocumentObject.h>
 #include "ViewProviderTile.h"
diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp b/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp
index a9b0a4391d..9d54bebf0a 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp
@@ -21,14 +21,11 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <FCConfig.h>
 
-#include "PreCompiled.h"
-
-#ifndef _PreComp_
 # ifdef FC_OS_WIN32
 #  include <windows.h>
 # endif
-#endif
 
 #include <App/DocumentObject.h>
 #include <Mod/TechDraw/App/DrawPage.h>
diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp b/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp
index f18ed6643d..bb20e943c0 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp
@@ -20,15 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-
-#ifndef _PreComp_
 #include <QMessageBox>
 #include <QTextStream>
+
+#include <FCConfig.h>
+
 # ifdef FC_OS_WIN32
 #  include <windows.h>
 # endif
-#endif
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp b/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp
index a63ab53b15..3ea16b051d 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp
@@ -21,14 +21,11 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <FCConfig.h>
 
-#include "PreCompiled.h"
-
-#ifndef _PreComp_
 # ifdef FC_OS_WIN32
 #  include <windows.h>
 # endif
-#endif
 
 #include <App/DocumentObject.h>
 #include <Base/Parameter.h>
diff --git a/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp b/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp
index 154fb47f5b..b6bc609cfb 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp
@@ -21,12 +21,10 @@
  ***************************************************************************/
 
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <QMessageBox>
 # include <QTextStream>
-#endif
+
 
 #include <App/Application.h>
 #include <App/DocumentObject.h>
diff --git a/src/Mod/TechDraw/Gui/Widgets/CompassDialWidget.cpp b/src/Mod/TechDraw/Gui/Widgets/CompassDialWidget.cpp
index 4a9150af3c..a27e1dbcab 100644
--- a/src/Mod/TechDraw/Gui/Widgets/CompassDialWidget.cpp
+++ b/src/Mod/TechDraw/Gui/Widgets/CompassDialWidget.cpp
@@ -23,10 +23,8 @@
 //largely based on a python widget from:
 //https://github.com/tcalmant/demo-ipopo-qt/blob/master/pc/details/compass.py
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QtGui>
-#endif
+
 
 #include <Mod/TechDraw/TechDrawGlobal.h>
 
diff --git a/src/Mod/TechDraw/Gui/Widgets/CompassWidget.cpp b/src/Mod/TechDraw/Gui/Widgets/CompassWidget.cpp
index 43fae90a78..c7f7895c98 100644
--- a/src/Mod/TechDraw/Gui/Widgets/CompassWidget.cpp
+++ b/src/Mod/TechDraw/Gui/Widgets/CompassWidget.cpp
@@ -24,8 +24,6 @@
 // adjustment QDoubleSpinBox and QPushButtons that increment the spin box by a
 // (usually) larger step than the arrows on the spinbox
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QApplication>
 #include <QLabel>
 #include <QObject>
@@ -33,7 +31,7 @@
 #include <QtGui>
 #include <QtWidgets/QDoubleSpinBox>
 #include <QtWidgets/QVBoxLayout>
-#endif
+
 
 #include <Mod/TechDraw/TechDrawGlobal.h>
 
diff --git a/src/Mod/TechDraw/Gui/Widgets/VectorEditWidget.cpp b/src/Mod/TechDraw/Gui/Widgets/VectorEditWidget.cpp
index 4135e54389..e499235d6f 100644
--- a/src/Mod/TechDraw/Gui/Widgets/VectorEditWidget.cpp
+++ b/src/Mod/TechDraw/Gui/Widgets/VectorEditWidget.cpp
@@ -22,9 +22,8 @@
 
 // A widget for editing Vector3d without taking up too much space in the UI.
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <limits>
+
 #include <QApplication>
 #include <QLabel>
 #include <QObject>
@@ -37,7 +36,6 @@
 #include <QLineEdit>
 #include <QSpacerItem>
 #include <QToolButton>
-#endif
 
 #include <Mod/TechDraw/TechDrawGlobal.h>
 
diff --git a/src/Mod/TechDraw/Gui/Workbench.cpp b/src/Mod/TechDraw/Gui/Workbench.cpp
index 4767a1cc25..8711cfbf31 100644
--- a/src/Mod/TechDraw/Gui/Workbench.cpp
+++ b/src/Mod/TechDraw/Gui/Workbench.cpp
@@ -21,11 +21,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <qobject.h>
-#endif
+
 
 #include "Workbench.h"
 #include <App/Application.h>
diff --git a/src/Mod/TechDraw/Gui/mrichtextedit.cpp b/src/Mod/TechDraw/Gui/mrichtextedit.cpp
index d6fbccb654..fee6445c50 100644
--- a/src/Mod/TechDraw/Gui/mrichtextedit.cpp
+++ b/src/Mod/TechDraw/Gui/mrichtextedit.cpp
@@ -26,9 +26,7 @@
  * for FreeCAD project https://www.freecad.org/
  ********************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 # include <algorithm>
 # include <iostream>
 # include <QApplication>
@@ -46,7 +44,7 @@
 # include <QRegularExpression>
 # include <QSettings>
 # include <QTextList>
-#endif
+
 
 #include <App/Application.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/Gui/mtextedit.cpp b/src/Mod/TechDraw/Gui/mtextedit.cpp
index 8c903db90c..e49c7f2728 100644
--- a/src/Mod/TechDraw/Gui/mtextedit.cpp
+++ b/src/Mod/TechDraw/Gui/mtextedit.cpp
@@ -22,14 +22,12 @@
 */
 // clazy:excludeall=qstring-arg
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 # include <cstdlib>
 # include <QBuffer>
 # include <QByteArray>
 # include <QImage>
 # include <QTextCursor>
-#endif
+
 
 #include "mtextedit.h"