From a0ab098f5c367afe8f8087a4c08576eabd8e36af Mon Sep 17 00:00:00 2001
From: Paul Wisbey <p.wisbey@samsung.com>
Date: Mon, 23 Feb 2015 11:48:04 +0000
Subject: [PATCH] Follow the include-order coding conventions

Change-Id: Ia56d0af7d5fd69b62c264eb01a9186e0bfa6de30
---
 adaptors/base/environment-options.h                   |  1 +
 adaptors/base/frame-time.cpp                          |  2 +-
 adaptors/base/frame-time.h                            |  1 +
 adaptors/base/interfaces/adaptor-internal-services.h  |  4 +++-
 .../base/interfaces/trigger-event-factory-interface.h |  5 ++---
 .../base/performance-logging/frame-time-stats.cpp     |  1 +
 .../performance-interface-factory.cpp                 |  2 ++
 .../performance-interface-factory.h                   |  4 +++-
 .../base/performance-logging/performance-marker.cpp   |  2 +-
 .../base/performance-logging/performance-server.cpp   |  4 +++-
 .../base/performance-logging/performance-server.h     |  8 ++++----
 .../statistics/stat-context-manager.cpp               |  2 +-
 .../performance-logging/statistics/stat-context.cpp   |  6 +++---
 .../performance-logging/statistics/stat-context.h     |  6 +++---
 adaptors/base/render-thread.cpp                       |  3 ++-
 adaptors/base/update-render-synchronization.cpp       |  4 +++-
 adaptors/base/update-render-synchronization.h         | 10 +++++-----
 adaptors/base/update-thread.cpp                       |  8 ++++----
 adaptors/base/update-thread.h                         |  2 +-
 adaptors/base/vsync-notifier.cpp                      |  4 +++-
 adaptors/common/abort-handler.cpp                     |  1 +
 adaptors/common/abort-handler.h                       |  3 +++
 adaptors/common/accessibility-gesture-detector.cpp    |  2 +-
 adaptors/common/accessibility-manager-impl.h          |  2 +-
 adaptors/common/adaptor-impl.h                        |  2 +-
 adaptors/common/adaptor.cpp                           |  4 ++--
 adaptors/common/adaptor.h                             |  9 ++++++---
 adaptors/common/application-impl.cpp                  |  2 +-
 adaptors/common/bitmap-loader-impl.cpp                |  9 ++++++---
 adaptors/common/bitmap-loader-impl.h                  |  2 ++
 adaptors/common/clipboard-event-notifier-impl.h       |  2 +-
 adaptors/common/color-controller-impl.h               |  3 +++
 adaptors/common/damage-observer.h                     |  1 -
 adaptors/common/drag-and-drop-detector-impl.h         |  2 +-
 adaptors/common/gl/egl-sync-implementation.cpp        |  3 ++-
 adaptors/common/gl/egl-sync-implementation.h          |  1 +
 adaptors/common/gl/gl-extensions.cpp                  |  1 -
 adaptors/common/gl/gl-proxy-implementation.cpp        |  3 ++-
 adaptors/common/gl/gl-proxy-implementation.h          |  3 +--
 adaptors/common/haptic-player-impl.h                  |  2 +-
 adaptors/common/indicator-buffer.cpp                  |  1 +
 adaptors/common/indicator-impl.cpp                    |  2 +-
 adaptors/common/indicator-impl.h                      |  4 ++--
 adaptors/common/kernel-trace.cpp                      |  6 +++---
 adaptors/common/key-impl.h                            |  2 +-
 adaptors/common/lifecycle-controller-impl.cpp         |  4 +++-
 adaptors/common/locale-utils.h                        |  2 +-
 adaptors/common/object-profiler.cpp                   |  3 +++
 adaptors/common/object-profiler.h                     |  3 +++
 adaptors/common/orientation-impl.h                    |  2 +-
 adaptors/common/performance-logger-impl.cpp           |  2 ++
 adaptors/common/performance-logger-impl.h             |  5 +++--
 adaptors/common/render-surface-impl.h                 |  4 +++-
 adaptors/common/style-monitor-impl.cpp                |  4 +++-
 adaptors/common/style-monitor-impl.h                  |  2 +-
 adaptors/common/timer-impl.h                          |  2 +-
 adaptors/common/trigger-event.h                       |  3 ++-
 adaptors/common/virtual-keyboard-impl.cpp             |  2 +-
 adaptors/common/window-impl.h                         |  9 ++++-----
 adaptors/mobile/mobile-render-surface-factory.cpp     |  1 +
 .../adaptor-framework/accessibility-gesture-handler.h |  2 +-
 adaptors/public-api/adaptor-framework/application.h   |  1 +
 .../public-api/adaptor-framework/bitmap-loader.cpp    |  3 +++
 .../public-api/adaptor-framework/bitmap-saver.cpp     |  5 +++++
 adaptors/public-api/adaptor-framework/bitmap-saver.h  |  1 +
 .../public-api/adaptor-framework/color-controller.h   |  1 +
 .../public-api/adaptor-framework/event-feeder.cpp     |  2 +-
 .../public-api/adaptor-framework/pixmap-image.cpp     |  6 +++---
 adaptors/tizen/tilt-sensor-impl.h                     |  2 +-
 adaptors/tizen/tts-player-impl-tizen.cpp              |  1 -
 adaptors/tizen/tts-player-impl.h                      |  2 ++
 adaptors/tv/tv-key-impl.cpp                           |  1 -
 adaptors/tv/tv-render-surface-factory.cpp             |  1 +
 adaptors/ubuntu/accessibility-manager-impl.h          |  2 +-
 adaptors/ubuntu/tilt-sensor-impl.h                    |  2 +-
 adaptors/ubuntu/tts-player-impl-ubuntu.cpp            |  2 +-
 adaptors/wayland/accessibility-manager-impl-wl.cpp    |  2 ++
 adaptors/wayland/clipboard-impl-wl.cpp                |  2 +-
 adaptors/wayland/clipboard-impl.h                     |  4 ++--
 adaptors/wayland/ecore-wl-render-surface-factory.cpp  |  1 +
 adaptors/wayland/imf-manager-impl-wl.cpp              |  2 +-
 adaptors/wayland/imf-manager-impl.h                   |  3 +--
 adaptors/wayland/key-impl-wl.cpp                      |  1 -
 adaptors/wayland/pixmap-image-impl-wl.cpp             |  2 +-
 adaptors/wayland/virtual-keyboard-impl-wl.cpp         |  2 +-
 adaptors/x11/accessibility-manager-impl-x.cpp         |  2 ++
 adaptors/x11/clipboard-impl-x.cpp                     |  2 +-
 adaptors/x11/clipboard-impl.h                         |  4 ++--
 adaptors/x11/ecore-x-render-surface-factory.cpp       |  1 +
 adaptors/x11/imf-manager-impl-x.cpp                   |  2 +-
 adaptors/x11/imf-manager-impl.h                       |  3 +--
 adaptors/x11/key-impl-x.cpp                           |  1 -
 adaptors/x11/virtual-keyboard-impl-x.cpp              |  2 +-
 adaptors/x11/window-impl-x.cpp                        |  2 +-
 .../slp/data-cache/data-cache-impl.cpp                | 11 +++++------
 .../slp/resource-loader/assimp-model-builder.cpp      | 19 +++++++++----------
 96 files changed, 180 insertions(+), 121 deletions(-)

diff --git a/adaptors/base/environment-options.h b/adaptors/base/environment-options.h
index fe74fc9..29336da 100644
--- a/adaptors/base/environment-options.h
+++ b/adaptors/base/environment-options.h
@@ -18,6 +18,7 @@
  *
  */
 
+// EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
 
 namespace Dali
diff --git a/adaptors/base/frame-time.cpp b/adaptors/base/frame-time.cpp
index 345c278..025a6a7 100644
--- a/adaptors/base/frame-time.cpp
+++ b/adaptors/base/frame-time.cpp
@@ -18,7 +18,7 @@
 // CLASS HEADER
 #include "frame-time.h"
 
-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
 #include <dali/integration-api/platform-abstraction.h>
 
