diff --git a/src/Mod/CAM/PathSimulator/App/PreCompiled.h b/src/Mod/CAM/PathSimulator/App/PreCompiled.h
index a89f828e6e..870535dc66 100644
--- a/src/Mod/CAM/PathSimulator/App/PreCompiled.h
+++ b/src/Mod/CAM/PathSimulator/App/PreCompiled.h
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef APP_PRECOMPILED_H
-#define APP_PRECOMPILED_H
+#ifndef PATH_SIMULATOR_APP_PRECOMPILED_H
+#define PATH_SIMULATOR_APP_PRECOMPILED_H
 
 #include <FCConfig.h>
 
diff --git a/src/Mod/CAM/PathSimulator/AppGL/PreCompiled.h b/src/Mod/CAM/PathSimulator/AppGL/PreCompiled.h
index a89f828e6e..f3f9e92376 100644
--- a/src/Mod/CAM/PathSimulator/AppGL/PreCompiled.h
+++ b/src/Mod/CAM/PathSimulator/AppGL/PreCompiled.h
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef APP_PRECOMPILED_H
-#define APP_PRECOMPILED_H
+#ifndef PATH_SIMULATOR_APPGL_PRECOMPILED_H
+#define PATH_SIMULATOR_APPGL_PRECOMPILED_H
 
 #include <FCConfig.h>
 
diff --git a/src/Mod/Cloud/App/PreCompiled.h b/src/Mod/Cloud/App/PreCompiled.h
index 24dc9b1c3e..2c093f3fc3 100644
--- a/src/Mod/Cloud/App/PreCompiled.h
+++ b/src/Mod/Cloud/App/PreCompiled.h
@@ -21,8 +21,8 @@
  ***************************************************************************/
 
 
-#ifndef APP_PRECOMPILED_H
-#define APP_PRECOMPILED_H
+#ifndef CLOUD_APP_PRECOMPILED_H
+#define CLOUD_APP_PRECOMPILED_H
 
 #include <FCConfig.h>
 
diff --git a/src/Mod/Cloud/Gui/PreCompiled.h b/src/Mod/Cloud/Gui/PreCompiled.h
index e4ac1e867d..b531f3bdb1 100644
--- a/src/Mod/Cloud/Gui/PreCompiled.h
+++ b/src/Mod/Cloud/Gui/PreCompiled.h
@@ -21,8 +21,8 @@
  ***************************************************************************/
 
 
-#ifndef GUI_PRECOMPILED_H
-#define GUI_PRECOMPILED_H
+#ifndef CLOUD_GUI_PRECOMPILED_H
+#define CLOUD_GUI_PRECOMPILED_H
 
 #include <FCConfig.h>
 
diff --git a/src/Mod/Import/App/PreCompiled.h b/src/Mod/Import/App/PreCompiled.h
index 7c41caec2c..157b9e6fd8 100644
--- a/src/Mod/Import/App/PreCompiled.h
+++ b/src/Mod/Import/App/PreCompiled.h
@@ -21,8 +21,8 @@
  ***************************************************************************/
 
 
-#ifndef __PRECOMPILED__
-#define __PRECOMPILED__
+#ifndef IMPORT_APP_PRECOMPILED_H
+#define IMPORT_APP_PRECOMPILED_H
 
 #include <FCConfig.h>
 
diff --git a/src/Mod/Import/Gui/PreCompiled.h b/src/Mod/Import/Gui/PreCompiled.h
index fdafc1a21f..6584813a0c 100644
--- a/src/Mod/Import/Gui/PreCompiled.h
+++ b/src/Mod/Import/Gui/PreCompiled.h
@@ -21,8 +21,8 @@
  ***************************************************************************/
 
 
-#ifndef __PRECOMPILED_GUI__
-#define __PRECOMPILED_GUI__
+#ifndef IMPORT_GUI_PRECOMPILED_H
+#define IMPORT_GUI_PRECOMPILED_H
 
 #include <FCConfig.h>
 
diff --git a/src/Mod/Inspection/App/PreCompiled.h b/src/Mod/Inspection/App/PreCompiled.h
index 71c68dc908..447cd24797 100644
--- a/src/Mod/Inspection/App/PreCompiled.h
+++ b/src/Mod/Inspection/App/PreCompiled.h
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef APP_PRECOMPILED_H
-#define APP_PRECOMPILED_H
+#ifndef INSPECTION_APP_PRECOMPILED_H
+#define INSPECTION_APP_PRECOMPILED_H
 
 #include <FCConfig.h>
 
