Merge "DALi Version 2.0.52" into devel/master

diff --git a/dali/internal/imaging/tizen/native-image-source-impl-tizen.h b/dali/internal/imaging/tizen/native-image-source-impl-tizen.h
index 10dd6c9..35299ba 100644 (file)
--- a/dali/internal/imaging/tizen/native-image-source-impl-tizen.h
+++ b/dali/internal/imaging/tizen/native-image-source-impl-tizen.h
@@ -22,6 +22,7 @@
 #include <dali/devel-api/threading/mutex.h>
 #include <dali/public-api/common/dali-vector.h>
 #include <tbm_surface.h>
+#include <memory>
 
 // INTERNAL INCLUDES
 #include <dali/internal/imaging/common/native-image-source-impl.h>

diff --git a/dali/internal/imaging/ubuntu-x11/native-image-source-impl-x.h b/dali/internal/imaging/ubuntu-x11/native-image-source-impl-x.h
index a522fa1..6f49953 100644 (file)
--- a/dali/internal/imaging/ubuntu-x11/native-image-source-impl-x.h
+++ b/dali/internal/imaging/ubuntu-x11/native-image-source-impl-x.h
@@ -20,12 +20,10 @@
 
 // EXTERNAL INCLUDES
 #include <dali/internal/system/linux/dali-ecore-x.h>
+#include <memory>
 
 // INTERNAL INCLUDES
-#include <dali/internal/graphics/common/graphics-interface.h>
-
 #include <dali/public-api/adaptor-framework/native-image-source.h>
-
 #include <dali/internal/imaging/common/native-image-source-impl.h>
 
 namespace Dali