diff --git a/src/Gui/GuiConsole.cpp b/src/Gui/GuiConsole.cpp
index a2bfc7dd30..5a98a8739c 100644
--- a/src/Gui/GuiConsole.cpp
+++ b/src/Gui/GuiConsole.cpp
@@ -24,15 +24,11 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include "stdio.h"
 # ifdef FC_OS_WIN32
 #   include "io.h"
-# endif
-# ifdef FC_OS_WIN32
 #   include <windows.h>
 # endif
 # include "fcntl.h"
-# include <iostream>
 #endif
 
 #include "GuiConsole.h"
diff --git a/src/Gui/InputField.cpp b/src/Gui/InputField.cpp
index 70922f05b6..d03a521d4d 100644
--- a/src/Gui/InputField.cpp
+++ b/src/Gui/InputField.cpp
@@ -28,20 +28,19 @@
 # include <QPixmapCache>
 #endif
 
-#include <Base/Console.h>
-#include <Base/Quantity.h>
-#include <Base/Exception.h>
-#include <Base/Tools.h>
 #include <App/Application.h>
-#include <App/PropertyUnits.h>
-#include <App/ExpressionParser.h>
 #include <App/DocumentObject.h>
-#include "ExpressionCompleter.h"
-#include "Command.h"
+#include <App/ExpressionParser.h>
+#include <App/PropertyUnits.h>
+#include <Base/Exception.h>
+#include <Base/Quantity.h>
+#include <Base/Tools.h>
+
 #include "InputField.h"
 #include "BitmapFactory.h"
+#include "Command.h"
 #include "QuantitySpinBox_p.h"
-#include "propertyeditor/PropertyItem.h"
+
 
 using namespace Gui;
 using namespace App;
diff --git a/src/Gui/InputField.h b/src/Gui/InputField.h
index d242446f90..2f49bd21f0 100644
--- a/src/Gui/InputField.h
+++ b/src/Gui/InputField.h
@@ -25,16 +25,13 @@
 #define GUI_INPUTFIELD_H
 
 #include <QValidator>
-#include <App/Property.h>
-#include <App/Expression.h>
 #include <Base/Parameter.h>
-#include <Gui/MetaTypes.h>
-#include "Widgets.h"
-#include "Window.h"
-#include "SpinBox.h"
-#include "FileDialog.h"
+
 #include "ExpressionBinding.h"
 #include "ExpressionCompleter.h"
+#include "MetaTypes.h"
+#include "Widgets.h"
+
 
 #ifdef Q_MOC_RUN
 Q_DECLARE_METATYPE(Base::Quantity)
diff --git a/src/Gui/InputVector.cpp b/src/Gui/InputVector.cpp
index 9b73b7aafc..92ea2ac6fc 100644
--- a/src/Gui/InputVector.cpp
+++ b/src/Gui/InputVector.cpp
@@ -26,10 +26,12 @@
 # include <QComboBox>
 #endif
 
+#include <Base/UnitsApi.h>
+
 #include "InputVector.h"
 #include "ui_InputVector.h"
 #include "QuantitySpinBox.h"
-#include <Base/UnitsApi.h>
+
 
 using namespace Gui;
 
diff --git a/src/Gui/InputVector.h b/src/Gui/InputVector.h
index 45af70d00a..33800d9276 100644
--- a/src/Gui/InputVector.h
+++ b/src/Gui/InputVector.h
@@ -23,13 +23,10 @@
 #ifndef GUI_INPUTVECTOR_H
 #define GUI_INPUTVECTOR_H
 
-#include <cfloat>
 #include <memory>
-#include <boost/any.hpp>
+#include <QApplication>
 #include <QDialog>
 #include <QMessageBox>
-#include <QApplication>
-
 #include <Gui/propertyeditor/PropertyItem.h>
 
 class QGridLayout;
diff --git a/src/Gui/LinkViewPyImp.cpp b/src/Gui/LinkViewPyImp.cpp
index c5d01abe8d..bc1b559175 100644
--- a/src/Gui/LinkViewPyImp.cpp
+++ b/src/Gui/LinkViewPyImp.cpp
@@ -21,22 +21,16 @@
  ****************************************************************************/
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <Inventor/nodes/SoSeparator.h>
-#endif
 