diff --git a/src/Mod/Inspection/Gui/PreCompiled.h b/src/Mod/Inspection/Gui/PreCompiled.h
index aa1c80f707..74816df791 100644
--- a/src/Mod/Inspection/Gui/PreCompiled.h
+++ b/src/Mod/Inspection/Gui/PreCompiled.h
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef GUI_PRECOMPILED_H
-#define GUI_PRECOMPILED_H
+#ifndef INSPECTION_GUI_PRECOMPILED_H
+#define INSPECTION_GUI_PRECOMPILED_H
 
 #include <FCConfig.h>
 
diff --git a/src/Mod/JtReader/App/PreCompiled.h b/src/Mod/JtReader/App/PreCompiled.h
index e56c443a97..ccfecec3af 100644
--- a/src/Mod/JtReader/App/PreCompiled.h
+++ b/src/Mod/JtReader/App/PreCompiled.h
@@ -3,9 +3,8 @@
  *   LGPL                                                                  *
  ***************************************************************************/
 
-#ifndef __PRECOMPILED__
-
-#define __PRECOMPILED__
+#ifndef JTREADER_APP_PRECOMPILED_H
+#define JTREADER_APP_PRECOMPILED_H
 
 #include <FCConfig.h>
 
diff --git a/src/Mod/MeshPart/App/PreCompiled.h b/src/Mod/MeshPart/App/PreCompiled.h
index b175099d14..0905376a54 100644
--- a/src/Mod/MeshPart/App/PreCompiled.h
+++ b/src/Mod/MeshPart/App/PreCompiled.h
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef __PRECOMPILED__
-#define __PRECOMPILED__
+#ifndef MESH_PART_APP_PRECOMPILED_H
+#define MESH_PART_APP_PRECOMPILED_H
 
 #include <FCConfig.h>
 
diff --git a/src/Mod/MeshPart/Gui/PreCompiled.h b/src/Mod/MeshPart/Gui/PreCompiled.h
index 46bfb71fac..5a4b8be6cc 100644
--- a/src/Mod/MeshPart/Gui/PreCompiled.h
+++ b/src/Mod/MeshPart/Gui/PreCompiled.h
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef __PRECOMPILED_GUI__
-#define __PRECOMPILED_GUI__
+#ifndef MESH_PART_GUI_PRECOMPILED_H
+#define MESH_PART_GUI_PRECOMPILED_H
 
 #include <FCConfig.h>
 
diff --git a/src/Mod/PartDesign/App/PreCompiled.h b/src/Mod/PartDesign/App/PreCompiled.h
index 90618407a5..0498d94641 100644
--- a/src/Mod/PartDesign/App/PreCompiled.h
+++ b/src/Mod/PartDesign/App/PreCompiled.h
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef __PRECOMPILED__
-#define __PRECOMPILED__
+#ifndef PART_DESIGN_APP_PRECOMPILED_H
+#define PART_DESIGN_APP_PRECOMPILED_H
 
 #include <FCConfig.h>
 
diff --git a/src/Mod/PartDesign/Gui/PreCompiled.h b/src/Mod/PartDesign/Gui/PreCompiled.h
index a11e46bab9..2175ca393e 100644
--- a/src/Mod/PartDesign/Gui/PreCompiled.h
+++ b/src/Mod/PartDesign/Gui/PreCompiled.h
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef __PRECOMPILED_GUI__
-#define __PRECOMPILED_GUI__
+#ifndef PART_DESIGN_PRECOMPILED_H
+#define PART_DESIGN_PRECOMPILED_H
 
 #include <FCConfig.h>
 
@@ -58,4 +58,4 @@
 # include <Gui/InventorAll.h>
 
 #endif // _PreComp_
-#endif // __PRECOMPILED_GUI__
+#endif // PART_DESIGN_PRECOMPILED_H
diff --git a/src/Mod/ReverseEngineering/App/PreCompiled.h b/src/Mod/ReverseEngineering/App/PreCompiled.h
index 5e279d222a..54aab5795c 100644
--- a/src/Mod/ReverseEngineering/App/PreCompiled.h
+++ b/src/Mod/ReverseEngineering/App/PreCompiled.h
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef __PRECOMPILED__
-#define __PRECOMPILED__
+#ifndef REVERSE_ENGINEERING_APP_PRECOMPILED_H
+#define REVERSE_ENGINEERING_APP_PRECOMPILED_H
 
 #include <FCConfig.h>
 
