diff --git a/ApplicationLibCode/Application/RiaApplication.h b/ApplicationLibCode/Application/RiaApplication.h
index 590070cd05..06d2c17fb3 100644
--- a/ApplicationLibCode/Application/RiaApplication.h
+++ b/ApplicationLibCode/Application/RiaApplication.h
@@ -21,12 +21,11 @@
 
 #include "RiaDefines.h"
 
-#include "cafPdmField.h"
-#include "cafPdmObject.h"
-
-#include "cvfFont.h"
+#include "cafPdmPointer.h"
 #include "cvfObject.h"
 
+#include <QEventLoop>
+#include <QMap>
 #include <QMutex>
 #include <QPointer>
 #include <QProcess>
@@ -35,7 +34,6 @@
 
 #include <gsl/gsl>
 
-#include <iostream>
 #include <memory>
 
 class QAction;
@@ -79,7 +77,8 @@ class UiProcess;
 namespace cvf
 {
 class ProgramOptions;
-}
+class Font;
+} // namespace cvf
 
 //==================================================================================================
 /// Base class for all ResInsight applications. I.e. console and GUI
diff --git a/ApplicationLibCode/Application/RiaGuiApplication.h b/ApplicationLibCode/Application/RiaGuiApplication.h
index c2c2805f6e..a65741fc9c 100644
--- a/ApplicationLibCode/Application/RiaGuiApplication.h
+++ b/ApplicationLibCode/Application/RiaGuiApplication.h
@@ -21,11 +21,6 @@
 #include "RiaApplication.h"
 #include "RiaDefines.h"
 
-#include "cafPdmField.h"
-#include "cafPdmObject.h"
-
-#include "cvfObject.h"
-
 #include <QApplication>
 #include <QMutex>
 #include <QPointer>
diff --git a/ApplicationLibCode/Commands/ExportCommands/RicAdvancedSnapshotExportFeature.cpp b/ApplicationLibCode/Commands/ExportCommands/RicAdvancedSnapshotExportFeature.cpp
index ebd090ed0d..0a4085f80f 100644
--- a/ApplicationLibCode/Commands/ExportCommands/RicAdvancedSnapshotExportFeature.cpp
+++ b/ApplicationLibCode/Commands/ExportCommands/RicAdvancedSnapshotExportFeature.cpp
@@ -47,6 +47,7 @@
 #include "cafUtils.h"
 
 #include <QAction>
+#include <QApplication>
 #include <QDebug>
 #include <QDir>
 
diff --git a/ApplicationLibCode/Commands/MeasurementCommands/RicMeasurementPickEventHandler.cpp b/ApplicationLibCode/Commands/MeasurementCommands/RicMeasurementPickEventHandler.cpp
index 774a8686e4..e8ef60d643 100644
--- a/ApplicationLibCode/Commands/MeasurementCommands/RicMeasurementPickEventHandler.cpp
+++ b/ApplicationLibCode/Commands/MeasurementCommands/RicMeasurementPickEventHandler.cpp
@@ -19,8 +19,6 @@
 #include "RicMeasurementPickEventHandler.h"
 
 #include "RiaApplication.h"
-#include "RiuViewer.h"
-#include "RiuViewerCommands.h"
 
 #include "Rim3dView.h"
 #include "RimExtrudedCurveIntersection.h"
@@ -28,13 +26,18 @@
 #include "RimMeasurement.h"
 #include "RimProject.h"
 
-#include "cafDisplayCoordTransform.h"
-#include "cafSelectionManager.h"
+#include "RiuViewer.h"
+#include "RiuViewerCommands.h"
 
 #include "RivPartPriority.h"
 
+#include "cafDisplayCoordTransform.h"
+#include "cafSelectionManager.h"
+
 #include "cvfPart.h"
 
