diff --git a/ApplicationLibCode/Application/RiaApplication.h b/ApplicationLibCode/Application/RiaApplication.h
index ee34b42017..5496295dbf 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/RiaFontCache.cpp b/ApplicationLibCode/Application/RiaFontCache.cpp
index 188b9ced9a..85e4f53d31 100644
--- a/ApplicationLibCode/Application/RiaFontCache.cpp
+++ b/ApplicationLibCode/Application/RiaFontCache.cpp
@@ -20,9 +20,11 @@
 
 #include "RiaGuiApplication.h"
 
+#include "cafAssert.h"
 #include "cafFixedAtlasFont.h"
 
 #include <QDesktopWidget>
+
 #include <cmath>
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/Application/RiaGuiApplication.h b/ApplicationLibCode/Application/RiaGuiApplication.h
index 9a725e018c..2e293d380b 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/Application/RiaPreferences.cpp b/ApplicationLibCode/Application/RiaPreferences.cpp
index f935916aab..d0ea2ebdee 100644
--- a/ApplicationLibCode/Application/RiaPreferences.cpp
+++ b/ApplicationLibCode/Application/RiaPreferences.cpp
@@ -41,6 +41,7 @@
 #include "cafPdmUiFilePathEditor.h"
 #include "cafPdmUiLineEditor.h"
 
+#include <QCoreApplication>
 #include <QDate>
 #include <QDir>
 #include <QLocale>
diff --git a/ApplicationLibCode/Application/Tools/RiaStdStringTools.cpp b/ApplicationLibCode/Application/Tools/RiaStdStringTools.cpp
index 794f1a7b2f..0b444b698e 100644
--- a/ApplicationLibCode/Application/Tools/RiaStdStringTools.cpp
+++ b/ApplicationLibCode/Application/Tools/RiaStdStringTools.cpp
@@ -20,7 +20,6 @@
 
 #include "fast_float/include/fast_float/fast_float.h"
 
-#include <cctype>
 #include <charconv>
 #include <regex>
 #include <sstream>
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/ExportCommands/RicCreateDepthAdjustedLasFilesUi.cpp b/ApplicationLibCode/Commands/ExportCommands/RicCreateDepthAdjustedLasFilesUi.cpp
index 021f429aa8..ad275a9233 100644
--- a/ApplicationLibCode/Commands/ExportCommands/RicCreateDepthAdjustedLasFilesUi.cpp
+++ b/ApplicationLibCode/Commands/ExportCommands/RicCreateDepthAdjustedLasFilesUi.cpp
@@ -31,7 +31,6 @@
 
 #include "cafPdmUiCheckBoxEditor.h"
 #include "cafPdmUiFilePathEditor.h"
-#include "cafPdmUiOrdering.h"
 #include "cafPdmUiTreeSelectionEditor.h"
 
 CAF_PDM_SOURCE_INIT( RicCreateDepthAdjustedLasFilesUi, "RicCreateDepthAdjustedLasFilesUi" );
diff --git a/ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp b/ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp
index 9629952ff4..88a5c427d1 100644
--- a/ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp
+++ b/ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp
@@ -33,7 +33,6 @@
 #include "cafPdmUiFilePathEditor.h"
 #include "cafPdmUiGroup.h"
 #include "cafPdmUiLineEditor.h"
-#include "cafPdmUiOrdering.h"
 #include "cafPdmUiTreeSelectionEditor.h"
 
 #include <QDir>
diff --git a/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileResampleUi.cpp b/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileResampleUi.cpp
index 152d23c9e4..c2dfb84fa1 100644
--- a/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileResampleUi.cpp
+++ b/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileResampleUi.cpp
@@ -20,7 +20,6 @@
 
 #include "cafPdmUiCheckBoxEditor.h"
 #include "cafPdmUiFilePathEditor.h"
-#include "cafPdmUiOrdering.h"
 
 #include <cmath>
 
diff --git a/ApplicationLibCode/Commands/ExportCommands/RicExportWellPathsUi.cpp b/ApplicationLibCode/Commands/ExportCommands/RicExportWellPathsUi.cpp
index c44aac515c..87a2decc15 100644
--- a/ApplicationLibCode/Commands/ExportCommands/RicExportWellPathsUi.cpp
+++ b/ApplicationLibCode/Commands/ExportCommands/RicExportWellPathsUi.cpp
@@ -25,7 +25,6 @@
 #include "RimProject.h"
 
 #include "cafPdmUiFilePathEditor.h"
-#include "cafPdmUiOrdering.h"
 
 CAF_PDM_SOURCE_INIT( RicExportWellPathsUi, "RicExportWellPathsUi" );
 
diff --git a/ApplicationLibCode/Commands/ExportCommands/RicSaveEclipseInputVisibleCellsUi.cpp b/ApplicationLibCode/Commands/ExportCommands/RicSaveEclipseInputVisibleCellsUi.cpp
index 0745a3b89f..8ed93cd536 100644
--- a/ApplicationLibCode/Commands/ExportCommands/RicSaveEclipseInputVisibleCellsUi.cpp
+++ b/ApplicationLibCode/Commands/ExportCommands/RicSaveEclipseInputVisibleCellsUi.cpp
@@ -22,7 +22,6 @@
 #include "RiaPreferences.h"
 
 #include "cafPdmUiFilePathEditor.h"
-#include "cafPdmUiOrdering.h"
 
 #include <QDir>
 
diff --git a/ApplicationLibCode/Commands/HoloLensCommands/RicHoloLensCreateSessionUi.cpp b/ApplicationLibCode/Commands/HoloLensCommands/RicHoloLensCreateSessionUi.cpp
index 80766ce294..ccbed05d73 100644
--- a/ApplicationLibCode/Commands/HoloLensCommands/RicHoloLensCreateSessionUi.cpp
+++ b/ApplicationLibCode/Commands/HoloLensCommands/RicHoloLensCreateSessionUi.cpp
@@ -24,7 +24,6 @@
 #include "RicHoloLensServerSettings.h"
 
 #include "cafPdmSettings.h"
-#include "cafPdmUiOrdering.h"
 
 #include "cvfAssert.h"
 
diff --git a/ApplicationLibCode/Commands/HoloLensCommands/RicHoloLensExportToFolderUi.cpp b/ApplicationLibCode/Commands/HoloLensCommands/RicHoloLensExportToFolderUi.cpp
index 45a63791a3..fd3406b999 100644
--- a/ApplicationLibCode/Commands/HoloLensCommands/RicHoloLensExportToFolderUi.cpp
+++ b/ApplicationLibCode/Commands/HoloLensCommands/RicHoloLensExportToFolderUi.cpp
@@ -25,7 +25,6 @@
 #include "RimProject.h"
 
 #include "cafPdmUiFilePathEditor.h"
