diff --git a/src/Mod/Robot/App/AppRobot.cpp b/src/Mod/Robot/App/AppRobot.cpp
index c6e286fdac..218818d47a 100644
--- a/src/Mod/Robot/App/AppRobot.cpp
+++ b/src/Mod/Robot/App/AppRobot.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
diff --git a/src/Mod/Robot/App/CMakeLists.txt b/src/Mod/Robot/App/CMakeLists.txt
index 816efbeb1e..fb5d767c42 100644
--- a/src/Mod/Robot/App/CMakeLists.txt
+++ b/src/Mod/Robot/App/CMakeLists.txt
@@ -42,7 +42,6 @@ SET(Python_SRCS
 
 SET(Mod_SRCS
     AppRobot.cpp
-    PreCompiled.cpp
     PreCompiled.h
 )
 
@@ -74,9 +73,9 @@ SET(Robot_SRCS
 )
 
 if(FREECAD_USE_PCH)
-    add_definitions(-D_PreComp_)
-    GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${Robot_SRCS})
-    ADD_MSVC_PRECOMPILED_HEADER(Robot PreCompiled.h PreCompiled.cpp PCH_SRCS)
+    target_precompile_headers(Robot PRIVATE
+            $<$<COMPILE_LANGUAGE:CXX>:"${CMAKE_CURRENT_LIST_DIR}/PreCompiled.h">
+    )
 endif(FREECAD_USE_PCH)
 
 # FIXME: The bundled KDL has some extensions which makes it incompatible
diff --git a/src/Mod/Robot/App/Edge2TracObject.cpp b/src/Mod/Robot/App/Edge2TracObject.cpp
index 24636dc027..fcbada9faa 100644
--- a/src/Mod/Robot/App/Edge2TracObject.cpp
+++ b/src/Mod/Robot/App/Edge2TracObject.cpp
@@ -20,13 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <BRepAdaptor_Curve.hxx>
 #include <CPnts_AbscissaPoint.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
-#endif
+
 
 #include <Base/Sequencer.h>
 #include <Mod/Part/App/PartFeature.h>
diff --git a/src/Mod/Robot/App/Edge2TracObject.h b/src/Mod/Robot/App/Edge2TracObject.h
index 4e07c89628..6526e83b0d 100644
--- a/src/Mod/Robot/App/Edge2TracObject.h
+++ b/src/Mod/Robot/App/Edge2TracObject.h
@@ -25,6 +25,8 @@
 
 #include <App/PropertyGeo.h>
 
+#include <Mod/Robot/RobotGlobal.h>
+
 #include "TrajectoryObject.h"
 
 
diff --git a/src/Mod/Robot/App/PreCompiled.cpp b/src/Mod/Robot/App/PreCompiled.cpp
deleted file mode 100644
index cde4369c5b..0000000000
--- a/src/Mod/Robot/App/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/Robot/App/PreCompiled.h b/src/Mod/Robot/App/PreCompiled.h
index 3a032ddf8a..c65b9cb243 100644
--- a/src/Mod/Robot/App/PreCompiled.h
+++ b/src/Mod/Robot/App/PreCompiled.h
@@ -25,19 +25,6 @@
 
 #include <FCConfig.h>
 
-// Exporting of App classes
-#ifdef FC_OS_WIN32
-#define RobotExport __declspec(dllexport)
-#define PartExport __declspec(dllimport)
-#define MeshExport __declspec(dllimport)
-#else  // for Linux
-#define RobotExport
-#define PartExport
-#define MeshExport
-#endif
-
-#ifdef _PreComp_
-
 // STL
 #include <memory>
 #include <sstream>
@@ -63,5 +50,4 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 
-#endif  // _PreComp_
 #endif
diff --git a/src/Mod/Robot/App/PropertyTrajectory.cpp b/src/Mod/Robot/App/PropertyTrajectory.cpp
index 1926fcaec5..cb1ba0c26a 100644
--- a/src/Mod/Robot/App/PropertyTrajectory.cpp
+++ b/src/Mod/Robot/App/PropertyTrajectory.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <sstream>
-#endif
+
 
 #include <Base/Reader.h>
 #include <Base/Writer.h>
diff --git a/src/Mod/Robot/App/PropertyTrajectory.h b/src/Mod/Robot/App/PropertyTrajectory.h
index 4593b8b995..5897782bc9 100644
--- a/src/Mod/Robot/App/PropertyTrajectory.h
+++ b/src/Mod/Robot/App/PropertyTrajectory.h
@@ -26,6 +26,8 @@
 #include <App/Property.h>
 #include <Base/BoundBox.h>
 
