diff --git a/ApplicationCode/Commands/RicExportFeatureImpl.cpp b/ApplicationCode/Commands/RicExportFeatureImpl.cpp
index df05e5fd89..e5b151b6fd 100644
--- a/ApplicationCode/Commands/RicExportFeatureImpl.cpp
+++ b/ApplicationCode/Commands/RicExportFeatureImpl.cpp
@@ -1,4 +1,3 @@
-#include "QDialogButtonBox"
 /////////////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2017-     Statoil ASA
diff --git a/ApplicationCode/Commands/RicReloadFormationNamesFeature.cpp b/ApplicationCode/Commands/RicReloadFormationNamesFeature.cpp
index 4f8b3d63a5..c20fe3c8b8 100644
--- a/ApplicationCode/Commands/RicReloadFormationNamesFeature.cpp
+++ b/ApplicationCode/Commands/RicReloadFormationNamesFeature.cpp
@@ -23,7 +23,7 @@
 #include "cafSelectionManager.h"
 
 #include <QAction>
-#include "QMessageBox"
+#include <QMessageBox>
 
 CAF_CMD_SOURCE_INIT(RicReloadFormationNamesFeature, "RicReloadFormationNamesFeature");
 
diff --git a/ApplicationCode/ProjectDataModel/RimFormationNames.cpp b/ApplicationCode/ProjectDataModel/RimFormationNames.cpp
index 749983db3e..5d91738cb7 100644
--- a/ApplicationCode/ProjectDataModel/RimFormationNames.cpp
+++ b/ApplicationCode/ProjectDataModel/RimFormationNames.cpp
@@ -28,7 +28,7 @@
 
 #include <QFile>
 #include <QFileInfo>
-#include "QMessageBox"
+#include <QMessageBox>
 
 CAF_PDM_SOURCE_INIT(RimFormationNames, "FormationNames");
 
diff --git a/ApplicationCode/ProjectDataModel/RimFormationNames.h b/ApplicationCode/ProjectDataModel/RimFormationNames.h
index 2e6a71320c..a40689ad9c 100644
--- a/ApplicationCode/ProjectDataModel/RimFormationNames.h
+++ b/ApplicationCode/ProjectDataModel/RimFormationNames.h
@@ -23,6 +23,9 @@
 
 class RigFormationNames;
 
+//==================================================================================================
+///  
+//==================================================================================================
 class RimFormationNames : public caf::PdmObject
 {
     CAF_PDM_HEADER_INIT;
diff --git a/ApplicationCode/ProjectDataModel/RimFormationNamesCollection.cpp b/ApplicationCode/ProjectDataModel/RimFormationNamesCollection.cpp
index 06de7100b2..00541cfb69 100644
--- a/ApplicationCode/ProjectDataModel/RimFormationNamesCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimFormationNamesCollection.cpp
@@ -15,10 +15,12 @@
 //  for more details.
 //
 /////////////////////////////////////////////////////////////////////////////////
+
 #include "RimFormationNamesCollection.h"
 
 #include "RimFormationNames.h"
-#include "QMessageBox"
+
+#include <QMessageBox>
 
 CAF_PDM_SOURCE_INIT(RimFormationNamesCollection, "FormationNamesCollectionObject");
 
diff --git a/ApplicationCode/ProjectDataModel/RimFormationNamesCollection.h b/ApplicationCode/ProjectDataModel/RimFormationNamesCollection.h
index 7d3facfa1d..6b4d182d3d 100644
--- a/ApplicationCode/ProjectDataModel/RimFormationNamesCollection.h
+++ b/ApplicationCode/ProjectDataModel/RimFormationNamesCollection.h
@@ -22,6 +22,9 @@
 
 class RimFormationNames;
 
+//==================================================================================================
+///  
+//==================================================================================================
 class RimFormationNamesCollection: public caf::PdmObject
 {
     CAF_PDM_HEADER_INIT;
@@ -36,6 +39,7 @@ public:
     
     void importFiles(const QStringList& fileNames);
     void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath);
+
 private:
     caf::PdmChildArrayField<RimFormationNames*> m_formationNamesList;
-};
\ No newline at end of file
+};
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp b/ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp
index a83a51b6a3..2ebaffb2a9 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp
@@ -17,13 +17,16 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RimFileSummaryCase.h"
+
+#include "RiaLogging.h"
+
+#include "RifEclipseSummaryTools.h"
+#include "RifReaderEclipseSummary.h"
+
 #include "RimTools.h"
 
