From d0703c50e4cbf4401ee39c6ac9c4e8875761a662 Mon Sep 17 00:00:00 2001
From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Thu, 24 Oct 2019 19:42:50 +0100
Subject: [PATCH] Remove DALI_ADAPTOR_COMPILATION define

Change-Id: I0894036153333197fbc58022954abbed283d53c9
---
 build/tizen/CMakeLists.txt                         |  4 +---
 build/tizen/deps-check.cmake                       |  1 -
 build/tizen/linker-test.cpp                        | 14 ++++++-----
 .../adaptor-framework/application-devel.cpp        |  7 +-----
 dali/integration-api/{ => adaptors}/adaptor.h      |  6 -----
 .../integration-api/{ => adaptors}/egl-interface.h |  0
 .../{ => adaptors}/log-factory-interface.h         |  2 +-
 .../{ => adaptors}/native-render-surface-factory.h |  0
 .../{ => adaptors}/native-render-surface.h         |  5 ----
 .../{ => adaptors}/render-surface-interface.h      |  4 +---
 .../{ => adaptors}/scene-holder-impl.cpp           |  6 ++---
 .../{ => adaptors}/scene-holder-impl.h             |  5 ----
 .../{ => adaptors}/scene-holder.cpp                |  4 ++--
 dali/integration-api/{ => adaptors}/scene-holder.h |  0
 .../thread-synchronization-interface.h             |  0
 .../trigger-event-factory-interface.h              |  4 ----
 .../{ => adaptors}/trigger-event-factory.h         |  4 ----
 .../{ => adaptors}/trigger-event-interface.h       |  0
 dali/integration-api/file.list                     | 28 +++++++++++-----------
 dali/internal/adaptor/common/adaptor-impl.h        | 27 +++++++--------------
 .../adaptor/common/adaptor-internal-services.h     | 14 +++++------
 dali/internal/adaptor/common/adaptor.cpp           |  9 ++-----
 .../common/combined-update-render-controller.cpp   | 10 ++++----
 .../common/combined-update-render-controller.h     | 11 ++++-----
 dali/internal/graphics/gles/egl-graphics.h         | 11 ++++-----
 dali/internal/graphics/gles/egl-implementation.h   |  3 +--
 .../input/tizen-wayland/ecore-virtual-keyboard.cpp |  5 ++--
 .../input-method-context-impl-ecore-wl.cpp         |  8 +++----
 .../virtual-keyboard-impl-ecore-wl.cpp             |  7 +++---
 .../ubuntu-x11/input-method-context-impl-x.cpp     | 16 ++++++-------
 .../input/ubuntu-x11/virtual-keyboard-impl-x.cpp   |  9 ++++---
 .../windows/input-method-context-impl-win.cpp      | 10 ++++----
 .../network/common/network-performance-client.h    |  2 +-
 dali/internal/system/common/environment-options.h  |  2 +-
 .../system/common/singleton-service-impl.cpp       |  9 +++----
 .../system/common/trigger-event-factory.cpp        |  4 ++--
 dali/internal/system/common/trigger-event.h        |  4 ++--
 .../tizen-wearable/capture-impl-tizen.cpp          | 10 ++++----
 .../system/windows/trigger-event-factory.cpp       |  6 ++---
 dali/internal/system/windows/trigger-event.h       | 14 +++++------
 .../common/native-render-surface-factory.cpp       |  6 ++---
 .../window-system/common/pixmap-render-surface.h   | 10 ++------
 dali/internal/window-system/common/window-impl.cpp |  7 +-----
 dali/internal/window-system/common/window-impl.h   |  9 ++-----
 .../window-system/common/window-render-surface.cpp |  9 ++++---
 .../window-system/common/window-render-surface.h   | 18 +++++---------
 .../native-render-surface-ecore-wl.cpp             | 10 ++++----
 .../tizen-wayland/native-render-surface-ecore-wl.h |  6 ++---
 .../ubuntu-x11/pixmap-render-surface-ecore-x.cpp   | 11 ++++-----
 .../ubuntu-x11/pixmap-render-surface-ecore-x.h     | 15 ++++++------
 .../ubuntu-x11/render-surface-factory-ecore-x.cpp  | 12 +++++-----
 .../windows/render-surface-factory-win.cpp         | 12 ++++++----
 third-party/glyphy/vector-font-cache.cpp           |  6 ++---
 53 files changed, 169 insertions(+), 247 deletions(-)
 rename dali/integration-api/{ => adaptors}/adaptor.h (99%)
 rename dali/integration-api/{ => adaptors}/egl-interface.h (100%)
 rename dali/integration-api/{ => adaptors}/log-factory-interface.h (94%)
 rename dali/integration-api/{ => adaptors}/native-render-surface-factory.h (100%)
 rename dali/integration-api/{ => adaptors}/native-render-surface.h (95%)
 rename dali/integration-api/{ => adaptors}/render-surface-interface.h (98%)
 rename dali/integration-api/{ => adaptors}/scene-holder-impl.cpp (98%)
 rename dali/integration-api/{ => adaptors}/scene-holder-impl.h (98%)
 rename dali/integration-api/{ => adaptors}/scene-holder.cpp (96%)
 rename dali/integration-api/{ => adaptors}/scene-holder.h (100%)
 rename dali/integration-api/{ => adaptors}/thread-synchronization-interface.h (100%)
 rename dali/integration-api/{ => adaptors}/trigger-event-factory-interface.h (95%)
 rename dali/integration-api/{ => adaptors}/trigger-event-factory.h (93%)
 rename dali/integration-api/{ => adaptors}/trigger-event-interface.h (100%)

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 752b04c..cb68586 100644
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -81,7 +81,6 @@ ADD_COMPILE_OPTIONS( -Wall ${DALI_CFLAGS} )# -Wextra -Wno-unused-parameter )# -W
 
 ADD_DEFINITIONS( -DNON_POWER_OF_TWO_TEXTURES
                  -DDALI_COMPILATION
-                 -DDALI_ADAPTOR_COMPILATION
                  ${DEFINITIONS} )
 
 # from root/build/tizen, get back to root
@@ -287,8 +286,7 @@ SET( LINKER_TEST_SOURCES
 )
 ADD_EXECUTABLE( ${LINKER_TEST_NAME} ${LINKER_TEST_SOURCES} )
 MESSAGE(STATUS "libs: ${DALICORE_LDFLAGS}")
-TARGET_COMPILE_OPTIONS( ${LINKER_TEST_NAME} PRIVATE -DDALI_ADAPTOR_COMPILATION -I${ROOT_SRC_DIR} ${DALICORE_CFLAGS} )
-TARGET_COMPILE_DEFINITIONS(${LINKER_TEST_NAME} PUBLIC -DDALI_ADAPTOR_COMPILATION )
+TARGET_COMPILE_OPTIONS( ${LINKER_TEST_NAME} PRIVATE -I${ROOT_SRC_DIR} ${DALICORE_CFLAGS} )
 TARGET_LINK_LIBRARIES(${LINKER_TEST_NAME} ${name} ${DALICORE_LDFLAGS} ${VCONF_LDFLAGS} ${HARFBUZZ_LDFLAGS} )
 TARGET_INCLUDE_DIRECTORIES( ${LINKER_TEST_NAME} PRIVATE ${DALI_TEST_SUITE_DIR} )
 