diff --git a/adaptors/base/frame-time.h b/adaptors/base/frame-time.h
index 3bc133a..42bc596 100644
--- a/adaptors/base/frame-time.h
+++ b/adaptors/base/frame-time.h
@@ -18,6 +18,7 @@
  *
  */
 
+// EXTERNAL INCLUDES
 #include <stdint.h>
 
 namespace Dali
diff --git a/adaptors/base/interfaces/adaptor-internal-services.h b/adaptors/base/interfaces/adaptor-internal-services.h
index 8585a92..e6714c9 100644
--- a/adaptors/base/interfaces/adaptor-internal-services.h
+++ b/adaptors/base/interfaces/adaptor-internal-services.h
@@ -18,9 +18,11 @@
  *
  */
 
-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES
 #include <dali/integration-api/core.h>
 #include <dali/integration-api/gl-abstraction.h>
+
+// INTERNAL INCLUDES
 #include <base/interfaces/egl-factory-interface.h>
 #include <base/interfaces/trigger-event-interface.h>
 #include <base/interfaces/performance-interface.h>
diff --git a/adaptors/base/interfaces/trigger-event-factory-interface.h b/adaptors/base/interfaces/trigger-event-factory-interface.h
index 50e9bd5..c1b7856 100644
--- a/adaptors/base/interfaces/trigger-event-factory-interface.h
+++ b/adaptors/base/interfaces/trigger-event-factory-interface.h
@@ -18,12 +18,11 @@
  *
  */
 
-// INTERNAL INCLUDES
-#include <base/interfaces/trigger-event-interface.h>
-
 // EXTERNAL INCLUDES
 #include <boost/function.hpp>
 
