diff --git a/src/Mod/Points/App/AppPointsPy.cpp b/src/Mod/Points/App/AppPointsPy.cpp
index 751af38549..49481866f8 100644
--- a/src/Mod/Points/App/AppPointsPy.cpp
+++ b/src/Mod/Points/App/AppPointsPy.cpp
@@ -20,31 +20,26 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <memory>
 #endif
 
-
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
-
-#include <Base/Console.h>
-#include <Base/Interpreter.h>
-#include <Base/FileInfo.h>
-
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <App/DocumentObjectPy.h>
 #include <App/Property.h>
+#include <Base/Console.h>
+#include <Base/Interpreter.h>
+#include <Base/FileInfo.h>
 
 #include "Points.h"
-#include "PointsPy.h"
 #include "PointsAlgos.h"
-#include "Structured.h"
+#include "PointsPy.h"
 #include "Properties.h"
+#include "Structured.h"
+
 
 namespace Points {
 class Module : public Py::ExtensionModule<Module>
diff --git a/src/Mod/Points/App/Points.cpp b/src/Mod/Points/App/Points.cpp
index e8831f5f3b..d306585104 100644
--- a/src/Mod/Points/App/Points.cpp
+++ b/src/Mod/Points/App/Points.cpp
@@ -20,25 +20,22 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <cmath>
 # include <iostream>
+# include <QtConcurrentMap>
 #endif
 
 #include <boost/math/special_functions/fpclassify.hpp>
-#include <QtConcurrentMap>
 
-#include <Base/Exception.h>
 #include <Base/Matrix.h>
-#include <Base/Persistence.h>
 #include <Base/Stream.h>
 #include <Base/Writer.h>
 
 #include "Points.h"
 #include "PointsAlgos.h"
-#include "PointsPy.h"
+
 
 #ifdef _MSC_VER
 # include <ppl.h>
diff --git a/src/Mod/Points/App/Points.h b/src/Mod/Points/App/Points.h
index 14d5aafd3c..caa7d54712 100644
--- a/src/Mod/Points/App/Points.h
+++ b/src/Mod/Points/App/Points.h
@@ -27,20 +27,19 @@
 #include <vector>
 #include <iterator>
 
-#include <Base/Vector3D.h>
+#include <App/ComplexGeoData.h>
+#include <App/PropertyGeo.h>
 #include <Base/Matrix.h>
 #include <Base/Reader.h>
+#include <Base/Vector3D.h>
 #include <Base/Writer.h>
 
-#include <App/ComplexGeoData.h>
-#include <App/PropertyStandard.h>
-#include <App/PropertyGeo.h>
+
 #include <Mod/Points/PointsGlobal.h>
 
 namespace Points
 {
 
-
 /** Point kernel
  */
 class PointsExport PointKernel : public Data::ComplexGeoData
diff --git a/src/Mod/Points/App/PointsAlgos.cpp b/src/Mod/Points/App/PointsAlgos.cpp
index f65408187c..167f3b9d9f 100644
--- a/src/Mod/Points/App/PointsAlgos.cpp
+++ b/src/Mod/Points/App/PointsAlgos.cpp
@@ -20,34 +20,30 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#ifdef FC_OS_LINUX
-# include <unistd.h>
-#endif
+# ifdef FC_OS_LINUX
+#  include <unistd.h>
+# endif
+# include <memory>
 # include <sstream>
 #endif
 
+#include <boost/lexical_cast.hpp>
+#include <boost/regex.hpp>
+#include <boost/algorithm/string.hpp>
 
-#include "PointsAlgos.h"
-#include "Points.h"
-
+#include <Base/Console.h>
 #include <Base/Converter.h>
 #include <Base/Exception.h>
 #include <Base/FileInfo.h>
-#include <Base/Console.h>
 #include <Base/Sequencer.h>
 #include <Base/Stream.h>
-
-#include <memory>
-#include <boost/regex.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/math/special_functions/fpclassify.hpp>
-
 #include <E57Format.h>
 
+#include "PointsAlgos.h"
+
+
 using namespace Points;
 
 void PointsAlgos::Load(PointKernel &points, const char *FileName)
diff --git a/src/Mod/Points/App/PointsAlgos.h b/src/Mod/Points/App/PointsAlgos.h
index 6bee986ed5..19ad609a59 100644
--- a/src/Mod/Points/App/PointsAlgos.h
+++ b/src/Mod/Points/App/PointsAlgos.h
@@ -20,13 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef _PointsAlgos_h_
 #define _PointsAlgos_h_
 
+#include <Eigen/Core>
+
 #include "Points.h"
 #include "Properties.h"
-#include <Eigen/Core>
+
 
 namespace Points
 {
diff --git a/src/Mod/Points/App/PointsFeature.cpp b/src/Mod/Points/App/PointsFeature.cpp
index 1ac669d745..1740226cf7 100644
--- a/src/Mod/Points/App/PointsFeature.cpp
+++ b/src/Mod/Points/App/PointsFeature.cpp
@@ -20,24 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <vector>
 #endif
-#include <vector>
-
-#include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/Stream.h>
-#include <Base/Writer.h>
-
 
 #include "PointsFeature.h"
 
-using namespace Points;
 
+using namespace Points;
 
 //===========================================================================
 // Feature
diff --git a/src/Mod/Points/App/PointsFeature.h b/src/Mod/Points/App/PointsFeature.h
index 64ff6a9f3e..5f5c1f07f9 100644
--- a/src/Mod/Points/App/PointsFeature.h
+++ b/src/Mod/Points/App/PointsFeature.h
@@ -20,15 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef POINTS_FEATURE_H
 #define POINTS_FEATURE_H
 
-#include <App/GeoFeature.h>
+#include <App/GeoFeature.h> // must be first include
 #include <App/FeatureCustom.h>
 #include <App/FeaturePython.h>
-#include <App/PropertyLinks.h>
 #include <App/PropertyGeo.h>
+
 #include "Points.h"
 #include "PropertyPointKernel.h"
 
diff --git a/src/Mod/Points/App/PointsGrid.cpp b/src/Mod/Points/App/PointsGrid.cpp
index 7a5c497c70..31ba18e7eb 100644
--- a/src/Mod/Points/App/PointsGrid.cpp
+++ b/src/Mod/Points/App/PointsGrid.cpp
@@ -20,17 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <algorithm>
 #endif
 
-
-
 #include "PointsGrid.h"
 
+
 using namespace Points;
 
 PointsGrid::PointsGrid (const PointKernel &rclM)
diff --git a/src/Mod/Points/App/PointsGrid.h b/src/Mod/Points/App/PointsGrid.h
index 41ac53d609..a85fac5d03 100644
--- a/src/Mod/Points/App/PointsGrid.h
+++ b/src/Mod/Points/App/PointsGrid.h
@@ -20,19 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef POINTS_GRID_H
 #define POINTS_GRID_H
 
 #include <set>
 
-#include "Points.h"
-#include <Base/Vector3D.h>
 #include <Base/BoundBox.h>
+#include <Base/Vector3D.h>
 
-#define  POINTS_CT_GRID          256     // Default value for number of elements per grid
-#define  POINTS_MAX_GRIDS        100000  // Default value for maximum number of grids
-#define  POINTS_CT_GRID_PER_AXIS 20
+#include "Points.h"
+
+#define  POINTS_CT_GRID           256     // Default value for number of elements per grid
+#define  POINTS_MAX_GRIDS         100000  // Default value for maximum number of grids
+#define  POINTS_CT_GRID_PER_AXIS  20
 #define  PONTSGRID_BBOX_EXTENSION 10.0f
 
 
diff --git a/src/Mod/Points/App/PointsPyImp.cpp b/src/Mod/Points/App/PointsPyImp.cpp
index f5380d6f8d..641ac8eb0e 100644
--- a/src/Mod/Points/App/PointsPyImp.cpp
+++ b/src/Mod/Points/App/PointsPyImp.cpp
@@ -20,20 +20,21 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#include "Mod/Points/App/Points.h"
-#include <Base/Builder3D.h>
-#include <Base/Converter.h>
-#include <Base/VectorPy.h>
-#include <Base/GeometryPyCXX.h>
 #include <boost/math/special_functions/fpclassify.hpp>
 
+#include <Base/Builder3D.h>
+#include <Base/Converter.h>
+#include <Base/GeometryPyCXX.h>
+#include <Base/VectorPy.h>
+
+#include "Points.h"
 // inclusion of the generated files (generated out of PointsPy.xml)
 #include "PointsPy.h"
 #include "PointsPy.cpp"
 
+
 using namespace Points;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Points/App/PreCompiled.h b/src/Mod/Points/App/PreCompiled.h
index ef8ca5ed07..5747089279 100644
--- a/src/Mod/Points/App/PreCompiled.h
+++ b/src/Mod/Points/App/PreCompiled.h
@@ -35,26 +35,30 @@
 
 #ifdef _PreComp_
 
+// Qt
+# include <QtConcurrentMap>
+
 // standard
-#include <cstdio>
-#include <cassert>
+# include <cstdio>
+# include <cassert>
 
 // STL
-#include <algorithm>
-#include <iostream>
-#include <fstream>
-#include <list>
-#include <map>
-#include <queue>
-#include <set>
-#include <sstream>
-#include <stack>
-#include <string>
-#include <vector>
-#include <bitset>
-#include <cfloat>
-#include <cmath>
-#include <cstdlib>
+# include <algorithm>
+# include <bitset>
+# include <cfloat>
+# include <cmath>
+# include <cstdlib>
+# include <iostream>
+# include <fstream>
+# include <list>
+# include <map>
+# include <memory>
+# include <queue>
+# include <set>
+# include <sstream>
+# include <stack>
+# include <string>
+# include <vector>
 
 #endif //_PreComp_
 
diff --git a/src/Mod/Points/App/Properties.cpp b/src/Mod/Points/App/Properties.cpp
index 0f4a736eb4..2ea0366762 100644
--- a/src/Mod/Points/App/Properties.cpp
+++ b/src/Mod/Points/App/Properties.cpp
@@ -20,31 +20,29 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <algorithm>
 # include <cmath>
 # include <iostream>
-# include <algorithm>
+# include <QtConcurrentMap>
 #endif
 
 #include <Base/Converter.h>
-#include <Base/Exception.h>
 #include <Base/Matrix.h>
 #include <Base/Persistence.h>
 #include <Base/Stream.h>
-#include <Base/Writer.h>
 #include <Base/VectorPy.h>
+#include <Base/Writer.h>
 
-#include "Points.h"
 #include "Properties.h"
-#include "PointsPy.h"
+#include "Points.h"
 
-#include <QtConcurrentMap>
 #ifdef _MSC_VER
 # include <ppl.h>
 #endif
 
+
 using namespace Points;
 using namespace std;
 
diff --git a/src/Mod/Points/App/Properties.h b/src/Mod/Points/App/Properties.h
index f9e5da902a..fcc3cd044c 100644
--- a/src/Mod/Points/App/Properties.h
+++ b/src/Mod/Points/App/Properties.h
@@ -20,26 +20,22 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef POINTS_POINTPROPERTIES_H
 #define POINTS_POINTPROPERTIES_H
 
 #include <vector>
 
-#include <Base/Vector3D.h>
+#include <App/PropertyStandard.h>
 #include <Base/Matrix.h>
 #include <Base/Reader.h>
 #include <Base/Writer.h>
 
-#include <App/PropertyStandard.h>
-#include <App/PropertyGeo.h>
-
 #include "Points.h"
 
+
 namespace Points
 {
 
-
 /** Greyvalue property.
  */
 class PointsExport PropertyGreyValue : public App::PropertyFloat
diff --git a/src/Mod/Points/App/PropertyPointKernel.cpp b/src/Mod/Points/App/PropertyPointKernel.cpp
index 162afffe06..75e21442a2 100644
--- a/src/Mod/Points/App/PropertyPointKernel.cpp
+++ b/src/Mod/Points/App/PropertyPointKernel.cpp
@@ -20,23 +20,21 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <algorithm>
 # include <cmath>
 # include <iostream>
-# include <algorithm>
 #endif
 
-#include <Base/Exception.h>
 #include <Base/Matrix.h>
-#include <Base/Stream.h>
 #include <Base/Writer.h>
 
 #include "PropertyPointKernel.h"
 #include "PointsPy.h"
 
+
 using namespace Points;
 
 TYPESYSTEM_SOURCE(Points::PropertyPointKernel , App::PropertyComplexGeoData)
diff --git a/src/Mod/Points/App/Structured.cpp b/src/Mod/Points/App/Structured.cpp
index 52300d6f65..2b48373935 100644
--- a/src/Mod/Points/App/Structured.cpp
+++ b/src/Mod/Points/App/Structured.cpp
@@ -20,20 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <vector>
 #endif
-#include <vector>
-
-#include <Base/Console.h>
-#include <Base/Exception.h>
-
 
 #include "Structured.h"
 
+
 using namespace Points;
 
 
diff --git a/src/Mod/Points/Gui/AppPointsGui.cpp b/src/Mod/Points/Gui/AppPointsGui.cpp
index ca8c32f89c..d637cf67b2 100644
--- a/src/Mod/Points/Gui/AppPointsGui.cpp
+++ b/src/Mod/Points/Gui/AppPointsGui.cpp
@@ -20,16 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
-
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
-
-#include "ViewProvider.h"
-#include "Workbench.h"
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
@@ -38,6 +29,10 @@
 #include <Gui/Language/Translator.h>
 #include <Mod/Points/App/PropertyPointKernel.h>
 
+#include "ViewProvider.h"
+#include "Workbench.h"
+
+
 // use a different name to CreateCommand()
 void CreatePointsCommands();
 
diff --git a/src/Mod/Points/Gui/Command.cpp b/src/Mod/Points/Gui/Command.cpp
index 973d519005..ef6418f4ed 100644
--- a/src/Mod/Points/Gui/Command.cpp
+++ b/src/Mod/Points/Gui/Command.cpp
@@ -20,29 +20,25 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <algorithm>
-# include <QFileInfo>
 # include <QInputDialog>
 # include <Inventor/events/SoMouseButtonEvent.h>
 #endif
 
-#include <Base/Exception.h>
-#include <Base/Interpreter.h>
-#include <Base/Matrix.h>
-#include <Base/Tools.h>
-#include <Base/UnitsApi.h>
 #include <App/Application.h>
 #include <App/Document.h>
+#include <Base/Exception.h>
+#include <Base/Interpreter.h>
+#include <Base/Tools.h>
+#include <Base/UnitsApi.h>
 #include <Gui/Application.h>
-#include <Gui/Document.h>
-#include <Gui/MainWindow.h>
 #include <Gui/Command.h>
+#include <Gui/Document.h>
 #include <Gui/FileDialog.h>
+#include <Gui/MainWindow.h>
 #include <Gui/Selection.h>
-#include <Gui/ViewProvider.h>
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>
 #include <Gui/WaitCursor.h>
@@ -50,6 +46,7 @@
 #include "../App/PointsFeature.h"
 #include "../App/Structured.h"
 #include "../App/Properties.h"
+
 #include "DlgPointsReadImp.h"
 #include "ViewProvider.h"
 
diff --git a/src/Mod/Points/Gui/DlgPointsReadImp.cpp b/src/Mod/Points/Gui/DlgPointsReadImp.cpp
index b45f979d29..14d55a6214 100644
--- a/src/Mod/Points/Gui/DlgPointsReadImp.cpp
+++ b/src/Mod/Points/Gui/DlgPointsReadImp.cpp
@@ -21,16 +21,13 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
 
 #include "DlgPointsReadImp.h"
 #include "ui_DlgPointsRead.h"
 
+
 using namespace PointsGui;
 
-
-
 DlgPointsReadImp::DlgPointsReadImp(const char *FileName, QWidget* parent,  Qt::WindowFlags fl )
     : QDialog( parent, fl )
     , ui(new Ui_DlgPointsRead)
diff --git a/src/Mod/Points/Gui/PreCompiled.h b/src/Mod/Points/Gui/PreCompiled.h
index 8dbd2b8da7..82a9bac52e 100644
--- a/src/Mod/Points/Gui/PreCompiled.h
+++ b/src/Mod/Points/Gui/PreCompiled.h
@@ -28,28 +28,29 @@
 
 #ifdef FC_OS_WIN32
 # ifndef NOMINMAX
-# define NOMINMAX
+#  define NOMINMAX
 # endif
 #endif
 
 #ifdef _PreComp_
 
 // standard
-#include <cstdio>
-#include <cassert>
+# include <cstdio>
+# include <cassert>
 
 // STL
-#include <algorithm>
-#include <iostream>
-#include <list>
-#include <map>
-#include <queue>
-#include <set>
-#include <sstream>
-#include <stack>
-#include <string>
-#include <vector>
-#include <bitset>
+# include <algorithm>
+# include <bitset>
+# include <iostream>
+# include <limits>
+# include <list>
+# include <map>
+# include <queue>
+# include <set>
+# include <sstream>
+# include <stack>
+# include <string>
+# include <vector>
 
 #ifdef FC_OS_WIN32
 # include <windows.h>
diff --git a/src/Mod/Points/Gui/ViewProvider.cpp b/src/Mod/Points/Gui/ViewProvider.cpp
index 61422a3f5c..fe9410a4ce 100644
--- a/src/Mod/Points/Gui/ViewProvider.cpp
+++ b/src/Mod/Points/Gui/ViewProvider.cpp
@@ -20,44 +20,34 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <limits>
+# include <Inventor/errors/SoDebugError.h>
+# include <Inventor/events/SoMouseButtonEvent.h>
 # include <Inventor/nodes/SoCamera.h>
 # include <Inventor/nodes/SoCoordinate3.h>
 # include <Inventor/nodes/SoDrawStyle.h>
-# include <Inventor/nodes/SoPointSet.h>
 # include <Inventor/nodes/SoIndexedPointSet.h>
 # include <Inventor/nodes/SoMaterial.h>
 # include <Inventor/nodes/SoMaterialBinding.h>
 # include <Inventor/nodes/SoNormal.h>
-# include <Inventor/errors/SoDebugError.h>
-# include <Inventor/events/SoMouseButtonEvent.h>
+# include <Inventor/nodes/SoPointSet.h>
 #endif
 
 #include <boost/math/special_functions/fpclassify.hpp>
-#include <limits>
 
-/// Here the FreeCAD includes sorted by Base,App,Gui,...
-#include <Base/Console.h>
-#include <Base/Parameter.h>
-#include <Base/Exception.h>
-#include <Base/Sequencer.h>
-#include <Base/Tools2D.h>
-#include <Base/Vector3D.h>
-#include <App/Application.h>
 #include <App/Document.h>
+#include <Base/Vector3D.h>
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/SoFCSelection.h>
-#include <Gui/Window.h>
-
 #include <Gui/View3DInventorViewer.h>
 #include <Mod/Points/App/PointsFeature.h>
+#include <Mod/Points/App/Properties.h>
 
 #include "ViewProvider.h"
-#include "../App/Properties.h"
 
 
 using namespace PointsGui;
diff --git a/src/Mod/Points/Gui/ViewProvider.h b/src/Mod/Points/Gui/ViewProvider.h
index 0e1aa63fff..1c550e1737 100644
--- a/src/Mod/Points/Gui/ViewProvider.h
+++ b/src/Mod/Points/Gui/ViewProvider.h
@@ -23,10 +23,9 @@
 #ifndef POINTSGUI_VIEWPROVIDERPOINTS_H
 #define POINTSGUI_VIEWPROVIDERPOINTS_H
 
-#include <Base/Vector3D.h>
+#include <Gui/ViewProviderBuilder.h>
 #include <Gui/ViewProviderGeometryObject.h>
 #include <Gui/ViewProviderPythonFeature.h>
-#include <Gui/ViewProviderBuilder.h>
 #include <Inventor/SbVec2f.h>
 #include <Mod/Points/PointsGlobal.h>
 
diff --git a/src/Mod/Points/Gui/Workbench.cpp b/src/Mod/Points/Gui/Workbench.cpp
index ae8e3e0243..7dd51ebdd3 100644
--- a/src/Mod/Points/Gui/Workbench.cpp
+++ b/src/Mod/Points/Gui/Workbench.cpp
@@ -20,16 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-# include <qobject.h>
-#endif
+#include <Gui/MenuManager.h>
+#include <Gui/ToolBarManager.h>
 
 #include "Workbench.h"
-#include <Gui/ToolBarManager.h>
-#include <Gui/MenuManager.h>
+
 
 using namespace PointsGui;