diff --git a/src/Mod/Part/Gui/Mirroring.cpp b/src/Mod/Part/Gui/Mirroring.cpp
index 21eca65fcf..fbf77c417e 100644
--- a/src/Mod/Part/Gui/Mirroring.cpp
+++ b/src/Mod/Part/Gui/Mirroring.cpp
@@ -20,24 +20,22 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
+
 #ifndef _PreComp_
+
+// to avoid compiler warnings of redefining contents of basic.h
+// later by #include <Gui/ViewProvider.h>
+# define _USE_MATH_DEFINES
+# include <cmath>
+
+# include <cfloat>
 # include <QMessageBox>
 # include <QRegExp>
 # include <QTreeWidget>
-# include <TopoDS_Shape.hxx>
-# include <TopExp_Explorer.hxx>
-# include <cfloat>
-# include <Inventor/system/inttypes.h>
 #endif
 
-#include "Mirroring.h"
-#include "ui_Mirroring.h"
-#include "../App/PartFeature.h"
-#include <Base/Exception.h>
 #include <Base/Tools.h>
-#include <Base/UnitsApi.h>
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
@@ -51,6 +49,11 @@
 #include <Gui/Utilities.h>
 #include <Gui/ViewProvider.h>
 #include <Gui/WaitCursor.h>
+#include <Mod/Part/App/PartFeature.h>
+
+#include "Mirroring.h"
+#include "ui_Mirroring.h"
+
 
 using namespace PartGui;
 
diff --git a/src/Mod/Part/Gui/ReferenceHighlighter.h b/src/Mod/Part/Gui/ReferenceHighlighter.h
index 89fd3c10bc..f2619a6924 100644
--- a/src/Mod/Part/Gui/ReferenceHighlighter.h
+++ b/src/Mod/Part/Gui/ReferenceHighlighter.h
@@ -20,15 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PARTGUI_REFERENCEHIGHLIGHTER_H
 #define PARTGUI_REFERENCEHIGHLIGHTER_H
 
+#include <vector>
+
 #include <TopoDS_Shape.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
-#include <vector>
+
 #include <App/Material.h>
-#include <Mod/Part/PartGlobal.h>
+
 
 namespace PartGui {
 
diff --git a/src/Mod/Part/Gui/ShapeFromMesh.cpp b/src/Mod/Part/Gui/ShapeFromMesh.cpp
index c570f6cf2b..aa28182200 100644
--- a/src/Mod/Part/Gui/ShapeFromMesh.cpp
+++ b/src/Mod/Part/Gui/ShapeFromMesh.cpp
@@ -20,20 +20,20 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <sstream>
 #endif
 
-#include "ShapeFromMesh.h"
-#include "ui_ShapeFromMesh.h"
 #include <Base/UnitsApi.h>
-#include <App/DocumentObserver.h>
 #include <Gui/CommandT.h>
 #include <Gui/Selection.h>
 #include <Gui/WaitCursor.h>
 
+#include "ShapeFromMesh.h"
+#include "ui_ShapeFromMesh.h"
+
+
 using namespace PartGui;