diff --git a/src/Mod/Inspection/App/AppInspection.cpp b/src/Mod/Inspection/App/AppInspection.cpp
index 34e1a5a830..cc3ececdd4 100644
--- a/src/Mod/Inspection/App/AppInspection.cpp
+++ b/src/Mod/Inspection/App/AppInspection.cpp
@@ -22,11 +22,9 @@
 
 #include "PreCompiled.h"
 
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
-
 #include <Base/Console.h>
 #include <Base/PyObjectBase.h>
+
 #include "InspectionFeature.h"
 
 
diff --git a/src/Mod/Inspection/App/CMakeLists.txt b/src/Mod/Inspection/App/CMakeLists.txt
index e205400f38..707df92694 100644
--- a/src/Mod/Inspection/App/CMakeLists.txt
+++ b/src/Mod/Inspection/App/CMakeLists.txt
@@ -1,52 +1,51 @@
-if(MSVC)
-    add_definitions(-DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH)
-else(MSVC)
-    add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H)
-endif(MSVC)
-
-include_directories(
-    ${CMAKE_BINARY_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-)
-
-link_directories(${OCC_LIBRARY_DIR})
-
-set(Inspection_LIBS
-    FreeCADApp
-    Mesh
-    Points
-    Part
-)
-
-SET(Inspection_SRCS
-    AppInspection.cpp
-    InspectionFeature.cpp
-    InspectionFeature.h
-    PreCompiled.cpp
-    PreCompiled.h
-)
-
-set(Inspection_Scripts
-    ../Init.py
-)
-
-add_library(Inspection SHARED ${Inspection_SRCS} ${Inspection_Scripts})
-target_link_libraries(Inspection ${Inspection_LIBS})
-
-
-fc_target_copy_resource_flat(Inspection
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_BINARY_DIR}/Mod/Inspection
-    ${Inspection_Scripts}
-)
-
-SET_BIN_DIR(Inspection Inspection /Mod/Inspection)
-SET_PYTHON_PREFIX_SUFFIX(Inspection)
-
-INSTALL(TARGETS Inspection DESTINATION ${CMAKE_INSTALL_LIBDIR})
+if(MSVC)
+    add_definitions(-DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH)
+else(MSVC)
+    add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H)
+endif(MSVC)
+
+include_directories(
+    ${CMAKE_BINARY_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${Boost_INCLUDE_DIRS}
+    ${OCC_INCLUDE_DIR}
+    ${PYTHON_INCLUDE_DIRS}
+    ${ZLIB_INCLUDE_DIR}
+)
+
+link_directories(${OCC_LIBRARY_DIR})
+
+set(Inspection_LIBS
+    FreeCADApp
+    Mesh
+    Points
+    Part
+)
+
+SET(Inspection_SRCS
+    AppInspection.cpp
+    InspectionFeature.cpp
+    InspectionFeature.h
+    PreCompiled.cpp
+    PreCompiled.h
+)
+
+set(Inspection_Scripts
+    ../Init.py
+)
+
+add_library(Inspection SHARED ${Inspection_SRCS} ${Inspection_Scripts})
+target_link_libraries(Inspection ${Inspection_LIBS})
+
+
+fc_target_copy_resource_flat(Inspection
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_BINARY_DIR}/Mod/Inspection
+    ${Inspection_Scripts}
+)
+
+SET_BIN_DIR(Inspection Inspection /Mod/Inspection)
+SET_PYTHON_PREFIX_SUFFIX(Inspection)
+
+INSTALL(TARGETS Inspection DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/src/Mod/Inspection/App/InspectionFeature.cpp b/src/Mod/Inspection/App/InspectionFeature.cpp
index 0cad76d5dc..5c05a8c0bc 100644
--- a/src/Mod/Inspection/App/InspectionFeature.cpp
+++ b/src/Mod/Inspection/App/InspectionFeature.cpp
@@ -20,33 +20,33 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
+
+#ifndef _PreComp_
 #include <numeric>
+
 #include <gp_Pnt.hxx>
 #include <BRepExtrema_DistShapeShape.hxx>
 #include <BRepBuilderAPI_MakeVertex.hxx>
 #include <BRepClass3d_SolidClassifier.hxx>
 #include <BRepGProp_Face.hxx>
 #include <TopoDS.hxx>
-#include <TopoDS_Vertex.hxx>
 
+#include <QtConcurrentMap>
 #include <QEventLoop>
 #include <QFuture>
 #include <QFutureWatcher>
-#include <QtConcurrentMap>
 
 #include <boost_bind_bind.hpp>
+#endif
 
+#include <App/Application.h>
 #include <Base/Console.h>
-#include <Base/Exception.h>
 #include <Base/FutureWatcherProgress.h>
 #include <Base/Parameter.h>
 #include <Base/Sequencer.h>
 #include <Base/Stream.h>
-#include <Base/Tools.h>
-#include <App/Application.h>
-#include <Mod/Mesh/App/Mesh.h>
+
 #include <Mod/Mesh/App/MeshFeature.h>
 #include <Mod/Mesh/App/Core/Algorithm.h>
 #include <Mod/Mesh/App/Core/Grid.h>
diff --git a/src/Mod/Inspection/App/InspectionFeature.h b/src/Mod/Inspection/App/InspectionFeature.h
index 29906154aa..ea755ec88c 100644
--- a/src/Mod/Inspection/App/InspectionFeature.h
+++ b/src/Mod/Inspection/App/InspectionFeature.h
@@ -20,17 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef INSPECTION_FEATURE_H
 #define INSPECTION_FEATURE_H
 
 #include <App/DocumentObject.h>
-#include <App/PropertyLinks.h>
 #include <App/DocumentObjectGroup.h>
 
-#include <Mod/Mesh/App/Core/Iterator.h>
 #include <Mod/Points/App/Points.h>
 
+
 class TopoDS_Shape;
 class BRepExtrema_DistShapeShape;
 
diff --git a/src/Mod/Inspection/App/PreCompiled.h b/src/Mod/Inspection/App/PreCompiled.h
index 3ced7fcd7a..8575b976fc 100644
--- a/src/Mod/Inspection/App/PreCompiled.h
+++ b/src/Mod/Inspection/App/PreCompiled.h
@@ -50,6 +50,7 @@
 #include <cstdio>
 #include <cassert>
 #include <iostream>
+#include <numeric>
 
 // STL
 #include <algorithm>
@@ -63,8 +64,22 @@
 #include <string>
 #include <vector>
 
-// Xerces
-#include <xercesc/util/XercesDefs.hpp>
+// boost
+#include <boost_bind_bind.hpp>
+
+// OCC
+#include <gp_Pnt.hxx>
+#include <BRepExtrema_DistShapeShape.hxx>
+#include <BRepBuilderAPI_MakeVertex.hxx>
+#include <BRepClass3d_SolidClassifier.hxx>
+#include <BRepGProp_Face.hxx>
+#include <TopoDS.hxx>
+
+// Qt
+#include <QtConcurrentMap>
+#include <QEventLoop>
+#include <QFuture>
+#include <QFutureWatcher>
 
 #endif //_PreComp_
 
diff --git a/src/Mod/Inspection/Gui/AppInspectionGui.cpp b/src/Mod/Inspection/Gui/AppInspectionGui.cpp
index a7c2719478..b122439c07 100644
--- a/src/Mod/Inspection/Gui/AppInspectionGui.cpp
+++ b/src/Mod/Inspection/Gui/AppInspectionGui.cpp
@@ -22,9 +22,6 @@
 
 #include "PreCompiled.h"
 
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
-
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
 #include <Base/PyObjectBase.h>
@@ -33,6 +30,7 @@
 #include "ViewProviderInspection.h"
 #include "Workbench.h"
 
+
 // use a different name to CreateCommand()
 void CreateInspectionCommands(void);
 
diff --git a/src/Mod/Inspection/Gui/CMakeLists.txt b/src/Mod/Inspection/Gui/CMakeLists.txt
index 657f842c46..1e9e655a43 100644
--- a/src/Mod/Inspection/Gui/CMakeLists.txt
+++ b/src/Mod/Inspection/Gui/CMakeLists.txt
@@ -4,7 +4,6 @@ include_directories(
     ${Boost_INCLUDE_DIRS}
     ${COIN3D_INCLUDE_DIRS}
     ${PYTHON_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIR}
 )
 
diff --git a/src/Mod/Inspection/Gui/Command.cpp b/src/Mod/Inspection/Gui/Command.cpp
index 8cc7eb24ac..c07e578f7b 100644
--- a/src/Mod/Inspection/Gui/Command.cpp
+++ b/src/Mod/Inspection/Gui/Command.cpp
@@ -22,7 +22,9 @@
 
 #include "PreCompiled.h"
 
+#ifndef _PreComp_
 #include <Inventor/events/SoButtonEvent.h>
+#endif
 
 #include <App/Document.h>
 #include <Gui/Application.h>
diff --git a/src/Mod/Inspection/Gui/PreCompiled.h b/src/Mod/Inspection/Gui/PreCompiled.h
index 3be417afa1..b0a131ea2d 100644
--- a/src/Mod/Inspection/Gui/PreCompiled.h
+++ b/src/Mod/Inspection/Gui/PreCompiled.h
@@ -67,13 +67,29 @@
 #include <string>
 #include <vector>
 
-// Xerces
-#include <xercesc/util/XercesDefs.hpp>
-
 #ifdef FC_OS_WIN32
 # include <windows.h>
 #endif
 
+// Inventor
+#include <Inventor/SoPickedPoint.h>
+#include <Inventor/actions/SoRayPickAction.h>
+#include <Inventor/actions/SoSearchAction.h>
+#include <Inventor/details/SoFaceDetail.h>
+#include <Inventor/events/SoButtonEvent.h>
+#include <Inventor/events/SoKeyboardEvent.h>
+#include <Inventor/events/SoMouseButtonEvent.h>
+#include <Inventor/lists/SoPickedPointList.h> 
+#include <Inventor/nodes/SoCoordinate3.h>
+#include <Inventor/nodes/SoDrawStyle.h>
+#include <Inventor/nodes/SoIndexedFaceSet.h>
+#include <Inventor/nodes/SoMaterial.h>
+#include <Inventor/nodes/SoMaterialBinding.h>
+#include <Inventor/nodes/SoNormal.h>
+#include <Inventor/nodes/SoPointSet.h>
+#include <Inventor/nodes/SoShapeHints.h>
+#include <Inventor/errors/SoDebugError.h>
+
 // Qt Toolkit
 #ifndef __QtAll__
 # include <Gui/QtAll.h>
diff --git a/src/Mod/Inspection/Gui/ViewProviderInspection.cpp b/src/Mod/Inspection/Gui/ViewProviderInspection.cpp
index 853f3b5ac6..1933622780 100644
--- a/src/Mod/Inspection/Gui/ViewProviderInspection.cpp
+++ b/src/Mod/Inspection/Gui/ViewProviderInspection.cpp
@@ -20,43 +20,39 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <QApplication>
 # include <QMenu>
 # include <QMessageBox>
-#endif
 
-#include <Inventor/actions/SoRayPickAction.h>
 #include <Inventor/SoPickedPoint.h>
-#include <Inventor/lists/SoPickedPointList.h> 
+#include <Inventor/actions/SoRayPickAction.h>
+#include <Inventor/actions/SoSearchAction.h>
 #include <Inventor/details/SoFaceDetail.h>
 #include <Inventor/events/SoButtonEvent.h>
 #include <Inventor/events/SoKeyboardEvent.h>
 #include <Inventor/events/SoMouseButtonEvent.h>
+#include <Inventor/lists/SoPickedPointList.h> 
 #include <Inventor/nodes/SoCoordinate3.h>
 #include <Inventor/nodes/SoDrawStyle.h>
 #include <Inventor/nodes/SoIndexedFaceSet.h>
-#include <Inventor/nodes/SoPointSet.h>
 #include <Inventor/nodes/SoMaterial.h>
-#include <Inventor/nodes/SoShapeHints.h>
-#include <Inventor/nodes/SoOrthographicCamera.h>
 #include <Inventor/nodes/SoMaterialBinding.h>
 #include <Inventor/nodes/SoNormal.h>
+#include <Inventor/nodes/SoPointSet.h>
+#include <Inventor/nodes/SoShapeHints.h>
 #include <Inventor/errors/SoDebugError.h>
-#include <Inventor/actions/SoSearchAction.h>
+#endif
 
-#include <Base/Exception.h>
-#include <App/PropertyLinks.h>
 #include <App/GeoFeature.h>
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/Flag.h>
 #include <Gui/MainWindow.h>
 #include <Gui/SoFCColorBar.h>
-#include <Gui/ViewProviderGeometryObject.h>
+
 #include <Gui/View3DInventorViewer.h>
 #include <Gui/Widgets.h>
 #include <Mod/Points/App/Properties.h>
diff --git a/src/Mod/Inspection/Gui/VisualInspection.cpp b/src/Mod/Inspection/Gui/VisualInspection.cpp
index 310791fed9..21a2b11a47 100644
--- a/src/Mod/Inspection/Gui/VisualInspection.cpp
+++ b/src/Mod/Inspection/Gui/VisualInspection.cpp
@@ -20,24 +20,23 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <cfloat>
 #endif
-#include "VisualInspection.h"
-#include "ui_VisualInspection.h"
 
-#include <Base/UnitsApi.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
-#include <App/Application.h>
 #include <Gui/Command.h>
 #include <Gui/Document.h>
-#include <Gui/ViewProvider.h>
 #include <Gui/Application.h>
 #include <Gui/MainWindow.h>
 #include <Gui/PrefWidgets.h>
+#include <Gui/ViewProvider.h>
+
+#include "VisualInspection.h"
+#include "ui_VisualInspection.h"
+
 
 using namespace InspectionGui;
 
diff --git a/src/Mod/Inspection/Gui/VisualInspection.h b/src/Mod/Inspection/Gui/VisualInspection.h
index fc4d6d9e36..db508ace1b 100644
--- a/src/Mod/Inspection/Gui/VisualInspection.h
+++ b/src/Mod/Inspection/Gui/VisualInspection.h
@@ -20,12 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef INSPECTIONGUI_VISUALINSPECTION_H
 #define INSPECTIONGUI_VISUALINSPECTION_H
 
 #include <QDialog>
-#include <vector>
+
 
 class QTreeWidgetItem;
 class QPushButton;
diff --git a/src/Mod/Inspection/Gui/Workbench.cpp b/src/Mod/Inspection/Gui/Workbench.cpp
index 57652841ce..6fe143215c 100644
--- a/src/Mod/Inspection/Gui/Workbench.cpp
+++ b/src/Mod/Inspection/Gui/Workbench.cpp
@@ -20,16 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include "Workbench.h"
+
 #include <Gui/MenuManager.h>
 #include <Gui/ToolBarManager.h>
 
+
 using namespace InspectionGui;
 
 /// @namespace InspectionGui @class Workbench