+#include <Mod/Robot/RobotGlobal.h>
+
 #include "Trajectory.h"
 
 
diff --git a/src/Mod/Robot/App/Robot6Axis.cpp b/src/Mod/Robot/App/Robot6Axis.cpp
index c20d630222..a46a4ad264 100644
--- a/src/Mod/Robot/App/Robot6Axis.cpp
+++ b/src/Mod/Robot/App/Robot6Axis.cpp
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include "kdl_cp/chainfksolverpos_recursive.hpp"
 #include "kdl_cp/chainiksolverpos_nr_jl.hpp"
 #include "kdl_cp/chainiksolvervel_pinv.hpp"
-#endif
+
 
 #include <Base/FileInfo.h>
 #include <Base/Reader.h>
diff --git a/src/Mod/Robot/App/Robot6AxisPyImp.cpp b/src/Mod/Robot/App/Robot6AxisPyImp.cpp
index 9dd6eba69d..a9f59a36d4 100644
--- a/src/Mod/Robot/App/Robot6AxisPyImp.cpp
+++ b/src/Mod/Robot/App/Robot6AxisPyImp.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <sstream>
-#endif
+
 
 #include <Base/MatrixPy.h>
 #include <Base/PlacementPy.h>
diff --git a/src/Mod/Robot/App/RobotAlgos.cpp b/src/Mod/Robot/App/RobotAlgos.cpp
index 28738bd48e..04382ff4fa 100644
--- a/src/Mod/Robot/App/RobotAlgos.cpp
+++ b/src/Mod/Robot/App/RobotAlgos.cpp
@@ -20,13 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include "kdl_cp/chainfksolverpos_recursive.hpp"
 #include "kdl_cp/chainiksolverpos_nr.hpp"
 #include "kdl_cp/chainiksolvervel_pinv.hpp"
 #include "kdl_cp/frames_io.hpp"
-#endif
+
 
 #include "RobotAlgos.h"
 
diff --git a/src/Mod/Robot/App/RobotObject.cpp b/src/Mod/Robot/App/RobotObject.cpp
index ed4b094ed3..ec80dd5281 100644
--- a/src/Mod/Robot/App/RobotObject.cpp
+++ b/src/Mod/Robot/App/RobotObject.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/DocumentObjectPy.h>
 #include <Base/Placement.h>
diff --git a/src/Mod/Robot/App/RobotObject.h b/src/Mod/Robot/App/RobotObject.h
index 273c275f4e..1cb39af514 100644
--- a/src/Mod/Robot/App/RobotObject.h
+++ b/src/Mod/Robot/App/RobotObject.h
@@ -26,6 +26,8 @@
 #include <App/GeoFeature.h>
 #include <App/PropertyFile.h>
 
+#include <Mod/Robot/RobotGlobal.h>
+
 #include "Robot6Axis.h"
 
 
diff --git a/src/Mod/Robot/App/RobotObjectPyImp.cpp b/src/Mod/Robot/App/RobotObjectPyImp.cpp
index 4bb779a232..3a58b6ea73 100644
--- a/src/Mod/Robot/App/RobotObjectPyImp.cpp
+++ b/src/Mod/Robot/App/RobotObjectPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 // clang-format off
 // inclusion of the generated files (generated out of RobotObjectPy.xml)
diff --git a/src/Mod/Robot/App/Simulation.cpp b/src/Mod/Robot/App/Simulation.cpp
index 637a84bd58..caa1698dbc 100644
--- a/src/Mod/Robot/App/Simulation.cpp
+++ b/src/Mod/Robot/App/Simulation.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "Simulation.h"
 
diff --git a/src/Mod/Robot/App/Simulation.h b/src/Mod/Robot/App/Simulation.h
index 67fadc8dc0..37d9ced27c 100644
--- a/src/Mod/Robot/App/Simulation.h
+++ b/src/Mod/Robot/App/Simulation.h
@@ -25,6 +25,8 @@
 
 #include <Base/Placement.h>
 
+#include <Mod/Robot/RobotGlobal.h>
+
 #include "Robot6Axis.h"
 #include "Trajectory.h"
 
