diff --git a/ApplicationLibCode/Application/RiaPlotDefines.cpp b/ApplicationLibCode/Application/RiaPlotDefines.cpp
index 5405da79f5..30a10e1e9b 100644
--- a/ApplicationLibCode/Application/RiaPlotDefines.cpp
+++ b/ApplicationLibCode/Application/RiaPlotDefines.cpp
@@ -23,6 +23,8 @@
 
 #include "cafAppEnum.h"
 
+#include <QPaintDevice>
+
 namespace caf
 {
 template <>
diff --git a/ApplicationLibCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp b/ApplicationLibCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp
index bfa24e1397..709c933509 100644
--- a/ApplicationLibCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp
+++ b/ApplicationLibCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp
@@ -19,6 +19,7 @@
 
 #include "RimReservoirCellResultsStorage.h"
 
+#include "RifReaderEclipseOutput.h"
 #include "RigActiveCellInfo.h"
 #include "RigCaseCellResultsData.h"
 #include "RigCell.h"
@@ -36,7 +37,7 @@
 
 #include "cvfGeometryTools.h"
 
-#include "RifReaderEclipseOutput.h"
+#include <QDataStream>
 #include <QDebug>
 #include <QDir>
 #include <QFile>
diff --git a/ApplicationLibCode/UserInterface/RiuQwtPlotTools.cpp b/ApplicationLibCode/UserInterface/RiuQwtPlotTools.cpp
index bbda2104b7..e1052c5a81 100644
--- a/ApplicationLibCode/UserInterface/RiuQwtPlotTools.cpp
+++ b/ApplicationLibCode/UserInterface/RiuQwtPlotTools.cpp
@@ -40,6 +40,8 @@
 #include "qwt_plot_shapeitem.h"
 #include "qwt_scale_widget.h"
 
+#include <QIcon>
+
 #include <vector>
 
 //--------------------------------------------------------------------------------------------------
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafIconProvider.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafIconProvider.cpp
index 44df519501..a3ab36815f 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafIconProvider.cpp
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafIconProvider.cpp
@@ -98,7 +98,10 @@ IconProvider::~IconProvider()
 //--------------------------------------------------------------------------------------------------
 IconProvider::IconProvider( const IconProvider& rhs )
 {
-    *m_impl = *rhs.m_impl;
+    if ( rhs.m_impl )
+        m_impl = std::make_unique<Impl>( *rhs.m_impl );
+    else
+        m_impl = std::make_unique<Impl>();
 }
 
 //--------------------------------------------------------------------------------------------------