diff --git a/src/Mod/ReverseEngineering/Gui/PreCompiled.h b/src/Mod/ReverseEngineering/Gui/PreCompiled.h
index 9304374b8e..4b6b1ef0a9 100644
--- a/src/Mod/ReverseEngineering/Gui/PreCompiled.h
+++ b/src/Mod/ReverseEngineering/Gui/PreCompiled.h
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef __PRECOMPILED_GUI__
-#define __PRECOMPILED_GUI__
+#ifndef REVERSE_ENGINEERING_GUI_PRECOMPILED_H
+#define REVERSE_ENGINEERING_GUI_PRECOMPILED_H
 
 #include <FCConfig.h>
 
diff --git a/src/Mod/Sandbox/App/PreCompiled.h b/src/Mod/Sandbox/App/PreCompiled.h
index ed9b674db7..4c93443354 100644
--- a/src/Mod/Sandbox/App/PreCompiled.h
+++ b/src/Mod/Sandbox/App/PreCompiled.h
@@ -21,8 +21,8 @@
  ***************************************************************************/
 
 
-#ifndef APP_PRECOMPILED_H
-#define APP_PRECOMPILED_H
+#ifndef SANDBOX_APP_PRECOMPILED_H
+#define SANDBOX_APP_PRECOMPILED_H
 
 #include <FCConfig.h>
 
diff --git a/src/Mod/Sandbox/Gui/PreCompiled.h b/src/Mod/Sandbox/Gui/PreCompiled.h
index f8a4715690..82ad54f308 100644
--- a/src/Mod/Sandbox/Gui/PreCompiled.h
+++ b/src/Mod/Sandbox/Gui/PreCompiled.h
@@ -21,8 +21,8 @@
  ***************************************************************************/
 
 
-#ifndef GUI_PRECOMPILED_H
-#define GUI_PRECOMPILED_H
+#ifndef SANDBOX_GUI_PRECOMPILED_H
+#define SANDBOX_GUI_PRECOMPILED_H
 
 #include <FCConfig.h>
 
diff --git a/src/Mod/Sketcher/App/PreCompiled.h b/src/Mod/Sketcher/App/PreCompiled.h
index fee75e3516..bb59d2261a 100644
--- a/src/Mod/Sketcher/App/PreCompiled.h
+++ b/src/Mod/Sketcher/App/PreCompiled.h
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef __PRECOMPILED__
-#define __PRECOMPILED__
+#ifndef SKETCHER_APP_PRECOMPILED_H
+#define SKETCHER_APP_PRECOMPILED_H
 
 #include <FCConfig.h>
 
diff --git a/src/Mod/Sketcher/Gui/PreCompiled.h b/src/Mod/Sketcher/Gui/PreCompiled.h
index 896b418c35..4fecadd51f 100644
--- a/src/Mod/Sketcher/Gui/PreCompiled.h
+++ b/src/Mod/Sketcher/Gui/PreCompiled.h
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef __PRECOMPILED_GUI__
-#define __PRECOMPILED_GUI__
+#ifndef SKETCHER_GUI_PRECOMPILED_H
+#define SKETCHER_GUI_PRECOMPILED_H
 
 #include <FCConfig.h>
 
@@ -69,4 +69,4 @@
 // all of Inventor
 #include <Gui/InventorAll.h>
 
-#endif  // __PRECOMPILED_GUI__
+#endif  // SKETCHER_GUI_PRECOMPILED_H
diff --git a/src/Mod/Spreadsheet/App/PreCompiled.h b/src/Mod/Spreadsheet/App/PreCompiled.h
index e83c123319..a440f0d594 100644
--- a/src/Mod/Spreadsheet/App/PreCompiled.h
+++ b/src/Mod/Spreadsheet/App/PreCompiled.h
@@ -21,8 +21,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef SPREADSHEET_PRECOMPILED_H
-#define SPREADSHEET_PRECOMPILED_H
+#ifndef SPREADSHEET_APP_PRECOMPILED_H
+#define SPREADSHEET_APP_PRECOMPILED_H
 
 #include <FCConfig.h>
 
@@ -46,4 +46,4 @@
 // Qt
 #include <QLocale>
 
