diff --git a/src/Mod/Start/App/AppStart.cpp b/src/Mod/Start/App/AppStart.cpp
index 34a2bcdf6f..e442d3b55e 100644
--- a/src/Mod/Start/App/AppStart.cpp
+++ b/src/Mod/Start/App/AppStart.cpp
@@ -20,19 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <Python.h>
-#endif
 
 #include <Base/Console.h>
 #include <Base/PyObjectBase.h>
 #include <Base/Interpreter.h>
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
 
-#include "StartConfiguration.h"
 
 namespace Start {
 class Module : public Py::ExtensionModule<Module>
diff --git a/src/Mod/Start/App/CMakeLists.txt b/src/Mod/Start/App/CMakeLists.txt
index ef7d5d11e0..00a4faad99 100644
--- a/src/Mod/Start/App/CMakeLists.txt
+++ b/src/Mod/Start/App/CMakeLists.txt
@@ -1,29 +1,28 @@
-include_directories(
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-
-set(Start_LIBS
-    FreeCADApp
-)
-
-SET(Start_SRCS
-    AppStart.cpp
-    PreCompiled.cpp
-    PreCompiled.h
-    StartConfiguration.h
-)
-
-
-
-add_library(Start SHARED ${Start_SRCS})
-target_link_libraries(Start ${Start_LIBS})
-
-
-SET_BIN_DIR(Start Start /Mod/Start)
-SET_PYTHON_PREFIX_SUFFIX(Start)
-
-INSTALL(TARGETS Start DESTINATION ${CMAKE_INSTALL_LIBDIR})
+include_directories(
+    ${Boost_INCLUDE_DIRS}
+    ${OCC_INCLUDE_DIR}
+    ${ZLIB_INCLUDE_DIR}
+    ${PYTHON_INCLUDE_DIRS}
+)
+
+set(Start_LIBS
+    FreeCADApp
+)
+
+SET(Start_SRCS
+    AppStart.cpp
+    PreCompiled.cpp
+    PreCompiled.h
+    StartConfiguration.h
+)
+
+
+
+add_library(Start SHARED ${Start_SRCS})
+target_link_libraries(Start ${Start_LIBS})
+
+
+SET_BIN_DIR(Start Start /Mod/Start)
+SET_PYTHON_PREFIX_SUFFIX(Start)
+
+INSTALL(TARGETS Start DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/src/Mod/Start/App/PreCompiled.h b/src/Mod/Start/App/PreCompiled.h
index 314e78d4cb..1646b56310 100644
--- a/src/Mod/Start/App/PreCompiled.h
+++ b/src/Mod/Start/App/PreCompiled.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef START_PRECOMPILED_H
 #define START_PRECOMPILED_H
 
@@ -37,22 +36,4 @@
 # define MeshExport
 #endif
 
-#ifdef _PreComp_
-
-// standard
-#include <iostream>
-#include <sstream>
-#include <stdio.h>
-#include <assert.h>
-#include <string>
-#include <map>
-#include <vector>
-#include <set>
-#include <bitset>
-
-#include <Python.h>
-
-
-#endif // _PreComp_
 #endif
-
diff --git a/src/Mod/Start/Gui/AppStartGui.cpp b/src/Mod/Start/Gui/AppStartGui.cpp
index 78aa7fc0f0..eded79a9cd 100644
--- a/src/Mod/Start/Gui/AppStartGui.cpp
+++ b/src/Mod/Start/Gui/AppStartGui.cpp
@@ -20,26 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <Python.h>
-#endif
-
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
 #include <Base/PyObjectBase.h>
 #include <Gui/Application.h>
-#include <Gui/WorkbenchManager.h>
-#include <Gui/Language/Translator.h>
-#include "Workbench.h"
 #include <Gui/WidgetFactory.h>
-#include "DlgStartPreferencesImp.h"
+#include <Gui/Language/Translator.h>
 
-#include <Mod/Start/App/StartConfiguration.h>
+#include "DlgStartPreferencesImp.h"
+#include "Workbench.h"
 
 
 // use a different name to CreateCommand()
diff --git a/src/Mod/Start/Gui/CMakeLists.txt b/src/Mod/Start/Gui/CMakeLists.txt
index caa6a64e1d..10b91ef91e 100644
--- a/src/Mod/Start/Gui/CMakeLists.txt
+++ b/src/Mod/Start/Gui/CMakeLists.txt
@@ -4,7 +4,6 @@ include_directories(
     ${COIN3D_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIR}
     ${PYTHON_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
 )
 
 set(StartGui_LIBS
diff --git a/src/Mod/Start/Gui/Command.cpp b/src/Mod/Start/Gui/Command.cpp
index 8cd3ca756b..96c243c25e 100644
--- a/src/Mod/Start/Gui/Command.cpp
+++ b/src/Mod/Start/Gui/Command.cpp
@@ -20,17 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <QCoreApplication>
-# include <QTextStream>
-#endif
 
 #include <Gui/Application.h>
 #include <Gui/Command.h>
-#include <Gui/MainWindow.h>
-#include <Gui/FileDialog.h>
+
 #include "Workbench.h"
 
 
diff --git a/src/Mod/Start/Gui/DlgStartPreferencesImp.cpp b/src/Mod/Start/Gui/DlgStartPreferencesImp.cpp
index 3aae3034a4..5812c8b50b 100644
--- a/src/Mod/Start/Gui/DlgStartPreferencesImp.cpp
+++ b/src/Mod/Start/Gui/DlgStartPreferencesImp.cpp
@@ -20,14 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
+#include <Gui/Application.h>
+
 #include "DlgStartPreferencesImp.h"
 #include "ui_DlgStartPreferences.h"
-#include <Gui/PrefWidgets.h>
-#include <Base/Console.h>
-#include <Gui/Application.h>
+
 
 using namespace StartGui;
 
diff --git a/src/Mod/Start/Gui/PreCompiled.h b/src/Mod/Start/Gui/PreCompiled.h
index 73027c6af8..ae62f427ea 100644
--- a/src/Mod/Start/Gui/PreCompiled.h
+++ b/src/Mod/Start/Gui/PreCompiled.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef STARTGUI_PRECOMPILED_H
 #define STARTGUI_PRECOMPILED_H
 
@@ -35,12 +34,7 @@
 # define StartGuiExport
 #endif
 
-
 #ifdef _PreComp_
-
-// Python
-#include <Python.h>
-
 // standard
 #include <iostream>
 #include <assert.h>
@@ -61,11 +55,8 @@
 # include <windows.h>
 #endif
 
-
 // Qt Toolkit
-#ifndef __QtAll__
-# include <Gui/QtAll.h>
-#endif
+#include <QCoreApplication>
 
 #endif //_PreComp_
 
diff --git a/src/Mod/Start/Gui/Workbench.cpp b/src/Mod/Start/Gui/Workbench.cpp
index 363c374627..b8da50c321 100644
--- a/src/Mod/Start/Gui/Workbench.cpp
+++ b/src/Mod/Start/Gui/Workbench.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
@@ -28,25 +27,19 @@
 #endif
 
 #include "Workbench.h"
-#include <Gui/ToolBarManager.h>
-#include <Gui/MenuManager.h>
-#include <Gui/ToolBarManager.h>
-#include <Gui/DockWindowManager.h>
-#include <Gui/Application.h>
-#include <Gui/Action.h>
-#include <Gui/Command.h>
-#include <Gui/Selection.h>
-#include <Gui/ToolBoxManager.h>
-#include <Gui/MainWindow.h>
-#include <Gui/MDIView.h>
-#include <App/Document.h>
-#include <App/DocumentObject.h>
+
 #include <Base/Console.h>
 #include <Base/Exception.h>
 #include <Base/Interpreter.h>
 #include <Base/Tools.h>
 
-#include <Mod/Start/App/StartConfiguration.h>
+#include <Gui/ToolBarManager.h>
+#include <Gui/DockWindowManager.h>
+#include <Gui/Application.h>
+#include <Gui/Command.h>
+#include <Gui/MainWindow.h>
+#include <Gui/MDIView.h>
+
 
 using namespace StartGui;