diff --git a/src/Gui/Command.cpp b/src/Gui/Command.cpp
index a54a1e22a2..8aa9f990b3 100644
--- a/src/Gui/Command.cpp
+++ b/src/Gui/Command.cpp
@@ -23,6 +23,7 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <Inventor/SbSphere.h>
 # include <Inventor/actions/SoGetBoundingBoxAction.h>
 # include <Inventor/nodes/SoOrthographicCamera.h>
 # include <sstream>
diff --git a/src/Gui/Quarter/ContextMenu.cpp b/src/Gui/Quarter/ContextMenu.cpp
index 88c3535a5e..c85daca085 100644
--- a/src/Gui/Quarter/ContextMenu.cpp
+++ b/src/Gui/Quarter/ContextMenu.cpp
@@ -31,14 +31,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \**************************************************************************/
 
-#include "ContextMenu.h"
-
 #include <QMenu>
 
-#include <Inventor/SoEventManager.h>
-#include <Inventor/scxml/SoScXMLStateMachine.h>
+#include "ContextMenu.h"
+#include "QuarterWidget.h"
 
-#include <Quarter/QuarterWidget.h>
 
 using namespace SIM::Coin3D::Quarter;
 
diff --git a/src/Gui/Quarter/EventFilter.cpp b/src/Gui/Quarter/EventFilter.cpp
index faf056d375..0787738b02 100644
--- a/src/Gui/Quarter/EventFilter.cpp
+++ b/src/Gui/Quarter/EventFilter.cpp
@@ -34,21 +34,15 @@
 
 */
 
-#include <Quarter/eventhandlers/EventFilter.h>
+#include <QEvent>
+#include <QMouseEvent>
 
-#include <QtCore/QEvent>
-#include <QtGui/QMouseEvent>
+#include "QuarterWidget.h"
+#include "devices/Keyboard.h"
+#include "devices/Mouse.h"
+#include "devices/SpaceNavigatorDevice.h"
+#include "eventhandlers/EventFilter.h"
 