diff --git a/src/Mod/Robot/App/Trajectory.cpp b/src/Mod/Robot/App/Trajectory.cpp
index 9cfc704604..299c0e3e1b 100644
--- a/src/Mod/Robot/App/Trajectory.cpp
+++ b/src/Mod/Robot/App/Trajectory.cpp
@@ -20,9 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <memory>
 
 #include "kdl_cp/path_line.hpp"
@@ -32,7 +30,6 @@
 #include "kdl_cp/trajectory_segment.hpp"
 #include "kdl_cp/utilities/error.h"
 #include "kdl_cp/velocityprofile_trap.hpp"
-#endif
 
 #include <Base/Exception.h>
 #include <Base/Reader.h>
diff --git a/src/Mod/Robot/App/Trajectory.h b/src/Mod/Robot/App/Trajectory.h
index 1a9cb4c722..44d93344f0 100644
--- a/src/Mod/Robot/App/Trajectory.h
+++ b/src/Mod/Robot/App/Trajectory.h
@@ -28,6 +28,8 @@
 #include <Base/Persistence.h>
 #include <Base/Placement.h>
 
+#include <Mod/Robot/RobotGlobal.h>
+
 #include "Waypoint.h"
 
 
diff --git a/src/Mod/Robot/App/TrajectoryCompound.cpp b/src/Mod/Robot/App/TrajectoryCompound.cpp
index d6c6811582..934e489a74 100644
--- a/src/Mod/Robot/App/TrajectoryCompound.cpp
+++ b/src/Mod/Robot/App/TrajectoryCompound.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "TrajectoryCompound.h"
 #include "Waypoint.h"
diff --git a/src/Mod/Robot/App/TrajectoryCompound.h b/src/Mod/Robot/App/TrajectoryCompound.h
index afb7ddb64e..c44a920a8a 100644
--- a/src/Mod/Robot/App/TrajectoryCompound.h
+++ b/src/Mod/Robot/App/TrajectoryCompound.h
@@ -25,6 +25,8 @@
 
 #include <App/PropertyLinks.h>
 
+#include <Mod/Robot/RobotGlobal.h>
+
 #include "TrajectoryObject.h"
 
 
diff --git a/src/Mod/Robot/App/TrajectoryDressUpObject.cpp b/src/Mod/Robot/App/TrajectoryDressUpObject.cpp
index 54d6a4906f..ac254fb146 100644
--- a/src/Mod/Robot/App/TrajectoryDressUpObject.cpp
+++ b/src/Mod/Robot/App/TrajectoryDressUpObject.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "TrajectoryDressUpObject.h"
 #include "Waypoint.h"
diff --git a/src/Mod/Robot/App/TrajectoryDressUpObject.h b/src/Mod/Robot/App/TrajectoryDressUpObject.h
index 2e763e7de7..8102249622 100644
--- a/src/Mod/Robot/App/TrajectoryDressUpObject.h
+++ b/src/Mod/Robot/App/TrajectoryDressUpObject.h
@@ -26,6 +26,8 @@
 #include <App/PropertyGeo.h>
 #include <App/PropertyUnits.h>
 
+#include <Mod/Robot/RobotGlobal.h>
+
 #include "TrajectoryObject.h"
 
 
diff --git a/src/Mod/Robot/App/TrajectoryObject.cpp b/src/Mod/Robot/App/TrajectoryObject.cpp
index c627f34a0a..4d2bf2da19 100644
--- a/src/Mod/Robot/App/TrajectoryObject.cpp
+++ b/src/Mod/Robot/App/TrajectoryObject.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/DocumentObjectPy.h>
 #include <Base/Placement.h>
diff --git a/src/Mod/Robot/App/TrajectoryObject.h b/src/Mod/Robot/App/TrajectoryObject.h
index 44aabdbe94..2ba9d4c1b1 100644
--- a/src/Mod/Robot/App/TrajectoryObject.h
+++ b/src/Mod/Robot/App/TrajectoryObject.h
@@ -26,6 +26,8 @@
 #include <App/GeoFeature.h>
 #include <App/PropertyGeo.h>
 
+#include <Mod/Robot/RobotGlobal.h>
+
 #include "PropertyTrajectory.h"
 #include "Trajectory.h"
 
diff --git a/src/Mod/Robot/App/TrajectoryPyImp.cpp b/src/Mod/Robot/App/TrajectoryPyImp.cpp
index 159b59f623..70bcd7343f 100644
--- a/src/Mod/Robot/App/TrajectoryPyImp.cpp
+++ b/src/Mod/Robot/App/TrajectoryPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/PlacementPy.h>
 