diff --git a/build/tizen/deps-check.cmake b/build/tizen/deps-check.cmake
index d22ccd8..e3f5bf4 100644
--- a/build/tizen/deps-check.cmake
+++ b/build/tizen/deps-check.cmake
@@ -233,7 +233,6 @@ SET( DALI_CFLAGS
   ${UTILX_CFLAGS}
   -Wall
   -DDALI_COMPILATION
-  -DDALI_ADAPTOR_COMPILATION
 )
 
 # Default set of linked librarires
diff --git a/build/tizen/linker-test.cpp b/build/tizen/linker-test.cpp
index a85622d..e10bffa 100644
--- a/build/tizen/linker-test.cpp
+++ b/build/tizen/linker-test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,16 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <iostream>
 #include <dali/public-api/dali-core.h>
-
-#include <dali/public-api/adaptor-framework/application.h>
-#include <dali/integration-api/adaptor.h>
-#include <dali/integration-api/render-surface.h>
 #include <dali/devel-api/adaptor-framework/orientation.h>
+#include <dali/integration-api/render-surface.h>
+
+// INTERNAL INCLUDES
 #include <dali/public-api/adaptor-framework/timer.h>
-#include <iostream>
+#include <dali/public-api/adaptor-framework/application.h>
+#include <dali/integration-api/adaptors/adaptor.h>
 
 using namespace Dali;
 
diff --git a/dali/devel-api/adaptor-framework/application-devel.cpp b/dali/devel-api/adaptor-framework/application-devel.cpp
index b9ef5dd..98aa010 100644
--- a/dali/devel-api/adaptor-framework/application-devel.cpp
+++ b/dali/devel-api/adaptor-framework/application-devel.cpp
@@ -17,13 +17,8 @@
 
 // INTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/application-devel.h>
-#include <dali/internal/adaptor/common/application-impl.h>
-
-#ifdef DALI_ADAPTOR_COMPILATION
-#include <dali/integration-api/scene-holder.h>
-#else
 #include <dali/integration-api/adaptors/scene-holder.h>
