diff --git a/src/App/ApplicationPy.h b/src/App/ApplicationPy.h
index ba94ee71b0..4c0bd34dfc 100644
--- a/src/App/ApplicationPy.h
+++ b/src/App/ApplicationPy.h
@@ -21,8 +21,7 @@
  *                                                                         *
  **************************************************************************/
 
-#ifndef APP_APPLICATIONPY_H
-#define APP_APPLICATIONPY_H
+#pragma once
 
 #include <Base/PyObjectBase.h>
 
@@ -90,5 +89,3 @@ public:
 };
 
 }
-
-#endif  // APP_APPLICATIONPY_H
diff --git a/src/App/Range.h b/src/App/Range.h
index e839f7cd0d..6f4f4113dd 100644
--- a/src/App/Range.h
+++ b/src/App/Range.h
@@ -26,9 +26,7 @@
 
 #include <string>
 #include <Base/Bitmask.h>
-#ifndef FC_GLOBAL_H
 #include <FCGlobal.h>
-#endif
 
 namespace App
 {
@@ -264,4 +262,4 @@ private:
 
 }  // namespace App
 
-ENABLE_BITMASK_OPERATORS(App::CellAddress::Cell)
\ No newline at end of file
+ENABLE_BITMASK_OPERATORS(App::CellAddress::Cell)
diff --git a/src/Base/Builder3D.h b/src/Base/Builder3D.h
index 5729bbc13d..c4b64e74a1 100644
--- a/src/Base/Builder3D.h
+++ b/src/Base/Builder3D.h
@@ -31,9 +31,7 @@
 #include <vector>
 #include <cstdint>
 #include <Base/Tools3D.h>
-#ifndef FC_GLOBAL_H
-# include <FCGlobal.h>
-#endif
+#include <FCGlobal.h>
 
 #include "Placement.h"
 
diff --git a/src/Base/Debugger.h b/src/Base/Debugger.h
index ffa1d289ec..767bf5cca1 100644
--- a/src/Base/Debugger.h
+++ b/src/Base/Debugger.h
@@ -27,9 +27,7 @@
 
 #include <QEventLoop>
 #include <QObject>