+#include <QApplication>
+
 #include <vector>
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/Commands/OperationsUsingObjReferences/RicPasteFeatureImpl.cpp b/ApplicationLibCode/Commands/OperationsUsingObjReferences/RicPasteFeatureImpl.cpp
index 71bdef8551..5185d11fbc 100644
--- a/ApplicationLibCode/Commands/OperationsUsingObjReferences/RicPasteFeatureImpl.cpp
+++ b/ApplicationLibCode/Commands/OperationsUsingObjReferences/RicPasteFeatureImpl.cpp
@@ -33,6 +33,7 @@
 #include "cafPdmObjectHandle.h"
 
 #include <QAction>
+#include <QApplication>
 #include <QClipboard>
 #include <QString>
 
diff --git a/ApplicationLibCode/Commands/RicCopyGridStatisticsToClipboardFeature.cpp b/ApplicationLibCode/Commands/RicCopyGridStatisticsToClipboardFeature.cpp
index 665ff94603..c0d3f023e8 100644
--- a/ApplicationLibCode/Commands/RicCopyGridStatisticsToClipboardFeature.cpp
+++ b/ApplicationLibCode/Commands/RicCopyGridStatisticsToClipboardFeature.cpp
@@ -18,7 +18,7 @@
 
 #include "RicCopyGridStatisticsToClipboardFeature.h"
 
-#include "RiaApplication.h"
+#include "RiaGuiApplication.h"
 
 #include "RicWellLogTools.h"
 
diff --git a/ApplicationLibCode/Commands/SeismicCommands/RicNewSeismicDifferenceFeature.cpp b/ApplicationLibCode/Commands/SeismicCommands/RicNewSeismicDifferenceFeature.cpp
index 9e0b15332b..39df6fa9da 100644
--- a/ApplicationLibCode/Commands/SeismicCommands/RicNewSeismicDifferenceFeature.cpp
+++ b/ApplicationLibCode/Commands/SeismicCommands/RicNewSeismicDifferenceFeature.cpp
@@ -18,7 +18,7 @@
 
 #include "RicNewSeismicDifferenceFeature.h"
 
-#include "RiaApplication.h"
+#include "RiaGuiApplication.h"
 
 #include "RimOilField.h"
 #include "RimProject.h"
diff --git a/ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicWellTarget3dEditor.cpp b/ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicWellTarget3dEditor.cpp
index 05c878c35a..dc91e4a043 100644
--- a/ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicWellTarget3dEditor.cpp
+++ b/ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicWellTarget3dEditor.cpp
@@ -40,6 +40,9 @@
 #include "cvfModelBasicList.h"
 #include "cvfPart.h"
 
+#include <QApplication>
+
+
 CAF_PDM_UI_3D_OBJECT_EDITOR_SOURCE_INIT( RicWellTarget3dEditor );
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/Commands/WellPathCommands/RicAppendPointsToPolygonFilterFeature.cpp b/ApplicationLibCode/Commands/WellPathCommands/RicAppendPointsToPolygonFilterFeature.cpp
index 05908fcacd..baf580f324 100644
--- a/ApplicationLibCode/Commands/WellPathCommands/RicAppendPointsToPolygonFilterFeature.cpp
+++ b/ApplicationLibCode/Commands/WellPathCommands/RicAppendPointsToPolygonFilterFeature.cpp
@@ -29,6 +29,7 @@
 #include "cafSelectionManagerTools.h"
 
 #include <QAction>
+#include <QApplication>
 #include <QClipboard>
 
 CAF_CMD_SOURCE_INIT( RicAppendPointsToPolygonFilterFeature, "RicAppendPointsToPolygonFilterFeature" );
diff --git a/GrpcInterface/RiaGrpcApplicationInterface.cpp b/GrpcInterface/RiaGrpcApplicationInterface.cpp
index 410ec00ffb..70f97ecc3a 100644
--- a/GrpcInterface/RiaGrpcApplicationInterface.cpp
+++ b/GrpcInterface/RiaGrpcApplicationInterface.cpp
@@ -21,6 +21,7 @@
 
 #include "cvfProgramOptions.h"
 
+#include <QCoreApplication>
 #include <QProcessEnvironment>
 
 //--------------------------------------------------------------------------------------------------