-#endif
+#include <dali/internal/adaptor/common/application-impl.h>
 
 namespace Dali
 {
diff --git a/dali/integration-api/adaptor.h b/dali/integration-api/adaptors/adaptor.h
similarity index 99%
rename from dali/integration-api/adaptor.h
rename to dali/integration-api/adaptors/adaptor.h
index eb0f6f0..a18cf8a 100755
--- a/dali/integration-api/adaptor.h
+++ b/dali/integration-api/adaptors/adaptor.h
@@ -32,13 +32,7 @@
 #include <dali/public-api/adaptor-framework/window.h>
 #include <dali/public-api/adaptor-framework/application-configuration.h>
 #include <dali/public-api/dali-adaptor-common.h>
-
-#ifdef DALI_ADAPTOR_COMPILATION
-#include <dali/integration-api/log-factory-interface.h>
-#else
 #include <dali/integration-api/adaptors/log-factory-interface.h>
-#endif
-
 
 namespace Dali
 {
diff --git a/dali/integration-api/egl-interface.h b/dali/integration-api/adaptors/egl-interface.h
similarity index 100%
rename from dali/integration-api/egl-interface.h
rename to dali/integration-api/adaptors/egl-interface.h
diff --git a/dali/integration-api/log-factory-interface.h b/dali/integration-api/adaptors/log-factory-interface.h
similarity index 94%
rename from dali/integration-api/log-factory-interface.h
rename to dali/integration-api/adaptors/log-factory-interface.h
index 5c6a7ea..738ae05 100644
--- a/dali/integration-api/log-factory-interface.h
+++ b/dali/integration-api/adaptors/log-factory-interface.h
@@ -2,7 +2,7 @@
 #define DALI_ADAPTOR_LOG_FACTORY_INTERFACE_H
 
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dali/integration-api/native-render-surface-factory.h b/dali/integration-api/adaptors/native-render-surface-factory.h
similarity index 100%
rename from dali/integration-api/native-render-surface-factory.h
rename to dali/integration-api/adaptors/native-render-surface-factory.h
diff --git a/dali/integration-api/native-render-surface.h b/dali/integration-api/adaptors/native-render-surface.h
similarity index 95%
rename from dali/integration-api/native-render-surface.h
rename to dali/integration-api/adaptors/native-render-surface.h
index 4728bcb..dff0f26 100644
--- a/dali/integration-api/native-render-surface.h
+++ b/dali/integration-api/adaptors/native-render-surface.h
@@ -20,12 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/dali-adaptor-common.h>
-
-#ifdef DALI_ADAPTOR_COMPILATION
-#include <dali/integration-api/render-surface-interface.h>
-#else
 #include <dali/integration-api/adaptors/render-surface-interface.h>
-#endif
 
 namespace Dali
 {
diff --git a/dali/integration-api/render-surface-interface.h b/dali/integration-api/adaptors/render-surface-interface.h
similarity index 98%
rename from dali/integration-api/render-surface-interface.h
rename to dali/integration-api/adaptors/render-surface-interface.h
index 501bf62..f780554 100644
--- a/dali/integration-api/render-surface-interface.h
+++ b/dali/integration-api/adaptors/render-surface-interface.h
@@ -2,7 +2,7 @@
 #define DALI_RENDER_SURFACE_INTERFACE_H
 
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,6 @@
 #include <dali/integration-api/core-enumerations.h>
 #include <dali/public-api/math/vector4.h>
 
-// INTERNAL INCLUDES
-
 namespace Dali
 {
 
diff --git a/dali/integration-api/scene-holder-impl.cpp b/dali/integration-api/adaptors/scene-holder-impl.cpp
similarity index 98%
rename from dali/integration-api/scene-holder-impl.cpp
rename to dali/integration-api/adaptors/scene-holder-impl.cpp
index a5eca04..958eda9 100644
--- a/dali/integration-api/scene-holder-impl.cpp
+++ b/dali/integration-api/adaptors/scene-holder-impl.cpp
@@ -16,9 +16,9 @@
  */
 
 // CLASS HEADER
-#include <dali/integration-api/scene-holder-impl.h>
+#include <dali/integration-api/adaptors/scene-holder-impl.h>
 
-// EXTERNAL HEADERS
+// EXTERNAL INCLUDES
 #include <sys/time.h>
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/actors/layer.h>
@@ -28,7 +28,7 @@
 #include <dali/integration-api/events/hover-event-integ.h>
 #include <dali/integration-api/events/wheel-event-integ.h>
 
-// INTERNAL HEADERS
+// INTERNAL INCLUDES
 #include <dali/internal/adaptor/common/adaptor-impl.h>
 #include <dali/internal/adaptor/common/lifecycle-observer.h>
 #include <dali/internal/input/common/key-impl.h>
diff --git a/dali/integration-api/scene-holder-impl.h b/dali/integration-api/adaptors/scene-holder-impl.h
similarity index 98%
rename from dali/integration-api/scene-holder-impl.h
rename to dali/integration-api/adaptors/scene-holder-impl.h
index 29ebf02..8fbec83 100644
--- a/dali/integration-api/scene-holder-impl.h
+++ b/dali/integration-api/adaptors/scene-holder-impl.h
@@ -29,13 +29,8 @@
 #include <dali/integration-api/events/touch-event-combiner.h>
 
 // INTERNAL INCLUDES
-#ifdef DALI_ADAPTOR_COMPILATION
-#include <dali/integration-api/render-surface-interface.h>
-#include <dali/integration-api/scene-holder.h>
-#else
 #include <dali/integration-api/adaptors/render-surface-interface.h>
 #include <dali/integration-api/adaptors/scene-holder.h>
-#endif
 
 namespace Dali
 {
diff --git a/dali/integration-api/scene-holder.cpp b/dali/integration-api/adaptors/scene-holder.cpp
similarity index 96%
rename from dali/integration-api/scene-holder.cpp
rename to dali/integration-api/adaptors/scene-holder.cpp
index 7a232b9..5439d53 100644
--- a/dali/integration-api/scene-holder.cpp
+++ b/dali/integration-api/adaptors/scene-holder.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/integration-api/scene-holder.h>
+#include <dali/integration-api/adaptors/scene-holder.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/events/wheel-event.h>
@@ -26,7 +26,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/actors/layer.h>
-#include <dali/integration-api/scene-holder-impl.h>
+#include <dali/integration-api/adaptors/scene-holder-impl.h>
 
 namespace Dali
 {
diff --git a/dali/integration-api/scene-holder.h b/dali/integration-api/adaptors/scene-holder.h
similarity index 100%
rename from dali/integration-api/scene-holder.h
rename to dali/integration-api/adaptors/scene-holder.h
diff --git a/dali/integration-api/thread-synchronization-interface.h b/dali/integration-api/adaptors/thread-synchronization-interface.h
similarity index 100%
rename from dali/integration-api/thread-synchronization-interface.h
rename to dali/integration-api/adaptors/thread-synchronization-interface.h
diff --git a/dali/integration-api/trigger-event-factory-interface.h b/dali/integration-api/adaptors/trigger-event-factory-interface.h
similarity index 95%
rename from dali/integration-api/trigger-event-factory-interface.h
rename to dali/integration-api/adaptors/trigger-event-factory-interface.h
index 8fa4290..f76f7f5 100644
--- a/dali/integration-api/trigger-event-factory-interface.h
+++ b/dali/integration-api/adaptors/trigger-event-factory-interface.h
@@ -22,11 +22,7 @@
 #include <dali/public-api/signals/callback.h>
 
 // INTERNAL INCLUDES
-#ifdef DALI_ADAPTOR_COMPILATION
-#include <dali/integration-api/trigger-event-interface.h>
-#else
 #include <dali/integration-api/adaptors/trigger-event-interface.h>
-#endif
 
 namespace Dali
 {
diff --git a/dali/integration-api/trigger-event-factory.h b/dali/integration-api/adaptors/trigger-event-factory.h
similarity index 93%
rename from dali/integration-api/trigger-event-factory.h
rename to dali/integration-api/adaptors/trigger-event-factory.h
index d2630ee..54ce735 100644
--- a/dali/integration-api/trigger-event-factory.h
+++ b/dali/integration-api/adaptors/trigger-event-factory.h
@@ -20,11 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/dali-adaptor-common.h>
-#ifdef DALI_ADAPTOR_COMPILATION
-#include <dali/integration-api/trigger-event-factory-interface.h>
-#else
 #include <dali/integration-api/adaptors/trigger-event-factory-interface.h>
-#endif
 
 namespace Dali
 {
diff --git a/dali/integration-api/trigger-event-interface.h b/dali/integration-api/adaptors/trigger-event-interface.h
similarity index 100%
rename from dali/integration-api/trigger-event-interface.h
rename to dali/integration-api/adaptors/trigger-event-interface.h
diff --git a/dali/integration-api/file.list b/dali/integration-api/file.list
index 6aad427..22cb636 100644
--- a/dali/integration-api/file.list
+++ b/dali/integration-api/file.list
@@ -1,23 +1,23 @@
 
 
 SET( adaptor_integration_api_src_files
-  ${adaptor_integration_api_dir}/scene-holder.cpp 
-  ${adaptor_integration_api_dir}/scene-holder-impl.cpp
+  ${adaptor_integration_api_dir}/adaptors/scene-holder.cpp
+  ${adaptor_integration_api_dir}/adaptors/scene-holder-impl.cpp
 )
 
 
 SET( adaptor_integration_api_header_files
-  ${adaptor_integration_api_dir}/adaptor.h 
-  ${adaptor_integration_api_dir}/egl-interface.h 
-  ${adaptor_integration_api_dir}/log-factory-interface.h 
-  ${adaptor_integration_api_dir}/native-render-surface.h 
-  ${adaptor_integration_api_dir}/native-render-surface-factory.h 
-  ${adaptor_integration_api_dir}/render-surface-interface.h 
-  ${adaptor_integration_api_dir}/scene-holder.h 
-  ${adaptor_integration_api_dir}/scene-holder-impl.h 
-  ${adaptor_integration_api_dir}/thread-synchronization-interface.h 
-  ${adaptor_integration_api_dir}/trigger-event-interface.h 
-  ${adaptor_integration_api_dir}/trigger-event-factory-interface.h 
-  ${adaptor_integration_api_dir}/trigger-event-factory.h
+  ${adaptor_integration_api_dir}/adaptors/adaptor.h
+  ${adaptor_integration_api_dir}/adaptors/egl-interface.h
+  ${adaptor_integration_api_dir}/adaptors/log-factory-interface.h
+  ${adaptor_integration_api_dir}/adaptors/native-render-surface.h
+  ${adaptor_integration_api_dir}/adaptors/native-render-surface-factory.h
+  ${adaptor_integration_api_dir}/adaptors/render-surface-interface.h
+  ${adaptor_integration_api_dir}/adaptors/scene-holder.h
+  ${adaptor_integration_api_dir}/adaptors/scene-holder-impl.h
+  ${adaptor_integration_api_dir}/adaptors/thread-synchronization-interface.h
+  ${adaptor_integration_api_dir}/adaptors/trigger-event-interface.h
+  ${adaptor_integration_api_dir}/adaptors/trigger-event-factory-interface.h
+  ${adaptor_integration_api_dir}/adaptors/trigger-event-factory.h
 )
 
diff --git a/dali/internal/adaptor/common/adaptor-impl.h b/dali/internal/adaptor/common/adaptor-impl.h
index 74f7ab3..546e206 100755
--- a/dali/internal/adaptor/common/adaptor-impl.h
+++ b/dali/internal/adaptor/common/adaptor-impl.h
@@ -27,31 +27,22 @@
 #include <dali/integration-api/render-controller.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/adaptor.h>
-#include <dali/integration-api/scene.h>
-
-#ifdef DALI_ADAPTOR_COMPILATION
-#include <dali/integration-api/scene-holder-impl.h>
-#else
-#include <dali/integration-api/adaptors/scene-holder-impl.h>
-#endif
-
 #include <dali/public-api/adaptor-framework/tts-player.h>
 #include <dali/devel-api/adaptor-framework/clipboard.h>
-
+#include <dali/integration-api/scene.h>
+#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/integration-api/adaptors/scene-holder-impl.h>
+#include <dali/integration-api/adaptors/trigger-event-factory.h>
+#include <dali/internal/adaptor/common/adaptor-internal-services.h>
 #include <dali/internal/graphics/common/graphics-interface.h>
-
 #include <dali/internal/legacy/common/tizen-platform-abstraction.h>
-#include <dali/internal/adaptor/common/adaptor-internal-services.h>
-#include <dali/internal/system/common/environment-options.h>
+#include <dali/internal/network/common/socket-factory.h>
 #include <dali/internal/system/common/core-event-interface.h>
-#include <dali/internal/window-system/common/damage-observer.h>
-#include <dali/internal/window-system/common/window-visibility-observer.h>
+#include <dali/internal/system/common/environment-options.h>
 #include <dali/internal/system/common/kernel-trace.h>
 #include <dali/internal/system/common/system-trace.h>
-#include <dali/integration-api/trigger-event-factory.h>
-#include <dali/internal/network/common/socket-factory.h>
-
+#include <dali/internal/window-system/common/damage-observer.h>
+#include <dali/internal/window-system/common/window-visibility-observer.h>
 
 namespace Dali
 {
diff --git a/dali/internal/adaptor/common/adaptor-internal-services.h b/dali/internal/adaptor/common/adaptor-internal-services.h
index de6c4e3..8b1ca17 100644
--- a/dali/internal/adaptor/common/adaptor-internal-services.h
+++ b/dali/internal/adaptor/common/adaptor-internal-services.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_ADAPTOR_INTERNAL_SERVICES_H
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,16 +23,16 @@
 #include <dali/integration-api/gl-abstraction.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/trigger-event-interface.h>
-#include <dali/integration-api/trigger-event-factory-interface.h>
-#include <dali/integration-api/render-surface-interface.h>
-#include <dali/internal/window-system/common/display-connection.h>
+#include <dali/integration-api/render-surface.h>
+#include <dali/integration-api/adaptors/render-surface-interface.h>
+#include <dali/integration-api/adaptors/trigger-event-factory-interface.h>
+#include <dali/integration-api/adaptors/trigger-event-interface.h>
 #include <dali/internal/graphics/common/graphics-interface.h>
 #include <dali/internal/graphics/gles/egl-factory-interface.h>
 #include <dali/internal/network/common/socket-factory-interface.h>
-#include <dali/internal/system/common/performance-interface.h>
 #include <dali/internal/network/common/trace-interface.h>
-#include <dali/integration-api/render-surface.h>
+#include <dali/internal/system/common/performance-interface.h>
+#include <dali/internal/window-system/common/display-connection.h>
 
 namespace Dali
 {
diff --git a/dali/internal/adaptor/common/adaptor.cpp b/dali/internal/adaptor/common/adaptor.cpp
index 195f936..13bec1b 100755
--- a/dali/internal/adaptor/common/adaptor.cpp
+++ b/dali/internal/adaptor/common/adaptor.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/integration-api/adaptor.h>
+#include <dali/integration-api/adaptors/adaptor.h>
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
@@ -25,15 +25,10 @@
 #include <dali/devel-api/adaptor-framework/accessibility-adaptor.h>
 #include <dali/devel-api/adaptor-framework/style-monitor.h>
 #include <dali/integration-api/render-surface.h>
+#include <dali/integration-api/adaptors/scene-holder.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
 #include <dali/internal/window-system/common/window-impl.h>
 
-#ifdef DALI_ADAPTOR_COMPILATION
-#include <dali/integration-api/scene-holder.h>
-#else
-#include <dali/integration-api/adaptors/scene-holder.h>
-#endif
-
 namespace Dali
 {
 
diff --git a/dali/internal/adaptor/common/combined-update-render-controller.cpp b/dali/internal/adaptor/common/combined-update-render-controller.cpp
index 8aac435..36fc133 100644
--- a/dali/internal/adaptor/common/combined-update-render-controller.cpp
+++ b/dali/internal/adaptor/common/combined-update-render-controller.cpp
@@ -23,15 +23,15 @@
 #include <dali/integration-api/platform-abstraction.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/trigger-event-factory.h>
-#include <dali/internal/adaptor/common/combined-update-render-controller-debug.h>
-#include <dali/internal/system/common/environment-options.h>
-#include <dali/internal/system/common/time-service.h>
-#include <dali/internal/adaptor/common/adaptor-internal-services.h>
+#include <dali/integration-api/adaptors/trigger-event-factory.h>
 #include <dali/devel-api/adaptor-framework/thread-settings.h>
+#include <dali/internal/adaptor/common/adaptor-internal-services.h>
+#include <dali/internal/adaptor/common/combined-update-render-controller-debug.h>
 #include <dali/internal/graphics/gles/egl-graphics.h>
 #include <dali/internal/graphics/gles/egl-implementation.h>
 #include <dali/internal/graphics/common/graphics-interface.h>
+#include <dali/internal/system/common/environment-options.h>
+#include <dali/internal/system/common/time-service.h>
 
 namespace Dali
 {
diff --git a/dali/internal/adaptor/common/combined-update-render-controller.h b/dali/internal/adaptor/common/combined-update-render-controller.h
index cfcb25b..1257e86 100644
--- a/dali/internal/adaptor/common/combined-update-render-controller.h
+++ b/dali/internal/adaptor/common/combined-update-render-controller.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_COMBINED_UPDATE_RENDER_CONTROLLER_H
 
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,18 +21,17 @@
 // EXTERNAL INCLUDES
 #include <semaphore.h>
 #include <stdint.h>
-#include <dali/integration-api/core.h>
 #include <dali/devel-api/threading/conditional-wait.h>
+#include <dali/integration-api/core.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/thread-synchronization-interface.h>
-#include <dali/internal/system/common/performance-interface.h>
-#include <dali/internal/system/common/fps-tracker.h>
+#include <dali/integration-api/adaptors/thread-synchronization-interface.h>
 #include <dali/internal/adaptor/common/thread-controller-interface.h>
+#include <dali/internal/system/common/fps-tracker.h>
+#include <dali/internal/system/common/performance-interface.h>
 #include <dali/internal/system/common/update-status-logger.h>
 #include <dali/internal/window-system/common/display-connection.h>
 
-
 namespace Dali
 {
 
diff --git a/dali/internal/graphics/gles/egl-graphics.h b/dali/internal/graphics/gles/egl-graphics.h
index ca98ca0..cc23fcc 100644
--- a/dali/internal/graphics/gles/egl-graphics.h
+++ b/dali/internal/graphics/gles/egl-graphics.h
@@ -18,18 +18,15 @@
  *
  */
 
-// EXTERNAL INCLUDES
-
 // INTERNAL INCLUDES
+#include <dali/integration-api/adaptors/egl-interface.h>
+#include <dali/internal/graphics/common/egl-image-extensions.h>
 #include <dali/internal/graphics/common/graphics-interface.h>
-#include <dali/internal/graphics/gles/gl-proxy-implementation.h>
 #include <dali/internal/graphics/gles/gl-implementation.h>
-#include <dali/integration-api/egl-interface.h>
-
+#include <dali/internal/graphics/gles/gl-proxy-implementation.h>
+#include <dali/internal/graphics/gles/egl-context-helper-implementation.h>
 #include <dali/internal/graphics/gles/egl-implementation.h>
-#include <dali/internal/graphics/common/egl-image-extensions.h>
 #include <dali/internal/graphics/gles/egl-sync-implementation.h>
-#include <dali/internal/graphics/gles/egl-context-helper-implementation.h>
 
 namespace Dali
 {
diff --git a/dali/internal/graphics/gles/egl-implementation.h b/dali/internal/graphics/gles/egl-implementation.h
index 3f01537..187c981 100644
--- a/dali/internal/graphics/gles/egl-implementation.h
+++ b/dali/internal/graphics/gles/egl-implementation.h
@@ -26,11 +26,10 @@
 #include <dali/integration-api/core-enumerations.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/egl-interface.h>
+#include <dali/integration-api/adaptors/egl-interface.h>
 
 namespace Dali
 {
-
 namespace Internal
 {
 namespace Adaptor
diff --git a/dali/internal/input/tizen-wayland/ecore-virtual-keyboard.cpp b/dali/internal/input/tizen-wayland/ecore-virtual-keyboard.cpp
index 1a63ccf..6249a6f 100755
--- a/dali/internal/input/tizen-wayland/ecore-virtual-keyboard.cpp
+++ b/dali/internal/input/tizen-wayland/ecore-virtual-keyboard.cpp
@@ -20,14 +20,13 @@
 
 // EXTERNAL INCLUDES
 #include <algorithm>
-
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
+#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/internal/input/common/input-method-context-impl.h>
 #include <dali/internal/input/tizen-wayland/ecore-virtual-keyboard.h>
-#include <dali/integration-api/adaptor.h>
 #include <dali/internal/system/common/locale-utils.h>
-#include <dali/internal/input/common/input-method-context-impl.h>
 
 namespace Dali
 {
diff --git a/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp b/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp
index d1bba79..96310e4 100755
--- a/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp
+++ b/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp
@@ -34,12 +34,12 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/adaptor.h>
-#include <dali/integration-api/scene-holder.h>
-#include <dali/internal/system/common/locale-utils.h>
-#include <dali/internal/system/common/singleton-service-impl.h>
 #include <dali/public-api/adaptor-framework/input-method.h>
+#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/integration-api/adaptors/scene-holder.h>
 #include <dali/internal/input/common/key-impl.h>
+#include <dali/internal/system/common/locale-utils.h>
+#include <dali/internal/system/common/singleton-service-impl.h>
 #include <dali/internal/window-system/common/window-render-surface.h>
 
 #define TOKEN_STRING(x) #x
diff --git a/dali/internal/input/tizen-wayland/virtual-keyboard-impl-ecore-wl.cpp b/dali/internal/input/tizen-wayland/virtual-keyboard-impl-ecore-wl.cpp
index 4c664ac..831f848 100755
--- a/dali/internal/input/tizen-wayland/virtual-keyboard-impl-ecore-wl.cpp
+++ b/dali/internal/input/tizen-wayland/virtual-keyboard-impl-ecore-wl.cpp
@@ -19,16 +19,15 @@
 #include <dali/internal/input/common/virtual-keyboard-impl.h>
 
 // EXTERNAL INCLUDES
-#include <dali/internal/system/linux/dali-ecore.h>
-#include <dali/internal/input/linux/dali-ecore-imf.h>
 #include <algorithm>
-
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/adaptor.h>
+#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/internal/input/linux/dali-ecore-imf.h>
 #include <dali/internal/system/common/locale-utils.h>
+#include <dali/internal/system/linux/dali-ecore.h>
 
 namespace Dali
 {
diff --git a/dali/internal/input/ubuntu-x11/input-method-context-impl-x.cpp b/dali/internal/input/ubuntu-x11/input-method-context-impl-x.cpp
index 8517a05..815a698 100755
--- a/dali/internal/input/ubuntu-x11/input-method-context-impl-x.cpp
+++ b/dali/internal/input/ubuntu-x11/input-method-context-impl-x.cpp
@@ -19,22 +19,22 @@
 #include <dali/internal/input/ubuntu-x11/input-method-context-impl-x.h>
 
 // EXTERNAL INCLUDES
-#include <dali/internal/input/linux/dali-ecore-imf.h>
-#include <dali/internal/input/ubuntu-x11/dali-ecore-input.h>
-#include <dali/internal/system/linux/dali-ecore.h>
 #include <dali/public-api/events/key-event.h>
-#include <dali/public-api/adaptor-framework/key.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/adaptor.h>
+#include <dali/public-api/adaptor-framework/key.h>
+#include <dali/integration-api/adaptors/adaptor.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
-#include <dali/internal/system/common/locale-utils.h>
-#include <dali/internal/system/common/singleton-service-impl.h>
-#include <dali/internal/input/common/virtual-keyboard-impl.h>
 #include <dali/internal/input/common/key-impl.h>
+#include <dali/internal/input/common/virtual-keyboard-impl.h>
+#include <dali/internal/input/linux/dali-ecore-imf.h>
 #include <dali/internal/input/tizen-wayland/ecore-virtual-keyboard.h>
+#include <dali/internal/input/ubuntu-x11/dali-ecore-input.h>
+#include <dali/internal/system/common/locale-utils.h>
+#include <dali/internal/system/common/singleton-service-impl.h>
+#include <dali/internal/system/linux/dali-ecore.h>
 
 namespace Dali
 {
diff --git a/dali/internal/input/ubuntu-x11/virtual-keyboard-impl-x.cpp b/dali/internal/input/ubuntu-x11/virtual-keyboard-impl-x.cpp
index 864814d..ecfb023 100755
--- a/dali/internal/input/ubuntu-x11/virtual-keyboard-impl-x.cpp
+++ b/dali/internal/input/ubuntu-x11/virtual-keyboard-impl-x.cpp
@@ -19,16 +19,15 @@
 #include <dali/internal/input/common/virtual-keyboard-impl.h>
 
 // EXTERNAL INCLUDES
-#include <X11/Xlib.h>
-#include <dali/internal/system/linux/dali-ecore-x.h>
 #include <algorithm>
-
+#include <X11/Xlib.h>
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/adaptor.h>
-#include <dali/internal/system/common/locale-utils.h>
+#include <dali/integration-api/adaptors/adaptor.h>
 #include <dali/internal/input/ubuntu-x11/input-method-context-impl-x.h>
+#include <dali/internal/system/common/locale-utils.h>
+#include <dali/internal/system/linux/dali-ecore-x.h>
 
 namespace Dali
 {
diff --git a/dali/internal/input/windows/input-method-context-impl-win.cpp b/dali/internal/input/windows/input-method-context-impl-win.cpp
index 4cd4b65..1c3a5a0 100755
--- a/dali/internal/input/windows/input-method-context-impl-win.cpp
+++ b/dali/internal/input/windows/input-method-context-impl-win.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,17 +20,17 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/events/key-event.h>
-#include <dali/public-api/adaptor-framework/key.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/adaptor.h>
+#include <dali/public-api/adaptor-framework/key.h>
+#include <dali/integration-api/adaptors/adaptor.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
+#include <dali/internal/input/common/key-impl.h>
+#include <dali/internal/input/common/virtual-keyboard-impl.h>
 #include <dali/internal/system/common/locale-utils.h>
 #include <dali/internal/system/common/singleton-service-impl.h>
-#include <dali/internal/input/common/virtual-keyboard-impl.h>
-#include <dali/internal/input/common/key-impl.h>
 
 namespace Dali
 {
diff --git a/dali/internal/network/common/network-performance-client.h b/dali/internal/network/common/network-performance-client.h
index 1920f2c..17a4cc0 100644
--- a/dali/internal/network/common/network-performance-client.h
+++ b/dali/internal/network/common/network-performance-client.h
@@ -23,9 +23,9 @@
 
 // INTERNAL INCLUDES
 #include <dali/internal/system/common/performance-marker.h>
-#include <dali/integration-api/trigger-event-factory-interface.h>
 #include <dali/internal/network/common/client-send-data-interface.h>
 #include <dali/internal/network/common/socket-factory-interface.h>
+#include <dali/integration-api/adaptors/trigger-event-factory-interface.h>
 
 
 namespace Dali
diff --git a/dali/internal/system/common/environment-options.h b/dali/internal/system/common/environment-options.h
index 253ea7e..02dcc29 100644
--- a/dali/internal/system/common/environment-options.h
+++ b/dali/internal/system/common/environment-options.h
@@ -23,8 +23,8 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
+#include <dali/integration-api/adaptors/log-factory-interface.h>
 #include <dali/internal/adaptor/common/threading-mode.h>
-#include <dali/integration-api/log-factory-interface.h>
 
 namespace Dali
 {
diff --git a/dali/internal/system/common/singleton-service-impl.cpp b/dali/internal/system/common/singleton-service-impl.cpp
index b7c8769..16e6969 100755
--- a/dali/internal/system/common/singleton-service-impl.cpp
+++ b/dali/internal/system/common/singleton-service-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,13 +19,14 @@
 #include <dali/internal/system/common/singleton-service-impl.h>
 
 // EXTERNAL INCLUDES
-#include <dali/integration-api/debug.h>
 #include <dali/integration-api/core.h>
-#include <dali/integration-api/adaptor.h>
+#include <dali/integration-api/debug.h>
 #include <dali/integration-api/processor-interface.h>
-#include <dali/internal/adaptor/common/adaptor-impl.h>
 
 // INTERNAL INCLUDES
+#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/internal/adaptor/common/adaptor-impl.h>
+
 #if defined(DEBUG_ENABLED)
 #include <dali/internal/system/common/logging.h>
 Debug::Filter* gSingletonServiceLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_SINGLETON_SERVICE" );
diff --git a/dali/internal/system/common/trigger-event-factory.cpp b/dali/internal/system/common/trigger-event-factory.cpp
index d137748..059e350 100644
--- a/dali/internal/system/common/trigger-event-factory.cpp
+++ b/dali/internal/system/common/trigger-event-factory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/integration-api/trigger-event-factory.h>
+#include <dali/integration-api/adaptors/trigger-event-factory.h>
 
 // INTERNAL INCLUDES
 #include <dali/internal/system/common/trigger-event.h>
diff --git a/dali/internal/system/common/trigger-event.h b/dali/internal/system/common/trigger-event.h
index 500416a..ebb3958 100644
--- a/dali/internal/system/common/trigger-event.h
+++ b/dali/internal/system/common/trigger-event.h
@@ -20,11 +20,11 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/signals/callback.h>
-#include <dali/internal/system/common/file-descriptor-monitor.h>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/dali-adaptor-common.h>
-#include <dali/integration-api/trigger-event-interface.h>
+#include <dali/integration-api/adaptors/trigger-event-interface.h>
+#include <dali/internal/system/common/file-descriptor-monitor.h>
 
 namespace Dali
 {
diff --git a/dali/internal/system/tizen-wayland/tizen-wearable/capture-impl-tizen.cpp b/dali/internal/system/tizen-wayland/tizen-wearable/capture-impl-tizen.cpp
index 6f6b631..73bcaef 100755
--- a/dali/internal/system/tizen-wayland/tizen-wearable/capture-impl-tizen.cpp
+++ b/dali/internal/system/tizen-wayland/tizen-wearable/capture-impl-tizen.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,15 +19,15 @@
 #include <dali/internal/system/tizen-wayland/tizen-wearable/capture-impl.h>
 
 // EXTERNAL INCLUDES
+#include <fstream>
+#include <string.h>
+#include <dali/public-api/common/stage.h>
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/render-tasks/render-task-list.h>
-#include <dali/public-api/common/stage.h>
 #include <dali/integration-api/debug.h>
-#include <fstream>
-#include <string.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/adaptor.h>
+#include <dali/integration-api/adaptors/adaptor.h>
 
 namespace
 {
diff --git a/dali/internal/system/windows/trigger-event-factory.cpp b/dali/internal/system/windows/trigger-event-factory.cpp
index 7151c65..3b06129 100755
--- a/dali/internal/system/windows/trigger-event-factory.cpp
+++ b/dali/internal/system/windows/trigger-event-factory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
  */
 
 // CLASS HEADER
-#include <dali/integration-api/trigger-event-factory.h>
+#include <dali/integration-api/adaptors/trigger-event-factory.h>
 
-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES
 #include <dali/internal/system/windows/trigger-event.h>
 
 namespace Dali
diff --git a/dali/internal/system/windows/trigger-event.h b/dali/internal/system/windows/trigger-event.h
index 0d2e868..56ee96f 100755
--- a/dali/internal/system/windows/trigger-event.h
+++ b/dali/internal/system/windows/trigger-event.h
@@ -18,12 +18,12 @@
 *
 */
 
-// EXTERNAL INCLUDES
-#include <dali/public-api/signals/callback.h>
-
-// INTERNAL INCLUDES
-#include <dali/public-api/dali-adaptor-common.h>
-#include <dali/integration-api/trigger-event-interface.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/signals/callback.h>
+
+// INTERNAL INCLUDES
+#include <dali/public-api/dali-adaptor-common.h>
+#include <dali/integration-api/adaptors/trigger-event-interface.h>
 
 namespace Dali
 {
@@ -84,4 +84,4 @@ private:
 
 } // namespace Dali
 
-#endif // DALI_INTERNAL_TRIGGER_EVENT_IMPL_H
\ No newline at end of file
+#endif // DALI_INTERNAL_TRIGGER_EVENT_IMPL_H
diff --git a/dali/internal/window-system/common/native-render-surface-factory.cpp b/dali/internal/window-system/common/native-render-surface-factory.cpp
index f1eb81c..bf1f3ce 100644
--- a/dali/internal/window-system/common/native-render-surface-factory.cpp
+++ b/dali/internal/window-system/common/native-render-surface-factory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/native-render-surface.h>
-#include <dali/internal/window-system/common/render-surface-factory.h>
+#include <dali/integration-api/adaptors/native-render-surface.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
+#include <dali/internal/window-system/common/render-surface-factory.h>
 
 namespace Dali
 {
diff --git a/dali/internal/window-system/common/pixmap-render-surface.h b/dali/internal/window-system/common/pixmap-render-surface.h
index 6d139d6..d60911a 100644
--- a/dali/internal/window-system/common/pixmap-render-surface.h
+++ b/dali/internal/window-system/common/pixmap-render-surface.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_WINDOWSYSTEM_COMMON_PIXMAP_RENDER_SURFACE_H
 
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,14 +19,8 @@
  */
 
 // INTERNAL INCLUDES
-
-#ifdef DALI_ADAPTOR_COMPILATION
-#include <dali/integration-api/render-surface-interface.h>
-#include <dali/internal/graphics/common/graphics-interface.h>
-#else
 #include <dali/integration-api/adaptors/render-surface-interface.h>
-#endif
-
+#include <dali/internal/graphics/common/graphics-interface.h>
 
 namespace Dali
 {
diff --git a/dali/internal/window-system/common/window-impl.cpp b/dali/internal/window-system/common/window-impl.cpp
index 4755a44..6e90e64 100644
--- a/dali/internal/window-system/common/window-impl.cpp
+++ b/dali/internal/window-system/common/window-impl.cpp
@@ -29,13 +29,8 @@
 #include <dali/devel-api/adaptor-framework/orientation.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 
-#ifdef DALI_ADAPTOR_COMPILATION
-#include <dali/integration-api/render-surface-interface.h>
-#else
-#include <dali/integration-api/adaptors/render-surface-interface.h>
-#endif
-
 // INTERNAL HEADERS
+#include <dali/integration-api/adaptors/render-surface-interface.h>
 #include <dali/internal/window-system/common/event-handler.h>
 #include <dali/internal/window-system/common/orientation-impl.h>
 #include <dali/internal/window-system/common/render-surface-factory.h>
diff --git a/dali/internal/window-system/common/window-impl.h b/dali/internal/window-system/common/window-impl.h
index a11b55d..7f33050 100644
--- a/dali/internal/window-system/common/window-impl.h
+++ b/dali/internal/window-system/common/window-impl.h
@@ -24,17 +24,12 @@
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/render-tasks/render-task-list.h>
 
-#ifdef DALI_ADAPTOR_COMPILATION
-#include <dali/integration-api/scene-holder-impl.h>
-#else
-#include <dali/integration-api/adaptors/scene-holder-impl.h>
-#endif
-
 // INTERNAL INCLUDES
-#include <dali/internal/adaptor/common/adaptor-impl.h>
 #include <dali/public-api/adaptor-framework/window.h>
 #include <dali/public-api/adaptor-framework/key-grab.h>
 #include <dali/devel-api/adaptor-framework/window-devel.h>
+#include <dali/integration-api/adaptors/scene-holder-impl.h>
+#include <dali/internal/adaptor/common/adaptor-impl.h>
 #include <dali/internal/window-system/common/event-handler.h>
 
 namespace Dali
diff --git a/dali/internal/window-system/common/window-render-surface.cpp b/dali/internal/window-system/common/window-render-surface.cpp
index f1e4cb7..de98f92 100644
--- a/dali/internal/window-system/common/window-render-surface.cpp
+++ b/dali/internal/window-system/common/window-render-surface.cpp
@@ -23,18 +23,17 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/trigger-event-factory-interface.h>
-#include <dali/integration-api/thread-synchronization-interface.h>
-#include <dali/internal/graphics/gles/egl-implementation.h>
+#include <dali/integration-api/adaptors/thread-synchronization-interface.h>
+#include <dali/integration-api/adaptors/trigger-event-factory-interface.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
 #include <dali/internal/adaptor/common/adaptor-internal-services.h>
+#include <dali/internal/graphics/gles/egl-graphics.h>
+#include <dali/internal/graphics/gles/egl-implementation.h>
 #include <dali/internal/window-system/common/window-base.h>
 #include <dali/internal/window-system/common/window-factory.h>
 #include <dali/internal/window-system/common/window-system.h>
-#include <dali/internal/graphics/gles/egl-graphics.h>
 #include <dali/internal/system/common/environment-variables.h>
 
-
 namespace Dali
 {
 namespace Internal
diff --git a/dali/internal/window-system/common/window-render-surface.h b/dali/internal/window-system/common/window-render-surface.h
index 8749342..fee703e 100644
--- a/dali/internal/window-system/common/window-render-surface.h
+++ b/dali/internal/window-system/common/window-render-surface.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_WINDOWSYSTEM_COMMON_WINDOW_RENDER_SURFACE_H
 
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,21 +18,15 @@
  *
  */
 
-// INTERNAL INCLUDES
-#include <dali/internal/graphics/common/graphics-interface.h>
-
-#ifdef DALI_ADAPTOR_COMPILATION
-#include <dali/integration-api/egl-interface.h>
-#include <dali/integration-api/render-surface-interface.h>
-#else
-#include <dali/integration-api/adaptors/egl-interface.h>
-#include <dali/integration-api/adaptors/render-surface-interface.h>
-#endif
-
 // EXTERNAL INCLUDES
 #include <dali/public-api/signals/connection-tracker.h>
 #include <dali/public-api/signals/dali-signal.h>
 
+// INTERNAL INCLUDES
+#include <dali/integration-api/adaptors/egl-interface.h>
+#include <dali/integration-api/adaptors/render-surface-interface.h>
+#include <dali/internal/graphics/common/graphics-interface.h>
+
 namespace Dali
 {
 
diff --git a/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.cpp b/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.cpp
index 54004b1..c4f7915 100644
--- a/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.cpp
+++ b/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.cpp
@@ -32,14 +32,14 @@
 #include <tbm_surface_internal.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/system/common/trigger-event.h>
-#include <dali/internal/graphics/gles/egl-implementation.h>
+#include <dali/integration-api/adaptors/thread-synchronization-interface.h>
+#include <dali/internal/adaptor/common/adaptor-impl.h>
+#include <dali/internal/adaptor/common/adaptor-internal-services.h>
 #include <dali/internal/graphics/gles/egl-graphics.h>
+#include <dali/internal/graphics/gles/egl-implementation.h>
+#include <dali/internal/system/common/trigger-event.h>
 #include <dali/internal/window-system/common/display-connection.h>
 #include <dali/internal/window-system/common/window-system.h>
-#include <dali/integration-api/thread-synchronization-interface.h>
-#include <dali/internal/adaptor/common/adaptor-impl.h>
-#include <dali/internal/adaptor/common/adaptor-internal-services.h>
 
 namespace Dali
 {
diff --git a/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h b/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h
index 1a1affc..6f96195 100644
--- a/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h
+++ b/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_WINDOWSYSTEM_TIZENWAYLAND_NATIVE_SURFACE_ECORE_WL_H
 
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/dali-adaptor-common.h>
-#include <dali/integration-api/egl-interface.h>
-#include <dali/integration-api/native-render-surface.h>
+#include <dali/integration-api/adaptors/egl-interface.h>
+#include <dali/integration-api/adaptors/native-render-surface.h>
 #include <dali/internal/graphics/common/graphics-interface.h>
 
 namespace Dali
diff --git a/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.cpp b/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.cpp
index 514b049..755905d 100644
--- a/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.cpp
+++ b/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.cpp
@@ -22,22 +22,19 @@
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-
 #include <X11/extensions/Xfixes.h> // for damage notify
 #include <X11/extensions/Xdamage.h> // for damage notify
-
 #include <dali/integration-api/gl-abstraction.h>
 #include <dali/integration-api/debug.h>
 #include <dali/devel-api/threading/mutex.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/thread-synchronization-interface.h>
-#include <dali/internal/system/common/trigger-event.h>
-#include <dali/internal/window-system/common/display-connection.h>
-#include <dali/internal/graphics/gles/egl-graphics.h>
+#include <dali/integration-api/adaptors/thread-synchronization-interface.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
 #include <dali/internal/adaptor/common/adaptor-internal-services.h>
-
+#include <dali/internal/graphics/gles/egl-graphics.h>
+#include <dali/internal/system/common/trigger-event.h>
+#include <dali/internal/window-system/common/display-connection.h>
 
 namespace Dali
 {
diff --git a/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h b/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h
index 1e51708..8e578f7 100644
--- a/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h
+++ b/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h
@@ -18,18 +18,17 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <dali/devel-api/threading/conditional-wait.h>
+
 // INTERNAL INCLUDES
-#include <dali/integration-api/egl-interface.h>
-#include <dali/internal/graphics/gles/egl-implementation.h>
-#include <dali/internal/window-system/common/pixmap-render-surface.h>
-#include <dali/internal/window-system/ubuntu-x11/ecore-x-types.h>
 #include <dali/public-api/dali-adaptor-common.h>
+#include <dali/integration-api/adaptors/egl-interface.h>
 #include <dali/internal/graphics/common/graphics-interface.h>
-
-// EXTERNAL INCLUDES
-#include <dali/devel-api/threading/conditional-wait.h>
+#include <dali/internal/graphics/gles/egl-implementation.h>
 #include <dali/internal/system/linux/dali-ecore-x.h>
-
+#include <dali/internal/window-system/common/pixmap-render-surface.h>
+#include <dali/internal/window-system/ubuntu-x11/ecore-x-types.h>
 
 namespace Dali
 {
diff --git a/dali/internal/window-system/ubuntu-x11/render-surface-factory-ecore-x.cpp b/dali/internal/window-system/ubuntu-x11/render-surface-factory-ecore-x.cpp
index 95a619d..0c91ed9 100644
--- a/dali/internal/window-system/ubuntu-x11/render-surface-factory-ecore-x.cpp
+++ b/dali/internal/window-system/ubuntu-x11/render-surface-factory-ecore-x.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,14 +18,14 @@
 // CLASS HEADER
 #include <dali/internal/window-system/ubuntu-x11/render-surface-factory-ecore-x.h>
 
+// EXTERNAL HEADERS
+#include <memory>
+
 // INTERNAL HEADERS
+#include <dali/integration-api/adaptors/native-render-surface.h>
+#include <dali/internal/window-system/common/display-utils.h>
 #include <dali/internal/window-system/common/window-render-surface.h>
 #include <dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h>
-#include <dali/internal/window-system/common/display-utils.h>
-#include <dali/integration-api/native-render-surface.h>
-
-// EXTERNAL INCLUDES
-#include <memory>
 
 namespace Dali
 {
diff --git a/dali/internal/window-system/windows/render-surface-factory-win.cpp b/dali/internal/window-system/windows/render-surface-factory-win.cpp
index e181692..fdb32bb 100755
--- a/dali/internal/window-system/windows/render-surface-factory-win.cpp
+++ b/dali/internal/window-system/windows/render-surface-factory-win.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,17 @@
  *
  */
 
+// CLASS HEADER
+#include <dali/internal/window-system/windows/render-surface-factory-win.h>
+
 // EXTERNAL HEADERS
 #include <dali/integration-api/debug.h>
-#include <dali/integration-api/native-render-surface.h>
-#include <dali/internal/window-system/windows/render-surface-factory-win.h>
 
 // INTERNAL HEADERS
-#include <dali/internal/window-system/common/window-render-surface.h>
-#include <dali/internal/window-system/common/pixmap-render-surface.h>
+#include <dali/integration-api/adaptors/native-render-surface.h>
 #include <dali/internal/window-system/common/display-utils.h>
+#include <dali/internal/window-system/common/pixmap-render-surface.h>
+#include <dali/internal/window-system/common/window-render-surface.h>
 
 namespace Dali
 {
diff --git a/third-party/glyphy/vector-font-cache.cpp b/third-party/glyphy/vector-font-cache.cpp
index 434d9e9..64f364b 100644
--- a/third-party/glyphy/vector-font-cache.cpp
+++ b/third-party/glyphy/vector-font-cache.cpp
@@ -16,15 +16,15 @@
  */
 
 // CLASS HEADER
-#include <third-party/glyphy/vector-font-cache.h> // Replaced from: #include <dali/internal/glyphy/vector-font-cache.h>
+#include <third-party/glyphy/vector-font-cache.h>
 
 // EXTERNAL INCLUDES
 #include <vector>
 #include <math.h>
 
 // INTERNAL INCLUDES
-#include <third-party/glyphy/glyphy.h> // Replaced from: #include "../glyphy/glyphy.h"
-#include <third-party/glyphy/glyphy-freetype.h> // Replaced from: #include "../glyphy/glyphy-freetype.h"
+#include <third-party/glyphy/glyphy.h>
+#include <third-party/glyphy/glyphy-freetype.h>
 
 using namespace std;
 
-- 
2.7.4