diff --git a/src/Mod/Mesh/App/AppMesh.cpp b/src/Mod/Mesh/App/AppMesh.cpp
index 795c3c2aab..ecbc1140d3 100644
--- a/src/Mod/Mesh/App/AppMesh.cpp
+++ b/src/Mod/Mesh/App/AppMesh.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/Application.h>
 #include <App/MeasureManager.h>
diff --git a/src/Mod/Mesh/App/AppMeshPy.cpp b/src/Mod/Mesh/App/AppMeshPy.cpp
index 77a97d37c1..6c2af2129a 100644
--- a/src/Mod/Mesh/App/AppMeshPy.cpp
+++ b/src/Mod/Mesh/App/AppMeshPy.cpp
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <algorithm>
 #include <map>
 #include <memory>
-#endif
+
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/Mesh/App/CMakeLists.txt b/src/Mod/Mesh/App/CMakeLists.txt
index 64c80f2ca7..e1c84eb5b6 100644
--- a/src/Mod/Mesh/App/CMakeLists.txt
+++ b/src/Mod/Mesh/App/CMakeLists.txt
@@ -382,7 +382,6 @@ SET(Mesh_SRCS
     MeshPyImp.cpp
     MeshTexture.cpp
     MeshTexture.h
-    PreCompiled.cpp
     PreCompiled.h
     Segment.cpp
     Segment.h
@@ -398,9 +397,9 @@ if (MINGW AND CMAKE_COMPILER_IS_CLANGXX)
 endif()
 
 if(FREECAD_USE_PCH)
-    add_definitions(-D_PreComp_)
-    GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${Core_SRCS} ${Mesh_SRCS})
-    ADD_MSVC_PRECOMPILED_HEADER(Mesh PreCompiled.h PreCompiled.cpp PCH_SRCS)
+    target_precompile_headers(Mesh 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/Mesh/App/Core/Algorithm.cpp b/src/Mod/Mesh/App/Core/Algorithm.cpp
index 57018986c1..694fa144a2 100644
--- a/src/Mod/Mesh/App/Core/Algorithm.cpp
+++ b/src/Mod/Mesh/App/Core/Algorithm.cpp
@@ -20,12 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <algorithm>
 #include <limits>
-#endif
 
 #include <Base/Console.h>
 #include <Base/Sequencer.h>
diff --git a/src/Mod/Mesh/App/Core/Approximation.cpp b/src/Mod/Mesh/App/Core/Approximation.cpp
index cd0d976df4..f62a4fd468 100644
--- a/src/Mod/Mesh/App/Core/Approximation.cpp
+++ b/src/Mod/Mesh/App/Core/Approximation.cpp
@@ -20,14 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <algorithm>
 #include <cstdlib>
 #include <iterator>
 #include <limits>
-#endif
 
 #include <Base/BoundBox.h>
 #include <Base/Console.h>
diff --git a/src/Mod/Mesh/App/Core/Builder.cpp b/src/Mod/Mesh/App/Core/Builder.cpp
index 623da92bf7..745768bb42 100644
--- a/src/Mod/Mesh/App/Core/Builder.cpp
+++ b/src/Mod/Mesh/App/Core/Builder.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <algorithm>
-#endif
+
 
 #include <Base/Exception.h>
 #include <Base/Sequencer.h>
diff --git a/src/Mod/Mesh/App/Core/Curvature.cpp b/src/Mod/Mesh/App/Core/Curvature.cpp
index 0cc38a7f12..ac708438de 100644
--- a/src/Mod/Mesh/App/Core/Curvature.cpp
+++ b/src/Mod/Mesh/App/Core/Curvature.cpp
@@ -20,12 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <algorithm>
 #include <functional>
 #include <limits>
-#endif
 
 #include <QFuture>
 #include <QFutureWatcher>
diff --git a/src/Mod/Mesh/App/Core/CylinderFit.cpp b/src/Mod/Mesh/App/Core/CylinderFit.cpp
index 9b940cb9dd..c26186a588 100644
--- a/src/Mod/Mesh/App/Core/CylinderFit.cpp
+++ b/src/Mod/Mesh/App/Core/CylinderFit.cpp
@@ -53,14 +53,11 @@
 // We thus solve for 5 unknown parameters.
 // Thus for the solution to succeed the initial axis direction should be reasonable.
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <algorithm>
 #include <cstdlib>
 #include <iterator>
 #include <limits>
-#endif
 
 #include <Base/Console.h>
 #include <Base/Converter.h>
diff --git a/src/Mod/Mesh/App/Core/Decimation.cpp b/src/Mod/Mesh/App/Core/Decimation.cpp
index 4f02f5ac43..4f3838825f 100644
--- a/src/Mod/Mesh/App/Core/Decimation.cpp
+++ b/src/Mod/Mesh/App/Core/Decimation.cpp
@@ -20,10 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <limits>
-#endif
 
 #include "Decimation.h"
 #include "MeshKernel.h"
diff --git a/src/Mod/Mesh/App/Core/Definitions.cpp b/src/Mod/Mesh/App/Core/Definitions.cpp
index 7d19d8ec67..6b7675a017 100644
--- a/src/Mod/Mesh/App/Core/Definitions.cpp
+++ b/src/Mod/Mesh/App/Core/Definitions.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <cmath>
 
diff --git a/src/Mod/Mesh/App/Core/Degeneration.cpp b/src/Mod/Mesh/App/Core/Degeneration.cpp
index 2b27f5297f..c3ea81ea0b 100644
--- a/src/Mod/Mesh/App/Core/Degeneration.cpp
+++ b/src/Mod/Mesh/App/Core/Degeneration.cpp
@@ -20,13 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <algorithm>
 #include <map>
 #include <queue>
-#endif
+
 
 #include <boost/math/special_functions/fpclassify.hpp>
 
diff --git a/src/Mod/Mesh/App/Core/Elements.cpp b/src/Mod/Mesh/App/Core/Elements.cpp
index 7fd1d86a96..be61f4e9c3 100644
--- a/src/Mod/Mesh/App/Core/Elements.cpp
+++ b/src/Mod/Mesh/App/Core/Elements.cpp
@@ -20,10 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <limits>
-#endif
 
 #include <Mod/Mesh/App/WildMagic4/Wm4DistSegment3Triangle3.h>
 #include <Mod/Mesh/App/WildMagic4/Wm4DistVector3Triangle3.h>
diff --git a/src/Mod/Mesh/App/Core/Evaluation.cpp b/src/Mod/Mesh/App/Core/Evaluation.cpp
index 126eed55bf..8257d37688 100644
--- a/src/Mod/Mesh/App/Core/Evaluation.cpp
+++ b/src/Mod/Mesh/App/Core/Evaluation.cpp
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <algorithm>
 #include <vector>
-#endif
+
 
 #include <Base/Matrix.h>
 #include <Base/Sequencer.h>
diff --git a/src/Mod/Mesh/App/Core/Grid.cpp b/src/Mod/Mesh/App/Core/Grid.cpp
index 17ef47eb53..12ac229a29 100644
--- a/src/Mod/Mesh/App/Core/Grid.cpp
+++ b/src/Mod/Mesh/App/Core/Grid.cpp
@@ -20,13 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <algorithm>
 #include <cmath>
 #include <limits>
-#endif
 
 #include "Algorithm.h"
 #include "Grid.h"
diff --git a/src/Mod/Mesh/App/Core/IO/Reader3MF.cpp b/src/Mod/Mesh/App/Core/IO/Reader3MF.cpp
index 6305795e69..1f7d3d82f2 100644
--- a/src/Mod/Mesh/App/Core/IO/Reader3MF.cpp
+++ b/src/Mod/Mesh/App/Core/IO/Reader3MF.cpp
@@ -20,15 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <boost/tokenizer.hpp>
 #include <memory>
 #include <ostream>
 #include <sstream>
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/parsers/XercesDOMParser.hpp>
-#endif
+
 
 #include "Core/MeshIO.h"
 #include "Core/MeshKernel.h"
diff --git a/src/Mod/Mesh/App/Core/IO/ReaderOBJ.cpp b/src/Mod/Mesh/App/Core/IO/ReaderOBJ.cpp
index ddfa50e234..888601a52a 100644
--- a/src/Mod/Mesh/App/Core/IO/ReaderOBJ.cpp
+++ b/src/Mod/Mesh/App/Core/IO/ReaderOBJ.cpp
@@ -20,14 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/tokenizer.hpp>
 #include <istream>
 #include <map>
-#endif
 
 #include "Core/MeshIO.h"
 #include "Core/MeshKernel.h"
diff --git a/src/Mod/Mesh/App/Core/IO/ReaderPLY.cpp b/src/Mod/Mesh/App/Core/IO/ReaderPLY.cpp
index 084132421c..48e78dee34 100644
--- a/src/Mod/Mesh/App/Core/IO/ReaderPLY.cpp
+++ b/src/Mod/Mesh/App/Core/IO/ReaderPLY.cpp
@@ -21,11 +21,9 @@
  *                                                                         *
  **************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <boost/lexical_cast.hpp>
 #include <istream>
-#endif
+
 
 #include "Core/MeshIO.h"
 #include "Core/MeshKernel.h"
diff --git a/src/Mod/Mesh/App/Core/IO/Writer3MF.cpp b/src/Mod/Mesh/App/Core/IO/Writer3MF.cpp
index 05937ca3e8..fc90af0f99 100644
--- a/src/Mod/Mesh/App/Core/IO/Writer3MF.cpp
+++ b/src/Mod/Mesh/App/Core/IO/Writer3MF.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <ostream>
 #include <sstream>
-#endif
+
 
 #include "Core/Evaluation.h"
 #include "Core/MeshKernel.h"
diff --git a/src/Mod/Mesh/App/Core/IO/WriterInventor.cpp b/src/Mod/Mesh/App/Core/IO/WriterInventor.cpp
index 777940d45d..8be03973cf 100644
--- a/src/Mod/Mesh/App/Core/IO/WriterInventor.cpp
+++ b/src/Mod/Mesh/App/Core/IO/WriterInventor.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "Core/Iterator.h"
 #include <Base/Builder3D.h>
diff --git a/src/Mod/Mesh/App/Core/IO/WriterOBJ.cpp b/src/Mod/Mesh/App/Core/IO/WriterOBJ.cpp
index e872ec73ee..92151d69f6 100644
--- a/src/Mod/Mesh/App/Core/IO/WriterOBJ.cpp
+++ b/src/Mod/Mesh/App/Core/IO/WriterOBJ.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "Core/Iterator.h"
 #include <Base/Console.h>
diff --git a/src/Mod/Mesh/App/Core/Info.cpp b/src/Mod/Mesh/App/Core/Info.cpp
index 3dd60c7cd6..7e9bfd3bb2 100644
--- a/src/Mod/Mesh/App/Core/Info.cpp
+++ b/src/Mod/Mesh/App/Core/Info.cpp
@@ -20,14 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <iomanip>
 #include <iostream>
 #include <map>
 #include <set>
-#endif
+
 
 #include "Info.h"
 #include "Iterator.h"
diff --git a/src/Mod/Mesh/App/Core/KDTree.cpp b/src/Mod/Mesh/App/Core/KDTree.cpp
index 9e262454b4..3d61ca6bed 100644
--- a/src/Mod/Mesh/App/Core/KDTree.cpp
+++ b/src/Mod/Mesh/App/Core/KDTree.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 #ifdef _MSC_VER
 #pragma warning(disable : 4396)
 #endif
diff --git a/src/Mod/Mesh/App/Core/MeshIO.cpp b/src/Mod/Mesh/App/Core/MeshIO.cpp
index fb68e033f6..9792741429 100644
--- a/src/Mod/Mesh/App/Core/MeshIO.cpp
+++ b/src/Mod/Mesh/App/Core/MeshIO.cpp
@@ -20,15 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <algorithm>
 #include <cmath>
 #include <iomanip>
 #include <sstream>
 #include <string_view>
-#endif
+
 
 #include <boost/algorithm/string.hpp>
 #include <boost/convert.hpp>
diff --git a/src/Mod/Mesh/App/Core/MeshKernel.cpp b/src/Mod/Mesh/App/Core/MeshKernel.cpp
index 9191516af3..5286455e1b 100644
--- a/src/Mod/Mesh/App/Core/MeshKernel.cpp
+++ b/src/Mod/Mesh/App/Core/MeshKernel.cpp
@@ -20,16 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <map>
 #include <queue>
 #include <stdexcept>
-#endif
+
 
 #include <Base/Exception.h>
 #include <Base/Stream.h>
diff --git a/src/Mod/Mesh/App/Core/Projection.cpp b/src/Mod/Mesh/App/Core/Projection.cpp
index 030f2b83da..ca127e7e4e 100644
--- a/src/Mod/Mesh/App/Core/Projection.cpp
+++ b/src/Mod/Mesh/App/Core/Projection.cpp
@@ -20,13 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <map>
-#endif
+
 
 #include "Grid.h"
 #include "Iterator.h"
diff --git a/src/Mod/Mesh/App/Core/Segmentation.cpp b/src/Mod/Mesh/App/Core/Segmentation.cpp
index 9061f17e85..8b2dd035a3 100644
--- a/src/Mod/Mesh/App/Core/Segmentation.cpp
+++ b/src/Mod/Mesh/App/Core/Segmentation.cpp
@@ -20,12 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <algorithm>
 #include <cmath>
 #include <limits>
-#endif
 
 #include "Algorithm.h"
 #include "Approximation.h"
diff --git a/src/Mod/Mesh/App/Core/SetOperations.cpp b/src/Mod/Mesh/App/Core/SetOperations.cpp
index e19987fee0..90520ab486 100644
--- a/src/Mod/Mesh/App/Core/SetOperations.cpp
+++ b/src/Mod/Mesh/App/Core/SetOperations.cpp
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <fstream>
 #include <ios>
-#endif
+
 
 #include <Base/Builder3D.h>
 #include <Base/Sequencer.h>
diff --git a/src/Mod/Mesh/App/Core/Smoothing.cpp b/src/Mod/Mesh/App/Core/Smoothing.cpp
index 195bc5fa7e..330f66aa3e 100644
--- a/src/Mod/Mesh/App/Core/Smoothing.cpp
+++ b/src/Mod/Mesh/App/Core/Smoothing.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <cmath>
-#endif
+
 
 #include <Base/Tools.h>
 
diff --git a/src/Mod/Mesh/App/Core/SphereFit.cpp b/src/Mod/Mesh/App/Core/SphereFit.cpp
index 02a42fd409..de515296b5 100644
--- a/src/Mod/Mesh/App/Core/SphereFit.cpp
+++ b/src/Mod/Mesh/App/Core/SphereFit.cpp
@@ -20,14 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-
-#ifndef _PreComp_
 #include <algorithm>
 #include <cstdlib>
 #include <iterator>
 #include <limits>
-#endif
 
 #include "SphereFit.h"
 
diff --git a/src/Mod/Mesh/App/Core/Tools.cpp b/src/Mod/Mesh/App/Core/Tools.cpp
index f7fac2ade3..d48f17cafa 100644
--- a/src/Mod/Mesh/App/Core/Tools.cpp
+++ b/src/Mod/Mesh/App/Core/Tools.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <algorithm>
-#endif
+
 
 #include "Tools.h"
 
diff --git a/src/Mod/Mesh/App/Core/TopoAlgorithm.cpp b/src/Mod/Mesh/App/Core/TopoAlgorithm.cpp
index 3273fb9385..0c87f130fb 100644
--- a/src/Mod/Mesh/App/Core/TopoAlgorithm.cpp
+++ b/src/Mod/Mesh/App/Core/TopoAlgorithm.cpp
@@ -20,16 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <algorithm>
 #include <boost/core/ignore_unused.hpp>
 #include <cmath>
 #include <limits>
 #include <queue>
 #include <utility>
-#endif
+
 
 #include <Base/Console.h>
 #include <Mod/Mesh/App/WildMagic4/Wm4MeshCurvature.h>
diff --git a/src/Mod/Mesh/App/Core/Triangulation.cpp b/src/Mod/Mesh/App/Core/Triangulation.cpp
index 98dbcc91d4..1b1b30c444 100644
--- a/src/Mod/Mesh/App/Core/Triangulation.cpp
+++ b/src/Mod/Mesh/App/Core/Triangulation.cpp
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <cmath>
 #include <limits>
 #include <queue>
-#endif
+
 
 #include <Base/Console.h>
 #include <Base/Exception.h>
diff --git a/src/Mod/Mesh/App/Core/Trim.cpp b/src/Mod/Mesh/App/Core/Trim.cpp
index f569acbc2e..1be2be0f2f 100644
--- a/src/Mod/Mesh/App/Core/Trim.cpp
+++ b/src/Mod/Mesh/App/Core/Trim.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <algorithm>
 #include <cmath>
-#endif
+
 
 #include <Base/Sequencer.h>
 
diff --git a/src/Mod/Mesh/App/Core/TrimByPlane.cpp b/src/Mod/Mesh/App/Core/TrimByPlane.cpp
index 6965dcfad6..cbc08269ce 100644
--- a/src/Mod/Mesh/App/Core/TrimByPlane.cpp
+++ b/src/Mod/Mesh/App/Core/TrimByPlane.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <algorithm>
-#endif
+
 
 #include "Grid.h"
 #include "Iterator.h"
diff --git a/src/Mod/Mesh/App/Core/Visitor.cpp b/src/Mod/Mesh/App/Core/Visitor.cpp
index de260b58c8..34d2548008 100644
--- a/src/Mod/Mesh/App/Core/Visitor.cpp
+++ b/src/Mod/Mesh/App/Core/Visitor.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <cmath>
-#endif
+
 
 #include "Algorithm.h"
 #include "Approximation.h"
diff --git a/src/Mod/Mesh/App/Edge.cpp b/src/Mod/Mesh/App/Edge.cpp
index 54c68e4f50..7e2893de02 100644
--- a/src/Mod/Mesh/App/Edge.cpp
+++ b/src/Mod/Mesh/App/Edge.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <sstream>
-#endif
+
 
 #include "Edge.h"
 #include "Mesh.h"
diff --git a/src/Mod/Mesh/App/EdgePyImp.cpp b/src/Mod/Mesh/App/EdgePyImp.cpp
index ac9243acb0..5795dd214b 100644
--- a/src/Mod/Mesh/App/EdgePyImp.cpp
+++ b/src/Mod/Mesh/App/EdgePyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Converter.h>
 #include <Base/GeometryPyCXX.h>
diff --git a/src/Mod/Mesh/App/Exporter.cpp b/src/Mod/Mesh/App/Exporter.cpp
index 98518deb6e..9f2522c6cc 100644
--- a/src/Mod/Mesh/App/Exporter.cpp
+++ b/src/Mod/Mesh/App/Exporter.cpp
@@ -20,13 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <algorithm>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/core/ignore_unused.hpp>
 #include <vector>
-#endif
+
 
 #include <App/Application.h>
 #include <App/ComplexGeoData.h>
diff --git a/src/Mod/Mesh/App/Facet.cpp b/src/Mod/Mesh/App/Facet.cpp
index 5664bf2e9d..62e54f13d1 100644
--- a/src/Mod/Mesh/App/Facet.cpp
+++ b/src/Mod/Mesh/App/Facet.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <sstream>
-#endif
+
 
 #include "Facet.h"
 #include "Mesh.h"
diff --git a/src/Mod/Mesh/App/FacetPyImp.cpp b/src/Mod/Mesh/App/FacetPyImp.cpp
index 0f5c4b60da..7eb35854f7 100644
--- a/src/Mod/Mesh/App/FacetPyImp.cpp
+++ b/src/Mod/Mesh/App/FacetPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/GeometryPyCXX.h>
 #include <Base/VectorPy.h>
diff --git a/src/Mod/Mesh/App/FeatureMeshCurvature.cpp b/src/Mod/Mesh/App/FeatureMeshCurvature.cpp
index 85a4cac98c..b4b81b6e5d 100644
--- a/src/Mod/Mesh/App/FeatureMeshCurvature.cpp
+++ b/src/Mod/Mesh/App/FeatureMeshCurvature.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "Core/Curvature.h"
 
diff --git a/src/Mod/Mesh/App/FeatureMeshDefects.cpp b/src/Mod/Mesh/App/FeatureMeshDefects.cpp
index 2a8c5de810..e19c889c70 100644
--- a/src/Mod/Mesh/App/FeatureMeshDefects.cpp
+++ b/src/Mod/Mesh/App/FeatureMeshDefects.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "Core/Degeneration.h"
 #include "Core/Triangulation.h"
diff --git a/src/Mod/Mesh/App/FeatureMeshExport.cpp b/src/Mod/Mesh/App/FeatureMeshExport.cpp
index 81682c889c..e69119b3b3 100644
--- a/src/Mod/Mesh/App/FeatureMeshExport.cpp
+++ b/src/Mod/Mesh/App/FeatureMeshExport.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "FeatureMeshExport.h"
 #include "MeshFeature.h"
diff --git a/src/Mod/Mesh/App/FeatureMeshImport.cpp b/src/Mod/Mesh/App/FeatureMeshImport.cpp
index c7b0612178..c7617e965d 100644
--- a/src/Mod/Mesh/App/FeatureMeshImport.cpp
+++ b/src/Mod/Mesh/App/FeatureMeshImport.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "FeatureMeshImport.h"
 
diff --git a/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.cpp b/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.cpp
index ee8975d2db..fddece1417 100644
--- a/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.cpp
+++ b/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.cpp
@@ -20,10 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <limits>
-#endif
 
 #include <Base/Converter.h>
 
diff --git a/src/Mod/Mesh/App/FeatureMeshSetOperations.cpp b/src/Mod/Mesh/App/FeatureMeshSetOperations.cpp
index 01dd37862b..9c594c8333 100644
--- a/src/Mod/Mesh/App/FeatureMeshSetOperations.cpp
+++ b/src/Mod/Mesh/App/FeatureMeshSetOperations.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "Core/Iterator.h"
 #include "Core/SetOperations.h"
diff --git a/src/Mod/Mesh/App/FeatureMeshSolid.cpp b/src/Mod/Mesh/App/FeatureMeshSolid.cpp
index 41262f3669..9d432b9569 100644
--- a/src/Mod/Mesh/App/FeatureMeshSolid.cpp
+++ b/src/Mod/Mesh/App/FeatureMeshSolid.cpp
@@ -20,10 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <limits>
-#endif
 
 #include <App/Document.h>
 
diff --git a/src/Mod/Mesh/App/FeatureMeshTransform.cpp b/src/Mod/Mesh/App/FeatureMeshTransform.cpp
index 4e9de70a28..8c5cfbf5aa 100644
--- a/src/Mod/Mesh/App/FeatureMeshTransform.cpp
+++ b/src/Mod/Mesh/App/FeatureMeshTransform.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Matrix.h>
 
diff --git a/src/Mod/Mesh/App/FeatureMeshTransformDemolding.cpp b/src/Mod/Mesh/App/FeatureMeshTransformDemolding.cpp
index 293ceebbc2..e7525c200c 100644
--- a/src/Mod/Mesh/App/FeatureMeshTransformDemolding.cpp
+++ b/src/Mod/Mesh/App/FeatureMeshTransformDemolding.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "FeatureMeshTransformDemolding.h"
 
diff --git a/src/Mod/Mesh/App/Importer.cpp b/src/Mod/Mesh/App/Importer.cpp
index 8bfe187331..c0c4ee6328 100644
--- a/src/Mod/Mesh/App/Importer.cpp
+++ b/src/Mod/Mesh/App/Importer.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/Document.h>
 
diff --git a/src/Mod/Mesh/App/Mesh.cpp b/src/Mod/Mesh/App/Mesh.cpp
index 125df12d97..7c59f15bea 100644
--- a/src/Mod/Mesh/App/Mesh.cpp
+++ b/src/Mod/Mesh/App/Mesh.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <algorithm>
 #include <sstream>
-#endif
+
 
 #include <Base/Builder3D.h>
 #include <Base/Console.h>
diff --git a/src/Mod/Mesh/App/MeshFeature.cpp b/src/Mod/Mesh/App/MeshFeature.cpp
index e09b337304..270a005fcf 100644
--- a/src/Mod/Mesh/App/MeshFeature.cpp
+++ b/src/Mod/Mesh/App/MeshFeature.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/FeaturePythonPyImp.h>
 
diff --git a/src/Mod/Mesh/App/MeshFeaturePyImp.cpp b/src/Mod/Mesh/App/MeshFeaturePyImp.cpp
index 74eca9fd43..d01dc38a97 100644
--- a/src/Mod/Mesh/App/MeshFeaturePyImp.cpp
+++ b/src/Mod/Mesh/App/MeshFeaturePyImp.cpp
@@ -20,10 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <limits>
-#endif
 
 #include "MeshFeature.h"
 // inclusion of the generated files (generated out of MeshFeaturePy.xml)
diff --git a/src/Mod/Mesh/App/MeshPointPyImp.cpp b/src/Mod/Mesh/App/MeshPointPyImp.cpp
index 1cba0da0d7..e2fa48af0e 100644
--- a/src/Mod/Mesh/App/MeshPointPyImp.cpp
+++ b/src/Mod/Mesh/App/MeshPointPyImp.cpp
@@ -20,11 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <limits>
 #include <sstream>
-#endif
 
 #include <Base/VectorPy.h>
 
diff --git a/src/Mod/Mesh/App/MeshProperties.cpp b/src/Mod/Mesh/App/MeshProperties.cpp
index cd9e1ebd44..1c8665d195 100644
--- a/src/Mod/Mesh/App/MeshProperties.cpp
+++ b/src/Mod/Mesh/App/MeshProperties.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Converter.h>
 #include <Base/Exception.h>
diff --git a/src/Mod/Mesh/App/MeshPyImp.cpp b/src/Mod/Mesh/App/MeshPyImp.cpp
index 4ca5abb7c4..3e72eb69bf 100644
--- a/src/Mod/Mesh/App/MeshPyImp.cpp
+++ b/src/Mod/Mesh/App/MeshPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Converter.h>
 #include <Base/GeometryPyCXX.h>
diff --git a/src/Mod/Mesh/App/MeshTexture.cpp b/src/Mod/Mesh/App/MeshTexture.cpp
index 16be349df7..24f0eda861 100644
--- a/src/Mod/Mesh/App/MeshTexture.cpp
+++ b/src/Mod/Mesh/App/MeshTexture.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "MeshTexture.h"
 
diff --git a/src/Mod/Mesh/App/PreCompiled.cpp b/src/Mod/Mesh/App/PreCompiled.cpp
deleted file mode 100644
index ccf2b83403..0000000000
--- a/src/Mod/Mesh/App/PreCompiled.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/***************************************************************************
- *   Copyright (c) 2003 Werner Mayer <wmayer[at]users.sourceforge.net>     *
- *                                                                         *
- *   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/Mesh/App/PreCompiled.h b/src/Mod/Mesh/App/PreCompiled.h
index 6145ecb0e3..c83a5cc3bf 100644
--- a/src/Mod/Mesh/App/PreCompiled.h
+++ b/src/Mod/Mesh/App/PreCompiled.h
@@ -26,8 +26,6 @@
 
 #include <FCConfig.h>
 
-#ifdef _PreComp_
-
 // standard
 #include <cassert>
 #include <cmath>
@@ -74,6 +72,4 @@
 #include <xercesc/util/XMLUniDefs.hpp>
 #include <xercesc/util/XercesVersion.hpp>
 
-#endif  //_PreComp_
-
 #endif
diff --git a/src/Mod/Mesh/App/Segment.cpp b/src/Mod/Mesh/App/Segment.cpp
index 69b66112a4..60a1e81e22 100644
--- a/src/Mod/Mesh/App/Segment.cpp
+++ b/src/Mod/Mesh/App/Segment.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <algorithm>
 #include <sstream>
-#endif
+
 
 #include "Mesh.h"
 #include "MeshPy.h"
diff --git a/src/Mod/Mesh/Gui/AppMeshGui.cpp b/src/Mod/Mesh/Gui/AppMeshGui.cpp
index a4c6e7a419..ca224f85c3 100644
--- a/src/Mod/Mesh/Gui/AppMeshGui.cpp
+++ b/src/Mod/Mesh/Gui/AppMeshGui.cpp
@@ -20,15 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <Inventor/SoDB.h>
 #include <Inventor/SoInput.h>
 #include <Inventor/annex/ForeignFiles/SoSTLFileKit.h>
 #include <Inventor/nodes/SoSeparator.h>
 
 #include <QApplication>
-#endif
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
diff --git a/src/Mod/Mesh/Gui/CMakeLists.txt b/src/Mod/Mesh/Gui/CMakeLists.txt
index 63b860a526..fa13f23768 100644
--- a/src/Mod/Mesh/Gui/CMakeLists.txt
+++ b/src/Mod/Mesh/Gui/CMakeLists.txt
@@ -126,7 +126,6 @@ SET(MeshGui_SRCS
     AppMeshGui.cpp
     Command.cpp
     Doxygen.cpp
-    PreCompiled.cpp
     PreCompiled.h
     MeshEditor.cpp
     MeshEditor.h
@@ -140,12 +139,6 @@ SET(MeshGui_SRCS
     Workbench.h
 )
 
-if(FREECAD_USE_PCH)
-    add_definitions(-D_PreComp_)
-    GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${MeshGui_SRCS})
-    ADD_MSVC_PRECOMPILED_HEADER(MeshGui PreCompiled.h PreCompiled.cpp PCH_SRCS)
-endif(FREECAD_USE_PCH)
-
 SET(MeshGuiIcon_SVG
     Resources/icons/MeshWorkbench.svg
 )
@@ -159,6 +152,13 @@ if (EIGEN3_NO_DEPRECATED_COPY)
 endif ()
 
 add_library(MeshGui SHARED ${MeshGui_SRCS} ${MeshGuiIcon_SVG})
+
+if(FREECAD_USE_PCH)
+    target_precompile_headers(MeshGui PRIVATE
+            $<$<COMPILE_LANGUAGE:CXX>:"${CMAKE_CURRENT_LIST_DIR}/PreCompiled.h">
+    )
+endif(FREECAD_USE_PCH)
+
 target_include_directories(
     MeshGui
     PRIVATE
diff --git a/src/Mod/Mesh/Gui/Command.cpp b/src/Mod/Mesh/Gui/Command.cpp
index 47f5731df6..16c9cf5379 100644
--- a/src/Mod/Mesh/Gui/Command.cpp
+++ b/src/Mod/Mesh/Gui/Command.cpp
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <FCConfig.h>
+
 #ifdef FC_OS_WIN32
 #include <windows.h>
 #endif
@@ -34,7 +34,6 @@
 #include <qinputdialog.h>
 #include <qmessagebox.h>
 #include <qstringlist.h>
-#endif
 
 #include <Gui/InventorAll.h>
 
diff --git a/src/Mod/Mesh/Gui/DlgDecimating.cpp b/src/Mod/Mesh/Gui/DlgDecimating.cpp
index fd759bfc02..58f34f7c4a 100644
--- a/src/Mod/Mesh/Gui/DlgDecimating.cpp
+++ b/src/Mod/Mesh/Gui/DlgDecimating.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Gui/CommandT.h>
 #include <Gui/Selection/Selection.h>
diff --git a/src/Mod/Mesh/Gui/DlgDecimating.h b/src/Mod/Mesh/Gui/DlgDecimating.h
index 838cec7705..0cff36bb40 100644
--- a/src/Mod/Mesh/Gui/DlgDecimating.h
+++ b/src/Mod/Mesh/Gui/DlgDecimating.h
@@ -24,6 +24,8 @@
 #ifndef MESHGUI_DLGDECIMATING_H
 #define MESHGUI_DLGDECIMATING_H
 
+#include <Mod/Mesh/MeshGlobal.h>
+
 #include <QDialog>
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
diff --git a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp
index b493272c3b..f538ec6694 100644
--- a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp
+++ b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp
@@ -20,13 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QDockWidget>
 #include <QMessageBox>
 #include <QPointer>
 #include <QScrollArea>
-#endif
+
 
 #include <Gui/Application.h>
 #include <Gui/Command.h>
diff --git a/src/Mod/Mesh/Gui/DlgEvaluateSettings.cpp b/src/Mod/Mesh/Gui/DlgEvaluateSettings.cpp
index 42ff26ecdb..e8ea1ab5b2 100644
--- a/src/Mod/Mesh/Gui/DlgEvaluateSettings.cpp
+++ b/src/Mod/Mesh/Gui/DlgEvaluateSettings.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "DlgEvaluateSettings.h"
 #include "ui_DlgEvaluateSettings.h"
diff --git a/src/Mod/Mesh/Gui/DlgEvaluateSettings.h b/src/Mod/Mesh/Gui/DlgEvaluateSettings.h
index 5c9f5ba801..234da00b32 100644
--- a/src/Mod/Mesh/Gui/DlgEvaluateSettings.h
+++ b/src/Mod/Mesh/Gui/DlgEvaluateSettings.h
@@ -24,6 +24,8 @@
 #ifndef MESHGUI_DLG_EVALUATE_SETTINGS_H
 #define MESHGUI_DLG_EVALUATE_SETTINGS_H
 
+#include <FCGlobal.h>
+
 #include <QDialog>
 
 namespace MeshGui
diff --git a/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp b/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp
index 4433dca7a8..d76e5beaf6 100644
--- a/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp
+++ b/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp
@@ -20,11 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <qmessagebox.h>
-#endif
 
 #include <App/Document.h>
 #include <Base/Interpreter.h>
diff --git a/src/Mod/Mesh/Gui/DlgRegularSolidImp.h b/src/Mod/Mesh/Gui/DlgRegularSolidImp.h
index 84eeadcee1..f82ce81a34 100644
--- a/src/Mod/Mesh/Gui/DlgRegularSolidImp.h
+++ b/src/Mod/Mesh/Gui/DlgRegularSolidImp.h
@@ -24,6 +24,8 @@
 #ifndef MESHGUI_DLGREGULARSOLID_IMP_H
 #define MESHGUI_DLGREGULARSOLID_IMP_H
 
+#include <Mod/Mesh/MeshGlobal.h>
+
 #include <QDialog>
 #include <memory>
 
diff --git a/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.cpp b/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.cpp
index ec0eb00ecb..eb51102082 100644
--- a/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.cpp
+++ b/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/Application.h>
 #include <Mod/Mesh/App/Core/MeshIO.h>
diff --git a/src/Mod/Mesh/Gui/DlgSettingsMeshView.cpp b/src/Mod/Mesh/Gui/DlgSettingsMeshView.cpp
index 0481bce872..91f900dfef 100644
--- a/src/Mod/Mesh/Gui/DlgSettingsMeshView.cpp
+++ b/src/Mod/Mesh/Gui/DlgSettingsMeshView.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Gui/Window.h>
 
diff --git a/src/Mod/Mesh/Gui/DlgSmoothing.cpp b/src/Mod/Mesh/Gui/DlgSmoothing.cpp
index 4a668aa9d9..f0eede39be 100644
--- a/src/Mod/Mesh/Gui/DlgSmoothing.cpp
+++ b/src/Mod/Mesh/Gui/DlgSmoothing.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QButtonGroup>
 #include <QDialogButtonBox>
-#endif
+
 
 #include <Gui/Command.h>
 #include <Gui/Selection/Selection.h>
diff --git a/src/Mod/Mesh/Gui/DlgSmoothing.h b/src/Mod/Mesh/Gui/DlgSmoothing.h
index 89919334f4..09c2bb0c16 100644
--- a/src/Mod/Mesh/Gui/DlgSmoothing.h
+++ b/src/Mod/Mesh/Gui/DlgSmoothing.h
@@ -27,6 +27,7 @@
 #include <QDialog>
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
+
 #ifndef MESH_GLOBAL_H
 #include <Mod/Mesh/MeshGlobal.h>
 #endif
diff --git a/src/Mod/Mesh/Gui/Doxygen.cpp b/src/Mod/Mesh/Gui/Doxygen.cpp
index d8e722346a..81704c42c8 100644
--- a/src/Mod/Mesh/Gui/Doxygen.cpp
+++ b/src/Mod/Mesh/Gui/Doxygen.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 /*! \namespace MeshGui
     \brief The namespace of the Mesh Graphical interface layer library
diff --git a/src/Mod/Mesh/Gui/MeshEditor.cpp b/src/Mod/Mesh/Gui/MeshEditor.cpp
index 72cb10ec22..91f17830dd 100644
--- a/src/Mod/Mesh/Gui/MeshEditor.cpp
+++ b/src/Mod/Mesh/Gui/MeshEditor.cpp
@@ -20,9 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <QMenu>
 #include <QTimer>
 #include <algorithm>
@@ -45,7 +43,6 @@
 #include <Inventor/nodes/SoPointSet.h>
 #include <Inventor/nodes/SoSeparator.h>
 #include <Inventor/nodes/SoShapeHints.h>
-#endif
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/Mesh/Gui/MeshSelection.cpp b/src/Mod/Mesh/Gui/MeshSelection.cpp
index d63cf2f398..77cf740a71 100644
--- a/src/Mod/Mesh/Gui/MeshSelection.cpp
+++ b/src/Mod/Mesh/Gui/MeshSelection.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <algorithm>
 #include <QBitmap>
 
@@ -30,7 +28,6 @@
 #include <Inventor/details/SoFaceDetail.h>
 #include <Inventor/events/SoMouseButtonEvent.h>
 #include <Inventor/nodes/SoCamera.h>
-#endif
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/Mesh/Gui/PreCompiled.cpp b/src/Mod/Mesh/Gui/PreCompiled.cpp
deleted file mode 100644
index a634963fef..0000000000
--- a/src/Mod/Mesh/Gui/PreCompiled.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/***************************************************************************
- *   Copyright (c) 2003 Werner Mayer <wmayer[at]users.sourceforge.net>     *
- *                                                                         *
- *   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/Mesh/Gui/PreCompiled.h b/src/Mod/Mesh/Gui/PreCompiled.h
index fe239dc4e1..7414df8eeb 100644
--- a/src/Mod/Mesh/Gui/PreCompiled.h
+++ b/src/Mod/Mesh/Gui/PreCompiled.h
@@ -25,8 +25,6 @@
 
 #include <FCConfig.h>
 
-#ifdef _PreComp_
-
 // standard
 #include <ios>
 
@@ -46,8 +44,8 @@
 // Inventor
 #include <Gui/InventorAll.h>
 
-#elif defined(FC_OS_WIN32)
+#if defined(FC_OS_WIN32)
 #include <Windows.h>
-#endif  //_PreComp_
+#endif
 
 #endif  // MESHGUI_PRECOMPILED_H
diff --git a/src/Mod/Mesh/Gui/PropertyEditorMesh.cpp b/src/Mod/Mesh/Gui/PropertyEditorMesh.cpp
index ca04676eae..816403a154 100644
--- a/src/Mod/Mesh/Gui/PropertyEditorMesh.cpp
+++ b/src/Mod/Mesh/Gui/PropertyEditorMesh.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Mod/Mesh/App/MeshFeature.h>
 
diff --git a/src/Mod/Mesh/Gui/RemeshGmsh.cpp b/src/Mod/Mesh/Gui/RemeshGmsh.cpp
index f33129db76..76a38fec1d 100644
--- a/src/Mod/Mesh/Gui/RemeshGmsh.cpp
+++ b/src/Mod/Mesh/Gui/RemeshGmsh.cpp
@@ -20,13 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QElapsedTimer>
 #include <QMessageBox>
 #include <QPointer>
 #include <QTextCursor>
-#endif
+
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/Mesh/Gui/RemeshGmsh.h b/src/Mod/Mesh/Gui/RemeshGmsh.h
index f426b80489..cb213e003f 100644
--- a/src/Mod/Mesh/Gui/RemeshGmsh.h
+++ b/src/Mod/Mesh/Gui/RemeshGmsh.h
@@ -23,6 +23,8 @@
 #ifndef MESHGUI_REMESHGMSH_H
 #define MESHGUI_REMESHGMSH_H
 
+#include <Mod/Mesh/MeshGlobal.h>
+
 #include <memory>
 #include <QDialog>
 #include <QProcess>
diff --git a/src/Mod/Mesh/Gui/RemoveComponents.cpp b/src/Mod/Mesh/Gui/RemoveComponents.cpp
index 9df41394af..8772ad62a4 100644
--- a/src/Mod/Mesh/Gui/RemoveComponents.cpp
+++ b/src/Mod/Mesh/Gui/RemoveComponents.cpp
@@ -20,11 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <limits>
+
 #include <QPushButton>
-#endif
+
 
 #include <Gui/Application.h>
 #include <Gui/Document.h>
diff --git a/src/Mod/Mesh/Gui/Segmentation.cpp b/src/Mod/Mesh/Gui/Segmentation.cpp
index ff648a83aa..d1a13032ed 100644
--- a/src/Mod/Mesh/Gui/Segmentation.cpp
+++ b/src/Mod/Mesh/Gui/Segmentation.cpp
@@ -20,11 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <limits>
 #include <sstream>
-#endif
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/Mesh/Gui/SegmentationBestFit.cpp b/src/Mod/Mesh/Gui/SegmentationBestFit.cpp
index c157e65383..472c35869d 100644
--- a/src/Mod/Mesh/Gui/SegmentationBestFit.cpp
+++ b/src/Mod/Mesh/Gui/SegmentationBestFit.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <limits>
 #include <sstream>
 
@@ -30,7 +28,6 @@
 #include <QMessageBox>
 #include <QPointer>
 #include <QVBoxLayout>
-#endif
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/Mesh/Gui/Selection.cpp b/src/Mod/Mesh/Gui/Selection.cpp
index b78934e8f1..d0c402aada 100644
--- a/src/Mod/Mesh/Gui/Selection.cpp
+++ b/src/Mod/Mesh/Gui/Selection.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "Selection.h"
 #include "ui_Selection.h"
diff --git a/src/Mod/Mesh/Gui/Selection.h b/src/Mod/Mesh/Gui/Selection.h
index 1d766e3d4c..5f5bd2a28f 100644
--- a/src/Mod/Mesh/Gui/Selection.h
+++ b/src/Mod/Mesh/Gui/Selection.h
@@ -23,6 +23,8 @@
 #ifndef MESHGUI_SELECTION_H
 #define MESHGUI_SELECTION_H
 
+#include <Mod/Mesh/MeshGlobal.h>
+
 #include <vector>
 #include <QWidget>
 
diff --git a/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.cpp b/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.cpp
index a309ff52c0..e425e5ac39 100644
--- a/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.cpp
+++ b/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.cpp
@@ -20,15 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
+#include <FCConfig.h>
 
 #ifndef FC_OS_WIN32
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES 1
 #endif
+#else
+#include <windows.h>
 #endif
 
-#ifndef _PreComp_
 #include <algorithm>
 #include <limits>
 #ifdef FC_OS_MACOSX
@@ -54,7 +55,7 @@
 #include <Inventor/elements/SoViewingMatrixElement.h>
 #include <Inventor/errors/SoDebugError.h>
 #include <Inventor/nodes/SoCoordinate3.h>
-#endif
+
 #include <Inventor/C/glue/gl.h>
 
 #include <Gui/GLBuffer.h>
diff --git a/src/Mod/Mesh/Gui/SoFCMeshObject.cpp b/src/Mod/Mesh/Gui/SoFCMeshObject.cpp
index 268e40fde5..5673577131 100644
--- a/src/Mod/Mesh/Gui/SoFCMeshObject.cpp
+++ b/src/Mod/Mesh/Gui/SoFCMeshObject.cpp
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <FCConfig.h>
+
 #include <algorithm>
 #include <limits>
 #ifdef FC_OS_WIN32
@@ -48,7 +48,6 @@
 #include <Inventor/details/SoFaceDetail.h>
 #include <Inventor/details/SoLineDetail.h>
 #include <Inventor/misc/SoState.h>
-#endif
 
 #include <Base/Console.h>
 #include <Base/Exception.h>
diff --git a/src/Mod/Mesh/Gui/SoPolygon.cpp b/src/Mod/Mesh/Gui/SoPolygon.cpp
index bd8f626136..c15b62184f 100644
--- a/src/Mod/Mesh/Gui/SoPolygon.cpp
+++ b/src/Mod/Mesh/Gui/SoPolygon.cpp
@@ -20,9 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <limits>
+
+#include <FCConfig.h>
+
 #ifdef FC_OS_WIN32
 #include <Windows.h>
 #endif
@@ -39,7 +40,6 @@
 #include <Inventor/elements/SoCoordinateElement.h>
 #include <Inventor/elements/SoLazyElement.h>
 #include <Inventor/misc/SoState.h>
-#endif
 
 #include "SoPolygon.h"
 
diff --git a/src/Mod/Mesh/Gui/ThumbnailExtension.cpp b/src/Mod/Mesh/Gui/ThumbnailExtension.cpp
index 2c3aba2b1b..9f12b06ee6 100644
--- a/src/Mod/Mesh/Gui/ThumbnailExtension.cpp
+++ b/src/Mod/Mesh/Gui/ThumbnailExtension.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QBuffer>
 #include <QByteArray>
 
@@ -32,7 +30,6 @@
 #include <Inventor/nodes/SoIndexedFaceSet.h>
 #include <Inventor/nodes/SoOrthographicCamera.h>
 #include <Inventor/nodes/SoSeparator.h>
-#endif
 
 #include <Gui/SoFCOffscreenRenderer.h>
 
diff --git a/src/Mod/Mesh/Gui/ViewProvider.cpp b/src/Mod/Mesh/Gui/ViewProvider.cpp
index a4f017265a..6739cd416a 100644
--- a/src/Mod/Mesh/Gui/ViewProvider.cpp
+++ b/src/Mod/Mesh/Gui/ViewProvider.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QAction>
 #include <QMenu>
 #include <cmath>
@@ -50,7 +48,6 @@
 #include <Inventor/nodes/SoShapeHints.h>
 #include <Inventor/nodes/SoTransform.h>
 #include <Inventor/VRMLnodes/SoVRMLGroup.h>
-#endif
 
 #include <QFuture>
 #include <QFutureWatcher>
diff --git a/src/Mod/Mesh/Gui/ViewProviderCurvature.cpp b/src/Mod/Mesh/Gui/ViewProviderCurvature.cpp
index af5a69cd19..6226814687 100644
--- a/src/Mod/Mesh/Gui/ViewProviderCurvature.cpp
+++ b/src/Mod/Mesh/Gui/ViewProviderCurvature.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <algorithm>
 #include <iomanip>
 #include <ios>
@@ -39,7 +37,6 @@
 #include <Inventor/nodes/SoMaterial.h>
 #include <Inventor/nodes/SoShapeHints.h>
 #include <Inventor/sensors/SoIdleSensor.h>
-#endif
 
 #include <boost/range/adaptors.hpp>
 
diff --git a/src/Mod/Mesh/Gui/ViewProviderDefects.cpp b/src/Mod/Mesh/Gui/ViewProviderDefects.cpp
index 161decef12..c6a05ed54d 100644
--- a/src/Mod/Mesh/Gui/ViewProviderDefects.cpp
+++ b/src/Mod/Mesh/Gui/ViewProviderDefects.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <Inventor/nodes/SoBaseColor.h>
 #include <Inventor/nodes/SoCoordinate3.h>
 #include <Inventor/nodes/SoDrawStyle.h>
@@ -30,7 +28,7 @@
 #include <Inventor/nodes/SoMarkerSet.h>
 #include <Inventor/nodes/SoSeparator.h>
 #include <Inventor/nodes/SoShapeHints.h>
-#endif
+
 
 #include <App/Application.h>
 #include <Base/Parameter.h>
diff --git a/src/Mod/Mesh/Gui/ViewProviderMeshFaceSet.cpp b/src/Mod/Mesh/Gui/ViewProviderMeshFaceSet.cpp
index 7c87803a1b..ff29292644 100644
--- a/src/Mod/Mesh/Gui/ViewProviderMeshFaceSet.cpp
+++ b/src/Mod/Mesh/Gui/ViewProviderMeshFaceSet.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <algorithm>
 
 #include <Inventor/nodes/SoBaseColor.h>
@@ -30,7 +28,6 @@
 #include <Inventor/nodes/SoIndexedLineSet.h>
 #include <Inventor/nodes/SoMaterial.h>
 #include <Inventor/nodes/SoSeparator.h>
-#endif
 
 #include <App/Document.h>
 #include <Gui/Selection/Selection.h>
diff --git a/src/Mod/Mesh/Gui/ViewProviderMeshPyImp.cpp b/src/Mod/Mesh/Gui/ViewProviderMeshPyImp.cpp
index 371492c1f1..17a5371ff8 100644
--- a/src/Mod/Mesh/Gui/ViewProviderMeshPyImp.cpp
+++ b/src/Mod/Mesh/Gui/ViewProviderMeshPyImp.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <sstream>
-#endif
+
 
 #include "ViewProvider.h"
 // inclusion of the generated files (generated out of ViewProviderMeshPy.xml)
diff --git a/src/Mod/Mesh/Gui/ViewProviderPython.cpp b/src/Mod/Mesh/Gui/ViewProviderPython.cpp
index f8501f3ffc..6f1b7d2ec8 100644
--- a/src/Mod/Mesh/Gui/ViewProviderPython.cpp
+++ b/src/Mod/Mesh/Gui/ViewProviderPython.cpp
@@ -22,7 +22,6 @@
 
 
 // clang-format off
-#include "PreCompiled.h"
 #include "ViewProviderPython.h"
 // clang-format on
 
diff --git a/src/Mod/Mesh/Gui/ViewProviderTransform.cpp b/src/Mod/Mesh/Gui/ViewProviderTransform.cpp
index 933c1e4a07..f23ff8af7f 100644
--- a/src/Mod/Mesh/Gui/ViewProviderTransform.cpp
+++ b/src/Mod/Mesh/Gui/ViewProviderTransform.cpp
@@ -20,14 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <Inventor/manips/SoTransformerManip.h>
 #include <Inventor/nodes/SoDrawStyle.h>
 #include <Inventor/nodes/SoMaterial.h>
 #include <Inventor/nodes/SoNormalBinding.h>
 #include <Inventor/nodes/SoSeparator.h>
-#endif
+
 
 #include <Gui/Selection/SoFCSelection.h>
 #include <Mod/Mesh/App/MeshFeature.h>
diff --git a/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.cpp b/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.cpp
index c1d4b778ac..8859341658 100644
--- a/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.cpp
+++ b/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <Inventor/draggers/SoTrackballDragger.h>
 #include <Inventor/manips/SoTransformerManip.h>
 #include <Inventor/nodes/SoAntiSquish.h>
@@ -31,7 +29,7 @@
 #include <Inventor/nodes/SoMaterialBinding.h>
 #include <Inventor/nodes/SoSeparator.h>
 #include <Inventor/nodes/SoSurroundScale.h>
-#endif
+
 
 #include <Base/Console.h>
 #include <Gui/Selection/SoFCSelection.h>
diff --git a/src/Mod/Mesh/Gui/Workbench.cpp b/src/Mod/Mesh/Gui/Workbench.cpp
index e3a2e22b34..e7e96f2c7e 100644
--- a/src/Mod/Mesh/Gui/Workbench.cpp
+++ b/src/Mod/Mesh/Gui/Workbench.cpp
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QGroupBox>
 #include <QObject>
 #include <QLabel>
-#endif
+
 
 #include <Gui/Application.h>
 #include <Gui/Command.h>