+// INTERNAL INCLUDES
+#include <base/interfaces/trigger-event-interface.h>
 
 namespace Dali
 {
diff --git a/adaptors/base/performance-logging/frame-time-stats.cpp b/adaptors/base/performance-logging/frame-time-stats.cpp
index b6f0bdb..2bc6028 100644
--- a/adaptors/base/performance-logging/frame-time-stats.cpp
+++ b/adaptors/base/performance-logging/frame-time-stats.cpp
@@ -18,6 +18,7 @@
 // STRUCT HEADER
 #include "frame-time-stats.h"
 
+// EXTERNAL INCLUDES
 #include <cmath>
 
 namespace Dali
diff --git a/adaptors/base/performance-logging/performance-interface-factory.cpp b/adaptors/base/performance-logging/performance-interface-factory.cpp
index 4822623..ebd4f8a 100644
--- a/adaptors/base/performance-logging/performance-interface-factory.cpp
+++ b/adaptors/base/performance-logging/performance-interface-factory.cpp
@@ -17,6 +17,8 @@
 
 // CLASS HEADER
 #include "performance-interface-factory.h"
+
+// INTERNAL INCLUDES
 #include "performance-server.h"
 
 namespace Dali
diff --git a/adaptors/base/performance-logging/performance-interface-factory.h b/adaptors/base/performance-logging/performance-interface-factory.h
index aa29f03..abbe0d1 100644
--- a/adaptors/base/performance-logging/performance-interface-factory.h
+++ b/adaptors/base/performance-logging/performance-interface-factory.h
@@ -18,9 +18,11 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+
 // INTERNAL INCLUDES
 #include <base/interfaces/adaptor-internal-services.h>
-#include <dali/integration-api/debug.h>
 #include <base/environment-options.h>
 
 namespace Dali
diff --git a/adaptors/base/performance-logging/performance-marker.cpp b/adaptors/base/performance-logging/performance-marker.cpp
index 15e9b52..72b1f83 100644
--- a/adaptors/base/performance-logging/performance-marker.cpp
+++ b/adaptors/base/performance-logging/performance-marker.cpp
@@ -18,7 +18,7 @@
 // CLASS HEADER
 #include "performance-marker.h"
 
-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
 
 
diff --git a/adaptors/base/performance-logging/performance-server.cpp b/adaptors/base/performance-logging/performance-server.cpp
index 2736ad2..79cf214 100644
--- a/adaptors/base/performance-logging/performance-server.cpp
+++ b/adaptors/base/performance-logging/performance-server.cpp
@@ -18,9 +18,11 @@
 // CLASS HEADER
 #include "performance-server.h"
 
+// EXTERNAL INCLUDES
+#include <dali/integration-api/platform-abstraction.h>
+
 // INTERNAL INCLUDES
 #include <base/environment-options.h>
-#include <dali/integration-api/platform-abstraction.h>
 
 namespace Dali
 {
diff --git a/adaptors/base/performance-logging/performance-server.h b/adaptors/base/performance-logging/performance-server.h
index a20ccd9..40a495e 100644
--- a/adaptors/base/performance-logging/performance-server.h
+++ b/adaptors/base/performance-logging/performance-server.h
@@ -18,16 +18,16 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <boost/thread/mutex.hpp>
+#include <dali/public-api/common/dali-vector.h>
+
 // INTERNAL INCLUDES
 #include <base/performance-logging/frame-time-stats.h>
-#include <dali/public-api/common/dali-vector.h>
 #include <base/interfaces/adaptor-internal-services.h>
 #include <base/performance-logging/performance-marker.h>
 #include <base/performance-logging/statistics/stat-context-manager.h>
 
-// EXTERNAL INCLUDES
-#include <boost/thread/mutex.hpp>
-
 namespace Dali
 {
 
diff --git a/adaptors/base/performance-logging/statistics/stat-context-manager.cpp b/adaptors/base/performance-logging/statistics/stat-context-manager.cpp
index 5d7146e..22a67d1 100644
--- a/adaptors/base/performance-logging/statistics/stat-context-manager.cpp
+++ b/adaptors/base/performance-logging/statistics/stat-context-manager.cpp
@@ -18,7 +18,7 @@
 // CLASS HEADER
 #include "stat-context-manager.h"
 
-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
 
 namespace Dali
diff --git a/adaptors/base/performance-logging/statistics/stat-context.cpp b/adaptors/base/performance-logging/statistics/stat-context.cpp
index 7197322..de0a4fc 100644
--- a/adaptors/base/performance-logging/statistics/stat-context.cpp
+++ b/adaptors/base/performance-logging/statistics/stat-context.cpp
@@ -19,12 +19,12 @@
 // CLASS HEADER
 #include "stat-context.h"
 
-// INTERNAL INCLUDES
-#include <dali/integration-api/platform-abstraction.h>
-
 // EXTERNAL INCLUDES
 #include <cstdio>
 
+// INTERNAL INCLUDES
+#include <dali/integration-api/platform-abstraction.h>
+
 namespace Dali
 {
 
diff --git a/adaptors/base/performance-logging/statistics/stat-context.h b/adaptors/base/performance-logging/statistics/stat-context.h
index 2f241d9..2408905 100644
--- a/adaptors/base/performance-logging/statistics/stat-context.h
+++ b/adaptors/base/performance-logging/statistics/stat-context.h
@@ -18,15 +18,15 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <string>
+
 // INTERNAL INCLUDES
 #include <base/performance-logging/performance-marker.h>
 #include <base/performance-logging/frame-time-stats.h>
 #include <base/interfaces/performance-interface.h>
 #include <base/performance-logging/statistics/stat-context-log-interface.h>
 
-// EXTERNAL INCLUDES
-#include <string>
-
 namespace Dali
 {
 
diff --git a/adaptors/base/render-thread.cpp b/adaptors/base/render-thread.cpp
index e477191..bf31e8f 100644
--- a/adaptors/base/render-thread.cpp
+++ b/adaptors/base/render-thread.cpp
@@ -18,9 +18,10 @@
 // CLASS HEADER
 #include "render-thread.h"
 
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/debug.h>
 #include <base/interfaces/adaptor-internal-services.h>
 #include <base/update-render-synchronization.h>
 #include <base/environment-options.h>
diff --git a/adaptors/base/update-render-synchronization.cpp b/adaptors/base/update-render-synchronization.cpp
index a86df45..702b917 100644
--- a/adaptors/base/update-render-synchronization.cpp
+++ b/adaptors/base/update-render-synchronization.cpp
@@ -18,8 +18,10 @@
 // CLASS HEADER
 #include "update-render-synchronization.h"
 
-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
+
+// INTERNAL INCLUDES
 #include <base/interfaces/adaptor-internal-services.h>
 
 namespace Dali
diff --git a/adaptors/base/update-render-synchronization.h b/adaptors/base/update-render-synchronization.h
index 68d4297..73322b4 100644
--- a/adaptors/base/update-render-synchronization.h
+++ b/adaptors/base/update-render-synchronization.h
@@ -18,17 +18,17 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <stdint.h>
+#include <boost/thread.hpp>
+#include <boost/thread/condition_variable.hpp>
+
 // INTERNAL INCLUDES
 #include <base/interfaces/performance-interface.h>
 #include <base/interfaces/trigger-event-interface.h>
 #include <base/frame-time.h>
 #include <base/render-thread.h>
 
-// EXTERNAL INCLUDES
-#include <stdint.h>
-#include <boost/thread.hpp>
-#include <boost/thread/condition_variable.hpp>
-
 namespace Dali
 {
 
diff --git a/adaptors/base/update-thread.cpp b/adaptors/base/update-thread.cpp
index 8247a69..03b9fde 100644
--- a/adaptors/base/update-thread.cpp
+++ b/adaptors/base/update-thread.cpp
@@ -18,16 +18,16 @@
 // CLASS HEADER
 #include "update-thread.h"
 
+// EXTERNAL INCLUDES
+#include <boost/thread.hpp>
+#include <cstdio>
+
 // INTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
 #include <base/interfaces/adaptor-internal-services.h>
 #include <base/update-render-synchronization.h>
 #include <base/environment-options.h>
 
-// EXTERNAL INCLUDES
-#include <boost/thread.hpp>
-#include <cstdio>
-
 namespace Dali
 {
 
diff --git a/adaptors/base/update-thread.h b/adaptors/base/update-thread.h
index 37c3831..fda142e 100644
--- a/adaptors/base/update-thread.h
+++ b/adaptors/base/update-thread.h
@@ -18,7 +18,7 @@
  *
  */
 
-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES
 #include <dali/public-api/common/vector-wrapper.h>
 
 namespace boost
diff --git a/adaptors/base/vsync-notifier.cpp b/adaptors/base/vsync-notifier.cpp
index ebf7c0e..e459df6 100644
--- a/adaptors/base/vsync-notifier.cpp
+++ b/adaptors/base/vsync-notifier.cpp
@@ -15,6 +15,9 @@
  *
  */
 
+// CLASS HEADER
+#include "vsync-notifier.h"
+
 // EXTERNAL INCLUDES
 #include <boost/thread.hpp>
 
@@ -22,7 +25,6 @@
 #include <dali/integration-api/platform-abstraction.h>
 
 // INTERNAL INCLUDES
-#include "vsync-notifier.h"
 #include <base/interfaces/adaptor-internal-services.h>
 #include <base/update-render-synchronization.h>
 #include <base/environment-options.h>
diff --git a/adaptors/common/abort-handler.cpp b/adaptors/common/abort-handler.cpp
index 5508ecc..eea7ec6 100644
--- a/adaptors/common/abort-handler.cpp
+++ b/adaptors/common/abort-handler.cpp
@@ -15,6 +15,7 @@
  *
  */
 
+// CLASS HEADER
 #include "abort-handler.h"
 
 namespace Dali
diff --git a/adaptors/common/abort-handler.h b/adaptors/common/abort-handler.h
index 64bd035..af53864 100644
--- a/adaptors/common/abort-handler.h
+++ b/adaptors/common/abort-handler.h
@@ -18,7 +18,10 @@
  *
  */
 
+// EXTERNAL INCLUDES
 #include <signal.h>
+
+// INTERNAL INCLUDES
 #include "application.h"
 
 namespace Dali
diff --git a/adaptors/common/accessibility-gesture-detector.cpp b/adaptors/common/accessibility-gesture-detector.cpp
index fb2e3e7..81d9d2e 100644
--- a/adaptors/common/accessibility-gesture-detector.cpp
+++ b/adaptors/common/accessibility-gesture-detector.cpp
@@ -19,9 +19,9 @@
 #include "accessibility-gesture-detector.h"
 
 // EXTERNAL INCLUDES
+#include <dali/integration-api/events/gesture-requests.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/events/gesture-requests.h>
 #include <accessibility-manager-impl.h>
 
 namespace Dali
diff --git a/adaptors/common/accessibility-manager-impl.h b/adaptors/common/accessibility-manager-impl.h
index c2f20b7..3c6ebf8 100644
--- a/adaptors/common/accessibility-manager-impl.h
+++ b/adaptors/common/accessibility-manager-impl.h
@@ -25,9 +25,9 @@
 #include <dali/public-api/math/vector2.h>
 #include <dali/public-api/events/touch-point.h>
 #include <dali/integration-api/events/touch-event-combiner.h>
-#include <accessibility-manager.h>
 
 // INTERNAL INCLUDES
+#include <accessibility-manager.h>
 #include <accessibility-action-handler.h>
 #include <accessibility-gesture-handler.h>
 #include <indicator-impl.h>
diff --git a/adaptors/common/adaptor-impl.h b/adaptors/common/adaptor-impl.h
index b62080d..a3ce04c 100644
--- a/adaptors/common/adaptor-impl.h
+++ b/adaptors/common/adaptor-impl.h
@@ -23,12 +23,12 @@
 #include <boost/function.hpp>
 #include <boost/thread.hpp>
 
-// INTERNAL INCLUDES
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/common/view-mode.h>
 #include <dali/public-api/math/rect.h>
 #include <dali/integration-api/render-controller.h>
 
+// INTERNAL INCLUDES
 #include <adaptor.h>
 #include <render-surface.h>
 #include <tts-player.h>
diff --git a/adaptors/common/adaptor.cpp b/adaptors/common/adaptor.cpp
index cf13b18..7eecd5b 100644
--- a/adaptors/common/adaptor.cpp
+++ b/adaptors/common/adaptor.cpp
@@ -20,12 +20,12 @@
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
+
+// INTERNAL INCLUDES
 #include <accessibility-manager.h>
 #include <imf-manager.h>
 #include <style-monitor.h>
 #include <window.h>
-
-// INTERNAL INCLUDES
 #include <adaptor-impl.h>
 #include <render-surface-impl.h>
 #include <window-impl.h>
diff --git a/adaptors/common/adaptor.h b/adaptors/common/adaptor.h
index 01c7beb..41da540 100644
--- a/adaptors/common/adaptor.h
+++ b/adaptors/common/adaptor.h
@@ -20,13 +20,16 @@
 
 // EXTERNAL INCLUDES
 #include <boost/function.hpp>
-#include "window.h"
-#include "application-configuration.h"
-#include "tts-player.h"
+
 #include <dali/public-api/signals/dali-signal.h>
 #include <dali/public-api/math/rect.h>
 #include <dali/public-api/events/touch-event.h>
 
+// INTERNAL INCLUDES
+#include "window.h"
+#include "application-configuration.h"
+#include "tts-player.h"
+
 namespace Dali DALI_INTERNAL
 {
 
diff --git a/adaptors/common/application-impl.cpp b/adaptors/common/application-impl.cpp
index 894607f..6b288b5 100644
--- a/adaptors/common/application-impl.cpp
+++ b/adaptors/common/application-impl.cpp
@@ -20,9 +20,9 @@
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
-#include <style-monitor.h>
 
 // INTERNAL INCLUDES
+#include <style-monitor.h>
 #include <command-line-options.h>
 #include <common/adaptor-impl.h>
 #include <singleton-service-impl.h>
diff --git a/adaptors/common/bitmap-loader-impl.cpp b/adaptors/common/bitmap-loader-impl.cpp
index ef540ee..700e121 100644
--- a/adaptors/common/bitmap-loader-impl.cpp
+++ b/adaptors/common/bitmap-loader-impl.cpp
@@ -14,12 +14,15 @@
  * limitations under the License.
  */
 
-#include "bitmap-loader-impl.h"
+// EXTERNAL INCLUDES
+#include <string>
+
 #include <dali/integration-api/resource-types.h>
 #include <dali/integration-api/resource-cache.h>
-#include "image-loaders/image-loader.h"
 
-#include <string>
+// INTERNAL INCLUDES
+#include "bitmap-loader-impl.h"
+#include "image-loaders/image-loader.h"
 
 namespace Dali
 {
diff --git a/adaptors/common/bitmap-loader-impl.h b/adaptors/common/bitmap-loader-impl.h
index 89ea84c..c9f8ff4 100644
--- a/adaptors/common/bitmap-loader-impl.h
+++ b/adaptors/common/bitmap-loader-impl.h
@@ -23,6 +23,8 @@
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/common/intrusive-ptr.h>
 #include <dali/integration-api/bitmap.h>
+
+// INTERNAL INCLUDES
 #include <bitmap-loader.h>
 
 namespace Dali
diff --git a/adaptors/common/clipboard-event-notifier-impl.h b/adaptors/common/clipboard-event-notifier-impl.h
index 9a2659c..db51291 100644
--- a/adaptors/common/clipboard-event-notifier-impl.h
+++ b/adaptors/common/clipboard-event-notifier-impl.h
@@ -22,9 +22,9 @@
 #include <string>
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/math/vector2.h>
-#include <clipboard-event-notifier.h>
 
 // INTERNAL INCLUDES
+#include <clipboard-event-notifier.h>
 
 namespace Dali
 {
diff --git a/adaptors/common/color-controller-impl.h b/adaptors/common/color-controller-impl.h
index 5af4b18..eb7d552 100644
--- a/adaptors/common/color-controller-impl.h
+++ b/adaptors/common/color-controller-impl.h
@@ -18,7 +18,10 @@
  *
  */
 
+// EXTERNAL INCLUDES
 #include <dali/public-api/object/base-object.h>
+
+// INTERNAL INCLUDES
 #include <color-controller.h>
 
 namespace Dali
diff --git a/adaptors/common/damage-observer.h b/adaptors/common/damage-observer.h
index eb9dd47..d0a2316 100644
--- a/adaptors/common/damage-observer.h
+++ b/adaptors/common/damage-observer.h
@@ -20,7 +20,6 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/vector-wrapper.h>
-
 #include <dali/public-api/math/rect.h>
 
 namespace Dali
diff --git a/adaptors/common/drag-and-drop-detector-impl.h b/adaptors/common/drag-and-drop-detector-impl.h
index e6fd5cc..d4a1395 100644
--- a/adaptors/common/drag-and-drop-detector-impl.h
+++ b/adaptors/common/drag-and-drop-detector-impl.h
@@ -23,9 +23,9 @@
 
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/math/vector2.h>
-#include <drag-and-drop-detector.h>
 
 // INTERNAL INCLUDES
+#include <drag-and-drop-detector.h>
 
 namespace Dali
 {
diff --git a/adaptors/common/gl/egl-sync-implementation.cpp b/adaptors/common/gl/egl-sync-implementation.cpp
index dc19e59..c40864d 100644
--- a/adaptors/common/gl/egl-sync-implementation.cpp
+++ b/adaptors/common/gl/egl-sync-implementation.cpp
@@ -30,9 +30,10 @@
 
 #include <boost/thread/mutex.hpp>
 
+#include <dali/integration-api/debug.h>
+
 // INTERNAL INCLUDES
 #include <gl/egl-implementation.h>
-#include <dali/integration-api/debug.h>
 
 #ifdef _ARCH_ARM_
 
diff --git a/adaptors/common/gl/egl-sync-implementation.h b/adaptors/common/gl/egl-sync-implementation.h
index f09724a..616f156 100644
--- a/adaptors/common/gl/egl-sync-implementation.h
+++ b/adaptors/common/gl/egl-sync-implementation.h
@@ -18,6 +18,7 @@
  *
  */
 
+// EXTERNAL INCLUDES
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <dali/public-api/common/dali-common.h>
diff --git a/adaptors/common/gl/gl-extensions.cpp b/adaptors/common/gl/gl-extensions.cpp
index f02b871..7ca36df 100644
--- a/adaptors/common/gl/gl-extensions.cpp
+++ b/adaptors/common/gl/gl-extensions.cpp
@@ -22,7 +22,6 @@
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
-// INTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
 
 namespace Dali
diff --git a/adaptors/common/gl/gl-proxy-implementation.cpp b/adaptors/common/gl/gl-proxy-implementation.cpp
index c2400d6..1b62416 100644
--- a/adaptors/common/gl/gl-proxy-implementation.cpp
+++ b/adaptors/common/gl/gl-proxy-implementation.cpp
@@ -21,9 +21,10 @@
 // EXTERNAL INCLUDES
 #include <math.h>
 
+#include <dali/integration-api/debug.h>
+
 // INTERNAL INCLUDES
 #include <base/environment-options.h>
-#include <dali/integration-api/debug.h>
 
 namespace
 {
diff --git a/adaptors/common/gl/gl-proxy-implementation.h b/adaptors/common/gl/gl-proxy-implementation.h
index 43cefcf..96e8508 100644
--- a/adaptors/common/gl/gl-proxy-implementation.h
+++ b/adaptors/common/gl/gl-proxy-implementation.h
@@ -18,8 +18,7 @@
  *
  */
 
-// EXTERNAL INCLUDES
-
+// INTERNAL INCLUDES
 #include <gl/gl-implementation.h>
 
 namespace Dali
diff --git a/adaptors/common/haptic-player-impl.h b/adaptors/common/haptic-player-impl.h
index 1ed7d7b..9c93e2f 100644
--- a/adaptors/common/haptic-player-impl.h
+++ b/adaptors/common/haptic-player-impl.h
@@ -21,9 +21,9 @@
 // EXTERNAL INCLUDES
 #include <string>
 #include <dali/public-api/object/base-object.h>
-#include <haptic-player.h>
 
 // INTERNAL INCLUDES
+#include <haptic-player.h>
 #include <feedback/feedback-plugin-proxy.h>
 
 namespace Dali
diff --git a/adaptors/common/indicator-buffer.cpp b/adaptors/common/indicator-buffer.cpp
index 955f75d..b1086824 100644
--- a/adaptors/common/indicator-buffer.cpp
+++ b/adaptors/common/indicator-buffer.cpp
@@ -15,6 +15,7 @@
  *
  */
 
+// CLASS HEADER
 #include "indicator-buffer.h"
 
 namespace Dali
diff --git a/adaptors/common/indicator-impl.cpp b/adaptors/common/indicator-impl.cpp
index a5e0e92..5cf7daa 100644
--- a/adaptors/common/indicator-impl.cpp
+++ b/adaptors/common/indicator-impl.cpp
@@ -29,7 +29,6 @@
 #include <errno.h>
 
 #include <dali/public-api/images/bitmap-image.h>
-#include <pixmap-image.h>
 #include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/events/touch-event.h>
 #include <dali/public-api/events/touch-point.h>
@@ -42,6 +41,7 @@
 // INTERNAL INCLUDES
 #include <adaptor-impl.h>
 #include <accessibility-manager-impl.h>
+#include <pixmap-image.h>
 
 using Dali::Vector4;
 
diff --git a/adaptors/common/indicator-impl.h b/adaptors/common/indicator-impl.h
index 92fec4d..5ed35a1 100644
--- a/adaptors/common/indicator-impl.h
+++ b/adaptors/common/indicator-impl.h
@@ -23,8 +23,6 @@
 #include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/actors/mesh-actor.h>
 #include <dali/public-api/geometry/animatable-mesh.h>
-#include <window.h>
-#include <timer.h>
 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/events/pan-gesture.h>
 #include <dali/public-api/events/pan-gesture-detector.h>
@@ -33,6 +31,8 @@
 #include <indicator-buffer.h>
 #include <server-connection.h>
 #include <shared-file.h>
+#include <timer.h>
+#include <window.h>
 
 namespace Dali
 {
diff --git a/adaptors/common/kernel-trace.cpp b/adaptors/common/kernel-trace.cpp
index d73f7dc..8e9404b 100644
--- a/adaptors/common/kernel-trace.cpp
+++ b/adaptors/common/kernel-trace.cpp
@@ -18,14 +18,14 @@
 // CLASS HEADER
 #include "kernel-trace.h"
 
-// INTERNAL HEADERS
-#include <dali/integration-api/debug.h>
-
 // EXTERNAL HEADERS
 #include <fcntl.h>
 #include <stdio.h>
 #include <unistd.h>
 
+// INTERNAL HEADERS
+#include <dali/integration-api/debug.h>
+
 namespace Dali
 {
 
diff --git a/adaptors/common/key-impl.h b/adaptors/common/key-impl.h
index d78e852..dc103d5 100644
--- a/adaptors/common/key-impl.h
+++ b/adaptors/common/key-impl.h
@@ -18,7 +18,7 @@
  *
  */
 
-// EXTERNAL INCLUDES
+// INTERNAL INCLUDES
 #include <key.h>
 
 namespace Dali
diff --git a/adaptors/common/lifecycle-controller-impl.cpp b/adaptors/common/lifecycle-controller-impl.cpp
index 9a0e1d9..52b6c13 100644
--- a/adaptors/common/lifecycle-controller-impl.cpp
+++ b/adaptors/common/lifecycle-controller-impl.cpp
@@ -18,8 +18,10 @@
 // CLASS HEADER
 #include "lifecycle-controller-impl.h"
 
-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES
 #include <dali/public-api/object/type-registry.h>
+
+// INTERNAL INCLUDES
 #include <adaptor-impl.h>
 #include <singleton-service-impl.h>
 
diff --git a/adaptors/common/locale-utils.h b/adaptors/common/locale-utils.h
index 136abb7..0db57a9 100644
--- a/adaptors/common/locale-utils.h
+++ b/adaptors/common/locale-utils.h
@@ -20,9 +20,9 @@
 
 // EXTERNAL INCLUDES
 #include <string>
-#include <virtual-keyboard.h>
 
 // INTERNAL INCLUDES
+#include <virtual-keyboard.h>
 
 namespace Dali
 {
diff --git a/adaptors/common/object-profiler.cpp b/adaptors/common/object-profiler.cpp
index 92eabc9..464a36a 100644
--- a/adaptors/common/object-profiler.cpp
+++ b/adaptors/common/object-profiler.cpp
@@ -15,7 +15,10 @@
  *
  */
 
+// CLASS HEADER
 #include "object-profiler.h"
+
+// EXTERNAL INCLUDES
 #include <stdlib.h>
 #include <dali/integration-api/debug.h>
 #include <dali/integration-api/profiling.h>
diff --git a/adaptors/common/object-profiler.h b/adaptors/common/object-profiler.h
index 63235d2..f07210f 100644
--- a/adaptors/common/object-profiler.h
+++ b/adaptors/common/object-profiler.h
@@ -18,10 +18,13 @@
  *
  */
 
+// EXTERNAL INCLUDES
 #include <dali/public-api/object/object-registry.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/common/map-wrapper.h>
 #include <dali/public-api/signals/connection-tracker.h>
+
+// INTERNAL INCLUDES
 #include <timer.h>
 
 namespace Dali
diff --git a/adaptors/common/orientation-impl.h b/adaptors/common/orientation-impl.h
index 12d28c9..e49f133 100644
--- a/adaptors/common/orientation-impl.h
+++ b/adaptors/common/orientation-impl.h
@@ -22,9 +22,9 @@
 #include <cmath>
 #include <dali/public-api/common/constants.h>
 #include <dali/public-api/object/base-object.h>
-#include <orientation.h>
 
 // INTERNAL INCLUDES
+#include <orientation.h>
 #include <rotation-observer.h>
 
 namespace Dali
diff --git a/adaptors/common/performance-logger-impl.cpp b/adaptors/common/performance-logger-impl.cpp
index 87ee690..8b36320 100644
--- a/adaptors/common/performance-logger-impl.cpp
+++ b/adaptors/common/performance-logger-impl.cpp
@@ -17,6 +17,8 @@
 
 // CLASS HEADER
 #include <performance-logger-impl.h>
+
+// INTERNAL INCLUDES
 #include <adaptor-impl.h>
 
 namespace Dali
diff --git a/adaptors/common/performance-logger-impl.h b/adaptors/common/performance-logger-impl.h
index da835a0..f5d1c64 100644
--- a/adaptors/common/performance-logger-impl.h
+++ b/adaptors/common/performance-logger-impl.h
@@ -18,10 +18,11 @@
  *
  */
 
-#include <base/interfaces/performance-interface.h>
-
 // EXTERNAL INCLUDES
 #include <dali/public-api/object/base-object.h>
+
+// INTERNAL INCLUDES
+#include <base/interfaces/performance-interface.h>
 #include <performance-logger.h>
 
 namespace Dali
diff --git a/adaptors/common/render-surface-impl.h b/adaptors/common/render-surface-impl.h
index 5fa8c02..4077f80 100644
--- a/adaptors/common/render-surface-impl.h
+++ b/adaptors/common/render-surface-impl.h
@@ -19,9 +19,11 @@
  */
 
 // EXTERNAL INCLUDES
-#include <render-surface.h>
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/common/view-mode.h>
+
+// INTERNAL INCLUDES
+#include <render-surface.h>
 #include <base/interfaces/egl-interface.h>
 
 namespace Dali
diff --git a/adaptors/common/style-monitor-impl.cpp b/adaptors/common/style-monitor-impl.cpp
index 7358bab..3db191b 100644
--- a/adaptors/common/style-monitor-impl.cpp
+++ b/adaptors/common/style-monitor-impl.cpp
@@ -18,8 +18,10 @@
 // CLASS HEADER
 #include "style-monitor-impl.h"
 
-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES
 #include <dali/public-api/object/type-registry.h>
+
+// INTERNAL INCLUDES
 #include <adaptor-impl.h>
 #include <singleton-service-impl.h>
 
diff --git a/adaptors/common/style-monitor-impl.h b/adaptors/common/style-monitor-impl.h
index ca3e845..cd3adcd 100644
--- a/adaptors/common/style-monitor-impl.h
+++ b/adaptors/common/style-monitor-impl.h
@@ -21,10 +21,10 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/object/base-object.h>
-#include <style-monitor.h>
 #include <dali/integration-api/platform-abstraction.h>
 
 // INTERNAL INCLUDES
+#include <style-monitor.h>
 
 namespace Dali
 {
diff --git a/adaptors/common/timer-impl.h b/adaptors/common/timer-impl.h
index 98f6f91..e8bc456 100644
--- a/adaptors/common/timer-impl.h
+++ b/adaptors/common/timer-impl.h
@@ -21,10 +21,10 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/object/base-object.h>
-#include <timer.h>
 
 // INTERNAL INCLUDES
 #include <base/interfaces/timer-interface.h>
+#include <timer.h>
 
 namespace Dali
 {
diff --git a/adaptors/common/trigger-event.h b/adaptors/common/trigger-event.h
index 64a2392..e511b3f 100644
--- a/adaptors/common/trigger-event.h
+++ b/adaptors/common/trigger-event.h
@@ -21,8 +21,9 @@
 // EXTERNAL INCLUDES
 #include <boost/function.hpp>
 
-// INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
+
+// INTERNAL INCLUDES
 #include <base/interfaces/trigger-event-interface.h>
 
 namespace Dali
diff --git a/adaptors/common/virtual-keyboard-impl.cpp b/adaptors/common/virtual-keyboard-impl.cpp
index 25299b2..6ba3924 100644
--- a/adaptors/common/virtual-keyboard-impl.cpp
+++ b/adaptors/common/virtual-keyboard-impl.cpp
@@ -22,10 +22,10 @@
 #include <algorithm>
 
 #include <dali/public-api/common/vector-wrapper.h>
-#include <adaptor.h>
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
+#include <adaptor.h>
 #include <locale-utils.h>
 #include <imf-manager-impl.h>
 
diff --git a/adaptors/common/window-impl.h b/adaptors/common/window-impl.h
index cd7cdb4..757e33b 100644
--- a/adaptors/common/window-impl.h
+++ b/adaptors/common/window-impl.h
@@ -21,16 +21,15 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/object/base-object.h>
-#include <window.h>
-#include <orientation.h>
-#include <render-surface.h>
-#include <drag-and-drop-detector.h>
 
 // INTERNAL INCLUDES
 #include <base/lifecycle-observer.h>
 #include <adaptor-impl.h>
 #include <indicator-impl.h>
-
+#include <window.h>
+#include <orientation.h>
+#include <render-surface.h>
+#include <drag-and-drop-detector.h>
 
 namespace Dali
 {
diff --git a/adaptors/mobile/mobile-render-surface-factory.cpp b/adaptors/mobile/mobile-render-surface-factory.cpp
index f5f2ed6..2770ed7 100644
--- a/adaptors/mobile/mobile-render-surface-factory.cpp
+++ b/adaptors/mobile/mobile-render-surface-factory.cpp
@@ -15,6 +15,7 @@
  *
  */
 
+// INTERNAL INCLUDES
 #include <pixmap-render-surface.h>
 
 namespace Dali
diff --git a/adaptors/public-api/adaptor-framework/accessibility-gesture-handler.h b/adaptors/public-api/adaptor-framework/accessibility-gesture-handler.h
index eac414c..d3044f4 100644
--- a/adaptors/public-api/adaptor-framework/accessibility-gesture-handler.h
+++ b/adaptors/public-api/adaptor-framework/accessibility-gesture-handler.h
@@ -18,7 +18,7 @@
  *
  */
 
-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES
 #include <dali/integration-api/events/pan-gesture-event.h>
 
 namespace Dali
diff --git a/adaptors/public-api/adaptor-framework/application.h b/adaptors/public-api/adaptor-framework/application.h
index 8d7c212..34e8292 100644
--- a/adaptors/public-api/adaptor-framework/application.h
+++ b/adaptors/public-api/adaptor-framework/application.h
@@ -24,6 +24,7 @@
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/common/view-mode.h>
 
+// INTERNAL INCLUDES
 #include "application-configuration.h"
 #include "style-monitor.h"
 #include "device-layout.h"
diff --git a/adaptors/public-api/adaptor-framework/bitmap-loader.cpp b/adaptors/public-api/adaptor-framework/bitmap-loader.cpp
index e0e54e4..73cdba4 100644
--- a/adaptors/public-api/adaptor-framework/bitmap-loader.cpp
+++ b/adaptors/public-api/adaptor-framework/bitmap-loader.cpp
@@ -14,14 +14,17 @@
  * limitations under the License.
  */
 
+// CLASS HEADER
 #include "bitmap-loader.h"
 
+// EXTERNAL INCLUDES
 #include <string>
 
 #include <dali/integration-api/bitmap.h>
 #include <dali/integration-api/resource-types.h>
 #include <dali/integration-api/resource-cache.h>
 
+// INTERNAL INCLUDES
 #include "image-loaders/image-loader.h"
 #include <bitmap-loader-impl.h>
 
diff --git a/adaptors/public-api/adaptor-framework/bitmap-saver.cpp b/adaptors/public-api/adaptor-framework/bitmap-saver.cpp
index 65a94c5..735f40b 100644
--- a/adaptors/public-api/adaptor-framework/bitmap-saver.cpp
+++ b/adaptors/public-api/adaptor-framework/bitmap-saver.cpp
@@ -14,8 +14,13 @@
  * limitations under the License.
  */
 
+// CLASS HEADER
 #include "bitmap-saver.h"
+
+// EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
+
+// INTERNAL INCLUDES
 #include <platform-abstractions/slp/resource-loader/resource-loader.h>
 #include <platform-abstractions/slp/image-loaders/loader-jpeg.h>
 #include <platform-abstractions/slp/image-loaders/loader-png.h>
diff --git a/adaptors/public-api/adaptor-framework/bitmap-saver.h b/adaptors/public-api/adaptor-framework/bitmap-saver.h
index 9f9b00f..12786f5 100644
--- a/adaptors/public-api/adaptor-framework/bitmap-saver.h
+++ b/adaptors/public-api/adaptor-framework/bitmap-saver.h
@@ -17,6 +17,7 @@
  * limitations under the License.
  */
 
+// EXTERNAL INCLUDES
 #include <string>
 #include <dali/public-api/images/pixel.h>
 
diff --git a/adaptors/public-api/adaptor-framework/color-controller.h b/adaptors/public-api/adaptor-framework/color-controller.h
index 9d661fd..21bd9c6 100644
--- a/adaptors/public-api/adaptor-framework/color-controller.h
+++ b/adaptors/public-api/adaptor-framework/color-controller.h
@@ -18,6 +18,7 @@
  *
  */
 
+// EXTERNAL INCLUDES
 #include <dali/public-api/object/base-handle.h>
 
 namespace Dali
diff --git a/adaptors/public-api/adaptor-framework/event-feeder.cpp b/adaptors/public-api/adaptor-framework/event-feeder.cpp
index 50ab107..1652c7b 100644
--- a/adaptors/public-api/adaptor-framework/event-feeder.cpp
+++ b/adaptors/public-api/adaptor-framework/event-feeder.cpp
@@ -15,7 +15,7 @@
  *
  */
 
-// HEADER
+// CLASS HEADER
 #include <event-feeder.h>
 
 // INTERNAL INCLUDES
diff --git a/adaptors/public-api/adaptor-framework/pixmap-image.cpp b/adaptors/public-api/adaptor-framework/pixmap-image.cpp
index fcc8715..ae6f74a 100644
--- a/adaptors/public-api/adaptor-framework/pixmap-image.cpp
+++ b/adaptors/public-api/adaptor-framework/pixmap-image.cpp
@@ -18,12 +18,12 @@
 // CLASS HEADER
 #include <pixmap-image.h>
 
-// INTERNAL INCLUDES
-#include <pixmap-image-impl.h>
-
 // EXTERNAL INCLUDES
 #include <dali/public-api/object/any.h>
 
+// INTERNAL INCLUDES
+#include <pixmap-image-impl.h>
+
 namespace Dali
 {
 
diff --git a/adaptors/tizen/tilt-sensor-impl.h b/adaptors/tizen/tilt-sensor-impl.h
index 599b169..4f864ad 100644
--- a/adaptors/tizen/tilt-sensor-impl.h
+++ b/adaptors/tizen/tilt-sensor-impl.h
@@ -21,10 +21,10 @@
 // EXTERNAL INCLUDES
 #include <deque>
 #include <dali/public-api/object/base-object.h>
-#include <timer.h>
 
 // INTERNAL INCLUDES
 #include <tilt-sensor.h>
+#include <timer.h>
 
 namespace Dali
 {
diff --git a/adaptors/tizen/tts-player-impl-tizen.cpp b/adaptors/tizen/tts-player-impl-tizen.cpp
index 282861c..70f5b9c 100644
--- a/adaptors/tizen/tts-player-impl-tizen.cpp
+++ b/adaptors/tizen/tts-player-impl-tizen.cpp
@@ -22,7 +22,6 @@
 #include <tts.h>
 #include <stdio.h>
 
-// INTERNAL INCLUDES
 #include <dali/public-api/object/type-registry.h>
 
 
diff --git a/adaptors/tizen/tts-player-impl.h b/adaptors/tizen/tts-player-impl.h
index d2659bc..9ee5921 100644
--- a/adaptors/tizen/tts-player-impl.h
+++ b/adaptors/tizen/tts-player-impl.h
@@ -24,6 +24,8 @@
 
 #include <dali/integration-api/debug.h>
 #include <dali/public-api/object/base-object.h>
+
+// INTERNAL INCLUDES
 #include <tts-player.h>
 
 namespace Dali
diff --git a/adaptors/tv/tv-key-impl.cpp b/adaptors/tv/tv-key-impl.cpp
index a643571..2e582a7 100644
--- a/adaptors/tv/tv-key-impl.cpp
+++ b/adaptors/tv/tv-key-impl.cpp
@@ -24,7 +24,6 @@
 #include <string.h>
 #include <iostream>
 
-
 #include <dali/integration-api/debug.h>
 
 
diff --git a/adaptors/tv/tv-render-surface-factory.cpp b/adaptors/tv/tv-render-surface-factory.cpp
index f5f2ed6..2770ed7 100644
--- a/adaptors/tv/tv-render-surface-factory.cpp
+++ b/adaptors/tv/tv-render-surface-factory.cpp
@@ -15,6 +15,7 @@
  *
  */
 
+// INTERNAL INCLUDES
 #include <pixmap-render-surface.h>
 
 namespace Dali
diff --git a/adaptors/ubuntu/accessibility-manager-impl.h b/adaptors/ubuntu/accessibility-manager-impl.h
index c2f20b7..3c6ebf8 100644
--- a/adaptors/ubuntu/accessibility-manager-impl.h
+++ b/adaptors/ubuntu/accessibility-manager-impl.h
@@ -25,9 +25,9 @@
 #include <dali/public-api/math/vector2.h>
 #include <dali/public-api/events/touch-point.h>
 #include <dali/integration-api/events/touch-event-combiner.h>
-#include <accessibility-manager.h>
 
 // INTERNAL INCLUDES
+#include <accessibility-manager.h>
 #include <accessibility-action-handler.h>
 #include <accessibility-gesture-handler.h>
 #include <indicator-impl.h>
diff --git a/adaptors/ubuntu/tilt-sensor-impl.h b/adaptors/ubuntu/tilt-sensor-impl.h
index 599b169..4f864ad 100644
--- a/adaptors/ubuntu/tilt-sensor-impl.h
+++ b/adaptors/ubuntu/tilt-sensor-impl.h
@@ -21,10 +21,10 @@
 // EXTERNAL INCLUDES
 #include <deque>
 #include <dali/public-api/object/base-object.h>
-#include <timer.h>
 
 // INTERNAL INCLUDES
 #include <tilt-sensor.h>
+#include <timer.h>
 
 namespace Dali
 {
diff --git a/adaptors/ubuntu/tts-player-impl-ubuntu.cpp b/adaptors/ubuntu/tts-player-impl-ubuntu.cpp
index adcc147..fcce032 100644
--- a/adaptors/ubuntu/tts-player-impl-ubuntu.cpp
+++ b/adaptors/ubuntu/tts-player-impl-ubuntu.cpp
@@ -18,7 +18,7 @@
 // CLASS HEADER
 #include "tts-player-impl.h"
 
-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES
 #include <dali/public-api/object/type-registry.h>
 
 
diff --git a/adaptors/wayland/accessibility-manager-impl-wl.cpp b/adaptors/wayland/accessibility-manager-impl-wl.cpp
index 0232c8b..c034368 100644
--- a/adaptors/wayland/accessibility-manager-impl-wl.cpp
+++ b/adaptors/wayland/accessibility-manager-impl-wl.cpp
@@ -27,6 +27,8 @@
 #include <dali/public-api/dali-core.h>
 #include <dali/integration-api/debug.h>
 #include <dali/integration-api/events/gesture-requests.h>
+
+// INTERNAL INCLUDES
 #include "system-settings.h"
 
 namespace Dali
diff --git a/adaptors/wayland/clipboard-impl-wl.cpp b/adaptors/wayland/clipboard-impl-wl.cpp
index 90fdcdc..488637d 100644
--- a/adaptors/wayland/clipboard-impl-wl.cpp
+++ b/adaptors/wayland/clipboard-impl-wl.cpp
@@ -22,10 +22,10 @@
 #include <Ecore.h>
 #include <Ecore_Wayland.h>
 #include <dali/public-api/dali-core.h>
+#include <dali/public-api/object/any.h>
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali/public-api/object/any.h>
 #include <singleton-service-impl.h>
 
 namespace //unnamed namespace
diff --git a/adaptors/wayland/clipboard-impl.h b/adaptors/wayland/clipboard-impl.h
index e09ce42..1275479 100644
--- a/adaptors/wayland/clipboard-impl.h
+++ b/adaptors/wayland/clipboard-impl.h
@@ -19,12 +19,12 @@
  */
 
 // EXTERNAL INCLUDES
-#include <clipboard.h>
 #include <dali/public-api/object/base-object.h>
 #include <Ecore.h>
 #include <Ecore_Wayland.h>
 
-
+// INTERNAL INCLUDES
+#include <clipboard.h>
 
 namespace Dali
 {
diff --git a/adaptors/wayland/ecore-wl-render-surface-factory.cpp b/adaptors/wayland/ecore-wl-render-surface-factory.cpp
index 0541747..60de84e 100644
--- a/adaptors/wayland/ecore-wl-render-surface-factory.cpp
+++ b/adaptors/wayland/ecore-wl-render-surface-factory.cpp
@@ -15,6 +15,7 @@
  *
  */
 
+// INTERNAL INCLUDES
 #include <ecore-wl-render-surface.h>
 
 namespace Dali
diff --git a/adaptors/wayland/imf-manager-impl-wl.cpp b/adaptors/wayland/imf-manager-impl-wl.cpp
index 1c02542..8ca84dc 100644
--- a/adaptors/wayland/imf-manager-impl-wl.cpp
+++ b/adaptors/wayland/imf-manager-impl-wl.cpp
@@ -22,10 +22,10 @@
 #include <boost/bind.hpp>
 #include <dali/public-api/events/key-event.h>
 #include <dali/public-api/object/type-registry.h>
-#include <adaptor.h>
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
+#include <adaptor.h>
 #include <window-render-surface.h>
 #include <adaptor-impl.h>
 #include <singleton-service-impl.h>
diff --git a/adaptors/wayland/imf-manager-impl.h b/adaptors/wayland/imf-manager-impl.h
index 11e4059..b241f0f 100644
--- a/adaptors/wayland/imf-manager-impl.h
+++ b/adaptors/wayland/imf-manager-impl.h
@@ -24,11 +24,10 @@
 #include <Ecore_Wayland.h>
 
 #include <dali/public-api/object/base-object.h>
-#include <imf-manager.h>
 #include <dali/integration-api/events/key-event-integ.h>
 
 // INTERNAL INCLUDES
-
+#include <imf-manager.h>
 
 namespace Dali
 {
diff --git a/adaptors/wayland/key-impl-wl.cpp b/adaptors/wayland/key-impl-wl.cpp
index c2c938a..120255e 100644
--- a/adaptors/wayland/key-impl-wl.cpp
+++ b/adaptors/wayland/key-impl-wl.cpp
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <iostream>
 
-
 #include <dali/integration-api/debug.h>
 
 
diff --git a/adaptors/wayland/pixmap-image-impl-wl.cpp b/adaptors/wayland/pixmap-image-impl-wl.cpp
index 86d7c51..fc5936f 100644
--- a/adaptors/wayland/pixmap-image-impl-wl.cpp
+++ b/adaptors/wayland/pixmap-image-impl-wl.cpp
@@ -20,12 +20,12 @@
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
-#include <render-surface.h>
 
 // INTERNAL INCLUDES
 #include <gl/egl-image-extensions.h>
 #include <gl/egl-factory.h>
 #include <adaptor-impl.h>
+#include <render-surface.h>
 
 // Allow this to be encoded and saved:
 #include <platform-abstractions/slp/resource-loader/resource-loader.h>
diff --git a/adaptors/wayland/virtual-keyboard-impl-wl.cpp b/adaptors/wayland/virtual-keyboard-impl-wl.cpp
index 0d9b790..57f87ac 100644
--- a/adaptors/wayland/virtual-keyboard-impl-wl.cpp
+++ b/adaptors/wayland/virtual-keyboard-impl-wl.cpp
@@ -24,10 +24,10 @@
 #include <algorithm>
 
 #include <dali/public-api/common/vector-wrapper.h>
-#include <adaptor.h>
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
+#include <adaptor.h>
 #include <locale-utils.h>
 #include <imf-manager-impl.h>
 
diff --git a/adaptors/x11/accessibility-manager-impl-x.cpp b/adaptors/x11/accessibility-manager-impl-x.cpp
index dd3c781..d443db4 100644
--- a/adaptors/x11/accessibility-manager-impl-x.cpp
+++ b/adaptors/x11/accessibility-manager-impl-x.cpp
@@ -26,6 +26,8 @@
 #include <dali/public-api/dali-core.h>
 #include <dali/integration-api/debug.h>
 #include <dali/integration-api/events/gesture-requests.h>
+
+// INTERNAL INCLUDES
 #include "system-settings.h"
 
 #define MSG_DOMAIN_CONTROL_ACCESS (int)ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL
diff --git a/adaptors/x11/clipboard-impl-x.cpp b/adaptors/x11/clipboard-impl-x.cpp
index 3d0f0f9..83b5e8e 100644
--- a/adaptors/x11/clipboard-impl-x.cpp
+++ b/adaptors/x11/clipboard-impl-x.cpp
@@ -20,11 +20,11 @@
 
 // EXTERNAL INCLUDES
 #include <Ecore_X.h>
+#include <dali/public-api/object/any.h>
 #include <dali/public-api/dali-core.h>
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali/public-api/object/any.h>
 #include <adaptor-impl.h>
 #include <ecore-x-window-interface.h>
 #include <singleton-service-impl.h>
diff --git a/adaptors/x11/clipboard-impl.h b/adaptors/x11/clipboard-impl.h
index 0d76ceb..22891a2 100644
--- a/adaptors/x11/clipboard-impl.h
+++ b/adaptors/x11/clipboard-impl.h
@@ -19,11 +19,11 @@
  */
 
 // EXTERNAL INCLUDES
-#include <clipboard.h>
 #include <dali/public-api/object/base-object.h>
 #include <Ecore_X.h>
 
-
+// INTERNAL INCLUDES
+#include <clipboard.h>
 
 namespace Dali
 {
diff --git a/adaptors/x11/ecore-x-render-surface-factory.cpp b/adaptors/x11/ecore-x-render-surface-factory.cpp
index f546d00..4e1fee8 100644
--- a/adaptors/x11/ecore-x-render-surface-factory.cpp
+++ b/adaptors/x11/ecore-x-render-surface-factory.cpp
@@ -15,6 +15,7 @@
  *
  */
 
+// INTERNAL INCLUDES
 #include "pixmap-render-surface.h"
 
 namespace Dali
diff --git a/adaptors/x11/imf-manager-impl-x.cpp b/adaptors/x11/imf-manager-impl-x.cpp
index 8bbade6..bb4eac5 100644
--- a/adaptors/x11/imf-manager-impl-x.cpp
+++ b/adaptors/x11/imf-manager-impl-x.cpp
@@ -22,10 +22,10 @@
 #include <boost/bind.hpp>
 #include <dali/public-api/events/key-event.h>
 #include <dali/public-api/object/type-registry.h>
-#include <adaptor.h>
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
+#include <adaptor.h>
 #include <window-render-surface.h>
 #include <adaptor-impl.h>
 #include <singleton-service-impl.h>
diff --git a/adaptors/x11/imf-manager-impl.h b/adaptors/x11/imf-manager-impl.h
index ced5124..f296ece 100644
--- a/adaptors/x11/imf-manager-impl.h
+++ b/adaptors/x11/imf-manager-impl.h
@@ -23,11 +23,10 @@
 #include <Ecore_X.h>
 
 #include <dali/public-api/object/base-object.h>
-#include <imf-manager.h>
 #include <dali/integration-api/events/key-event-integ.h>
 
 // INTERNAL INCLUDES
-
+#include <imf-manager.h>
 
 namespace Dali
 {
diff --git a/adaptors/x11/key-impl-x.cpp b/adaptors/x11/key-impl-x.cpp
index 0f8c1f0..ef690b4 100644
--- a/adaptors/x11/key-impl-x.cpp
+++ b/adaptors/x11/key-impl-x.cpp
@@ -24,7 +24,6 @@
 #include <string.h>
 #include <iostream>
 
-
 #include <dali/integration-api/debug.h>
 
 
diff --git a/adaptors/x11/virtual-keyboard-impl-x.cpp b/adaptors/x11/virtual-keyboard-impl-x.cpp
index 6e9474a..947bad8 100644
--- a/adaptors/x11/virtual-keyboard-impl-x.cpp
+++ b/adaptors/x11/virtual-keyboard-impl-x.cpp
@@ -24,10 +24,10 @@
 #include <algorithm>
 
 #include <dali/public-api/common/vector-wrapper.h>
-#include <adaptor.h>
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
+#include <adaptor.h>
 #include <locale-utils.h>
 #include <imf-manager-impl.h>
 
diff --git a/adaptors/x11/window-impl-x.cpp b/adaptors/x11/window-impl-x.cpp
index 71a2925..b8cf712 100644
--- a/adaptors/x11/window-impl-x.cpp
+++ b/adaptors/x11/window-impl-x.cpp
@@ -26,13 +26,13 @@
 #include <dali/integration-api/system-overlay.h>
 #include <dali/public-api/render-tasks/render-task.h>
 #include <dali/public-api/render-tasks/render-task-list.h>
-#include <orientation.h>
 
 // INTERNAL HEADERS
 #include <window-render-surface.h>
 #include <drag-and-drop-detector-impl.h>
 #include <indicator-impl.h>
 #include <window-visibility-observer.h>
+#include <orientation.h>
 #include <orientation-impl.h>
 
 namespace
diff --git a/platform-abstractions/slp/data-cache/data-cache-impl.cpp b/platform-abstractions/slp/data-cache/data-cache-impl.cpp
index b3d22ac..296917f 100644
--- a/platform-abstractions/slp/data-cache/data-cache-impl.cpp
+++ b/platform-abstractions/slp/data-cache/data-cache-impl.cpp
@@ -18,17 +18,16 @@
 // CLASS HEADER
 #include "data-cache-impl.h"
 
-// INTERNAL INCLUDES
-#include "data-cache-io.h"
-#include "data-compression.h"
-#include <dali/integration-api/debug.h>
-
-
 // EXTERNAL INCLUDES
 #include <boost/functional/hash.hpp>
 #include <boost/thread.hpp>
 #include <cstdio>
 
+// INTERNAL INCLUDES
+#include "data-cache-io.h"
+#include "data-compression.h"
+#include <dali/integration-api/debug.h>
+
 namespace Dali
 {
 
diff --git a/platform-abstractions/slp/resource-loader/assimp-model-builder.cpp b/platform-abstractions/slp/resource-loader/assimp-model-builder.cpp
index 22cfec1..23ad431 100644
--- a/platform-abstractions/slp/resource-loader/assimp-model-builder.cpp
+++ b/platform-abstractions/slp/resource-loader/assimp-model-builder.cpp
@@ -15,10 +15,16 @@
  *
  */
 
-// Class header
+// CLASS HEADER
 #include "assimp-model-builder.h"
 
-// Core headers
+// EXTERNAL INCLUDES
+#include <libgen.h>
+#include <assimp/assimp.hpp>
+#include <assimp/aiScene.h>
+#include <assimp/aiPostProcess.h> // Post processing flags
+#include <cstdio>
+
 #include <dali/public-api/common/light.h>
 #include <dali/public-api/math/matrix.h>
 #include <dali/public-api/math/vector2.h>
@@ -31,17 +37,10 @@
 #include <dali/public-api/animation/key-frames.h>
 #include <dali/integration-api/debug.h>
 
-// Local headers
+// INTERNAL INCLUDES
 #include "assimp-proxy.h"
 #include "left-hand-convertor.h"
 
-// External headers
-#include <libgen.h>
-#include <assimp/assimp.hpp>
-#include <assimp/aiScene.h>
-#include <assimp/aiPostProcess.h> // Post processing flags
-#include <cstdio>
-
 namespace Dali
 {
 namespace SlpPlatform
-- 
2.7.4