-#include "cafPdmUiOrdering.h"
 
 CAF_PDM_SOURCE_INIT( RicHoloLensExportToFolderUi, "RicHoloLensExportToFolderUi" );
 
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/RicCreateEnsembleSurfaceUi.cpp b/ApplicationLibCode/Commands/RicCreateEnsembleSurfaceUi.cpp
index f29e549794..49b2dbec12 100644
--- a/ApplicationLibCode/Commands/RicCreateEnsembleSurfaceUi.cpp
+++ b/ApplicationLibCode/Commands/RicCreateEnsembleSurfaceUi.cpp
@@ -22,7 +22,6 @@
 
 #include "cafPdmObject.h"
 #include "cafPdmUiCheckBoxEditor.h"
-#include "cafPdmUiOrdering.h"
 #include "cafPdmUiTreeSelectionEditor.h"
 
 CAF_PDM_SOURCE_INIT( RicCreateEnsembleSurfaceUi, "RicCreateEnsembleSurfaceUi" );
diff --git a/ApplicationLibCode/Commands/RicCreateEnsembleWellLogUi.cpp b/ApplicationLibCode/Commands/RicCreateEnsembleWellLogUi.cpp
index f486cf5dda..4d81c07d67 100644
--- a/ApplicationLibCode/Commands/RicCreateEnsembleWellLogUi.cpp
+++ b/ApplicationLibCode/Commands/RicCreateEnsembleWellLogUi.cpp
@@ -34,7 +34,6 @@
 #include "cafPdmObject.h"
 #include "cafPdmUiCheckBoxEditor.h"
 #include "cafPdmUiFilePathEditor.h"
-#include "cafPdmUiOrdering.h"
 #include "cafPdmUiTreeSelectionEditor.h"
 
 CAF_PDM_SOURCE_INIT( RicCreateEnsembleWellLogUi, "RicCreateEnsembleWellLogUi" );
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..471e5eeebb 100644
--- a/ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicWellTarget3dEditor.cpp
+++ b/ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicWellTarget3dEditor.cpp
@@ -40,6 +40,8 @@
 #include "cvfModelBasicList.h"
 #include "cvfPart.h"
 
+#include <QApplication>
+
 CAF_PDM_UI_3D_OBJECT_EDITOR_SOURCE_INIT( RicWellTarget3dEditor );
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/Commands/WellPathCommands/RicCreateWellTargetsPickEventHandler.cpp b/ApplicationLibCode/Commands/WellPathCommands/RicCreateWellTargetsPickEventHandler.cpp
index 69b73bd1cd..f864f55675 100644
--- a/ApplicationLibCode/Commands/WellPathCommands/RicCreateWellTargetsPickEventHandler.cpp
+++ b/ApplicationLibCode/Commands/WellPathCommands/RicCreateWellTargetsPickEventHandler.cpp
@@ -31,19 +31,17 @@
 #include "RimEclipseView.h"
 #include "RimGeoMechView.h"
 #include "RimModeledWellPath.h"
-#include "RimWellPath.h"
 #include "RimWellPathGeometryDef.h"
 #include "RimWellPathTarget.h"
 
-#include "RiuViewerCommands.h"
-
 #include "RivFemPartGeometryGenerator.h"
 #include "RivFemPickSourceInfo.h"
 #include "RivSourceInfo.h"
 #include "RivWellPathSourceInfo.h"
 
 #include "cafDisplayCoordTransform.h"
-#include "cafSelectionManager.h"
+
+#include <QApplication>
 
 #include <vector>
 
diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesAnnotationInView.h b/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesAnnotationInView.h
index aba72d219a..83852d2f6e 100644
--- a/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesAnnotationInView.h
+++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesAnnotationInView.h
@@ -28,7 +28,6 @@
 #include "cafPdmObject.h"
 #include "cafPdmPointer.h"
 #include "cafPdmPtrField.h"
-#include "cafPdmUiOrdering.h"
 
 // Include to make Pdm work for cvf::Color
 #include "cafPdmChildField.h"
diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesFromFileAnnotationInView.h b/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesFromFileAnnotationInView.h
index 213d4cfddd..2562dfb70e 100644
--- a/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesFromFileAnnotationInView.h
+++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesFromFileAnnotationInView.h
@@ -26,7 +26,6 @@
 #include "cafPdmObject.h"
 #include "cafPdmPointer.h"
 #include "cafPdmPtrField.h"
-#include "cafPdmUiOrdering.h"
 
 // Include to make Pdm work for cvf::Color
 #include "cafPdmChildField.h"
diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.h b/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.h
index c642077f30..d08ec594db 100644
--- a/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.h
+++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.h
@@ -23,7 +23,6 @@
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 #include "cafPdmPointer.h"
-#include "cafPdmUiOrdering.h"
 
 // Include to make Pdm work for cvf::Color
 #include "cafPdmChildField.h"
diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotationInView.h b/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotationInView.h
index 8cbca90336..1988f7b81c 100644
--- a/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotationInView.h
+++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotationInView.h
@@ -26,7 +26,6 @@
 #include "cafPdmObject.h"
 #include "cafPdmPointer.h"
 #include "cafPdmPtrField.h"
-#include "cafPdmUiOrdering.h"
 
 // Include to make Pdm work for cvf::Color
 #include "cafPdmChildField.h"
diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotation.h b/ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotation.h
index 998418ed39..dc457a1b1b 100644
--- a/ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotation.h
+++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotation.h
@@ -23,7 +23,6 @@
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 #include "cafPdmPointer.h"
-#include "cafPdmUiOrdering.h"
 
 // Include to make Pdm work for cvf::Color
 #include "cafPdmChildField.h"
diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotationInView.h b/ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotationInView.h
index 6add6a3570..0d3548a269 100644
--- a/ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotationInView.h
+++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotationInView.h
@@ -24,7 +24,6 @@
 #include "cafPdmObject.h"
 #include "cafPdmPointer.h"
 #include "cafPdmPtrField.h"
-#include "cafPdmUiOrdering.h"
 
 // Include to make Pdm work for cvf::Color
 #include "cafPdmChildField.h"
diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotationInView.h b/ApplicationLibCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotationInView.h
index 667258b8fb..8a707a46a2 100644
--- a/ApplicationLibCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotationInView.h
+++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotationInView.h
@@ -26,7 +26,6 @@
 #include "cafPdmObject.h"
 #include "cafPdmPointer.h"
 #include "cafPdmPtrField.h"
-#include "cafPdmUiOrdering.h"
 
 // Include to make Pdm work for cvf::Color
 #include "cafPdmChildField.h"
diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathCompletionSettings.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathCompletionSettings.cpp
index ca2b8c7424..38e292d358 100644
--- a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathCompletionSettings.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathCompletionSettings.cpp
@@ -27,7 +27,6 @@
 #include "cafPdmFieldScriptingCapability.h"
 #include "cafPdmObjectScriptingCapability.h"
 #include "cafPdmUiLineEditor.h"
-#include "cafPdmUiOrdering.h"
 #include "cafPdmUiTreeOrdering.h"
 
 namespace caf
diff --git a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationReportPlot.cpp b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationReportPlot.cpp
index b36cd65c62..e75eb7d66d 100644
--- a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationReportPlot.cpp
+++ b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationReportPlot.cpp
@@ -33,7 +33,6 @@
 #include "RiuQwtPlotWidget.h"
 
 #include "cafAssert.h"