-#include <Inventor/SoEventManager.h>
-#include <Inventor/events/SoLocation2Event.h>
-#include <Inventor/events/SoMouseButtonEvent.h>
-
-#include <Quarter/QuarterWidget.h>
-#include <Quarter/devices/Mouse.h>
-#include <Quarter/devices/Keyboard.h>
-#include <Quarter/devices/SpaceNavigatorDevice.h>
-
-#include <QGuiApplication>
 
 namespace SIM { namespace Coin3D { namespace Quarter {
 
diff --git a/src/Gui/Quarter/ImageReader.cpp b/src/Gui/Quarter/ImageReader.cpp
index 75c121db98..25aa9f92a4 100644
--- a/src/Gui/Quarter/ImageReader.cpp
+++ b/src/Gui/Quarter/ImageReader.cpp
@@ -30,12 +30,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \**************************************************************************/
 
-#include "ImageReader.h"
 #include <Inventor/SbImage.h>
-#include <Inventor/errors/SoDebugError.h>
-#include <QtGui/QImage>
+#include <QImage>
+
+#include "ImageReader.h"
+#include "QtCoinCompatibility.h"
 
-#include <Quarter/QtCoinCompatibility.h>
 
 using namespace SIM::Coin3D::Quarter;
 
diff --git a/src/Gui/Quarter/ImageReader.h b/src/Gui/Quarter/ImageReader.h
index 9d8ad2c186..078a43babd 100644
--- a/src/Gui/Quarter/ImageReader.h
+++ b/src/Gui/Quarter/ImageReader.h
@@ -33,7 +33,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \**************************************************************************/
 
-#include <Inventor/SbBasic.h>
 
 class SbImage;
 class SbString;
diff --git a/src/Gui/Quarter/Keyboard.cpp b/src/Gui/Quarter/Keyboard.cpp
index e16e4a62f3..1195212ae7 100644
--- a/src/Gui/Quarter/Keyboard.cpp
+++ b/src/Gui/Quarter/Keyboard.cpp
@@ -37,19 +37,17 @@
   the QuarterWidget.
 */
 
-
 #ifdef _MSC_VER
 #pragma warning(disable : 4267)
 #endif
 
-#include <Quarter/devices/Keyboard.h>
-
-#include <QtCore/QEvent>
-#include <QtGui/QKeyEvent>
-#include <Inventor/events/SoEvents.h>
-#include <Inventor/events/SoKeyboardEvent.h>
+#include <QEvent>
+#include <QKeyEvent>
+#include <Inventor/events/SoEvent.h>
 
 #include "KeyboardP.h"
+#include "devices/Keyboard.h"
+
 
 using namespace SIM::Coin3D::Quarter;
 
diff --git a/src/Gui/Quarter/Mouse.cpp b/src/Gui/Quarter/Mouse.cpp
index fa182955fc..e865f119f3 100644
--- a/src/Gui/Quarter/Mouse.cpp
+++ b/src/Gui/Quarter/Mouse.cpp
@@ -43,20 +43,18 @@
 #pragma warning(disable : 4267)
 #endif
 
-#include <Quarter/devices/Mouse.h>
+#include <QEvent>
+#include <QMouseEvent>
+#include <QWheelEvent>
+
 #include <Gui/SoMouseWheelEvent.h>
-
-#include <QtCore/QEvent>
-#include <QtCore/QSize>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QWheelEvent>
-
-#include <QGuiApplication>
-
 #include <Inventor/SbVec2s.h>
-#include <Inventor/events/SoEvents.h>
 #include <Inventor/errors/SoDebugError.h>
-#include <Quarter/QuarterWidget.h>
+#include <Inventor/events/SoEvents.h>
+
+#include "QuarterWidget.h"
+#include "devices/Mouse.h"
+
 
 namespace SIM { namespace Coin3D { namespace Quarter {
 
diff --git a/src/Gui/Quarter/QuarterWidget.cpp b/src/Gui/Quarter/QuarterWidget.cpp
index 9e708691fa..8bc9f6db31 100644
--- a/src/Gui/Quarter/QuarterWidget.cpp
+++ b/src/Gui/Quarter/QuarterWidget.cpp
@@ -54,52 +54,43 @@
 
 #include <cassert>
 
-#include <Quarter/QuarterWidget.h>
-#include <Quarter/eventhandlers/EventFilter.h>
-#include <Quarter/eventhandlers/DragDropHandler.h>
-
-#include <QtCore/QEvent>
-#include <QtCore/QDebug>
-#include <QtCore/QFile>
 #include <QAction>
 #include <QApplication>
+#include <QDebug>
+#include <QEvent>
+#include <QFile>
+#include <QGuiApplication>
+#include <QMetaObject>
+#include <QOpenGLDebugLogger>
+#include <QOpenGLDebugMessage>
 #include <QPaintEvent>
 #include <QResizeEvent>
-
-#include <QOpenGLDebugMessage>
-#include <QOpenGLDebugLogger>
+#include <QWindow>
 
 #if COIN_MAJOR_VERSION >= 4
 #include <Inventor/SbByteBuffer.h>
 #endif
 
-#include <Inventor/SbViewportRegion.h>
-#include <Inventor/system/gl.h>
-#include <Inventor/events/SoEvents.h>
-#include <Inventor/nodes/SoNode.h>
-#include <Inventor/nodes/SoCamera.h>
-#include <Inventor/nodes/SoSeparator.h>
-#include <Inventor/nodes/SoDirectionalLight.h>
-#include <Inventor/nodes/SoPerspectiveCamera.h>
+#include <Inventor/SbByteBuffer.h>
 #include <Inventor/SbColor.h>
-#include <Inventor/sensors/SoSensorManager.h>
+#include <Inventor/SbViewportRegion.h>
 #include <Inventor/SoDB.h>
-
-#include <Inventor/SbBasic.h>
-#include <Inventor/SoRenderManager.h>
 #include <Inventor/SoEventManager.h>
+#include <Inventor/SoRenderManager.h>
+#include <Inventor/nodes/SoCamera.h>
+#include <Inventor/nodes/SoDirectionalLight.h>
+#include <Inventor/nodes/SoNode.h>
+#include <Inventor/nodes/SoPerspectiveCamera.h>
+#include <Inventor/nodes/SoSeparator.h>
 #include <Inventor/scxml/ScXML.h>
 #include <Inventor/scxml/SoScXMLStateMachine.h>
 
-#include <ctime>
-
+#include "QuarterWidget.h"
 #include "InteractionMode.h"
-#include "QuarterWidgetP.h"
 #include "QuarterP.h"
-
-#include <QWindow>
-#include <QGuiApplication>
-#include <QMetaObject>
+#include "QuarterWidgetP.h"
+#include "eventhandlers/EventFilter.h"
+#include "eventhandlers/DragDropHandler.h"
 
 
 using namespace SIM::Coin3D::Quarter;
diff --git a/src/Gui/Quarter/QuarterWidget.h b/src/Gui/Quarter/QuarterWidget.h
index 80e781b613..2d777ae4e0 100644
--- a/src/Gui/Quarter/QuarterWidget.h
+++ b/src/Gui/Quarter/QuarterWidget.h
@@ -33,15 +33,16 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \**************************************************************************/
 
-#include <Inventor/SbBasic.h>
 #include <Inventor/SoRenderManager.h>
 #include <Inventor/actions/SoGLRenderAction.h>
 
-#include <QtGui/QColor>
+#include <QColor>
 #include <QGraphicsView>
-#include <QtCore/QUrl>
+#include <QUrl>
 #include <QtOpenGL.h>
-#include <Gui/Quarter/Basic.h>
+
+#include "Basic.h"
+
 
 class QMenu;
 class SoNode;
diff --git a/src/Gui/Quarter/QuarterWidgetP.h b/src/Gui/Quarter/QuarterWidgetP.h
index d9373961cb..c0ed5e01ad 100644
--- a/src/Gui/Quarter/QuarterWidgetP.h
+++ b/src/Gui/Quarter/QuarterWidgetP.h
@@ -34,12 +34,11 @@
 \**************************************************************************/
 
 #include <Inventor/SbBasic.h>
-#include <Inventor/SbName.h>
-#include <QtGui/QCursor>
-#include <QtCore/QList>
-#include <QtCore/QUrl>
+#include <QList>
+#include <QUrl>
 #include <QtOpenGL.h>
 
+
 class SoNode;
 class SoCamera;
 class SoRenderManager;
diff --git a/src/Gui/Quarter/SensorManager.cpp b/src/Gui/Quarter/SensorManager.cpp
index 5d2ebf115f..b453a03e32 100644
--- a/src/Gui/Quarter/SensorManager.cpp
+++ b/src/Gui/Quarter/SensorManager.cpp
@@ -32,15 +32,16 @@
 
 #include "SensorManager.h"
 
-#include <QtCore/QTimer>
+#include <QTimer>
 
-#include <Inventor/SoDB.h>
 #include <Inventor/SbTime.h>
+#include <Inventor/SoDB.h>
 #include <Inventor/SoRenderManager.h>
-#include <Inventor/nodekits/SoNodeKit.h>
 #include <Inventor/C/threads/thread.h>
+
 #include "SignalThread.h"
 
+
 using namespace SIM::Coin3D::Quarter;
 
 SensorManager::SensorManager()
diff --git a/src/Gui/Quarter/SoQTQuarterAdaptor.cpp b/src/Gui/Quarter/SoQTQuarterAdaptor.cpp
index 4f24e2d70a..16a57a8fa1 100644
--- a/src/Gui/Quarter/SoQTQuarterAdaptor.cpp
+++ b/src/Gui/Quarter/SoQTQuarterAdaptor.cpp
@@ -28,6 +28,7 @@
 #include <Inventor/actions/SoHandleEventAction.h>
 #include <Inventor/actions/SoRayPickAction.h>
 #include <Inventor/actions/SoSearchAction.h>
+#include <Inventor/events/SoEvents.h>
 #include <Inventor/nodes/SoLocateHighlight.h>
 #include <Inventor/nodes/SoOrthographicCamera.h>
 #include <Inventor/nodes/SoPerspectiveCamera.h>
diff --git a/src/Gui/Quarter/SoQTQuarterAdaptor.h b/src/Gui/Quarter/SoQTQuarterAdaptor.h
index e9cee0b949..4536430de4 100644
--- a/src/Gui/Quarter/SoQTQuarterAdaptor.h
+++ b/src/Gui/Quarter/SoQTQuarterAdaptor.h
@@ -21,16 +21,14 @@
 #ifndef SIM_COIN3D_SOQTQUARTERADAPTOR_H
 #define SIM_COIN3D_SOQTQUARTERADAPTOR_H
 
-#include "Gui/Quarter/QuarterWidget.h"
-#include <Inventor/SoSceneManager.h>
-#include <Inventor/SbSphere.h>
 #include <Inventor/SoType.h>
-#include <Inventor/events/SoKeyboardEvent.h>
-#include <Inventor/lists/SoCallbackList.h>
-#include <Inventor/sensors/SoTimerSensor.h>
 #include <Inventor/actions/SoGetMatrixAction.h>
 #include <Inventor/actions/SoSearchAction.h>
-#include <vector>
+#include <Inventor/lists/SoCallbackList.h>
+#include <Inventor/sensors/SoTimerSensor.h>
+
+#include "QuarterWidget.h"
+
 
 class SbViewportRegion;
 class SoCamera;
diff --git a/src/Gui/ViewProvider.cpp b/src/Gui/ViewProvider.cpp
index 739603070f..8afa9fbc8b 100644
--- a/src/Gui/ViewProvider.cpp
+++ b/src/Gui/ViewProvider.cpp
@@ -28,6 +28,7 @@
 # include <Inventor/SoPickedPoint.h>
 # include <Inventor/actions/SoGetBoundingBoxAction.h>
 # include <Inventor/details/SoDetail.h>
+# include <Inventor/events/SoKeyboardEvent.h>
 # include <Inventor/events/SoLocation2Event.h>
 # include <Inventor/events/SoMouseButtonEvent.h>
 # include <Inventor/nodes/SoSeparator.h>
diff --git a/src/Mod/Inspection/Gui/Command.cpp b/src/Mod/Inspection/Gui/Command.cpp
index b8a7807e4c..8cc7eb24ac 100644
--- a/src/Mod/Inspection/Gui/Command.cpp
+++ b/src/Mod/Inspection/Gui/Command.cpp
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
 
-#include <Base/Console.h>
+#include <Inventor/events/SoButtonEvent.h>
+
 #include <App/Document.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
diff --git a/src/Mod/Inspection/Gui/ViewProviderInspection.cpp b/src/Mod/Inspection/Gui/ViewProviderInspection.cpp
index a5099038ca..853f3b5ac6 100644
--- a/src/Mod/Inspection/Gui/ViewProviderInspection.cpp
+++ b/src/Mod/Inspection/Gui/ViewProviderInspection.cpp
@@ -33,6 +33,8 @@
 #include <Inventor/SoPickedPoint.h>
 #include <Inventor/lists/SoPickedPointList.h> 
 #include <Inventor/details/SoFaceDetail.h>
+#include <Inventor/events/SoButtonEvent.h>
+#include <Inventor/events/SoKeyboardEvent.h>
 #include <Inventor/events/SoMouseButtonEvent.h>
 #include <Inventor/nodes/SoCoordinate3.h>
 #include <Inventor/nodes/SoDrawStyle.h>
diff --git a/src/Mod/Mesh/Gui/MeshEditor.cpp b/src/Mod/Mesh/Gui/MeshEditor.cpp
index 673b188464..fe94a47568 100644
--- a/src/Mod/Mesh/Gui/MeshEditor.cpp
+++ b/src/Mod/Mesh/Gui/MeshEditor.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
@@ -32,6 +31,7 @@
 # include <Inventor/SoPickedPoint.h>
 # include <Inventor/details/SoFaceDetail.h>
 # include <Inventor/details/SoPointDetail.h>
+# include <Inventor/events/SoKeyboardEvent.h>
 # include <Inventor/events/SoLocation2Event.h>
 # include <Inventor/events/SoMouseButtonEvent.h>
 # include <Inventor/nodes/SoBaseColor.h>
diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
index 55c649e799..36d81372ca 100644
--- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
+++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
@@ -23,6 +23,7 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <Inventor/events/SoKeyboardEvent.h>
 # include <Inventor/nodes/SoPickStyle.h>
 # include <QApplication>
 # include <QInputDialog>
diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
index 59564d891e..2629dcbe1c 100644
--- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
@@ -30,6 +30,7 @@
 # include <Inventor/SbBox3f.h>
 # include <Inventor/SoPickedPoint.h>
 # include <Inventor/details/SoPointDetail.h>
+# include <Inventor/events/SoKeyboardEvent.h>
 # include <Inventor/nodes/SoCamera.h>
 # include <Inventor/SbLine.h>
 # include <Inventor/SbTime.h>