Cleanup includes

Use new tools in Visual Studio to help cleaning up includes and remove redundant includes.
2025-02-25 18:55:39 -06:00 · 2024-03-07 19:45:43 +01:00
parent ea27e952f5
commit bfda6519db
107 changed files with 141 additions and 236 deletions
--- 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
--- 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>

 //--------------------------------------------------------------------------------------------------
--- 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>
--- 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>
--- 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>
--- 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>

--- 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" );
--- 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>
--- 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>

--- 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" );

--- 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>

--- 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"

--- 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" );

--- 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>

 //--------------------------------------------------------------------------------------------------
--- 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>

--- 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"

--- 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" );
--- 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" );
--- 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"
--- 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 );

 //--------------------------------------------------------------------------------------------------
--- 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>

--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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
--- 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>
--- 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"

--- 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>
--- 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>

--- 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>

--- 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" );
--- 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" );
--- 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>
--- 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>
--- a/ApplicationLibCode/UserInterface/RiuPlotMainWindowTools.cpp
+++ b/ApplicationLibCode/UserInterface/RiuPlotMainWindowTools.cpp
@@ -20,6 +20,8 @@
 #include "RiaGuiApplication.h"
 #include "RiuPlotMainWindow.h"

+#include "cafPdmObject.h"
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
--- 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>

 //--------------------------------------------------------------------------------------------------
--- a/ApplicationLibCode/UserInterface/RiuSummaryPlot.cpp
+++ b/ApplicationLibCode/UserInterface/RiuSummaryPlot.cpp
@@ -32,6 +32,7 @@

 #include "cafCmdFeatureMenuBuilder.h"

+#include <QApplication>
 #include <QMenu>
 #include <QPointer>

--- 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
 {
--- 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>
--- 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
--- 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, ... )                          \
    {                                                                                                \
--- 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
--- 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;
--- 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>
--- 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 ) \
--- 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
 {
--- 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
--- 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
 {
--- 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 );
+    }
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
--- 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
--- 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>
--- 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
--- 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
--- 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;
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
--- 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 );

--- 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"

--- 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>

--- 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>
--- 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"
--- 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"
--- 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;
--- 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;

--- 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"
--- 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>

--- 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>
--- 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
--- 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
 {
 //--------------------------------------------------------------------------------------------------
--- 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
 {
--- 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;
--- 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" );

 //--------------------------------------------------------------------------------------------------
--- 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"
--- 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"

--- 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>
--- 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"

--- 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"
--- 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"

--- 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"

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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>
--- 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>

--- 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
--- 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>
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiSliderEditor.h
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiSliderEditor.h
@@ -35,6 +35,7 @@
 //##################################################################################################

 #pragma once
+
 #include "cafPdmUiFieldEditorHandle.h"

 #include <QGroupBox>
--- 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
--- 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>
--- 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>
--- 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
 {
--- 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>
--- 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>
--- 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>
--- 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>
--- a/Show More
+++ b/Show More