-#include "cafPdmUiOrdering.h"
 #include "cafPdmUiTreeOrdering.h"
 
 #include <QDebug>
diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftEnsembleCurveSet.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftEnsembleCurveSet.cpp
index 4792198871..1c368d3566 100644
--- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftEnsembleCurveSet.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftEnsembleCurveSet.cpp
@@ -31,7 +31,6 @@
 #include "RiuQwtPlotWidget.h"
 
 #include "cafPdmUiObjectHandle.h"
-#include "cafPdmUiOrdering.h"
 #include "cafPdmUiTreeOrdering.h"
 #include "cafPdmUiTreeSelectionEditor.h"
 
diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCase.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCase.cpp
index 8c75cd8aa2..ee72f023b1 100644
--- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCase.cpp
+++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCase.cpp
@@ -63,6 +63,7 @@
 
 #include "cvfVector3.h"
 
+#include <QApplication>
 #include <QFileInfo>
 
 #include <array>
diff --git a/ApplicationLibCode/ProjectDataModel/ProcessControl/RimProcess.cpp b/ApplicationLibCode/ProjectDataModel/ProcessControl/RimProcess.cpp
index 5fe493acef..770b6f3684 100644
--- a/ApplicationLibCode/ProjectDataModel/ProcessControl/RimProcess.cpp
+++ b/ApplicationLibCode/ProjectDataModel/ProcessControl/RimProcess.cpp
@@ -23,6 +23,7 @@
 
 #include "cafPdmFieldCapability.h"
 
+#include <QApplication>
 #include <QProcess>
 #include <QProcessEnvironment>
 
diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp
index 60585a4d47..5cb28a8360 100644
--- a/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp
+++ b/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp
@@ -61,9 +61,11 @@
 #include "cafProgressInfo.h"
 #include "cafUtils.h"
 
+#include <QApplication>
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
+
 #include <fstream>
 #include <string>
 
diff --git a/ApplicationLibCode/ProjectDataModel/RimStimPlanLegendConfig.cpp b/ApplicationLibCode/ProjectDataModel/RimStimPlanLegendConfig.cpp
index 93cf19c2d3..46cdf42dd7 100644
--- a/ApplicationLibCode/ProjectDataModel/RimStimPlanLegendConfig.cpp
+++ b/ApplicationLibCode/ProjectDataModel/RimStimPlanLegendConfig.cpp
@@ -20,7 +20,6 @@
 
 #include "RimRegularLegendConfig.h"
 
-#include "cafPdmUiOrdering.h"
 #include "cafPdmUiTreeOrdering.h"
 
 CAF_PDM_SOURCE_INIT( RimStimPlanLegendConfig, "RimStimPlanLegendConfig" );
diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp
index 6e5650c74f..bd193480c2 100644
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp
@@ -47,6 +47,7 @@
 
 #include "cafProgressInfo.h"
 
+#include <QCoreApplication>
 #include <QDir>
 
 CAF_PDM_SOURCE_INIT( RimSummaryCaseMainCollection, "SummaryCaseCollection" );
diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCurveCommonDataSource.h b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCurveCommonDataSource.h
index fe7c9fd36b..d5bc0d0191 100644
--- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCurveCommonDataSource.h
+++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCurveCommonDataSource.h
@@ -24,7 +24,6 @@
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 #include "cafPdmPtrField.h"
-#include "cafPdmUiOrdering.h"
 #include "cafTristate.h"
 
 #include <QDateTime>
diff --git a/ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp b/ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp
index 8f32f714f2..adfcd08106 100644
--- a/ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp
+++ b/ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp
@@ -43,6 +43,7 @@
 #include "DockWidget.h"
 
 #include <QAction>
+#include <QApplication>
 #include <QClipboard>
 #include <QInputDialog>
 #include <QMdiArea>
diff --git a/ApplicationLibCode/UserInterface/RiuPlotMainWindowTools.cpp b/ApplicationLibCode/UserInterface/RiuPlotMainWindowTools.cpp
index d81d95ab43..1910726831 100644
--- a/ApplicationLibCode/UserInterface/RiuPlotMainWindowTools.cpp
+++ b/ApplicationLibCode/UserInterface/RiuPlotMainWindowTools.cpp
@@ -20,6 +20,8 @@
 #include "RiaGuiApplication.h"
 #include "RiuPlotMainWindow.h"
 
+#include "cafPdmObject.h"
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/UserInterface/RiuPlotObjectPicker.cpp b/ApplicationLibCode/UserInterface/RiuPlotObjectPicker.cpp
index e189c13961..c3c844050f 100644
--- a/ApplicationLibCode/UserInterface/RiuPlotObjectPicker.cpp
+++ b/ApplicationLibCode/UserInterface/RiuPlotObjectPicker.cpp
@@ -21,6 +21,8 @@
 #include "RiaGuiApplication.h"
 #include "RiuPlotMainWindow.h"
 
+#include "cafPdmObject.h"
+
 #include <QMouseEvent>
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/UserInterface/RiuSummaryPlot.cpp b/ApplicationLibCode/UserInterface/RiuSummaryPlot.cpp
index 5e0de6acfc..9cd95d1fda 100644
--- a/ApplicationLibCode/UserInterface/RiuSummaryPlot.cpp
+++ b/ApplicationLibCode/UserInterface/RiuSummaryPlot.cpp
@@ -32,6 +32,7 @@
 
 #include "cafCmdFeatureMenuBuilder.h"
 
+#include <QApplication>
 #include <QMenu>
 #include <QPointer>
 
diff --git a/Fwk/AppFwk/cafCommand/cafCmdFieldChangeExec.cpp b/Fwk/AppFwk/cafCommand/cafCmdFieldChangeExec.cpp
index 3cf7280206..827e3d2966 100644
--- a/Fwk/AppFwk/cafCommand/cafCmdFieldChangeExec.cpp
+++ b/Fwk/AppFwk/cafCommand/cafCmdFieldChangeExec.cpp
@@ -38,6 +38,7 @@
 
 #include "cafNotificationCenter.h"
 #include "cafPdmReferenceHelper.h"