-#endif  // SPREADSHEET_PRECOMPILED_H
+#endif  // SPREADSHEET_APP_PRECOMPILED_H
diff --git a/src/Mod/Spreadsheet/Gui/PreCompiled.h b/src/Mod/Spreadsheet/Gui/PreCompiled.h
index 832bbfe9bf..6d08c5ef6a 100644
--- a/src/Mod/Spreadsheet/Gui/PreCompiled.h
+++ b/src/Mod/Spreadsheet/Gui/PreCompiled.h
@@ -21,8 +21,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef SPREADSHEET_PRECOMPILED_H
-#define SPREADSHEET_PRECOMPILED_H
+#ifndef SPREADSHEET_GUI_PRECOMPILED_H
+#define SPREADSHEET_GUI_PRECOMPILED_H
 
 #include <FCConfig.h>
 
@@ -40,4 +40,4 @@
 // Qt Toolkit
 #include <Gui/QtAll.h>
 
-#endif  // SPREADSHEET_PRECOMPILED_H
+#endif  // SPREADSHEET_GUI_PRECOMPILED_H
diff --git a/src/Mod/Surface/Gui/PreCompiled.h b/src/Mod/Surface/Gui/PreCompiled.h
index e5adb0b8c9..e29d145fdc 100644
--- a/src/Mod/Surface/Gui/PreCompiled.h
+++ b/src/Mod/Surface/Gui/PreCompiled.h
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef GUI_PRECOMPILED_H
-#define GUI_PRECOMPILED_H
+#ifndef SURFACE_GUI_PRECOMPILED_H
+#define SURFACE_GUI_PRECOMPILED_H
 
 #include <FCConfig.h>
 
diff --git a/src/Mod/Test/Gui/PreCompiled.h b/src/Mod/Test/Gui/PreCompiled.h
index 96c9e25108..b88a01c6ed 100644
--- a/src/Mod/Test/Gui/PreCompiled.h
+++ b/src/Mod/Test/Gui/PreCompiled.h
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef __PRECOMPILED_GUI__
-#define __PRECOMPILED_GUI__
+#ifndef TEST_GUI_PRECOMPILED_H
+#define TEST_GUI_PRECOMPILED_H
 
 #include <FCConfig.h>
 
diff --git a/src/Mod/Web/App/PreCompiled.h b/src/Mod/Web/App/PreCompiled.h
index b33f4d2376..8db93b3e8d 100644
--- a/src/Mod/Web/App/PreCompiled.h
+++ b/src/Mod/Web/App/PreCompiled.h
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef APP_PRECOMPILED_H
-#define APP_PRECOMPILED_H
+#ifndef WEB_APP_PRECOMPILED_H
+#define WEB_APP_PRECOMPILED_H
 
 #include <FCConfig.h>
 
diff --git a/src/Tools/_TEMPLATE_/App/PreCompiled.h b/src/Tools/_TEMPLATE_/App/PreCompiled.h
index 597dc8f8b5..e3ccb18815 100644
--- a/src/Tools/_TEMPLATE_/App/PreCompiled.h
+++ b/src/Tools/_TEMPLATE_/App/PreCompiled.h
@@ -21,8 +21,8 @@
  ***************************************************************************/
 
 
-#ifndef APP_PRECOMPILED_H
-#define APP_PRECOMPILED_H
+#ifndef TEMPLATE_APP_PRECOMPILED_H
+#define TEMPLATE_APP_PRECOMPILED_H
 
 #include <FCConfig.h>
 
diff --git a/src/Tools/_TEMPLATE_/Gui/PreCompiled.h b/src/Tools/_TEMPLATE_/Gui/PreCompiled.h
index 1feab1e177..c7ec7c084a 100644
--- a/src/Tools/_TEMPLATE_/Gui/PreCompiled.h
+++ b/src/Tools/_TEMPLATE_/Gui/PreCompiled.h
@@ -21,8 +21,8 @@
  ***************************************************************************/
 
 
-#ifndef GUI_PRECOMPILED_H
-#define GUI_PRECOMPILED_H
+#ifndef TEMPLATE_GUI_PRECOMPILED_H
+#define TEMPLATE_GUI_PRECOMPILED_H
 
 #include <FCConfig.h>
 
diff --git a/src/Tools/embedded/Qt/cxx/PreCompiled.h b/src/Tools/embedded/Qt/cxx/PreCompiled.h
index 2f6004a1db..ddd265a89e 100644
--- a/src/Tools/embedded/Qt/cxx/PreCompiled.h
+++ b/src/Tools/embedded/Qt/cxx/PreCompiled.h
@@ -1,5 +1,5 @@
-#ifndef __PRECOMPILED__
-#define __PRECOMPILED__
+#ifndef QT_CXX_PRECOMPILED_H
+#define QT_CXX_PRECOMPILED_H
 
 #ifdef FC_OS_WIN32
 // cmake generates this define