From ef670e7880befa2cd34ba7a875c443ac8f4eb4c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Reitb=C3=B6ck?= <mrpilot@gmx.net>
Date: Tue, 16 Sep 2025 00:11:37 +0200
Subject: [PATCH] Sketcher: use CMake to generate precompiled headers on all
 platforms

"Professional CMake" book suggest the following:

"Targets should build successfully with or without compiler support for precompiled headers. It
 should be considered an optimization, not a requirement. In particular, do not explicitly include a
 precompile header (e.g. stdafx.h) in the source code, let CMake force-include an automatically
 generated precompile header on the compiler command line instead. This is more portable across
 the major compilers and is likely to be easier to maintain. It will also avoid warnings being
 generated from certain code checking tools like iwyu (include what you use)."

Therefore, removed the "#include <PreCompiled.h>" from sources, also
there is no need for the "#ifdef _PreComp_" anymore
---
 src/Mod/Sketcher/App/AppSketcher.cpp          |  1 -
 src/Mod/Sketcher/App/AppSketcherPy.cpp        |  1 -
 src/Mod/Sketcher/App/CMakeLists.txt           |  7 +++---
 src/Mod/Sketcher/App/Constraint.cpp           |  3 ---
 src/Mod/Sketcher/App/ConstraintPyImp.cpp      |  4 +---
 .../App/ExternalGeometryExtension.cpp         |  1 -
 .../App/ExternalGeometryExtensionPyImp.cpp    |  1 -
 .../Sketcher/App/ExternalGeometryFacade.cpp   |  4 +---
 .../App/ExternalGeometryFacadePyImp.cpp       |  1 -
 src/Mod/Sketcher/App/GeoEnum.cpp              |  3 ++-
 src/Mod/Sketcher/App/GeoEnum.h                |  5 +++-
 src/Mod/Sketcher/App/GeoList.cpp              |  3 ---
 src/Mod/Sketcher/App/GeometryFacade.cpp       |  4 +---
 src/Mod/Sketcher/App/GeometryFacadePyImp.cpp  |  1 -
 src/Mod/Sketcher/App/Measure.cpp              |  1 -
 src/Mod/Sketcher/App/PreCompiled.cpp          | 24 -------------------
 src/Mod/Sketcher/App/PreCompiled.h            |  3 ---
 .../Sketcher/App/PropertyConstraintList.cpp   |  3 ---
 src/Mod/Sketcher/App/PythonConverter.cpp      |  3 ---
 src/Mod/Sketcher/App/Sketch.cpp               |  3 ---
 src/Mod/Sketcher/App/SketchAnalysis.cpp       |  3 ---
 .../Sketcher/App/SketchGeometryExtension.cpp  |  1 -
 .../App/SketchGeometryExtensionPyImp.cpp      |  1 -
 src/Mod/Sketcher/App/SketchObject.cpp         |  4 ----
 src/Mod/Sketcher/App/SketchObjectPyImp.cpp    |  3 ---
 src/Mod/Sketcher/App/SketchObjectSF.cpp       |  1 -
 src/Mod/Sketcher/App/SketchObjectSFPyImp.cpp  |  1 -
 src/Mod/Sketcher/App/SketchPyImp.cpp          |  1 -
 .../Sketcher/App/SolverGeometryExtension.cpp  |  1 -
 src/Mod/Sketcher/Gui/AppSketcherGui.cpp       |  1 -
 src/Mod/Sketcher/Gui/CMakeLists.txt           | 14 +++++------
 src/Mod/Sketcher/Gui/Command.cpp              |  4 +---
 src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp |  4 ----
 src/Mod/Sketcher/Gui/CommandConstraints.cpp   |  4 +---
 src/Mod/Sketcher/Gui/CommandCreateGeo.cpp     |  3 ---
 .../Sketcher/Gui/CommandSketcherBSpline.cpp   |  3 ---
 .../Sketcher/Gui/CommandSketcherOverlay.cpp   |  3 ---
 src/Mod/Sketcher/Gui/CommandSketcherTools.cpp |  5 ++--
 .../Gui/CommandSketcherVirtualSpace.cpp       |  4 ----
 src/Mod/Sketcher/Gui/DrawSketchHandler.cpp    |  3 ---
 .../Sketcher/Gui/DrawSketchHandlerOffset.h    |  2 ++
 .../Gui/DrawSketchKeyboardManager.cpp         |  5 +---
 src/Mod/Sketcher/Gui/EditDatumDialog.cpp      |  4 +---
 src/Mod/Sketcher/Gui/EditModeCoinManager.cpp  |  3 ---
 .../Gui/EditModeCoinManagerParameters.cpp     |  2 +-
 .../Gui/EditModeConstraintCoinManager.cpp     |  5 ++--
 .../Gui/EditModeGeometryCoinConverter.cpp     |  2 +-
 .../Gui/EditModeGeometryCoinManager.cpp       |  5 ++--
 ...ditModeInformationOverlayCoinConverter.cpp |  3 ---
 src/Mod/Sketcher/Gui/PreCompiled.cpp          | 23 ------------------
 src/Mod/Sketcher/Gui/PreCompiled.h            |  4 ----
 .../Gui/PropertyConstraintListItem.cpp        |  4 +---
 .../Sketcher/Gui/PropertyVisualLayerList.cpp  |  1 -
 src/Mod/Sketcher/Gui/ShortcutListener.cpp     |  4 +---
 src/Mod/Sketcher/Gui/SketchMirrorDialog.cpp   |  4 +---
 .../Sketcher/Gui/SketchOrientationDialog.cpp  |  4 +---
 .../Gui/SketchRectangularArrayDialog.cpp      |  4 +---
 .../Gui/SketcherRegularPolygonDialog.cpp      |  4 +---
 src/Mod/Sketcher/Gui/SketcherSettings.cpp     |  4 +---
 .../Gui/SketcherToolDefaultWidget.cpp         |  5 +---
 src/Mod/Sketcher/Gui/SnapManager.cpp          |  3 ---
 src/Mod/Sketcher/Gui/SoZoomTranslation.cpp    |  3 ---
 src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp    |  1 -
 .../Sketcher/Gui/TaskSketcherConstraints.cpp  |  3 ---
 .../Gui/TaskSketcherCreateCommands.cpp        |  4 +---
 src/Mod/Sketcher/Gui/TaskSketcherElements.cpp |  3 ---
 src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp |  3 ---
 .../Gui/TaskSketcherSolverAdvanced.cpp        |  4 +---
 src/Mod/Sketcher/Gui/TaskSketcherTool.cpp     |  5 ----
 .../Sketcher/Gui/TaskSketcherValidation.cpp   |  3 ---
 src/Mod/Sketcher/Gui/Utils.cpp                |  4 ----
 src/Mod/Sketcher/Gui/ViewProviderPython.cpp   |  4 +---
 src/Mod/Sketcher/Gui/ViewProviderSketch.cpp   |  3 ---
 .../Gui/ViewProviderSketchCoinAttorney.cpp    |  1 -
 .../ViewProviderSketchGeometryExtension.cpp   |  1 -
 ...ewProviderSketchGeometryExtensionPyImp.cpp |  1 -
 src/Mod/Sketcher/Gui/VisualLayer.cpp          |  1 -
 src/Mod/Sketcher/Gui/Workbench.cpp            |  1 -
 78 files changed, 43 insertions(+), 237 deletions(-)
 delete mode 100644 src/Mod/Sketcher/App/PreCompiled.cpp
 delete mode 100644 src/Mod/Sketcher/Gui/PreCompiled.cpp

