diff --git a/src/Gui/DlgActionsImp.cpp b/src/Gui/DlgActionsImp.cpp
index 1228b4629c..471c9213db 100644
--- a/src/Gui/DlgActionsImp.cpp
+++ b/src/Gui/DlgActionsImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <QDialogButtonBox>
@@ -32,19 +31,17 @@
 # include <QKeySequence>
 # include <QLineEdit>
 # include <QMessageBox>
-# include <QTextStream>
-# include <QVBoxLayout>
 #endif
 
 #include "DlgActionsImp.h"
 #include "ui_DlgActions.h"
 #include "Action.h"
 #include "Application.h"
-#include "Command.h"
 #include "BitmapFactory.h"
-#include "Widgets.h"
+#include "Command.h"
 #include "ui_DlgChooseIcon.h"
 
+
 using namespace Gui::Dialog;
 
 /* TRANSLATOR Gui::Dialog::DlgCustomActionsImp */
diff --git a/src/Gui/DlgActivateWindowImp.cpp b/src/Gui/DlgActivateWindowImp.cpp
index 6ee7d5e4f4..d6eac069f2 100644
--- a/src/Gui/DlgActivateWindowImp.cpp
+++ b/src/Gui/DlgActivateWindowImp.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <QApplication>
-# include <QHeaderView>
 # include <QPushButton>
 #endif
 
@@ -33,6 +31,7 @@
 #include "MainWindow.h"
 #include "MDIView.h"
 
+
 using namespace Gui::Dialog;
 
 /* TRANSLATOR Gui::Dialog::DlgActivateWindowImp */
diff --git a/src/Gui/DlgAddProperty.cpp b/src/Gui/DlgAddProperty.cpp
index a8e5c97730..f97f38b87f 100644
--- a/src/Gui/DlgAddProperty.cpp
+++ b/src/Gui/DlgAddProperty.cpp
@@ -25,15 +25,15 @@
 # include <QMessageBox>
 #endif
 
-#include "ui_DlgAddProperty.h"
-
-#include <Base/Tools.h>
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
-#include "MainWindow.h"
-#include <ViewProviderDocumentObject.h>
+#include <Base/Tools.h>
+
 #include "DlgAddProperty.h"
+#include "ui_DlgAddProperty.h"
+#include "MainWindow.h"
+#include "ViewProviderDocumentObject.h"
 
 
 using namespace Gui;
diff --git a/src/Gui/DlgCheckableMessageBox.cpp b/src/Gui/DlgCheckableMessageBox.cpp
index 3a001ecb59..a36fe198e4 100644
--- a/src/Gui/DlgCheckableMessageBox.cpp
+++ b/src/Gui/DlgCheckableMessageBox.cpp
@@ -30,19 +30,15 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <QHeaderView>
+# include <QPushButton>
 #endif
 
+#include <App/Application.h>
+
 #include "DlgCheckableMessageBox.h"
 #include "ui_DlgCheckableMessageBox.h"
-
-#include <QPushButton>
-#include <QtCore/QDebug>
-
 #include "MainWindow.h"
 