diff --git a/src/Mod/Robot/App/Waypoint.cpp b/src/Mod/Robot/App/Waypoint.cpp
index 921eb166d0..c5ebb2f16d 100644
--- a/src/Mod/Robot/App/Waypoint.cpp
+++ b/src/Mod/Robot/App/Waypoint.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include "kdl_cp/chain.hpp"
-#endif
+
 
 #include <Base/Reader.h>
 #include <Base/Writer.h>
diff --git a/src/Mod/Robot/App/WaypointPyImp.cpp b/src/Mod/Robot/App/WaypointPyImp.cpp
index 6c8870a0d9..2724b115f6 100644
--- a/src/Mod/Robot/App/WaypointPyImp.cpp
+++ b/src/Mod/Robot/App/WaypointPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/PlacementPy.h>
 #include <Base/PyWrapParseTupleAndKeywords.h>
diff --git a/src/Mod/Robot/Gui/AppRobotGui.cpp b/src/Mod/Robot/Gui/AppRobotGui.cpp
index 5e53149020..5aa0f8b894 100644
--- a/src/Mod/Robot/Gui/AppRobotGui.cpp
+++ b/src/Mod/Robot/Gui/AppRobotGui.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
diff --git a/src/Mod/Robot/Gui/CMakeLists.txt b/src/Mod/Robot/Gui/CMakeLists.txt
index 1fcf6d5ec0..cb94c94e78 100644
--- a/src/Mod/Robot/Gui/CMakeLists.txt
+++ b/src/Mod/Robot/Gui/CMakeLists.txt
@@ -23,7 +23,6 @@ set(RobotGui_UIC_SRCS
 SET(RobotGui_SRCS_Module
     AppRobotGui.cpp
     Resources/Robot.qrc
-    PreCompiled.cpp
     PreCompiled.h
     Workbench.cpp
     Workbench.h
@@ -101,18 +100,18 @@ SET(RobotGui_SRCS
     ${RobotGui_SRCS_TaskDlg}
 )
 
-if(FREECAD_USE_PCH)
-    add_definitions(-D_PreComp_)
-    GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${RobotGui_SRCS})
-    ADD_MSVC_PRECOMPILED_HEADER(RobotGui PreCompiled.h PreCompiled.cpp PCH_SRCS)
-endif(FREECAD_USE_PCH)
-
 SET(RobotGuiIcon_SVG
     Resources/icons/RobotWorkbench.svg
 )
 
 add_library(RobotGui SHARED ${RobotGui_SRCS} ${RobotGuiIcon_SVG})
 
+if(FREECAD_USE_PCH)
+    target_precompile_headers(RobotGui PRIVATE
+            $<$<COMPILE_LANGUAGE:CXX>:"${CMAKE_CURRENT_LIST_DIR}/PreCompiled.h">
+    )
+endif(FREECAD_USE_PCH)
+
 target_include_directories(
     RobotGui
     PRIVATE
diff --git a/src/Mod/Robot/Gui/Command.cpp b/src/Mod/Robot/Gui/Command.cpp
index 0bb7cc4d4b..fd463e7928 100644
--- a/src/Mod/Robot/Gui/Command.cpp
+++ b/src/Mod/Robot/Gui/Command.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QMessageBox>
-#endif
+
 
 #include <Gui/Application.h>
 #include <Gui/Command.h>
diff --git a/src/Mod/Robot/Gui/CommandExport.cpp b/src/Mod/Robot/Gui/CommandExport.cpp
index 3eb102d632..62ac369bc8 100644
--- a/src/Mod/Robot/Gui/CommandExport.cpp
+++ b/src/Mod/Robot/Gui/CommandExport.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QMessageBox>
-#endif
+
 
 #include <Gui/Application.h>
 #include <Gui/Command.h>
diff --git a/src/Mod/Robot/Gui/CommandInsertRobot.cpp b/src/Mod/Robot/Gui/CommandInsertRobot.cpp
index 917fd3c5b3..2bbe5e8839 100644
--- a/src/Mod/Robot/Gui/CommandInsertRobot.cpp
+++ b/src/Mod/Robot/Gui/CommandInsertRobot.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QMessageBox>
-#endif
+
 
 #include <Gui/Application.h>
 #include <Gui/Command.h>
diff --git a/src/Mod/Robot/Gui/CommandTrajectory.cpp b/src/Mod/Robot/Gui/CommandTrajectory.cpp
index a8c329b849..2cc9e2e763 100644
--- a/src/Mod/Robot/Gui/CommandTrajectory.cpp
+++ b/src/Mod/Robot/Gui/CommandTrajectory.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QInputDialog>
 #include <QMessageBox>
-#endif
+
 
 #include <Gui/Application.h>
 #include <Gui/Command.h>
diff --git a/src/Mod/Robot/Gui/PreCompiled.cpp b/src/Mod/Robot/Gui/PreCompiled.cpp
deleted file mode 100644
index cde4369c5b..0000000000
--- a/src/Mod/Robot/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/Robot/Gui/PreCompiled.h b/src/Mod/Robot/Gui/PreCompiled.h
index a83e4d0036..16cd9bcff4 100644
--- a/src/Mod/Robot/Gui/PreCompiled.h
+++ b/src/Mod/Robot/Gui/PreCompiled.h
@@ -25,21 +25,6 @@
 
 #include <FCConfig.h>
 
-// Importing of App classes
-#ifdef FC_OS_WIN32
-#define RobotExport __declspec(dllimport)
-#define PartExport __declspec(dllimport)
-#define PartGuiExport __declspec(dllimport)
-#define RobotGuiExport __declspec(dllexport)
-#else  // for Linux
-#define PartExport
-#define RobotExport
-#define PartGuiExport
-#define RobotGuiExport
-#endif
-
-#ifdef _PreComp_
-
 // STL
 #include <sstream>
 
@@ -71,6 +56,4 @@
 #include <Inventor/nodes/SoMarkerSet.h>
 #include <Inventor/nodes/SoSeparator.h>
 
-#endif  //_PreComp_
-
 #endif  // ROBOTGUI_PRECOMPILED_H
diff --git a/src/Mod/Robot/Gui/TaskDlgEdge2Trac.cpp b/src/Mod/Robot/Gui/TaskDlgEdge2Trac.cpp
index c6ee2e283a..a5cb94cdd3 100644
--- a/src/Mod/Robot/Gui/TaskDlgEdge2Trac.cpp
+++ b/src/Mod/Robot/Gui/TaskDlgEdge2Trac.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QApplication>
-#endif
+
 
 #include <Base/Console.h>
 #include <Base/Exception.h>
diff --git a/src/Mod/Robot/Gui/TaskDlgEdge2Trac.h b/src/Mod/Robot/Gui/TaskDlgEdge2Trac.h
index 2517ed740e..90098d9c96 100644
--- a/src/Mod/Robot/Gui/TaskDlgEdge2Trac.h
+++ b/src/Mod/Robot/Gui/TaskDlgEdge2Trac.h
@@ -26,6 +26,8 @@
 #include <Gui/TaskView/TaskDialog.h>
 #include <Mod/Robot/App/Edge2TracObject.h>
 
+#include <Mod/Robot/RobotGlobal.h>
+
 #include "TaskEdge2TracParameter.h"
 
 
diff --git a/src/Mod/Robot/Gui/TaskDlgSimulate.cpp b/src/Mod/Robot/Gui/TaskDlgSimulate.cpp
index 9404917579..1e74d411c7 100644
--- a/src/Mod/Robot/Gui/TaskDlgSimulate.cpp
+++ b/src/Mod/Robot/Gui/TaskDlgSimulate.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "TaskDlgSimulate.h"
 
diff --git a/src/Mod/Robot/Gui/TaskDlgSimulate.h b/src/Mod/Robot/Gui/TaskDlgSimulate.h
index dcdf8863e2..b26c5579ad 100644
--- a/src/Mod/Robot/Gui/TaskDlgSimulate.h
+++ b/src/Mod/Robot/Gui/TaskDlgSimulate.h
@@ -26,6 +26,7 @@
 #include <Gui/TaskView/TaskDialog.h>
 #include <Mod/Robot/App/RobotObject.h>
 #include <Mod/Robot/App/TrajectoryObject.h>
+#include <Mod/Robot/RobotGlobal.h>
 
 #include "TaskRobot6Axis.h"
 #include "TaskRobotControl.h"
diff --git a/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.cpp b/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.cpp
index 73b418b887..ef2f72fd15 100644
--- a/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.cpp
+++ b/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QApplication>
-#endif
+
 
 #include <Gui/Application.h>
 #include <Gui/Document.h>
diff --git a/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.h b/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.h
index 6d92f5f916..141078f3a6 100644
--- a/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.h
+++ b/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.h
@@ -24,6 +24,8 @@
 #define ROBOTGUI_TaskDlgTrajectoryCompound_H
 
 #include <Gui/TaskView/TaskDialog.h>
+
+#include <Mod/Robot/RobotGlobal.h>
 #include <Mod/Robot/App/TrajectoryCompound.h>
 
 
diff --git a/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.cpp b/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.cpp
index 3143bd682f..b88cc25faf 100644
--- a/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.cpp
+++ b/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Gui/Application.h>
 #include <Gui/Document.h>
diff --git a/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h b/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h
index 45e7ebaa2f..95109791d2 100644
--- a/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h
+++ b/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h
@@ -26,6 +26,8 @@
 #include <Gui/TaskView/TaskDialog.h>
 #include <Mod/Robot/App/TrajectoryDressUpObject.h>
 
+#include <Mod/Robot/RobotGlobal.h>
+
 #include "TaskTrajectoryDressUpParameter.h"
 
 
diff --git a/src/Mod/Robot/Gui/TaskEdge2TracParameter.cpp b/src/Mod/Robot/Gui/TaskEdge2TracParameter.cpp
index 9c3310fb51..08ab1a9dd6 100644
--- a/src/Mod/Robot/Gui/TaskEdge2TracParameter.cpp
+++ b/src/Mod/Robot/Gui/TaskEdge2TracParameter.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/Robot/Gui/TaskRobot6Axis.cpp b/src/Mod/Robot/Gui/TaskRobot6Axis.cpp
index 030878c143..02cab68bf6 100644
--- a/src/Mod/Robot/Gui/TaskRobot6Axis.cpp
+++ b/src/Mod/Robot/Gui/TaskRobot6Axis.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QString>
 #include <qpalette.h>
-#endif
+
 
 #include <Gui/BitmapFactory.h>
 #include <Gui/Placement.h>
diff --git a/src/Mod/Robot/Gui/TaskRobotControl.cpp b/src/Mod/Robot/Gui/TaskRobotControl.cpp
index d21bcc1007..1a955248f1 100644
--- a/src/Mod/Robot/Gui/TaskRobotControl.cpp
+++ b/src/Mod/Robot/Gui/TaskRobotControl.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Gui/BitmapFactory.h>
 
diff --git a/src/Mod/Robot/Gui/TaskRobotMessages.cpp b/src/Mod/Robot/Gui/TaskRobotMessages.cpp
index ad15dd961a..5d1d043960 100644
--- a/src/Mod/Robot/Gui/TaskRobotMessages.cpp
+++ b/src/Mod/Robot/Gui/TaskRobotMessages.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Gui/BitmapFactory.h>
 
diff --git a/src/Mod/Robot/Gui/TaskTrajectory.cpp b/src/Mod/Robot/Gui/TaskTrajectory.cpp
index 39b1baf6f0..a284169367 100644
--- a/src/Mod/Robot/Gui/TaskTrajectory.cpp
+++ b/src/Mod/Robot/Gui/TaskTrajectory.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
diff --git a/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.cpp b/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.cpp
index 6fa4a341c3..308ba848e3 100644
--- a/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.cpp
+++ b/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QString>
-#endif
+
 
 #include <Gui/BitmapFactory.h>
 #include <Gui/Placement.h>
diff --git a/src/Mod/Robot/Gui/TaskWatcher.cpp b/src/Mod/Robot/Gui/TaskWatcher.cpp
index 31df471ac3..506a9afed9 100644
--- a/src/Mod/Robot/Gui/TaskWatcher.cpp
+++ b/src/Mod/Robot/Gui/TaskWatcher.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "TaskWatcher.h"
 
diff --git a/src/Mod/Robot/Gui/TaskWatcher.h b/src/Mod/Robot/Gui/TaskWatcher.h
index d9f5d5b866..b7b6cf0b25 100644
--- a/src/Mod/Robot/Gui/TaskWatcher.h
+++ b/src/Mod/Robot/Gui/TaskWatcher.h
@@ -25,6 +25,8 @@
 
 #include <Gui/TaskView/TaskWatcher.h>
 
+#include <Mod/Robot/RobotGlobal.h>
+
 #include "TaskRobot6Axis.h"
 #include "TaskRobotControl.h"
 
diff --git a/src/Mod/Robot/Gui/TrajectorySimulate.cpp b/src/Mod/Robot/Gui/TrajectorySimulate.cpp
index ec7c01455b..0fb09f788e 100644
--- a/src/Mod/Robot/Gui/TrajectorySimulate.cpp
+++ b/src/Mod/Robot/Gui/TrajectorySimulate.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QTimer>
-#endif
+
 
 #include <Gui/Application.h>
 #include <Gui/Document.h>
diff --git a/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.cpp b/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.cpp
index 6622490c6a..1777bdcb5e 100644
--- a/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.cpp
+++ b/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Gui/Control.h>
 #include <Mod/Robot/Gui/TaskDlgEdge2Trac.h>
diff --git a/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.h b/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.h
index 58251b1527..36445744f5 100644
--- a/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.h
+++ b/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.h
@@ -24,6 +24,8 @@
 #ifndef ROBOT_VIEWPROVIDEREDGE2TRACOBJECT_H
 #define ROBOT_VIEWPROVIDEREDGE2TRACOBJECT_H
 
+#include <Mod/Robot/RobotGlobal.h>
+
 #include "ViewProviderTrajectory.h"
 
 namespace RobotGui
diff --git a/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp b/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp
index 050541a5f0..8422ccef7f 100644
--- a/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp
+++ b/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QFile>
 #include <sstream>
 
@@ -32,7 +30,6 @@
 #include <Inventor/actions/SoSearchAction.h>
 #include <Inventor/draggers/SoJackDragger.h>
 #include <Inventor/nodes/SoSeparator.h>
-#endif
 
 #include <Base/Tools.h>
 #include <App/Document.h>
diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp b/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp
index 4a10b13dfe..3da814e95d 100644
--- a/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp
+++ b/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp
@@ -20,8 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QAction>
 #include <QMenu>
 #include <sstream>
@@ -32,7 +30,6 @@
 #include <Inventor/nodes/SoLineSet.h>
 #include <Inventor/nodes/SoMarkerSet.h>
 #include <Inventor/nodes/SoSeparator.h>
-#endif
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp b/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp
index bc1df62173..bb2ca67f41 100644
--- a/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp
+++ b/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Gui/Control.h>
 #include <Mod/Robot/App/TrajectoryCompound.h>
diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.h b/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.h
index edd584a6c9..aa5a466d5e 100644
--- a/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.h
+++ b/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.h
@@ -24,6 +24,8 @@
 #ifndef ROBOT_ViewProviderTrajectoryCompound_H
 #define ROBOT_ViewProviderTrajectoryCompound_H
 
+#include <Mod/Robot/RobotGlobal.h>
+
 #include "ViewProviderTrajectory.h"
 
 namespace RobotGui
diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.cpp b/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.cpp
index 1d4f5769ac..03e22f808b 100644
--- a/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.cpp
+++ b/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Gui/Control.h>
 #include <Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h>
diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.h b/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.h
index 764b09102f..75c828e2dd 100644
--- a/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.h
+++ b/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.h
@@ -24,6 +24,8 @@
 #ifndef ROBOT_ViewProviderTrajectoryDressUp_H
 #define ROBOT_ViewProviderTrajectoryDressUp_H
 
+#include <Mod/Robot/RobotGlobal.h>
+
 #include "ViewProviderTrajectory.h"
 
 namespace RobotGui
diff --git a/src/Mod/Robot/Gui/Workbench.cpp b/src/Mod/Robot/Gui/Workbench.cpp
index d38510dbf0..bbc10734dd 100644
--- a/src/Mod/Robot/Gui/Workbench.cpp
+++ b/src/Mod/Robot/Gui/Workbench.cpp
@@ -20,13 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QDir>
 #include <QFileInfo>
 #include <QMessageBox>
 #include <qobject.h>
-#endif
+
 
 #include <App/Application.h>
 #include <Gui/Control.h>
diff --git a/src/Mod/Robot/RobotGlobal.h b/src/Mod/Robot/RobotGlobal.h
index d3e8537632..7830659c0e 100644
--- a/src/Mod/Robot/RobotGlobal.h
+++ b/src/Mod/Robot/RobotGlobal.h
@@ -20,11 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <FCGlobal.h>
-
 #ifndef ROBOT_GLOBAL_H
 #define ROBOT_GLOBAL_H
 
+#include <FCGlobal.h>
 
 // Robot
 #ifndef RobotExport