+#include "cafPdmUiOrdering.h"
 
 namespace caf
 {
diff --git a/Fwk/AppFwk/cafCommand/cafCmdUiCommandSystemImpl.cpp b/Fwk/AppFwk/cafCommand/cafCmdUiCommandSystemImpl.cpp
index 3c555155b7..49d8c4c78f 100644
--- a/Fwk/AppFwk/cafCommand/cafCmdUiCommandSystemImpl.cpp
+++ b/Fwk/AppFwk/cafCommand/cafCmdUiCommandSystemImpl.cpp
@@ -43,8 +43,7 @@
 #include "cafPdmChildArrayField.h"
 #include "cafPdmFieldHandle.h"
 #include "cafPdmObjectHandle.h"
-#include "cafPdmUiObjectHandle.h"
-#include "cafPdmXmlFieldHandle.h"
+#include "cafPdmReferenceHelper.h"
 #include "cafSelectionManager.h"
 
 #include <QMenu>
diff --git a/Fwk/AppFwk/cafCommandFeatures/ToggleCommands/cafToggleItemsFeatureImpl.cpp b/Fwk/AppFwk/cafCommandFeatures/ToggleCommands/cafToggleItemsFeatureImpl.cpp
index 4a91543dd8..7994eb173d 100644
--- a/Fwk/AppFwk/cafCommandFeatures/ToggleCommands/cafToggleItemsFeatureImpl.cpp
+++ b/Fwk/AppFwk/cafCommandFeatures/ToggleCommands/cafToggleItemsFeatureImpl.cpp
@@ -36,11 +36,8 @@
 
 #include "cafToggleItemsFeatureImpl.h"
 
-//#include "RiaFeatureCommandContext.h"
-//#include "RiaGuiApplication.h"
-//#include "RiuMainWindow.h"
-//#include "RiuPlotMainWindow.h"
-
+#include "cafCmdFeatureManager.h"
+#include "cafPdmField.h"
 #include "cafPdmUiFieldHandle.h"
 #include "cafPdmUiItem.h"
 #include "cafPdmUiObjectHandle.h"
@@ -50,7 +47,6 @@
 
 #include <QModelIndex>
 
-#include "cafCmdFeatureManager.h"
 #include <vector>
 
 namespace caf
diff --git a/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapability.h b/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapability.h
index d5513fe2e4..0440d0c237 100644
--- a/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapability.h
+++ b/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapability.h
@@ -45,11 +45,6 @@
 #include "cafPdmScriptIOMessages.h"
 
 #include <QIODevice>
-#include <QString>
-#include <QStringList>
-#include <QTextStream>
-
-#include <type_traits>
 
 #define CAF_PDM_InitScriptableField( field, keyword, default, uiName, ... )                          \
     {                                                                                                \
diff --git a/Fwk/AppFwk/cafPdmScripting/cafPdmObjectMethod.h b/Fwk/AppFwk/cafPdmScripting/cafPdmObjectMethod.h
index 210340ddec..0458006556 100644
--- a/Fwk/AppFwk/cafPdmScripting/cafPdmObjectMethod.h
+++ b/Fwk/AppFwk/cafPdmScripting/cafPdmObjectMethod.h
@@ -37,9 +37,7 @@
 
 #include "cafAssert.h"
 #include "cafPdmObject.h"
-#include "cafPdmObjectFactory.h"
 #include "cafPdmPointer.h"
-#include "cafPdmScriptResponse.h"
 
 /// CAF_PDM_OBJECT_METHOD_SOURCE_INIT associates the self class keyword and the method keyword with the method factory
 /// Place this in the cpp file, preferably above the constructor
diff --git a/Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptingCapability.h b/Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptingCapability.h
index 37d7c037b0..bff28f0eac 100644
--- a/Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptingCapability.h
+++ b/Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptingCapability.h
@@ -35,15 +35,9 @@
 //##################################################################################################
 #pragma once
 
-#include "cafPdmChildArrayField.h"
 #include "cafPdmObjectCapability.h"
-#include "cafPdmObjectMethod.h"
 #include "cafPdmObjectScriptingCapabilityRegister.h"
 
-#include <QString>
-
-#include <map>
-#include <memory>
 #include <vector>
 
 class QTextStream;
diff --git a/Fwk/AppFwk/cafPdmScripting/cafPdmScriptResponse.h b/Fwk/AppFwk/cafPdmScripting/cafPdmScriptResponse.h
index 482a586435..c8983d6e8d 100644
--- a/Fwk/AppFwk/cafPdmScripting/cafPdmScriptResponse.h
+++ b/Fwk/AppFwk/cafPdmScripting/cafPdmScriptResponse.h
@@ -36,7 +36,6 @@
 #pragma once
 
 #include "cafPdmObject.h"
-#include "cafPdmPointer.h"
 
 #include <QString>
 #include <QStringList>
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmBase.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmBase.h
index 503fbe84af..23b540257e 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmBase.h
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmBase.h
@@ -1,8 +1,5 @@
 #pragma once
 
-// Brings in size_t and definition of NULL
-#include <cstddef>
-
 // Macro to disable the copy constructor and assignment operator
 // Should be used in the private section of a class
 #define PDM_DISABLE_COPY_AND_ASSIGN( CLASS_NAME ) \
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmReferenceHelper.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmReferenceHelper.h
index c2d20a734c..50ce298a44 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmReferenceHelper.h
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmReferenceHelper.h
@@ -37,9 +37,6 @@
 #pragma once
 
 #include "cafPdmObjectHandle.h"
-#include "cafPdmPointer.h"
-
-#include <QStringList>
 
 namespace caf
 {
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafSignal.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafSignal.h
index 32b0122df8..4b3ba669d6 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafSignal.h
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafSignal.h
@@ -40,7 +40,6 @@
 #include <functional>
 #include <list>
 #include <map>
-#include <string>
 #include <type_traits>
 
 namespace caf
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmDocument.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmDocument.h
index 23c54ab357..21164263a2 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmDocument.h
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmDocument.h
@@ -35,9 +35,9 @@
 //##################################################################################################
 
 #pragma once
+
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
-#include "cafPdmPointer.h"
 
 namespace caf
 {
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmObject.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmObject.cpp
index 1c3d8c8a65..968ff651ad 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmObject.cpp
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmObject.cpp
@@ -1,5 +1,7 @@
 #include "cafPdmObject.h"
 
+#include "cafPdmUiFieldHandle.h"
+
 using namespace caf;
 
 CAF_PDM_ABSTRACT_SOURCE_INIT( PdmObject, "PdmObjectBase" );
@@ -15,6 +17,20 @@ caf::PdmObject::PdmObject()
     CAF_PDM_InitObject( "Base PDM Object", "", "", "The Abstract Base Class for the Project Data Model" );
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void PdmObject::addFieldUiNoDefault( PdmFieldHandle* field, const QString& keyword, PdmUiItemInfo* fieldDescription )
+{
+    addField( field, keyword );
+
+    PdmUiFieldHandle* uiFieldHandle = field->uiCapability();
+    if ( uiFieldHandle )
+    {
+        uiFieldHandle->setUiItemInfo( fieldDescription );
+    }
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmObject.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmObject.h
index 1616b01cd9..4f4c8fb71c 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmObject.h
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmObject.h
@@ -38,27 +38,16 @@
 
 #include "cafPdmObjectHandle.h"
 
-#include "cafPdmPointer.h"
-#include "cafPdmUiOrdering.h"
-
-#include <set>
-
 class QXmlStreamReader;
 class QXmlStreamWriter;
 
+#include "cafInternalPdmUiFieldCapability.h"
 #include "cafPdmObjectCapability.h"
-
 #include "cafPdmUiObjectHandle.h"
+#include "cafPdmUiOrdering.h"
 #include "cafPdmXmlObjectHandle.h"
 #include "cafPdmXmlObjectHandleMacros.h"
 
-#include "cafInternalPdmUiFieldCapability.h"
-#include "cafInternalPdmXmlFieldCapability.h"
-#include "cafPdmFieldHandle.h"
-
-#include "cafIconProvider.h"
-#include "cafPdmUiFieldSpecialization.h"
-
 namespace caf
 {
 class PdmFieldHandle;
@@ -183,16 +172,7 @@ public:
 
     /// Does the same as the above method, but omits the default value.
     /// Consider this method private. Please use the CAF_PDM_InitFieldNoDefault() macro instead.
-    void addFieldUiNoDefault( PdmFieldHandle* field, const QString& keyword, PdmUiItemInfo* fieldDescription )
-    {
-        addField( field, keyword );
-
-        PdmUiFieldHandle* uiFieldHandle = field->uiCapability();
-        if ( uiFieldHandle )
-        {
-            uiFieldHandle->setUiItemInfo( fieldDescription );
-        }
-    }
+    void addFieldUiNoDefault( PdmFieldHandle* field, const QString& keyword, PdmUiItemInfo* fieldDescription );
 
     /// Returns _this_ if _this_ has requested class keyword
     /// Traverses parents recursively and returns first parent of the requested
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafInternalPdmFieldTypeSpecializations.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafInternalPdmFieldTypeSpecializations.h
index b07a0da80b..4486578654 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafInternalPdmFieldTypeSpecializations.h
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafInternalPdmFieldTypeSpecializations.h
@@ -4,10 +4,6 @@
 #include "cafPdmObjectHandle.h"
 #include "cafPdmPointer.h"
 
-#include <QStringList>
-
-#include <type_traits>
-
 namespace caf
 {
 template <typename T>
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafInternalPdmUiFieldCapability.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafInternalPdmUiFieldCapability.h
index 451880046f..47ffa2ce5f 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafInternalPdmUiFieldCapability.h
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafInternalPdmUiFieldCapability.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "cafPdmChildArrayField.h"
+#include "cafPdmChildField.h"
 #include "cafPdmUiFieldHandle.h"
 
 namespace caf
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiEditorHandle.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiEditorHandle.h
index f6200ceaa1..2378d5527f 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiEditorHandle.h
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiEditorHandle.h
@@ -43,7 +43,6 @@
 
 namespace caf
 {
-class PdmUiItem;
 
 //==================================================================================================
 /// Abstract class to handle editors. Inherits QObject to be able to use signals and slots
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiFieldEditorHandle.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiFieldEditorHandle.cpp
index 09d985f71f..7c2cb1ca0d 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiFieldEditorHandle.cpp
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiFieldEditorHandle.cpp
@@ -42,9 +42,7 @@
 #include "cafPdmUiObjectHandle.h"
 
 #include <QAbstractScrollArea>
-#include <QLabel>
 #include <QMenu>
-#include <QVariant>
 
 namespace caf
 {
@@ -137,6 +135,30 @@ void PdmUiFieldEditorHandle::createWidgets( QWidget* parent )
     }
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QWidget* PdmUiFieldEditorHandle::combinedWidget()
+{
+    return m_combinedWidget;
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QWidget* PdmUiFieldEditorHandle::editorWidget()
+{
+    return m_editorWidget;
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QWidget* PdmUiFieldEditorHandle::labelWidget()
+{
+    return m_labelWidget;
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
@@ -153,6 +175,30 @@ int PdmUiFieldEditorHandle::rowStretchFactor() const
     return isMultiRowEditor() ? 1 : 0;
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QWidget* PdmUiFieldEditorHandle::createCombinedWidget( QWidget* parent )
+{
+    return nullptr;
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QWidget* PdmUiFieldEditorHandle::createEditorWidget( QWidget* parent )
+{
+    return nullptr;
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QWidget* PdmUiFieldEditorHandle::createLabelWidget( QWidget* parent )
+{
+    return nullptr;
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiFieldEditorHandle.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiFieldEditorHandle.h
index 11a3c464cc..5587792a66 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiFieldEditorHandle.h
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiFieldEditorHandle.h
@@ -40,14 +40,6 @@
 #include "cafPdmUiEditorHandle.h"
 #include "cafQShortenedLabel.h"
 
-#include <vector>
-
-#include <QPointer>
-#include <QString>
-#include <QWidget>
-
-class QLabel;
-
 namespace caf
 {
 //==================================================================================================
@@ -99,9 +91,9 @@ public:
     void              setUiField( PdmUiFieldHandle* uiFieldHandle );
 
     void     createWidgets( QWidget* parent );
-    QWidget* combinedWidget() { return m_combinedWidget; }
-    QWidget* editorWidget() { return m_editorWidget; }
-    QWidget* labelWidget() { return m_labelWidget; }
+    QWidget* combinedWidget();
+    QWidget* editorWidget();
+    QWidget* labelWidget();
     QMargins labelContentMargins() const;
     int      rowStretchFactor() const;
 
@@ -109,9 +101,9 @@ protected: // Virtual interface to override
     /// Implement one of these, or both editor and label. The widgets will be used in the parent layout according to
     /// being "Label" Editor" or a single combined widget.
 
-    virtual QWidget* createCombinedWidget( QWidget* parent ) { return nullptr; }
-    virtual QWidget* createEditorWidget( QWidget* parent ) { return nullptr; }
-    virtual QWidget* createLabelWidget( QWidget* parent ) { return nullptr; }
+    virtual QWidget* createCombinedWidget( QWidget* parent );
+    virtual QWidget* createEditorWidget( QWidget* parent );
+    virtual QWidget* createLabelWidget( QWidget* parent );
 
     void setValueToField( const QVariant& value );
 
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiItem.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiItem.cpp
index 37829e1e03..e5b4d1b88b 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiItem.cpp
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiItem.cpp
@@ -35,7 +35,6 @@
 //##################################################################################################
 
 #include "cafPdmUiItem.h"
-#include "cafPdmPtrField.h"
 #include "cafPdmUiEditorHandle.h"
 #include "cafPdmUiObjectEditorHandle.h"
 
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiItem.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiItem.h
index 947b9ce0c7..07d757ceab 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiItem.h
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiItem.h
@@ -39,10 +39,6 @@
 #include "cafIconProvider.h"
 #include "cafPdmUiFieldSpecialization.h"
 
-#include <QApplication>
-#include <QColor>
-#include <QString>
-#include <QVariant>
 #include <set>
 #include <type_traits>
 
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectEditorHandle.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectEditorHandle.h
index 05f043c4aa..23074f25f0 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectEditorHandle.h
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectEditorHandle.h
@@ -37,7 +37,6 @@
 
 #pragma once
 
-#include "cafPdmPointer.h"
 #include "cafPdmUiEditorHandle.h"
 
 #include <QPointer>
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiOrdering.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiOrdering.cpp
index 74c0b73f95..eacaf1bd3e 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiOrdering.cpp
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiOrdering.cpp
@@ -36,7 +36,6 @@
 
 #include "cafPdmUiOrdering.h"
 
-#include "cafPdmDataValueField.h"
 #include "cafPdmObjectHandle.h"
 #include "cafPdmUiFieldHandle.h"
 #include "cafPdmUiObjectHandle.h"
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiTreeOrdering.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiTreeOrdering.cpp
index 4ac222882c..656ff92704 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiTreeOrdering.cpp
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiTreeOrdering.cpp
@@ -37,7 +37,6 @@
 #include "cafPdmUiTreeOrdering.h"
 
 #include "cafAssert.h"
-#include "cafPdmDataValueField.h"
 #include "cafPdmObjectHandle.h"
 #include "cafPdmUiEditorHandle.h"
 #include "cafPdmUiFieldHandle.h"
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiTreeOrdering.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiTreeOrdering.h
index f531cc8d37..9bc32f4ff1 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiTreeOrdering.h
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiTreeOrdering.h
@@ -41,8 +41,6 @@
 #include <QList>
 #include <QString>
 
-#include <vector>
-
 namespace caf
 {
 class PdmFieldHandle;
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafQShortenedLabel.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafQShortenedLabel.cpp
index 305e81d1ed..9230fae456 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafQShortenedLabel.cpp
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafQShortenedLabel.cpp
@@ -36,9 +36,7 @@
 #include "cafQShortenedLabel.h"
 
 #include <QApplication>
-#include <QFontMetrics>
 #include <QResizeEvent>
-#include <QVBoxLayout>
 
 using namespace caf;
 
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafSelectionManager.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafSelectionManager.h
index b48433fee5..96acde4c0f 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafSelectionManager.h
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafSelectionManager.h
@@ -37,7 +37,6 @@
 
 #include "cafSelectionChangedReceiver.h"
 
-#include "cafPdmField.h"
 #include "cafPdmObjectHandle.h"
 #include "cafPdmPointer.h"
 #include "cafPdmUiItem.h"
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafUiTreeItem.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafUiTreeItem.h
index cd2d7c8ee6..1d0b04abe3 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafUiTreeItem.h
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafUiTreeItem.h
@@ -36,7 +36,6 @@
 
 #pragma once
 
-//#include <QAbstractItemModel>
 #include <QList>
 #include <iostream>
 
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldCapability.inl b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldCapability.inl
index 85b9ecd63f..7027f4a642 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldCapability.inl
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldCapability.inl
@@ -2,6 +2,8 @@
 #include "cafAssert.h"
 #include "cafInternalPdmFieldIoHelper.h"
 #include "cafPdmObjectFactory.h"
+#include "cafPdmObjectHandle.h"
+#include "cafPdmReferenceHelper.h"
 #include "cafPdmXmlObjectHandle.h"
 
 #include <QStringList>
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldReaderWriter.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldReaderWriter.h
index fa72d6cc19..0712c393f5 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldReaderWriter.h
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldReaderWriter.h
@@ -7,7 +7,6 @@
 #include "cafInternalPdmFieldIoHelper.h"
 #include "cafInternalPdmFilePathStreamOperators.h"
 #include "cafInternalPdmStreamOperators.h"
-#include "cafPdmReferenceHelper.h"
 
 namespace caf
 {
@@ -71,56 +70,4 @@ void PdmFieldReader<DataType>::readFieldData( DataType& fieldValue, QXmlStreamRe
 template <>
 void PdmFieldReader<QString>::readFieldData( QString& field, QXmlStreamReader& xmlStream, PdmObjectFactory* objectFactory );
 
-#if 0
-//--------------------------------------------------------------------------------------------------
-/// Specialized IO for PdmPointer
-//--------------------------------------------------------------------------------------------------
-template <typename DataType>
-struct PdmFieldWriter< PdmPointer<DataType> >
-{
-    static void writeFieldData(const PdmPointer<DataType> & fieldValue, QXmlStreamWriter& xmlStream, PdmReferenceHelper* referenceHelper)
-    {
-        QString dataString; 
-
-        CAF_ASSERT(referenceHelper);
-
-        if (fieldValue.isNull())
-        {
-            dataString = "NULL";
-        }
-        else
-        {
-            dataString = referenceHelper->referenceFromRootToObject(fieldValue.p());
-        }
-
-        xmlStream.writeCharacters(dataString);  
-    }
-};
-
-template <typename DataType>
-struct PdmFieldReader< PdmPointer<DataType> >
-{
-    static void readFieldData(PdmPointer<DataType> & fieldValue, QXmlStreamReader& xmlStream, PdmObjectFactory*, PdmReferenceHelper* referenceHelper)
-    {
-        PdmFieldIOHelper::skipComments(xmlStream);
-        if (!xmlStream.isCharacters()) return;
-
-        QString dataString = xmlStream.text().toString();
-
-        // Make stream point to end of element
-        QXmlStreamReader::TokenType type = xmlStream.readNext();
-        Q_UNUSED(type);
-        PdmFieldIOHelper::skipCharactersAndComments(xmlStream);
-
-        if (dataString != "NULL")
-        {
-            CAF_ASSERT(referenceHelper);
-            
-            PdmObjectHandle* objHandle = referenceHelper->objectFromReference(dataString);
-            fieldValue.setRawPtr(objHandle);
-        }
-    }
-};
-
-#endif
 } // End of namespace caf
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmSettings.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmSettings.cpp
index 2f1d1dd423..6ac0284ada 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmSettings.cpp
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmSettings.cpp
@@ -35,10 +35,12 @@
 //##################################################################################################
 
 #include "cafPdmSettings.h"
-
-#include "cafPdmField.h"
+#include "cafPdmObjectHandle.h"
+#include "cafPdmValueField.h"
 #include "cafPdmXmlObjectHandle.h"
 
+#include <QSettings>
+
 namespace caf
 {
 //--------------------------------------------------------------------------------------------------
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmSettings.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmSettings.h
index d9d7689197..6da23c60c7 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmSettings.h
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmSettings.h
@@ -36,7 +36,7 @@
 
 #pragma once
 
-#include <QSettings>
+#include <QString>
 
 namespace caf
 {
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlFieldHandle.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlFieldHandle.h
index b158215453..63741d0874 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlFieldHandle.h
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlFieldHandle.h
@@ -2,7 +2,6 @@
 
 #include "cafPdmFieldCapability.h"
 #include <QString>
-#include <vector>
 
 class QXmlStreamReader;
 class QXmlStreamWriter;
diff --git a/Fwk/AppFwk/cafTests/cafTestApplication/LineEditAndPushButtons.cpp b/Fwk/AppFwk/cafTests/cafTestApplication/LineEditAndPushButtons.cpp
index e3fe762732..18b9bc4c01 100644
--- a/Fwk/AppFwk/cafTests/cafTestApplication/LineEditAndPushButtons.cpp
+++ b/Fwk/AppFwk/cafTests/cafTestApplication/LineEditAndPushButtons.cpp
@@ -7,6 +7,8 @@
 #include "cafPdmUiPushButtonEditor.h"
 #include "cafPdmUiTreeSelectionEditor.h"
 
+#include <QGuiApplication>
+
 CAF_PDM_SOURCE_INIT( LineEditAndPushButtons, "LineEditAndPushButtons" );
 
 //--------------------------------------------------------------------------------------------------
diff --git a/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp b/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp
index 4d87f66a0c..3e0bdee720 100644
--- a/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp
+++ b/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp
@@ -33,7 +33,6 @@
 #include "cafPdmUiFilePathEditor.h"
 #include "cafPdmUiItem.h"
 #include "cafPdmUiListEditor.h"
-#include "cafPdmUiOrdering.h"
 #include "cafPdmUiPropertyView.h"
 #include "cafPdmUiPushButtonEditor.h"
 #include "cafPdmUiTableView.h"
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiActionPushButtonEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiActionPushButtonEditor.cpp
index d1ba0976bd..2b692f5e32 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiActionPushButtonEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiActionPushButtonEditor.cpp
@@ -41,7 +41,6 @@
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 #include "cafPdmUiFieldEditorHandle.h"
-#include "cafPdmUiOrdering.h"
 
 #include "cafFactory.h"
 
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxAndTextEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxAndTextEditor.cpp
index b50f347bc0..4092b50f8c 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxAndTextEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxAndTextEditor.cpp
@@ -41,8 +41,6 @@
 #include "cafPdmUiDefaultObjectEditor.h"
 #include "cafPdmUiFieldEditorHandle.h"
 #include "cafPdmUiLineEditor.h"
-#include "cafPdmUiOrdering.h"
-#include "cafQShortenedLabel.h"
 
 #include <QHBoxLayout>
 #include <QLabel>
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxEditor.cpp
index d52dd26fe9..48cf6ff17b 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxEditor.cpp
@@ -41,8 +41,6 @@
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 #include "cafPdmUiFieldEditorHandle.h"
-#include "cafPdmUiOrdering.h"
-#include "cafQShortenedLabel.h"
 
 #include "cafFactory.h"
 
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxTristateEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxTristateEditor.cpp
index 7e621d99ea..fd3749b7d9 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxTristateEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxTristateEditor.cpp
@@ -7,8 +7,6 @@
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 #include "cafPdmUiFieldEditorHandle.h"
-#include "cafPdmUiOrdering.h"
-#include "cafQShortenedLabel.h"
 
 #include "cafFactory.h"
 #include "cafTristate.h"
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp
index da19e6d17a..f8adaf40b0 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp
@@ -41,8 +41,6 @@
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 #include "cafPdmUiFieldEditorHandle.h"
-#include "cafPdmUiOrdering.h"
-#include "cafQShortenedLabel.h"
 
 #include "cafFactory.h"
 
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.cpp
index e0a9db744b..428674510e 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.cpp
@@ -40,7 +40,6 @@
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 #include "cafPdmUiFieldEditorHandle.h"
-#include "cafQShortenedLabel.h"
 #include "cafUiAppearanceSettings.h"
 #include "cafUiIconFactory.h"
 
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiDateEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiDateEditor.cpp
index 50f0e32ba8..8d1a1d4c2b 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiDateEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiDateEditor.cpp
@@ -41,8 +41,6 @@
 #include "cafPdmObject.h"
 #include "cafPdmUiDefaultObjectEditor.h"
 #include "cafPdmUiFieldEditorHandle.h"
-#include "cafPdmUiOrdering.h"
-#include "cafQShortenedLabel.h"
 #include "cafSelectionManager.h"
 
 #include <QApplication>
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleSliderEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleSliderEditor.cpp
index d5edbf88c8..78573a8605 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleSliderEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleSliderEditor.cpp
@@ -39,7 +39,6 @@
 #include "cafPdmField.h"
 #include "cafPdmUiFieldHandle.h"
 #include "cafPdmUiObjectHandle.h"
-#include "cafQShortenedLabel.h"
 
 #include <QDoubleValidator>
 #include <QHBoxLayout>
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleValueEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleValueEditor.cpp
index 0d44160155..cf0607a388 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleValueEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleValueEditor.cpp
@@ -42,7 +42,6 @@
 #include "cafPdmUiFieldEditorHandle.h"
 
 #include "cafFactory.h"
-#include "cafQShortenedLabel.h"
 
 #include <QDoubleValidator>
 #include <QHBoxLayout>
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiFilePathEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiFilePathEditor.cpp
index 07ab2c0be1..b2acbd40dc 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiFilePathEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiFilePathEditor.cpp
@@ -42,9 +42,8 @@
 #include "cafPdmUiDefaultObjectEditor.h"
 #include "cafPdmUiFieldEditorHandle.h"
 #include "cafPdmUiLineEditor.h"
-#include "cafPdmUiOrdering.h"
-#include "cafQShortenedLabel.h"
 
+#include <QApplication>
 #include <QBoxLayout>
 #include <QClipboard>
 #include <QDir>
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiFormLayoutObjectEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiFormLayoutObjectEditor.h
index 054ca7b941..4c49a76172 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiFormLayoutObjectEditor.h
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiFormLayoutObjectEditor.h
@@ -36,7 +36,6 @@
 
 #pragma once
 
-#include "cafPdmUiOrdering.h"
 #include "cafPdmUiWidgetObjectEditorHandle.h"
 
 #include <QPointer>
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiLineEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiLineEditor.cpp
index be15ba0e29..15ab06d5b8 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiLineEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiLineEditor.cpp
@@ -41,9 +41,7 @@
 #include "cafPdmObject.h"
 #include "cafPdmUiDefaultObjectEditor.h"
 #include "cafPdmUiFieldEditorHandle.h"
-#include "cafPdmUiOrdering.h"
 #include "cafPdmUniqueIdValidator.h"
-#include "cafQShortenedLabel.h"
 #include "cafSelectionManager.h"
 #include "cafUiAppearanceSettings.h"
 #include "cafUiIconFactory.h"
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.cpp
index e77b6d1616..c9bb4147d9 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.cpp
@@ -41,9 +41,6 @@
 #include "cafPdmUiDefaultObjectEditor.h"
 #include "cafPdmUiFieldEditorHandle.h"
 
-#include "cafFactory.h"
-#include "cafQShortenedLabel.h"
-
 #include <QApplication>
 #include <QBoxLayout>
 #include <QClipboard>
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiPushButtonEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiPushButtonEditor.cpp
index 711d27a328..9667434ab4 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiPushButtonEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiPushButtonEditor.cpp
@@ -41,10 +41,8 @@
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 #include "cafPdmUiFieldEditorHandle.h"
-#include "cafPdmUiOrdering.h"
 
 #include "cafFactory.h"
-#include "cafQShortenedLabel.h"
 
 #include <QBoxLayout>
 
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiPushButtonEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiPushButtonEditor.h
index ae94955b34..269c80a97a 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiPushButtonEditor.h
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiPushButtonEditor.h
@@ -35,12 +35,14 @@
 //##################################################################################################
 
 #pragma once
+
 #include "cafPdmUiFieldEditorHandle.h"
 
 #include <QLabel>
 #include <QPointer>
 #include <QPushButton>
 #include <QWidget>
+
 class QHBoxLayout;
 
 namespace caf
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiSliderEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiSliderEditor.cpp
index d34aaf9a9f..f3140d4518 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiSliderEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiSliderEditor.cpp
@@ -42,7 +42,6 @@
 #include "cafPdmUiFieldEditorHandle.h"
 
 #include "cafFactory.h"
-#include "cafQShortenedLabel.h"
 
 #include <QHBoxLayout>
 #include <QIntValidator>
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiSliderEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiSliderEditor.h
index 9ff9e53fc4..8f76eb660d 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiSliderEditor.h
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiSliderEditor.h
@@ -35,6 +35,7 @@
 //##################################################################################################
 
 #pragma once
+
 #include "cafPdmUiFieldEditorHandle.h"
 
 #include <QGroupBox>
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableRowEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableRowEditor.cpp
index 7162f75bf6..fe7ec29c91 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableRowEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableRowEditor.cpp
@@ -36,9 +36,8 @@
 
 #include "cafPdmUiTableRowEditor.h"
 
-#include "cafPdmField.h"
-#include "cafPdmObject.h"
-#include "cafPdmUiEditorHandle.h"
+#include "cafPdmUiObjectHandle.h"
+#include "cafPdmUiOrdering.h"
 #include "cafPdmUiTableViewQModel.h"
 
 namespace caf
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.cpp
index 797c32f473..55adc2893c 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.cpp
@@ -42,7 +42,6 @@
 #include "cafPdmUiEditorHandle.h"
 #include "cafPdmUiTableViewDelegate.h"
 #include "cafPdmUiTableViewQModel.h"
-#include "cafQShortenedLabel.h"
 #include "cafSelectionManager.h"
 
 #include <QApplication>
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.h
index 324ed59799..b95cab8712 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.h
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.h
@@ -36,11 +36,11 @@
 
 #pragma once
 
-#include "cafPdmDocument.h"
 #include "cafPdmUiFieldEditorHandle.h"
 #include "cafSelectionChangedReceiver.h"
 
 #include <QAbstractItemModel>
+#include <QBoxLayout>
 #include <QPointer>
 #include <QTableView>
 #include <QWidget>
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewQModel.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewQModel.cpp
index 4add98a298..0814e67c08 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewQModel.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewQModel.cpp
@@ -37,18 +37,13 @@
 #include "cafPdmUiTableViewQModel.h"
 
 #include "cafPdmChildArrayField.h"
-#include "cafPdmField.h"
-#include "cafPdmObject.h"
-#include "cafPdmUiComboBoxEditor.h"
 #include "cafPdmUiCommandSystemProxy.h"
 #include "cafPdmUiDateEditor.h"
 #include "cafPdmUiFieldEditorHelper.h"
 #include "cafPdmUiLineEditor.h"
+#include "cafPdmUiObjectHandle.h"
+#include "cafPdmUiOrdering.h"
 #include "cafPdmUiTableRowEditor.h"
-#include "cafPdmUiTableView.h"
-#include "cafSelectionManager.h"
-
-#include <QTableView>
 
 namespace caf
 {
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.cpp
index adeea776c1..d87f427d1a 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.cpp
@@ -40,8 +40,6 @@
 #include "cafPdmObject.h"
 #include "cafPdmUiDefaultObjectEditor.h"
 #include "cafPdmUiFieldEditorHandle.h"
-#include "cafPdmUiOrdering.h"
-#include "cafQShortenedLabel.h"
 
 #include <QIntValidator>
 #include <QLabel>
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.h
index eaccdd07a2..e68caf2526 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.h
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.h
@@ -35,7 +35,9 @@
 //##################################################################################################
 
 #pragma once
+
 #include "cafPdmUiFieldEditorHandle.h"
+
 #include <QLabel>
 #include <QPointer>
 #include <QPushButton>
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTimeEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTimeEditor.cpp
index c5a1ad4fcd..6b68545df1 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTimeEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTimeEditor.cpp
@@ -41,8 +41,6 @@
 #include "cafPdmObject.h"
 #include "cafPdmUiDefaultObjectEditor.h"
 #include "cafPdmUiFieldEditorHandle.h"
-#include "cafPdmUiOrdering.h"
-#include "cafQShortenedLabel.h"
 #include "cafSelectionManager.h"
 
 #include <QApplication>
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTimeEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiTimeEditor.h
index 109057a4b8..41f9a6b18a 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTimeEditor.h
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTimeEditor.h
@@ -38,7 +38,6 @@
 
 #include "cafPdmUiFieldEditorHandle.h"
 
-#include <QLabel>
 #include <QPointer>
 #include <QString>
 #include <QTimeEdit>
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiToolBarEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiToolBarEditor.h
index be53429233..9bc187bfdd 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiToolBarEditor.h
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiToolBarEditor.h
@@ -45,6 +45,7 @@
 
 class QToolBar;
 class QMainWindow;
+class QAction;
 
 namespace caf
 {
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionEditor.cpp
index 1035f8d393..8f64b77103 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionEditor.cpp
@@ -39,7 +39,6 @@
 #include "cafPdmObject.h"
 #include "cafPdmUiCommandSystemProxy.h"
 #include "cafPdmUiTreeSelectionQModel.h"
-#include "cafQShortenedLabel.h"
 
 #include <QBoxLayout>
 #include <QCheckBox>
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewEditor.cpp
index 3c036fcef3..1701b29442 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewEditor.cpp
@@ -49,6 +49,7 @@
 #include "cafPdmUiTreeViewQModel.h"
 #include "cafSelectionManager.h"
 
+#include <QApplication>
 #include <QDebug>
 #include <QDragMoveEvent>
 #include <QEvent>
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewItemDelegate.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewItemDelegate.cpp
index c0b4fa5d7a..0f093e01ae 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewItemDelegate.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewItemDelegate.cpp
@@ -49,6 +49,7 @@
 #include "cafPdmUiTreeViewQModel.h"
 #include "cafSelectionManager.h"
 
+#include <QApplication>
 #include <QEvent>
 #include <QIcon>
 #include <QModelIndexList>
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewQModel.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewQModel.cpp
index ec28ec433a..8f2e093828 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewQModel.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewQModel.cpp
@@ -36,10 +36,11 @@
 
 #include "cafPdmUiTreeViewQModel.h"
 
-#include "cafPdmField.h"
-#include "cafPdmObject.h"
+#include "cafPdmReferenceHelper.h"
 #include "cafPdmUiCommandSystemProxy.h"
 #include "cafPdmUiDragDropInterface.h"
+#include "cafPdmUiFieldHandle.h"
+#include "cafPdmUiObjectHandle.h"
 #include "cafPdmUiTreeItemEditor.h"
 #include "cafPdmUiTreeOrdering.h"
 #include "cafPdmUiTreeViewEditor.h"
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiValueRangeEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiValueRangeEditor.cpp
index ecdfd99f75..8c86f63aad 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiValueRangeEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiValueRangeEditor.cpp
@@ -41,8 +41,6 @@
 #include "cafPdmUiDefaultObjectEditor.h"
 #include "cafPdmUiFieldEditorHandle.h"
 #include "cafPdmUiLineEditor.h"
-#include "cafPdmUiOrdering.h"
-#include "cafQShortenedLabel.h"
 
 #include <QLabel>
 #include <QSlider>
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>
 
 //--------------------------------------------------------------------------------------------------