diff --git a/src/Gui/propertyeditor/PropertyEditor.cpp b/src/Gui/propertyeditor/PropertyEditor.cpp
index d6fe9e08e3..25bfb5b98d 100644
--- a/src/Gui/propertyeditor/PropertyEditor.cpp
+++ b/src/Gui/propertyeditor/PropertyEditor.cpp
@@ -25,31 +25,29 @@
 
 #ifndef _PreComp_
 # include <QApplication>
-# include <QPainter>
-# include <QMenu>
-# include <QDebug>
-# include <QDialog>
-# include <QMessageBox>
-# include <QCheckBox>
 # include <QInputDialog>
+# include <QMenu>
+# include <QPainter>
 #endif
 
 #include <boost/algorithm/string/predicate.hpp>
 
+#include <App/Application.h>
+#include <App/AutoTransaction.h>
+#include <App/Document.h>
 #include <Base/Console.h>
 #include <Base/Tools.h>
-#include <App/Application.h>
-#include <App/Document.h>
-#include <App/AutoTransaction.h>
-#include "ViewProviderDocumentObject.h"
-#include "MainWindow.h"
-#include "DlgAddProperty.h"
+
 #include "PropertyEditor.h"
+#include "DlgAddProperty.h"
+#include "MainWindow.h"
 #include "PropertyItemDelegate.h"
 #include "PropertyModel.h"
 #include "PropertyView.h"
+#include "ViewProviderDocumentObject.h"
 
-FC_LOG_LEVEL_INIT("PropertyView",true,true)
+
+FC_LOG_LEVEL_INIT("PropertyView", true, true)
 
 using namespace Gui::PropertyEditor;
 
diff --git a/src/Gui/propertyeditor/PropertyEditor.h b/src/Gui/propertyeditor/PropertyEditor.h
index bf4fc46990..e61ff0f26a 100644
--- a/src/Gui/propertyeditor/PropertyEditor.h
+++ b/src/Gui/propertyeditor/PropertyEditor.h
@@ -24,17 +24,14 @@
 #ifndef PROPERTYEDITOR_H
 #define PROPERTYEDITOR_H
 
-#include <map>
-#include <string>
-#include <vector>
 #include <unordered_set>
 
 #include <QTreeView>
 
-#include <App/DocumentObserver.h>
 #include "PropertyItem.h"
 #include "PropertyModel.h"
 