-#ifndef FC_GLOBAL_H
-# include <FCGlobal.h>
-#endif
+#include <FCGlobal.h>
 
 namespace Base
 {
diff --git a/src/Base/Factory.h b/src/Base/Factory.h
index cc7c813f85..6bf3e203d1 100644
--- a/src/Base/Factory.h
+++ b/src/Base/Factory.h
@@ -29,9 +29,7 @@
 #include <list>
 #include <map>
 #include <string>
-#ifndef FC_GLOBAL_H
-# include <FCGlobal.h>
-#endif
+#include <FCGlobal.h>
 
 
 namespace Base
diff --git a/src/Base/Handle.h b/src/Base/Handle.h
index 39998915a6..8845ac40ef 100644
--- a/src/Base/Handle.h
+++ b/src/Base/Handle.h
@@ -26,9 +26,7 @@
 
 #pragma once
 
-#ifndef FC_GLOBAL_H
-# include <FCGlobal.h>
-#endif
+#include <FCGlobal.h>
 
 
 class QAtomicInt;
diff --git a/src/Base/InputSource.h b/src/Base/InputSource.h
index 6d700c15a3..bb953194da 100644
--- a/src/Base/InputSource.h
+++ b/src/Base/InputSource.h
@@ -29,9 +29,7 @@
 
 #include <xercesc/util/BinInputStream.hpp>
 #include <xercesc/sax/InputSource.hpp>
-#ifndef FC_GLOBAL_H
-# include <FCGlobal.h>
-#endif
+#include <FCGlobal.h>
 
 namespace XERCES_CPP_NAMESPACE
 {
diff --git a/src/Base/Matrix.h b/src/Base/Matrix.h
index c1694f7e38..73a1a0f5b8 100644
--- a/src/Base/Matrix.h
+++ b/src/Base/Matrix.h
@@ -30,9 +30,7 @@
 #include <string>
 
 #include "Vector3D.h"
-#ifndef FC_GLOBAL_H
-# include <FCGlobal.h>
-#endif
+#include <FCGlobal.h>
 
 
 namespace Base
diff --git a/src/Base/PyTools.h b/src/Base/PyTools.h
index 41db025f43..f4a02da4d3 100644
--- a/src/Base/PyTools.h
+++ b/src/Base/PyTools.h
@@ -73,9 +73,7 @@ extern "C" {             /* a C library, but callable from C++ */
 #	undef  _POSIX_C_SOURCE
 #endif // (re-)defined in pyconfig.h
 #include <Python.h>
-#ifndef FC_GLOBAL_H
 #include <FCGlobal.h>
-#endif
 
 extern int PP_RELOAD;    /* 1=reload py modules when attributes referenced */
 extern int PP_DEBUG;     /* 1=start debugger when string/function/member run */
diff --git a/src/Base/Rotation.h b/src/Base/Rotation.h
index 0934956a55..032c7b00fd 100644
--- a/src/Base/Rotation.h
+++ b/src/Base/Rotation.h
@@ -26,9 +26,7 @@
 #pragma once
 
 #include "Vector3D.h"
-#ifndef FC_GLOBAL_H
-# include <FCGlobal.h>
-#endif
+#include <FCGlobal.h>
 
 namespace Base
 {
diff --git a/src/Base/StackWalker.h b/src/Base/StackWalker.h
index 90604362fd..ba5ce0e472 100644
--- a/src/Base/StackWalker.h
+++ b/src/Base/StackWalker.h
@@ -45,9 +45,7 @@
 #pragma once
 
 #include <Windows.h>
-#ifndef FC_GLOBAL_H
 #include <FCGlobal.h>
-#endif
 
 // special defines for VC5/6 (if no actual PSDK is installed):
 #if _MSC_VER < 1300
diff --git a/src/Base/Tools.h b/src/Base/Tools.h
index 7ca034ba18..69715f8798 100644
--- a/src/Base/Tools.h
+++ b/src/Base/Tools.h
@@ -25,9 +25,7 @@
 
 #pragma once
 
-#ifndef FC_GLOBAL_H
-# include <FCGlobal.h>
-#endif
+#include <FCGlobal.h>
 #include <algorithm>
 #include <cmath>
 #include <numbers>
diff --git a/src/Base/Tools2D.h b/src/Base/Tools2D.h
index aae37b6b20..e9e300cc8a 100644
--- a/src/Base/Tools2D.h
+++ b/src/Base/Tools2D.h
@@ -30,9 +30,7 @@
 #include <list>
 #include <vector>
 
-#ifndef FC_GLOBAL_H
-# include <FCGlobal.h>
-#endif
+#include <FCGlobal.h>
 
 
 namespace Base
diff --git a/src/Base/Tools3D.h b/src/Base/Tools3D.h
index ae169de529..287922e53f 100644
--- a/src/Base/Tools3D.h
+++ b/src/Base/Tools3D.h
@@ -25,9 +25,7 @@
 
 #pragma once
 
-#ifndef FC_GLOBAL_H
-# include <FCGlobal.h>
-#endif
+#include <FCGlobal.h>
 
 #include <cmath>
 #include <vector>
diff --git a/src/Base/Translate.h b/src/Base/Translate.h
index 6bc22ec934..b929c69fbd 100644
--- a/src/Base/Translate.h
+++ b/src/Base/Translate.h
@@ -29,9 +29,7 @@
 #include <QTranslator>
 #include <memory>
 #include <list>
-#ifndef FC_GLOBAL_H
-# include <FCGlobal.h>
-#endif
+#include <FCGlobal.h>
 
 namespace Py
 {
diff --git a/src/Base/Type.h b/src/Base/Type.h
index 4ed04a9056..600b3cedcf 100644
--- a/src/Base/Type.h
+++ b/src/Base/Type.h
@@ -31,9 +31,7 @@
 #include <map>
 #include <set>
 #include <vector>
-#ifndef FC_GLOBAL_H
-# include <FCGlobal.h>
-#endif
+#include <FCGlobal.h>
 
 namespace Base
 {
diff --git a/src/Base/UniqueNameManager.h b/src/Base/UniqueNameManager.h
index 81ecdf0ee4..b44c5a3214 100644
--- a/src/Base/UniqueNameManager.h
+++ b/src/Base/UniqueNameManager.h
@@ -24,9 +24,7 @@
 
 #pragma once
 
-#ifndef FC_GLOBAL_H
-# include <FCGlobal.h>
-#endif
+#include <FCGlobal.h>
 #include <vector>
 #include <string>
 #include <set>
diff --git a/src/Base/UnlimitedUnsigned.h b/src/Base/UnlimitedUnsigned.h
index 7945e9f238..cf28f5a494 100644
--- a/src/Base/UnlimitedUnsigned.h
+++ b/src/Base/UnlimitedUnsigned.h
@@ -24,9 +24,7 @@
 
 #pragma once
 
-#ifndef FC_GLOBAL_H
-# include <FCGlobal.h>
-#endif
+#include <FCGlobal.h>
 #include <vector>
 #include <string>
 #include <stdexcept>
diff --git a/src/Base/Uuid.h b/src/Base/Uuid.h
index 3eb99ff7cb..118456ba5b 100644
--- a/src/Base/Uuid.h
+++ b/src/Base/Uuid.h
@@ -28,9 +28,7 @@
 // Std. configurations
 
 #include <string>
-#ifndef FC_GLOBAL_H
-# include <FCGlobal.h>
-#endif
+#include <FCGlobal.h>
 
 namespace Base
 {
diff --git a/src/Mod/Assembly/Gui/Commands.h b/src/Mod/Assembly/Gui/Commands.h
index 2b146bfc08..c6e95f70fe 100644
--- a/src/Mod/Assembly/Gui/Commands.h
+++ b/src/Mod/Assembly/Gui/Commands.h
@@ -21,8 +21,7 @@
  *                                                                          *
  ***************************************************************************/
 
-#ifndef ASSEMBLYGUI_COMMANDS_H
-#define ASSEMBLYGUI_COMMANDS_H
+#pragma once
 
 #include <Mod/Assembly/App/AssemblyObject.h>
 
@@ -32,5 +31,3 @@ namespace AssemblyGui
 void CreateAssemblyCommands();
 
 }  // namespace AssemblyGui
-
-#endif  // ASSEMBLYGUI_COMMANDS_H
diff --git a/src/Mod/CAM/PathSimulator/AppGL/ViewCAMSimulator.h b/src/Mod/CAM/PathSimulator/AppGL/ViewCAMSimulator.h
index 54345d7ab2..72a3bf257e 100644
--- a/src/Mod/CAM/PathSimulator/AppGL/ViewCAMSimulator.h
+++ b/src/Mod/CAM/PathSimulator/AppGL/ViewCAMSimulator.h
@@ -22,8 +22,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef PATHSIMULATOR_VIEWCAMSIMULATOR_H
-#define PATHSIMULATOR_VIEWCAMSIMULATOR_H
+#pragma once
 
 #include <Gui/MDIView.h>
 
@@ -49,5 +48,3 @@ protected:
 };
 
 }  // namespace CAMSimulator
-
-#endif /* PATHSIMULATOR_VIEWCAMSIMULATOR_H */
diff --git a/src/Mod/Mesh/App/Core/Approximation.h b/src/Mod/Mesh/App/Core/Approximation.h
index 44a131a6b7..0fb6f57714 100644
--- a/src/Mod/Mesh/App/Core/Approximation.h
+++ b/src/Mod/Mesh/App/Core/Approximation.h
@@ -25,9 +25,8 @@
 #pragma once
 
 #include <Mod/Mesh/App/WildMagic4/Wm4QuadricSurface.h>
-#ifndef MESH_GLOBAL_H
-# include <Mod/Mesh/MeshGlobal.h>
-#endif
+#include <Mod/Mesh/MeshGlobal.h>
+
 #include <algorithm>
 #include <limits>
 #include <list>
diff --git a/src/Mod/Mesh/App/Core/Definitions.h b/src/Mod/Mesh/App/Core/Definitions.h
index 520b578ebc..1f2d92c87a 100644
--- a/src/Mod/Mesh/App/Core/Definitions.h
+++ b/src/Mod/Mesh/App/Core/Definitions.h
@@ -24,9 +24,7 @@
 
 #pragma once
 
-#ifndef MESH_GLOBAL_H
-# include <Mod/Mesh/MeshGlobal.h>
-#endif
+#include <Mod/Mesh/MeshGlobal.h>
 
 #include <limits>
 
diff --git a/src/Mod/Mesh/App/FeatureMeshExport.h b/src/Mod/Mesh/App/FeatureMeshExport.h
index 7267523cbc..c61ed9f962 100644
--- a/src/Mod/Mesh/App/FeatureMeshExport.h
+++ b/src/Mod/Mesh/App/FeatureMeshExport.h
@@ -27,9 +27,7 @@
 #include <App/DocumentObject.h>
 #include <App/PropertyLinks.h>
 
-#ifndef MESH_GLOBAL_H
-# include <Mod/Mesh/MeshGlobal.h>
-#endif
+#include <Mod/Mesh/MeshGlobal.h>
 
 namespace Mesh
 {
diff --git a/src/Mod/Mesh/App/MeshPoint.h b/src/Mod/Mesh/App/MeshPoint.h
index ae571fd45c..8ad6d0b887 100644
--- a/src/Mod/Mesh/App/MeshPoint.h
+++ b/src/Mod/Mesh/App/MeshPoint.h
@@ -29,9 +29,7 @@
 #include <Base/Vector3D.h>
 #include <Base/Handle.h>
 
-#ifndef MESH_GLOBAL_H
-# include <Mod/Mesh/MeshGlobal.h>
-#endif
+#include <Mod/Mesh/MeshGlobal.h>
 
 using Base::Vector3d;
 
diff --git a/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.h b/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.h
index 342a7372d3..9e84fc6810 100644
--- a/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.h
+++ b/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.h
@@ -24,9 +24,7 @@
 
 #pragma once
 
-#ifndef MESH_GLOBAL_H
-# include <Mod/Mesh/MeshGlobal.h>
-#endif
+#include <Mod/Mesh/MeshGlobal.h>
 #include <Gui/PropertyPage.h>
 
 
diff --git a/src/Mod/Mesh/Gui/DlgSettingsMeshView.h b/src/Mod/Mesh/Gui/DlgSettingsMeshView.h
index 068a31fe66..42ef2d02aa 100644
--- a/src/Mod/Mesh/Gui/DlgSettingsMeshView.h
+++ b/src/Mod/Mesh/Gui/DlgSettingsMeshView.h
@@ -24,9 +24,7 @@
 
 #pragma once
 
-#ifndef MESH_GLOBAL_H
-# include <Mod/Mesh/MeshGlobal.h>
-#endif
+#include <Mod/Mesh/MeshGlobal.h>
 #include <memory>
 
 #include <Gui/PropertyPage.h>
diff --git a/src/Mod/Mesh/Gui/DlgSmoothing.h b/src/Mod/Mesh/Gui/DlgSmoothing.h
index e5dc26b4a7..269d60d649 100644
--- a/src/Mod/Mesh/Gui/DlgSmoothing.h
+++ b/src/Mod/Mesh/Gui/DlgSmoothing.h
@@ -29,9 +29,7 @@
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
 
-#ifndef MESH_GLOBAL_H
-# include <Mod/Mesh/MeshGlobal.h>
-#endif
+#include <Mod/Mesh/MeshGlobal.h>
 
 class QButtonGroup;
 
diff --git a/src/Mod/Mesh/Gui/MeshSelection.h b/src/Mod/Mesh/Gui/MeshSelection.h
index 6da24f38a6..5cd934421b 100644
--- a/src/Mod/Mesh/Gui/MeshSelection.h
+++ b/src/Mod/Mesh/Gui/MeshSelection.h
@@ -29,9 +29,7 @@
 
 #include <Gui/Selection/SelectionObject.h>
 #include <Inventor/nodes/SoEventCallback.h>
-#ifndef MESH_GLOBAL_H
-# include <Mod/Mesh/MeshGlobal.h>
-#endif
+#include <Mod/Mesh/MeshGlobal.h>
 
 
 namespace Gui
diff --git a/src/Mod/Mesh/Gui/PropertyEditorMesh.h b/src/Mod/Mesh/Gui/PropertyEditorMesh.h
index 8e8cfc9870..377714461c 100644
--- a/src/Mod/Mesh/Gui/PropertyEditorMesh.h
+++ b/src/Mod/Mesh/Gui/PropertyEditorMesh.h
@@ -25,10 +25,7 @@
 #pragma once
 
 #include <Gui/propertyeditor/PropertyItem.h>
-#ifndef MESH_GLOBAL_H
-# include <Mod/Mesh/MeshGlobal.h>
-#endif
-
+#include <Mod/Mesh/MeshGlobal.h>
 
 namespace MeshGui
 {
diff --git a/src/Mod/Mesh/Gui/Segmentation.h b/src/Mod/Mesh/Gui/Segmentation.h
index 01e5298bfd..a62ee198fd 100644
--- a/src/Mod/Mesh/Gui/Segmentation.h
+++ b/src/Mod/Mesh/Gui/Segmentation.h
@@ -28,9 +28,7 @@
 
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
-#ifndef MESH_GLOBAL_H
-# include <Mod/Mesh/MeshGlobal.h>
-#endif
+#include <Mod/Mesh/MeshGlobal.h>
 
 
 // forward declarations
diff --git a/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.h b/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.h
index 9d31098242..7aec12ac41 100644
--- a/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.h
+++ b/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.h
@@ -29,9 +29,7 @@
 #include <Inventor/fields/SoSFBool.h>
 #include <Inventor/nodes/SoIndexedFaceSet.h>
 #include <vector>
-#ifndef MESH_GLOBAL_H
-# include <Mod/Mesh/MeshGlobal.h>
-#endif
+#include <Mod/Mesh/MeshGlobal.h>
 
 
 class SoGLCoordinateElement;
diff --git a/src/Mod/Mesh/Gui/SoPolygon.h b/src/Mod/Mesh/Gui/SoPolygon.h
index f299108e4f..01adb7f105 100644
--- a/src/Mod/Mesh/Gui/SoPolygon.h
+++ b/src/Mod/Mesh/Gui/SoPolygon.h
@@ -28,9 +28,7 @@
 #include <Inventor/fields/SoSFBool.h>
 #include <Inventor/fields/SoSFInt32.h>
 #include <Inventor/nodes/SoShape.h>
-#ifndef MESH_GLOBAL_H
-# include <Mod/Mesh/MeshGlobal.h>
-#endif
+#include <Mod/Mesh/MeshGlobal.h>
 
 
 namespace MeshGui
diff --git a/src/Mod/Mesh/Gui/Workbench.h b/src/Mod/Mesh/Gui/Workbench.h
index 2567a8576b..f902326a5b 100644
--- a/src/Mod/Mesh/Gui/Workbench.h
+++ b/src/Mod/Mesh/Gui/Workbench.h
@@ -25,9 +25,7 @@
 #pragma once
 
 #include <Gui/Workbench.h>
-#ifndef MESH_GLOBAL_H
-# include <Mod/Mesh/MeshGlobal.h>
-#endif
+#include <Mod/Mesh/MeshGlobal.h>
 
 
 namespace MeshGui