-#include <App/Application.h>
-//#include <App/Parameter.h>
-
 
 namespace Gui {
 namespace Dialog {
diff --git a/src/Gui/DlgCheckableMessageBox.h b/src/Gui/DlgCheckableMessageBox.h
index 7f750586e7..7556fda1b2 100644
--- a/src/Gui/DlgCheckableMessageBox.h
+++ b/src/Gui/DlgCheckableMessageBox.h
@@ -30,11 +30,9 @@
 #ifndef CHECKABLEMESSAGEBOX_H
 #define CHECKABLEMESSAGEBOX_H
 
-//#include "utils_global.h"
-
+#include <QDialog>
 #include <QDialogButtonBox>
 #include <QMessageBox>
-#include <QDialog>
 
 namespace Gui {
 namespace Dialog {
diff --git a/src/Gui/DlgCommandsImp.cpp b/src/Gui/DlgCommandsImp.cpp
index 3b5e5bb14c..b73166104f 100644
--- a/src/Gui/DlgCommandsImp.cpp
+++ b/src/Gui/DlgCommandsImp.cpp
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
+
 #ifndef _PreComp_
 # include <QHeaderView>
 # include <QTreeWidgetItemIterator>
@@ -32,9 +32,9 @@
 #include "DlgCommandsImp.h"
 #include "ui_DlgCommands.h"
 #include "Application.h"
-#include "Command.h"
 #include "BitmapFactory.h"
-#include "Widgets.h"
+#include "Command.h"
+
 
 using namespace Gui::Dialog;
 
diff --git a/src/Gui/DlgCreateNewPreferencePackImp.cpp b/src/Gui/DlgCreateNewPreferencePackImp.cpp
index 47c6bda8f0..1680305a01 100644
--- a/src/Gui/DlgCreateNewPreferencePackImp.cpp
+++ b/src/Gui/DlgCreateNewPreferencePackImp.cpp
@@ -20,16 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
+
 #ifndef _PreComp_
+# include <QMessageBox>
+# include <QPushButton>
 #endif
 
 #include "DlgCreateNewPreferencePackImp.h"
 #include "ui_DlgCreateNewPreferencePack.h"
 
-#include <QPushButton>
-#include <QMessageBox>
 
 using namespace Gui::Dialog;
 
diff --git a/src/Gui/DlgCustomizeImp.cpp b/src/Gui/DlgCustomizeImp.cpp
index 694ce54006..c620b275c0 100644
--- a/src/Gui/DlgCustomizeImp.cpp
+++ b/src/Gui/DlgCustomizeImp.cpp
@@ -20,19 +20,20 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
+
 #ifndef _PreComp_
 # include <QEvent>
 # include <QGridLayout>
-# include <QSizePolicy>
 # include <QPushButton>
+# include <QSizePolicy>
 #endif
 
 #include "DlgCustomizeImp.h"
 #include "MainWindow.h"
 #include "WidgetFactory.h"
 
+
 using namespace Gui::Dialog;
 
 QList<QByteArray> DlgCustomizeImp::_pages;
diff --git a/src/Gui/DlgCustomizeSpNavSettings.cpp b/src/Gui/DlgCustomizeSpNavSettings.cpp
index 98d1e9186a..4c95771317 100644
--- a/src/Gui/DlgCustomizeSpNavSettings.cpp
+++ b/src/Gui/DlgCustomizeSpNavSettings.cpp
@@ -24,8 +24,8 @@
 
 #include "DlgCustomizeSpNavSettings.h"
 #include "ui_DlgCustomizeSpNavSettings.h"
-#include "GuiApplicationNativeEventAware.h"
 #include "Application.h"
+#include "GuiApplicationNativeEventAware.h"
 
 
 using namespace Gui::Dialog;
diff --git a/src/Gui/DlgCustomizeSpaceball.cpp b/src/Gui/DlgCustomizeSpaceball.cpp
index dad8999c7f..c1837359fe 100644
--- a/src/Gui/DlgCustomizeSpaceball.cpp
+++ b/src/Gui/DlgCustomizeSpaceball.cpp
@@ -23,26 +23,28 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+#include <QComboBox>
 #include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QSplitter>
-#include <QPushButton>
 #include <QHeaderView>
+#include <QLabel>
+#include <QPainter>
 #include <QPrintDialog>
 #include <QPrinter>
-#include <QPainter>
+#include <QPushButton>
+#include <QSplitter>
 #include <QTableView>
-#include <QComboBox>
+#include <QVBoxLayout>
 #endif
 
 #include "Base/Console.h"
+
+#include "Command.h"
+#include "DlgCustomizeSpaceball.h"
 #include "Application.h"
+#include "BitmapFactory.h"
 #include "GuiApplicationNativeEventAware.h"
 #include "SpaceballEvent.h"
-#include "Command.h"
-#include "BitmapFactory.h"
-#include "DlgCustomizeSpaceball.h"
+
 
 typedef std::vector<Base::Reference<ParameterGrp> > GroupVector;
 
diff --git a/src/Gui/DlgCustomizeSpaceball.h b/src/Gui/DlgCustomizeSpaceball.h
index 1215933005..9226907c25 100644
--- a/src/Gui/DlgCustomizeSpaceball.h
+++ b/src/Gui/DlgCustomizeSpaceball.h
@@ -23,10 +23,10 @@
 #ifndef GUI_DIALOG_DLGCUSTOMIZESPACEBALL_H
 #define GUI_DIALOG_DLGCUSTOMIZESPACEBALL_H
 
-#include <QTreeView>
-#include <QListView>
-#include <QComboBox>
 #include <QAbstractListModel>
+#include <QComboBox>
+#include <QListView>
+#include <QTreeView>
 #include "PropertyPage.h"
 
 #include <boost/foreach.hpp>
diff --git a/src/Gui/DlgDisplayPropertiesImp.cpp b/src/Gui/DlgDisplayPropertiesImp.cpp
index 2a52d7db4a..736119cac3 100644
--- a/src/Gui/DlgDisplayPropertiesImp.cpp
+++ b/src/Gui/DlgDisplayPropertiesImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <algorithm>
@@ -29,25 +28,18 @@
 # include <QDockWidget>
 #endif
 
+#include <Base/Console.h>
+
 #include "DlgDisplayPropertiesImp.h"
 #include "ui_DlgDisplayProperties.h"
+#include "Application.h"
+#include "Document.h"
 #include "DlgMaterialPropertiesImp.h"
 #include "DockWindowManager.h"
-#include "View3DInventorViewer.h"
-#include "View3DInventor.h"
-#include "Command.h"
-#include "Application.h"
-#include "Widgets.h"
 #include "Selection.h"
-#include "Document.h"
 #include "ViewProvider.h"
 #include "WaitCursor.h"
-#include "SpinBox.h"
 
-#include <Base/Console.h>
-#include <App/Application.h>
-#include <App/DocumentObject.h>
-#include <App/Material.h>
 
 using namespace Gui::Dialog;
 using namespace std;