+
 namespace App {
 class Property;
 class Document;
diff --git a/src/Gui/propertyeditor/PropertyItem.cpp b/src/Gui/propertyeditor/PropertyItem.cpp
index d51824f00d..b6535e836b 100644
--- a/src/Gui/propertyeditor/PropertyItem.cpp
+++ b/src/Gui/propertyeditor/PropertyItem.cpp
@@ -24,47 +24,39 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <algorithm>
+# include <QApplication>
 # include <QComboBox>
 # include <QFontDatabase>
-# include <QLayout>
 # include <QLocale>
+# include <QPalette>
 # include <QPixmap>
 # include <QTextStream>
 # include <QTimer>
-# include <QApplication>
-# include <QPalette>
-# include <QtGlobal>
 #endif
 
-#include <boost/algorithm/string/predicate.hpp>
+#include "PropertyItem.h"
+#include "PropertyView.h"
 
-#include <Base/Tools.h>
-#include <Base/Console.h>
-#include <Base/Interpreter.h>
-#include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <App/PropertyGeo.h>
 #include <App/PropertyFile.h>
 #include <App/PropertyUnits.h>
-#include <Gui/Application.h>
-#include <Gui/Control.h>
-#include <Gui/Widgets.h>
+#include <Base/Console.h>
+#include <Base/Interpreter.h>
+#include <Base/Tools.h>
 #include <Gui/Command.h>
-#include <Gui/Document.h>
-#include <Gui/Selection.h>
-#include <Gui/MainWindow.h>
-#include <Gui/ViewProviderDocumentObject.h>
-#include <Gui/Placement.h>
-#include <Gui/FileDialog.h>
+#include <Gui/Control.h>
 #include <Gui/DlgPropertyLink.h>
+#include <Gui/FileDialog.h>
+#include <Gui/MainWindow.h>
+#include <Gui/Placement.h>
 #include <Gui/QuantitySpinBox.h>
-#include <Gui/VectorListEditor.h>
-
-#include "PropertyItem.h"
-#include "PropertyView.h"
+#include <Gui/Selection.h>
 #include <Gui/SpinBox.h>
+#include <Gui/VectorListEditor.h>
+#include <Gui/ViewProviderDocumentObject.h>
+
 
 using namespace Gui::PropertyEditor;
 using namespace Gui::Dialog;
diff --git a/src/Gui/propertyeditor/PropertyItem.h b/src/Gui/propertyeditor/PropertyItem.h
index 9de08a51d4..4975774801 100644
--- a/src/Gui/propertyeditor/PropertyItem.h
+++ b/src/Gui/propertyeditor/PropertyItem.h
@@ -24,22 +24,22 @@
 #ifndef PROPERTYEDITORITEM_H
 #define PROPERTYEDITORITEM_H
 
+#include <QItemEditorFactory>
 #include <QObject>
 #include <QPointer>
-#include <QItemEditorFactory>
 #include <vector>
 
+#include <App/PropertyStandard.h>
 #include <Base/Factory.h>
-#include <Base/Vector3D.h>
 #include <Base/Matrix.h>
 #include <Base/Placement.h>
 #include <Base/Quantity.h>
+#include <Base/Vector3D.h>
 #include <Base/UnitsApi.h>
-#include <App/DocumentObserver.h>
-#include <App/PropertyStandard.h>
-#include <Gui/Widgets.h>
 #include <Gui/ExpressionBinding.h>
 #include <Gui/MetaTypes.h>
+#include <Gui/Widgets.h>
+
 #include <FCGlobal.h>
 
 #ifdef Q_MOC_RUN
@@ -53,6 +53,7 @@ Q_DECLARE_METATYPE(Base::Quantity)
 Q_DECLARE_METATYPE(QList<Base::Quantity>)
 #endif
 
+
 #define PROPERTYITEM_HEADER \
 public: \
     static void *create(void); \
diff --git a/src/Gui/propertyeditor/PropertyItemDelegate.cpp b/src/Gui/propertyeditor/PropertyItemDelegate.cpp
index f7fb69bbdd..bb4a3714df 100644
--- a/src/Gui/propertyeditor/PropertyItemDelegate.cpp
+++ b/src/Gui/propertyeditor/PropertyItemDelegate.cpp
@@ -29,18 +29,16 @@
 # include <QPainter>
 #endif
 
-#include <Base/Console.h>
 #include <Base/Tools.h>
-#include <App/Application.h>
-#include <App/Document.h>
-#include <App/DocumentObject.h>
+
 #include "PropertyItemDelegate.h"
-#include "PropertyItem.h"
-#include "PropertyEditor.h"
 #include "MDIView.h"
+#include "PropertyEditor.h"
+#include "PropertyItem.h"
 #include "Tree.h"
 
-FC_LOG_LEVEL_INIT("PropertyView",true,true)
+
+FC_LOG_LEVEL_INIT("PropertyView", true, true)
 
 using namespace Gui::PropertyEditor;
 
diff --git a/src/Gui/propertyeditor/PropertyModel.cpp b/src/Gui/propertyeditor/PropertyModel.cpp
index 029ca31641..779baf3fd7 100644
--- a/src/Gui/propertyeditor/PropertyModel.cpp
+++ b/src/Gui/propertyeditor/PropertyModel.cpp
@@ -23,16 +23,13 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-# include <cfloat>
-#endif
-
 #include <boost/algorithm/string/predicate.hpp>
 
-#include "PropertyModel.h"
 #include "PropertyItem.h"
+#include "PropertyModel.h"
 #include "PropertyView.h"
 
+
 using namespace Gui;
 using namespace Gui::PropertyEditor;
 
diff --git a/src/Gui/propertyeditor/PropertyModel.h b/src/Gui/propertyeditor/PropertyModel.h
index a28779dc32..37d06d2596 100644
--- a/src/Gui/propertyeditor/PropertyModel.h
+++ b/src/Gui/propertyeditor/PropertyModel.h
@@ -26,11 +26,12 @@
 
 #include <QAbstractItemModel>
 #include <QStringList>
-#include <vector>
 #include <map>
 #include <unordered_map>
+#include <vector>
 #include "PropertyItem.h"
 
+
 namespace App {
 class Property;
 }