-#include <Base/MatrixPy.h>
-#include <Base/VectorPy.h>
 #include <Base/BoundBoxPy.h>
-#include <App/MaterialPy.h>
+#include <Base/MatrixPy.h>
 #include <App/DocumentObjectPy.h>
-
-#include "ViewProviderDocumentObjectPy.h"
-#include "ViewProviderLink.h"
-#include "WidgetFactory.h"
+#include <App/MaterialPy.h>
 
 #include "LinkViewPy.h"
 #include "LinkViewPy.cpp"
+#include "ViewProviderDocumentObjectPy.h"
+
 
 using namespace Gui;
 
diff --git a/src/Gui/Macro.cpp b/src/Gui/Macro.cpp
index 41ce6da705..335537bfb3 100644
--- a/src/Gui/Macro.cpp
+++ b/src/Gui/Macro.cpp
@@ -25,25 +25,22 @@
 
 #ifndef _PreComp_
 # include <assert.h>
-# include <stdio.h>
-# include <QApplication>
 # include <QFile>
 # include <QTextStream>
 #endif
 
-/// Here the FreeCAD includes sorted by Base,App,Gui......
-#include "Macro.h"
-
-#include <Base/Interpreter.h>
+#include <App/Application.h>
 #include <Base/Console.h>
 #include <Base/Exception.h>
-#include <App/Application.h>
+#include <Base/Interpreter.h>
 
+#include "Macro.h"
 #include "MainWindow.h"
 #include "PythonConsole.h"
 #include "PythonConsolePy.h"
 #include "PythonDebugger.h"
 
+
 using namespace Gui;
 
 
diff --git a/src/Gui/Macro.h b/src/Gui/Macro.h
index 44dab4aa50..c38a6cfd84 100644
--- a/src/Gui/Macro.h
+++ b/src/Gui/Macro.h
@@ -24,7 +24,6 @@
 #ifndef GUI_MACRO_H
 #define GUI_MACRO_H
 
-// Std. configurations
 #include <QString>
 #include <QStringList>
 #include <Base/Observer.h>
diff --git a/src/Gui/ManualAlignment.cpp b/src/Gui/ManualAlignment.cpp
index 6c2402dd55..45b662a7a3 100644
--- a/src/Gui/ManualAlignment.cpp
+++ b/src/Gui/ManualAlignment.cpp
@@ -30,36 +30,27 @@
 # include <QMessageBox>
 # include <QPainter>
 # include <QSplitter>
-# include <QStatusBar>
 # include <QTimer>
 # include <QVBoxLayout>
 # include <Inventor/SoPickedPoint.h>
 # include <Inventor/actions/SoSearchAction.h>
 # include <Inventor/events/SoMouseButtonEvent.h>
 # include <Inventor/fields/SoSFImage.h>
-# include <Inventor/nodes/SoCoordinate3.h>
-# include <Inventor/nodes/SoDrawStyle.h>
 # include <Inventor/nodes/SoImage.h>
 # include <Inventor/nodes/SoMaterial.h>
 # include <Inventor/nodes/SoOrthographicCamera.h>
-# include <Inventor/nodes/SoPickStyle.h>
-# include <Inventor/nodes/SoPointSet.h>
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoTranslation.h>
 # include <Inventor/sensors/SoNodeSensor.h>
-# include <boost_bind_bind.hpp>
 #endif
 
-
 #include <App/Document.h>
 #include <App/GeoFeature.h>
-#include <Base/Exception.h>
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/MainWindow.h>
 #include <Gui/Selection.h>
 #include <Gui/SplitView3DInventor.h>
-#include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>
 #include <Gui/ViewProviderGeometryObject.h>
 #include <Gui/WaitCursor.h>
diff --git a/src/Gui/ManualAlignment.h b/src/Gui/ManualAlignment.h
index 83416e5ed8..69e9a46050 100644
--- a/src/Gui/ManualAlignment.h
+++ b/src/Gui/ManualAlignment.h
@@ -28,10 +28,8 @@
 #include <Base/BoundBox.h>
 #include <Base/Placement.h>
 #include <Base/Vector3D.h>
-#include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/ViewProviderDocumentObject.h>
-#include <boost_signals2.hpp>
 
 class SbVec3f;
 class SoPickedPoint;