diff --git a/src/Mod/Sketcher/App/AppSketcher.cpp b/src/Mod/Sketcher/App/AppSketcher.cpp
index 042fd33c2e..f77d2dee7c 100644
--- a/src/Mod/Sketcher/App/AppSketcher.cpp
+++ b/src/Mod/Sketcher/App/AppSketcher.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
diff --git a/src/Mod/Sketcher/App/AppSketcherPy.cpp b/src/Mod/Sketcher/App/AppSketcherPy.cpp
index c324233c57..b24e92e764 100644
--- a/src/Mod/Sketcher/App/AppSketcherPy.cpp
+++ b/src/Mod/Sketcher/App/AppSketcherPy.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/Sketcher/App/CMakeLists.txt b/src/Mod/Sketcher/App/CMakeLists.txt
index 4e091be591..75ed7e2cee 100644
--- a/src/Mod/Sketcher/App/CMakeLists.txt
+++ b/src/Mod/Sketcher/App/CMakeLists.txt
@@ -123,7 +123,6 @@ SOURCE_GROUP("PlaneGCS" FILES ${PlaneGCS_SRCS})
 SET(SketchModule_SRCS
     AppSketcher.cpp
     AppSketcherPy.cpp
-    PreCompiled.cpp
     PreCompiled.h
     Measure.cpp
     Measure.h
@@ -159,9 +158,9 @@ if (FREECAD_WARN_ERROR)
 endif()
 
 if(FREECAD_USE_PCH)
-    add_definitions(-D_PreComp_)
-    GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" Sketcher_CPP_SRCS ${Sketcher_PCH_SRCS})
-    ADD_MSVC_PRECOMPILED_HEADER(Sketcher PreCompiled.h PreCompiled.cpp Sketcher_CPP_SRCS)
+    target_precompile_headers(Sketcher PRIVATE
+            $<$<COMPILE_LANGUAGE:CXX>:"${CMAKE_CURRENT_LIST_DIR}/PreCompiled.h">
+    )
 endif(FREECAD_USE_PCH)
 
 # Suppress some very long Eigen3 warnings of older versions
diff --git a/src/Mod/Sketcher/App/Constraint.cpp b/src/Mod/Sketcher/App/Constraint.cpp
index 916da1bcaa..3d78ef1d35 100644
--- a/src/Mod/Sketcher/App/Constraint.cpp
+++ b/src/Mod/Sketcher/App/Constraint.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QDateTime>
 #include <boost/random.hpp>
 #include <algorithm>
@@ -30,7 +28,6 @@
 #include <stdexcept>
 #include <string>
 #include <vector>
-#endif
 
 #include <fmt/ranges.h>
 
diff --git a/src/Mod/Sketcher/App/ConstraintPyImp.cpp b/src/Mod/Sketcher/App/ConstraintPyImp.cpp
index a6d0709f86..07014ec41e 100644
--- a/src/Mod/Sketcher/App/ConstraintPyImp.cpp
+++ b/src/Mod/Sketcher/App/ConstraintPyImp.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <sstream>
-#endif
+
 
 #include <Base/QuantityPy.h>
 
diff --git a/src/Mod/Sketcher/App/ExternalGeometryExtension.cpp b/src/Mod/Sketcher/App/ExternalGeometryExtension.cpp
index b6da7a4875..35c562a157 100644
--- a/src/Mod/Sketcher/App/ExternalGeometryExtension.cpp
+++ b/src/Mod/Sketcher/App/ExternalGeometryExtension.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Reader.h>
 #include <Base/Writer.h>
diff --git a/src/Mod/Sketcher/App/ExternalGeometryExtensionPyImp.cpp b/src/Mod/Sketcher/App/ExternalGeometryExtensionPyImp.cpp
index 14613ff65a..1d242b1ad6 100644
--- a/src/Mod/Sketcher/App/ExternalGeometryExtensionPyImp.cpp
+++ b/src/Mod/Sketcher/App/ExternalGeometryExtensionPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "ExternalGeometryExtensionPy.h"
 
diff --git a/src/Mod/Sketcher/App/ExternalGeometryFacade.cpp b/src/Mod/Sketcher/App/ExternalGeometryFacade.cpp
index 899bcc5100..88fe721278 100644
--- a/src/Mod/Sketcher/App/ExternalGeometryFacade.cpp
+++ b/src/Mod/Sketcher/App/ExternalGeometryFacade.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <boost/uuid/uuid_io.hpp>
-#endif
+
 
 #include <Base/Console.h>
 
diff --git a/src/Mod/Sketcher/App/ExternalGeometryFacadePyImp.cpp b/src/Mod/Sketcher/App/ExternalGeometryFacadePyImp.cpp
index 1c83ee41d5..5d270101f0 100644
--- a/src/Mod/Sketcher/App/ExternalGeometryFacadePyImp.cpp
+++ b/src/Mod/Sketcher/App/ExternalGeometryFacadePyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/GeometryPyCXX.h>
 #include <Base/MatrixPy.h>
diff --git a/src/Mod/Sketcher/App/GeoEnum.cpp b/src/Mod/Sketcher/App/GeoEnum.cpp
index d09cba4ca4..e0ad82af7f 100644
--- a/src/Mod/Sketcher/App/GeoEnum.cpp
+++ b/src/Mod/Sketcher/App/GeoEnum.cpp
@@ -20,10 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "GeoEnum.h"
 
+#include <FCConfig.h>
+
 using namespace Sketcher;
 
 bool GeoElementId::operator==(const GeoElementId& obj) const
diff --git a/src/Mod/Sketcher/App/GeoEnum.h b/src/Mod/Sketcher/App/GeoEnum.h
index 4a1c546f4d..7d7bf1ecfc 100644
--- a/src/Mod/Sketcher/App/GeoEnum.h
+++ b/src/Mod/Sketcher/App/GeoEnum.h
@@ -23,9 +23,12 @@
 #ifndef SKETCHER_GeoEnum_H
 #define SKETCHER_GeoEnum_H
 
-#include <Mod/Sketcher/SketcherGlobal.h>
 #include <functional>
 
+#include <FCConfig.h>
+
+#include <Mod/Sketcher/SketcherGlobal.h>
+
 namespace Sketcher
 {
 
diff --git a/src/Mod/Sketcher/App/GeoList.cpp b/src/Mod/Sketcher/App/GeoList.cpp
index b80bd4c6aa..4bd308ed98 100644
--- a/src/Mod/Sketcher/App/GeoList.cpp
+++ b/src/Mod/Sketcher/App/GeoList.cpp
@@ -20,10 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <cassert>
-#endif  // #ifndef _PreComp_
 
 #include <boost/core/ignore_unused.hpp>
 
diff --git a/src/Mod/Sketcher/App/GeometryFacade.cpp b/src/Mod/Sketcher/App/GeometryFacade.cpp
index 6746cae859..51e3a9edd0 100644
--- a/src/Mod/Sketcher/App/GeometryFacade.cpp
+++ b/src/Mod/Sketcher/App/GeometryFacade.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <boost/uuid/uuid_io.hpp>
-#endif
+
 
 #include "GeometryFacade.h"
 #include "GeometryFacadePy.h"
diff --git a/src/Mod/Sketcher/App/GeometryFacadePyImp.cpp b/src/Mod/Sketcher/App/GeometryFacadePyImp.cpp
index 658aa2526f..2418fd5160 100644
--- a/src/Mod/Sketcher/App/GeometryFacadePyImp.cpp
+++ b/src/Mod/Sketcher/App/GeometryFacadePyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/GeometryPyCXX.h>
 #include <Base/MatrixPy.h>
diff --git a/src/Mod/Sketcher/App/Measure.cpp b/src/Mod/Sketcher/App/Measure.cpp
index f57e52f8ec..042ac0aa93 100644
--- a/src/Mod/Sketcher/App/Measure.cpp
+++ b/src/Mod/Sketcher/App/Measure.cpp
@@ -22,7 +22,6 @@
 //! a class for establishing our connection with the unified measurement facility
 //! we are treating sketches like Part objects for now
 
-#include "PreCompiled.h"
 
 #include <App/Application.h>
 #include <App/MeasureManager.h>
diff --git a/src/Mod/Sketcher/App/PreCompiled.cpp b/src/Mod/Sketcher/App/PreCompiled.cpp
deleted file mode 100644
index 7cd1cae80f..0000000000
--- a/src/Mod/Sketcher/App/PreCompiled.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/***************************************************************************
- *   Copyright (c) 2008 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/Sketcher/App/PreCompiled.h b/src/Mod/Sketcher/App/PreCompiled.h
index 193ddb615e..fee75e3516 100644
--- a/src/Mod/Sketcher/App/PreCompiled.h
+++ b/src/Mod/Sketcher/App/PreCompiled.h
@@ -26,8 +26,6 @@
 #include <FCConfig.h>
 
 
-#ifdef _PreComp_
-
 // standard
 #include <algorithm>
 #include <cassert>
@@ -109,6 +107,5 @@
 
 #elif defined(FC_OS_WIN32)
 #include <windows.h>
-#endif  // _PreComp_
 
 #endif
diff --git a/src/Mod/Sketcher/App/PropertyConstraintList.cpp b/src/Mod/Sketcher/App/PropertyConstraintList.cpp
index 1f1541281d..ea32d3d736 100644
--- a/src/Mod/Sketcher/App/PropertyConstraintList.cpp
+++ b/src/Mod/Sketcher/App/PropertyConstraintList.cpp
@@ -20,11 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <cassert>
 #include <limits>
-#endif
 
 #include <App/ExpressionParser.h>
 #include <App/ObjectIdentifier.h>
diff --git a/src/Mod/Sketcher/App/PythonConverter.cpp b/src/Mod/Sketcher/App/PythonConverter.cpp
index f5795615fe..e2f827ae67 100644
--- a/src/Mod/Sketcher/App/PythonConverter.cpp
+++ b/src/Mod/Sketcher/App/PythonConverter.cpp
@@ -20,11 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <boost/algorithm/string/regex.hpp>
 #include <boost/format.hpp>
-#endif  // #ifndef _PreComp_
 
 #include <Base/Exception.h>
 #include <Mod/Sketcher/App/Constraint.h>
diff --git a/src/Mod/Sketcher/App/Sketch.cpp b/src/Mod/Sketcher/App/Sketch.cpp
index aa8eca5032..d6e3497dab 100644
--- a/src/Mod/Sketcher/App/Sketch.cpp
+++ b/src/Mod/Sketcher/App/Sketch.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <cmath>
 #include <iostream>
 
@@ -33,7 +31,6 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_Edge.hxx>
-#endif
 
 #include <Base/Console.h>
 #include <Base/Exception.h>
diff --git a/src/Mod/Sketcher/App/SketchAnalysis.cpp b/src/Mod/Sketcher/App/SketchAnalysis.cpp
index a64bf6a560..c5e0471fb0 100644
--- a/src/Mod/Sketcher/App/SketchAnalysis.cpp
+++ b/src/Mod/Sketcher/App/SketchAnalysis.cpp
@@ -21,8 +21,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <cmath>
 
 #include <BRep_Tool.hxx>
@@ -33,7 +31,6 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <gp_Pnt.hxx>
-#endif
 
 #include <App/Document.h>
 #include <Base/Console.h>
diff --git a/src/Mod/Sketcher/App/SketchGeometryExtension.cpp b/src/Mod/Sketcher/App/SketchGeometryExtension.cpp
index 871d57b936..d9d790d8c6 100644
--- a/src/Mod/Sketcher/App/SketchGeometryExtension.cpp
+++ b/src/Mod/Sketcher/App/SketchGeometryExtension.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Reader.h>
 #include <Base/Writer.h>
diff --git a/src/Mod/Sketcher/App/SketchGeometryExtensionPyImp.cpp b/src/Mod/Sketcher/App/SketchGeometryExtensionPyImp.cpp
index 791358954c..96593d616a 100644
--- a/src/Mod/Sketcher/App/SketchGeometryExtensionPyImp.cpp
+++ b/src/Mod/Sketcher/App/SketchGeometryExtensionPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "SketchGeometryExtensionPy.h"
 
diff --git a/src/Mod/Sketcher/App/SketchObject.cpp b/src/Mod/Sketcher/App/SketchObject.cpp
index 80552a9e9d..8b391210c2 100644
--- a/src/Mod/Sketcher/App/SketchObject.cpp
+++ b/src/Mod/Sketcher/App/SketchObject.cpp
@@ -21,8 +21,6 @@
  *                                                                          *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <algorithm>
 #include <cmath>
 #include <limits>
@@ -78,8 +76,6 @@
 #include <boost/range/adaptor/map.hpp>
 #include <boost/geometry.hpp>
 
-#endif
-
 #include <HLRAlgo_Projector.hxx>
 #include <HLRBRep_Algo.hxx>
 #include <HLRBRep_HLRToShape.hxx>
diff --git a/src/Mod/Sketcher/App/SketchObjectPyImp.cpp b/src/Mod/Sketcher/App/SketchObjectPyImp.cpp
index 2cc2ebae23..754fb7973f 100644
--- a/src/Mod/Sketcher/App/SketchObjectPyImp.cpp
+++ b/src/Mod/Sketcher/App/SketchObjectPyImp.cpp
@@ -20,13 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <memory>
 #include <sstream>
 
 #include <Geom_TrimmedCurve.hxx>
-#endif
 
 #include <App/Document.h>
 #include <Base/AxisPy.h>
diff --git a/src/Mod/Sketcher/App/SketchObjectSF.cpp b/src/Mod/Sketcher/App/SketchObjectSF.cpp
index 52a7adc063..932182f86e 100644
--- a/src/Mod/Sketcher/App/SketchObjectSF.cpp
+++ b/src/Mod/Sketcher/App/SketchObjectSF.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Console.h>
 
diff --git a/src/Mod/Sketcher/App/SketchObjectSFPyImp.cpp b/src/Mod/Sketcher/App/SketchObjectSFPyImp.cpp
index 592c2ccef0..4bd7e57291 100644
--- a/src/Mod/Sketcher/App/SketchObjectSFPyImp.cpp
+++ b/src/Mod/Sketcher/App/SketchObjectSFPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 // inclusion of the generated files (generated out of SketchObjectSFPy.xml)
 #include "SketchObjectSFPy.h"
diff --git a/src/Mod/Sketcher/App/SketchPyImp.cpp b/src/Mod/Sketcher/App/SketchPyImp.cpp
index a0cc748e31..252a9ac571 100644
--- a/src/Mod/Sketcher/App/SketchPyImp.cpp
+++ b/src/Mod/Sketcher/App/SketchPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/VectorPy.h>
 #include <Mod/Part/App/GeometryCurvePy.h>
diff --git a/src/Mod/Sketcher/App/SolverGeometryExtension.cpp b/src/Mod/Sketcher/App/SolverGeometryExtension.cpp
index f0e83cf6bd..bce419003a 100644
--- a/src/Mod/Sketcher/App/SolverGeometryExtension.cpp
+++ b/src/Mod/Sketcher/App/SolverGeometryExtension.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Exception.h>
 #include <Mod/Part/App/Geometry.h>
diff --git a/src/Mod/Sketcher/Gui/AppSketcherGui.cpp b/src/Mod/Sketcher/Gui/AppSketcherGui.cpp
index c636aa293c..3939a488ac 100644
--- a/src/Mod/Sketcher/Gui/AppSketcherGui.cpp
+++ b/src/Mod/Sketcher/Gui/AppSketcherGui.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
diff --git a/src/Mod/Sketcher/Gui/CMakeLists.txt b/src/Mod/Sketcher/Gui/CMakeLists.txt
index 002764d2aa..15a41b937b 100644
--- a/src/Mod/Sketcher/Gui/CMakeLists.txt
+++ b/src/Mod/Sketcher/Gui/CMakeLists.txt
@@ -75,7 +75,6 @@ SET(SketcherGui_SRCS
     CommandSketcherVirtualSpace.cpp
     CommandAlterGeometry.cpp
     Resources/Sketcher.qrc
-    PreCompiled.cpp
     PreCompiled.h
     SoZoomTranslation.cpp
     SoZoomTranslation.h
@@ -171,13 +170,6 @@ SET(SketcherGui_SRCS
     ${Python_SRCS}
 )
 
-if(FREECAD_USE_PCH)
-    add_definitions(-D_PreComp_)
-    GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${SketcherGui_SRCS})
-    ADD_MSVC_PRECOMPILED_HEADER(SketcherGui PreCompiled.h PreCompiled.cpp PCH_SRCS)
-endif(FREECAD_USE_PCH)
-
-
 SET(SketcherGuiIcon_SVG
     Resources/icons/SketcherWorkbench.svg
 )
@@ -187,6 +179,12 @@ add_library(SketcherGui SHARED
     ${SketcherGuiIcon_SVG}
 )
 
+if(FREECAD_USE_PCH)
+    target_precompile_headers(SketcherGui PRIVATE
+            $<$<COMPILE_LANGUAGE:CXX>:"${CMAKE_CURRENT_LIST_DIR}/PreCompiled.h">
+    )
+endif(FREECAD_USE_PCH)
+
 target_include_directories(
     SketcherGui
     PRIVATE
diff --git a/src/Mod/Sketcher/Gui/Command.cpp b/src/Mod/Sketcher/Gui/Command.cpp
index 07cadfae28..6cfee9d22d 100644
--- a/src/Mod/Sketcher/Gui/Command.cpp
+++ b/src/Mod/Sketcher/Gui/Command.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QApplication>
 #include <QCheckBox>
 #include <QGridLayout>
@@ -32,7 +30,7 @@
 #include <QMessageBox>
 #include <QSignalBlocker>
 #include <QWidgetAction>
-#endif
+
 
 #include <App/DocumentObjectGroup.h>
 #include <App/Datums.h>
diff --git a/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp b/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp
index be0313b66c..6ca501e5ba 100644
--- a/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp
+++ b/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp
@@ -20,10 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
-
 #include <Gui/Action.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp
index 1f0e89f795..d519de4a6b 100644
--- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp
+++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <limits>
+
 #include <Precision.hxx>
 #include <QPainter>
-#endif
 
 #include <boost/range/adaptor/reversed.hpp>
 
diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
index ee7e9e7ad8..e0574ce76d 100644
--- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
+++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
@@ -20,14 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <cstdlib>
 #include <memory>
 
 #include <QApplication>
 #include <QString>
-#endif
 
 #include <App/Datums.h>
 #include <Gui/Action.h>
diff --git a/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp b/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp
index 6ae4cf3e3b..326709f3ee 100644
--- a/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp
+++ b/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp
@@ -20,11 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <Inventor/SbString.h>
 #include <QApplication>
-#endif
 
 #include <App/Application.h>
 #include <Base/Console.h>
diff --git a/src/Mod/Sketcher/Gui/CommandSketcherOverlay.cpp b/src/Mod/Sketcher/Gui/CommandSketcherOverlay.cpp
index 98dc29f1ef..f33d11ea98 100644
--- a/src/Mod/Sketcher/Gui/CommandSketcherOverlay.cpp
+++ b/src/Mod/Sketcher/Gui/CommandSketcherOverlay.cpp
@@ -20,11 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <Inventor/SbString.h>
 #include <QApplication>
-#endif
 
 #include <App/Application.h>
 #include <Base/Console.h>
diff --git a/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp b/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp
index 9992b5f1ea..d3e261545f 100644
--- a/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp
+++ b/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <FCConfig.h>
+
 #include <memory>
 
 #include <QApplication>
@@ -29,7 +29,6 @@
 #include <QMessageBox>
 
 #include <Inventor/SbString.h>
-#endif
 
 #include <App/Application.h>
 #include <Base/Console.h>
diff --git a/src/Mod/Sketcher/Gui/CommandSketcherVirtualSpace.cpp b/src/Mod/Sketcher/Gui/CommandSketcherVirtualSpace.cpp
index 9e04753465..68548a5a09 100644
--- a/src/Mod/Sketcher/Gui/CommandSketcherVirtualSpace.cpp
+++ b/src/Mod/Sketcher/Gui/CommandSketcherVirtualSpace.cpp
@@ -20,10 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
-
 #include <App/Application.h>
 #include <Base/Console.h>
 #include <Gui/Action.h>
diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp
index ab2879968e..76738d2b4d 100644
--- a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp
+++ b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp
@@ -20,15 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <cmath>
 
 #include <QGuiApplication>
 #include <QPainter>
 
 #include <Inventor/events/SoKeyboardEvent.h>
-#endif  // #ifndef _PreComp_
 
 #include <Base/Console.h>
 #include <Base/Exception.h>
diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerOffset.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerOffset.h
index 3ef26bb74e..5762433ce0 100644
--- a/src/Mod/Sketcher/Gui/DrawSketchHandlerOffset.h
+++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerOffset.h
@@ -24,6 +24,8 @@
 #ifndef SKETCHERGUI_DrawSketchHandlerOffset_H
 #define SKETCHERGUI_DrawSketchHandlerOffset_H
 
+#include <FCConfig.h>
+
 #include <limits>
 
 #include <QApplication>
diff --git a/src/Mod/Sketcher/Gui/DrawSketchKeyboardManager.cpp b/src/Mod/Sketcher/Gui/DrawSketchKeyboardManager.cpp
index d678fa2aef..8df2615a5c 100644
--- a/src/Mod/Sketcher/Gui/DrawSketchKeyboardManager.cpp
+++ b/src/Mod/Sketcher/Gui/DrawSketchKeyboardManager.cpp
@@ -21,15 +21,12 @@
  ***************************************************************************/
 
 
-#include "PreCompiled.h"
-
-#ifndef _PreComp_
 #include <Inventor/events/SoKeyboardEvent.h>
 #include <QApplication>
 #include <QEvent>
 #include <QRegularExpression>
 #include <QRegularExpressionMatch>
-#endif
+
 
 #include "ViewProviderSketch.h"
 
diff --git a/src/Mod/Sketcher/Gui/EditDatumDialog.cpp b/src/Mod/Sketcher/Gui/EditDatumDialog.cpp
index fe8d6de477..6f2da69e58 100644
--- a/src/Mod/Sketcher/Gui/EditDatumDialog.cpp
+++ b/src/Mod/Sketcher/Gui/EditDatumDialog.cpp
@@ -20,14 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 /// Qt Include Files
 #include <Inventor/sensors/SoSensor.h>
 #include <QApplication>
 #include <QDialog>
-#endif
+
 
 #include <Base/Tools.h>
 #include <Gui/Application.h>
diff --git a/src/Mod/Sketcher/Gui/EditModeCoinManager.cpp b/src/Mod/Sketcher/Gui/EditModeCoinManager.cpp
index 91108d8353..e2cbc29740 100644
--- a/src/Mod/Sketcher/Gui/EditModeCoinManager.cpp
+++ b/src/Mod/Sketcher/Gui/EditModeCoinManager.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <memory>
 
 #include <Inventor/SbVec3f.h>
@@ -40,7 +38,6 @@
 #include <Inventor/nodes/SoSeparator.h>
 #include <Inventor/nodes/SoText2.h>
 #include <Inventor/nodes/SoTranslation.h>
-#endif  // #ifndef _PreComp_
 
 #include <Base/Exception.h>
 #include <Gui/Inventor/MarkerBitmaps.h>
diff --git a/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.cpp b/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.cpp
index a5dc822c39..f53abf569f 100644
--- a/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.cpp
+++ b/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.cpp
@@ -20,7 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
+#include <FCConfig.h>
 
 #include "Mod/Sketcher/App/ExternalGeometryFacade.h"
 
diff --git a/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.cpp b/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.cpp
index 667c59e8f7..2c855d5f94 100644
--- a/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.cpp
+++ b/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.cpp
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <FCConfig.h>
+
 #include <QPainter>
 #include <QRegularExpression>
 #include <limits>
@@ -40,7 +40,6 @@
 #include <Inventor/nodes/SoPickStyle.h>
 #include <Inventor/nodes/SoSeparator.h>
 #include <Inventor/nodes/SoTranslation.h>
-#endif  // #ifndef _PreComp_
 
 #include <Base/Converter.h>
 #include <Base/Exception.h>
diff --git a/src/Mod/Sketcher/Gui/EditModeGeometryCoinConverter.cpp b/src/Mod/Sketcher/Gui/EditModeGeometryCoinConverter.cpp
index e9b5cf3ea3..1eeff36fe7 100644
--- a/src/Mod/Sketcher/Gui/EditModeGeometryCoinConverter.cpp
+++ b/src/Mod/Sketcher/Gui/EditModeGeometryCoinConverter.cpp
@@ -20,7 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
+#include <FCConfig.h>
 
 #include <Base/Console.h>
 #include <Base/Exception.h>
diff --git a/src/Mod/Sketcher/Gui/EditModeGeometryCoinManager.cpp b/src/Mod/Sketcher/Gui/EditModeGeometryCoinManager.cpp
index 5486e5db9c..93e157d331 100644
--- a/src/Mod/Sketcher/Gui/EditModeGeometryCoinManager.cpp
+++ b/src/Mod/Sketcher/Gui/EditModeGeometryCoinManager.cpp
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <FCConfig.h>
+
 #include <memory>
 
 #include <Inventor/SbVec3f.h>
@@ -31,7 +31,6 @@
 #include <Inventor/nodes/SoMarkerSet.h>
 #include <Inventor/nodes/SoMaterial.h>
 #include <Inventor/nodes/SoSeparator.h>
-#endif  // #ifndef _PreComp_
 
 #include <Gui/Inventor/MarkerBitmaps.h>
 #include <Gui/Inventor/SmSwitchboard.h>
diff --git a/src/Mod/Sketcher/Gui/EditModeInformationOverlayCoinConverter.cpp b/src/Mod/Sketcher/Gui/EditModeInformationOverlayCoinConverter.cpp
index 29f17b61ad..151b055607 100644
--- a/src/Mod/Sketcher/Gui/EditModeInformationOverlayCoinConverter.cpp
+++ b/src/Mod/Sketcher/Gui/EditModeInformationOverlayCoinConverter.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <Inventor/nodes/SoCoordinate3.h>
 #include <Inventor/nodes/SoFont.h>
 #include <Inventor/nodes/SoGroup.h>
@@ -31,7 +29,6 @@
 #include <Inventor/nodes/SoSwitch.h>
 #include <Inventor/nodes/SoText2.h>
 #include <Inventor/nodes/SoTranslation.h>
-#endif  // #ifndef _PreComp_
 
 #include <Base/Console.h>
 #include <Base/Exception.h>
diff --git a/src/Mod/Sketcher/Gui/PreCompiled.cpp b/src/Mod/Sketcher/Gui/PreCompiled.cpp
deleted file mode 100644
index cde4369c5b..0000000000
--- a/src/Mod/Sketcher/Gui/PreCompiled.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/***************************************************************************
- *   Copyright (c) 2008 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/Sketcher/Gui/PreCompiled.h b/src/Mod/Sketcher/Gui/PreCompiled.h
index 57d3eb89bd..896b418c35 100644
--- a/src/Mod/Sketcher/Gui/PreCompiled.h
+++ b/src/Mod/Sketcher/Gui/PreCompiled.h
@@ -25,8 +25,6 @@
 
 #include <FCConfig.h>
 
-#ifdef _PreComp_
-
 // standard
 #include <cmath>
 #include <cstdlib>
@@ -71,6 +69,4 @@
 // all of Inventor
 #include <Gui/InventorAll.h>
 
-#endif  //_PreComp_
-
 #endif  // __PRECOMPILED_GUI__
diff --git a/src/Mod/Sketcher/Gui/PropertyConstraintListItem.cpp b/src/Mod/Sketcher/Gui/PropertyConstraintListItem.cpp
index 6a069cc906..2883afbe6f 100644
--- a/src/Mod/Sketcher/Gui/PropertyConstraintListItem.cpp
+++ b/src/Mod/Sketcher/Gui/PropertyConstraintListItem.cpp
@@ -20,12 +20,10 @@
  *                                                                          *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QDebug>
 #include <QTextStream>
 #include <memory>
-#endif
+
 
 #include <Base/Tools.h>
 #include <Mod/Sketcher/App/PropertyConstraintList.h>
diff --git a/src/Mod/Sketcher/Gui/PropertyVisualLayerList.cpp b/src/Mod/Sketcher/Gui/PropertyVisualLayerList.cpp
index acd17d7e0a..64092a8c59 100644
--- a/src/Mod/Sketcher/Gui/PropertyVisualLayerList.cpp
+++ b/src/Mod/Sketcher/Gui/PropertyVisualLayerList.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
diff --git a/src/Mod/Sketcher/Gui/ShortcutListener.cpp b/src/Mod/Sketcher/Gui/ShortcutListener.cpp
index f8c050f9a0..f57caea42b 100644
--- a/src/Mod/Sketcher/Gui/ShortcutListener.cpp
+++ b/src/Mod/Sketcher/Gui/ShortcutListener.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QKeyEvent>
 #include <QKeySequence>
-#endif
+
 
 #include "ShortcutListener.h"
 #include "ViewProviderSketch.h"
diff --git a/src/Mod/Sketcher/Gui/SketchMirrorDialog.cpp b/src/Mod/Sketcher/Gui/SketchMirrorDialog.cpp
index 33714f8f6c..1d97638015 100644
--- a/src/Mod/Sketcher/Gui/SketchMirrorDialog.cpp
+++ b/src/Mod/Sketcher/Gui/SketchMirrorDialog.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QDialog>
-#endif
+
 
 #include <Gui/MainWindow.h>
 
diff --git a/src/Mod/Sketcher/Gui/SketchOrientationDialog.cpp b/src/Mod/Sketcher/Gui/SketchOrientationDialog.cpp
index 7d53d70fd1..d02a227a85 100644
--- a/src/Mod/Sketcher/Gui/SketchOrientationDialog.cpp
+++ b/src/Mod/Sketcher/Gui/SketchOrientationDialog.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QDialog>
-#endif
+
 
 #include <Gui/BitmapFactory.h>
 #include <Gui/MainWindow.h>
diff --git a/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.cpp b/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.cpp
index d7ec332f87..dacb635db3 100644
--- a/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.cpp
+++ b/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QDialog>
-#endif
+
 
 #include <Gui/MainWindow.h>
 
diff --git a/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.cpp b/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.cpp
index eeb6895524..7708ed77a7 100644
--- a/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.cpp
+++ b/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QDialog>
-#endif
+
 
 #include <Gui/MainWindow.h>
 
diff --git a/src/Mod/Sketcher/Gui/SketcherSettings.cpp b/src/Mod/Sketcher/Gui/SketcherSettings.cpp
index 0718020718..845de3072c 100644
--- a/src/Mod/Sketcher/Gui/SketcherSettings.cpp
+++ b/src/Mod/Sketcher/Gui/SketcherSettings.cpp
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QMessageBox>
 #include <QPainter>
 #include <QPixmap>
-#endif
+
 
 #include <App/Application.h>
 #include <Base/Console.h>
diff --git a/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.cpp b/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.cpp
index 55d99c4193..a0fb3cf2c7 100644
--- a/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.cpp
+++ b/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.cpp
@@ -21,13 +21,10 @@
  ***************************************************************************/
 
 
-#include "PreCompiled.h"
-
-#ifndef _PreComp_
 #include <Inventor/events/SoKeyboardEvent.h>
 #include <QApplication>
 #include <QEvent>
-#endif
+
 
 #include "ui_SketcherToolDefaultWidget.h"
 #include <Gui/Application.h>
diff --git a/src/Mod/Sketcher/Gui/SnapManager.cpp b/src/Mod/Sketcher/Gui/SnapManager.cpp
index ad435cbe91..7c66724a13 100644
--- a/src/Mod/Sketcher/Gui/SnapManager.cpp
+++ b/src/Mod/Sketcher/Gui/SnapManager.cpp
@@ -20,10 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QApplication>
-#endif  // #ifndef _PreComp_
 
 #include <Base/Tools.h>
 #include <Mod/Sketcher/App/SketchObject.h>
diff --git a/src/Mod/Sketcher/Gui/SoZoomTranslation.cpp b/src/Mod/Sketcher/Gui/SoZoomTranslation.cpp
index e42a545aff..dc870b7292 100644
--- a/src/Mod/Sketcher/Gui/SoZoomTranslation.cpp
+++ b/src/Mod/Sketcher/Gui/SoZoomTranslation.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <cmath>
 
 #include <Inventor/actions/SoGLRenderAction.h>
@@ -30,7 +28,6 @@
 #include <Inventor/elements/SoViewVolumeElement.h>
 #include <Inventor/elements/SoViewportRegionElement.h>
 #include <Inventor/nodes/SoCamera.h>
-#endif
 
 #include "SoZoomTranslation.h"
 
diff --git a/src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp b/src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp
index a7d45b7192..c5baa544c4 100644
--- a/src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp
+++ b/src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Gui/Command.h>
 
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp
index 2b8a610d38..e3aedc6f78 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QContextMenuEvent>
 #include <QMenu>
 #include <QPainter>
@@ -34,7 +32,6 @@
 #include <boost/core/ignore_unused.hpp>
 #include <cmath>
 #include <limits>
-#endif
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.cpp b/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.cpp
index e41fdaed16..7738f16de6 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QEvent>
-#endif
+
 
 #include <Gui/BitmapFactory.h>
 
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp
index d42913c0b9..148be7d55d 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QContextMenuEvent>
 #include <QImage>
 #include <QLineEdit>
@@ -35,7 +33,6 @@
 #include <QWidgetAction>
 #include <boost/core/ignore_unused.hpp>
 #include <limits>
-#endif
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp b/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp
index 38744e6115..5aef572166 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp
@@ -20,12 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QAction>
 #include <QMenu>
 #include <QCheckBox>
-#endif
 
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.cpp b/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.cpp
index 25e76254c3..d95c91a75b 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QString>
-#endif
+
 
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherTool.cpp b/src/Mod/Sketcher/Gui/TaskSketcherTool.cpp
index da4ff8c3b9..543454862e 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherTool.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherTool.cpp
@@ -21,11 +21,6 @@
  ***************************************************************************/
 
 
-#include "PreCompiled.h"
-
-#ifndef _PreComp_
-#endif
-
 #include "TaskSketcherTool.h"
 #include <Gui/Application.h>
 #include <Gui/Document.h>
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp b/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp
index aaaa31b404..2c931420a9 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <Precision.hxx>
 #include <QDoubleValidator>
 #include <QLocale>
@@ -34,7 +32,6 @@
 #include <Inventor/nodes/SoDrawStyle.h>
 #include <Inventor/nodes/SoMarkerSet.h>
 #include <Inventor/nodes/SoSeparator.h>
-#endif
 
 #include <App/Document.h>
 #include <Gui/Application.h>
diff --git a/src/Mod/Sketcher/Gui/Utils.cpp b/src/Mod/Sketcher/Gui/Utils.cpp
index dc29a021c8..485d3fc033 100644
--- a/src/Mod/Sketcher/Gui/Utils.cpp
+++ b/src/Mod/Sketcher/Gui/Utils.cpp
@@ -20,13 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
-
 #include <QCursor>
 #include <QLocale>
 #include <QRegularExpression>
-#endif
 
 #include <App/Application.h>
 #include <Base/Quantity.h>
diff --git a/src/Mod/Sketcher/Gui/ViewProviderPython.cpp b/src/Mod/Sketcher/Gui/ViewProviderPython.cpp
index ae8ea6f687..e6e12e6449 100644
--- a/src/Mod/Sketcher/Gui/ViewProviderPython.cpp
+++ b/src/Mod/Sketcher/Gui/ViewProviderPython.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <Inventor/nodes/SoSeparator.h>
-#endif
+
 
 #include <Gui/ViewProviderBuilder.h>
 
diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
index 48862204f7..e53cb8b097 100644
--- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <boost/core/ignore_unused.hpp>
 #include <Inventor/SbBox3f.h>
 #include <Inventor/SbLine.h>
@@ -41,7 +39,6 @@
 #include <QWindow>
 
 #include <limits>
-#endif
 
 #include <fmt/format.h>
 
diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketchCoinAttorney.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketchCoinAttorney.cpp
index 2424205798..77b2acbb14 100644
--- a/src/Mod/Sketcher/Gui/ViewProviderSketchCoinAttorney.cpp
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketchCoinAttorney.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "ViewProviderSketchCoinAttorney.h"
 
diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.cpp
index 07f7117eae..37a941afbb 100644
--- a/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.cpp
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Exception.h>
 #include <Base/Reader.h>
diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtensionPyImp.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtensionPyImp.cpp
index 391d4be7f8..6af26f509e 100644
--- a/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtensionPyImp.cpp
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtensionPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "ViewProviderSketchGeometryExtensionPy.h"
 
diff --git a/src/Mod/Sketcher/Gui/VisualLayer.cpp b/src/Mod/Sketcher/Gui/VisualLayer.cpp
index 671e4dddd3..dd621f5485 100644
--- a/src/Mod/Sketcher/Gui/VisualLayer.cpp
+++ b/src/Mod/Sketcher/Gui/VisualLayer.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Reader.h>
 #include <Base/Writer.h>
diff --git a/src/Mod/Sketcher/Gui/Workbench.cpp b/src/Mod/Sketcher/Gui/Workbench.cpp
index 6ee89c8fb1..f27675d8aa 100644
--- a/src/Mod/Sketcher/Gui/Workbench.cpp
+++ b/src/Mod/Sketcher/Gui/Workbench.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "Utils.h"
 #include "Workbench.h"