-#include "QFileInfo"
-#include "RifReaderEclipseSummary.h"
-#include "QDir"
-#include "RifEclipseSummaryTools.h"
-#include "RiaLogging.h"
+#include <QDir>
+#include <QFileInfo>
 
 
 //==================================================================================================
diff --git a/ApplicationCode/UserInterface/RiuMainWindowBase.cpp b/ApplicationCode/UserInterface/RiuMainWindowBase.cpp
index e888044c27..0bada423d5 100644
--- a/ApplicationCode/UserInterface/RiuMainWindowBase.cpp
+++ b/ApplicationCode/UserInterface/RiuMainWindowBase.cpp
@@ -17,9 +17,11 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RiuMainWindowBase.h"
-#include "QSettings"
+
 #include "RiaVersionInfo.h"
 
+#include <QSettings>
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/UserInterface/RiuMainWindowBase.h b/ApplicationCode/UserInterface/RiuMainWindowBase.h
index ce4cafc65c..2bb580509e 100644
--- a/ApplicationCode/UserInterface/RiuMainWindowBase.h
+++ b/ApplicationCode/UserInterface/RiuMainWindowBase.h
@@ -19,8 +19,12 @@
 #pragma once
 
 #include <QMainWindow>
+
 struct RimMdiWindowGeometry;
 
+//==================================================================================================
+///  
+//==================================================================================================
 class RiuMainWindowBase : public QMainWindow
 {
     Q_OBJECT
@@ -39,8 +43,7 @@ public:
     void            loadWinGeoAndDockToolBarLayout();
     void            saveWinGeoAndDockToolBarLayout();
     void            showWindow();
+
 private:
     QString         registryFolderName();
-
-
 };
diff --git a/Fwk/AppFwk/cafAnimControl/cafFrameAnimationControl.cpp b/Fwk/AppFwk/cafAnimControl/cafFrameAnimationControl.cpp
index 4a38b238dc..34dbd5e9f9 100644
--- a/Fwk/AppFwk/cafAnimControl/cafFrameAnimationControl.cpp
+++ b/Fwk/AppFwk/cafAnimControl/cafFrameAnimationControl.cpp
@@ -37,7 +37,7 @@
 
 #include "cafFrameAnimationControl.h"
 
-#include "qtimer.h"
+#include <QTimer>
 
 
 namespace caf
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiFilePathEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiFilePathEditor.cpp
index 0bade2b9ed..57c44b1e42 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiFilePathEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiFilePathEditor.cpp
@@ -37,23 +37,19 @@
 
 #include "cafPdmUiFilePathEditor.h"
 
-#include "cafPdmUiDefaultObjectEditor.h"
-
+#include "cafFactory.h"
+#include "cafPdmField.h"
 #include "cafPdmObject.h"
+#include "cafPdmUiDefaultObjectEditor.h"
 #include "cafPdmUiFieldEditorHandle.h"
 #include "cafPdmUiOrdering.h"
 
-#include "cafPdmField.h"
-
-#include <QLineEdit>
-#include <QLabel>
+#include <QBoxLayout>
+#include <QDir>
+#include <QFileDialog>
 #include <QIntValidator>
-
-#include "cafFactory.h"
-#include "qboxlayout.h"
-#include "qtoolbutton.h"
-#include "qfiledialog.h"
-
+#include <QLabel>
+#include <QLineEdit>
 
 
 namespace caf
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiFilePathEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiFilePathEditor.h
index 410506a4d9..f067ea6f70 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiFilePathEditor.h
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiFilePathEditor.h
@@ -36,7 +36,9 @@
 
 
 #pragma once
+
 #include "cafPdmUiFieldEditorHandle.h"
+
 #include <QString>
 #include <QWidget>
 #include <QPointer>
@@ -52,7 +54,6 @@ namespace caf
 //==================================================================================================
 /// 
 //==================================================================================================
-
 class PdmUiFilePathEditorAttribute : public PdmUiEditorAttribute
 {
 public:
@@ -77,6 +78,9 @@ public:
 };
 
 
+//==================================================================================================
+/// 
+//==================================================================================================
 class PdmUiFilePathEditor : public PdmUiFieldEditorHandle
 {
     Q_OBJECT