From: Daniel McEwen <d.mcewen@partner.samsung.com>
Date: Fri, 17 May 2019 15:19:47 +0000 (+0100)
Subject: Purge underscored header file barriers
X-Git-Tag: dali_1.4.21~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=baad1726f5f7f05d98da7ca591f24dbe3c49dab2;p=platform%2Fcore%2Fuifw%2Fdali-core.git

Purge underscored header file barriers

Change-Id: I1f8c4a74a7a4e7e6cdd7b30b38ff7bb307cb782a
---

diff --git a/automated-tests/scripts/tcheadgen.sh b/automated-tests/scripts/tcheadgen.sh
index dfd378a..c8cd679 100755
--- a/automated-tests/scripts/tcheadgen.sh
+++ b/automated-tests/scripts/tcheadgen.sh
@@ -28,8 +28,8 @@ awk -F',' -v HEADER_NAME="$HEADER_NAME" '
         tc_array_counter = 0;
         tc_array_list[0] = "";
 
-print "#ifndef __" HEADER_NAME "__"
-print "#define __" HEADER_NAME "__"
+print "#ifndef " HEADER_NAME
+print "#define " HEADER_NAME
 print ""
 print "#include \"testcase.h\""
 print ""
@@ -67,7 +67,7 @@ print "    {" tc_array_list[i] "},"
 print "    {NULL, NULL}"
 print "};"
 print ""
-print "#endif // __" HEADER_NAME "__"
+print "#endif // " HEADER_NAME
 }' $TFILE > $FILE
 unlink $TFILE
 
diff --git a/automated-tests/src/common/assert.h b/automated-tests/src/common/assert.h
index a5d6cff..7d94ae2 100644
--- a/automated-tests/src/common/assert.h
+++ b/automated-tests/src/common/assert.h
@@ -1,5 +1,5 @@
-#ifndef _ASSERT_H_
-#define _ASSERT_H_
+#ifndef ASSERT_H
+#define ASSERT_H
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -79,4 +79,4 @@
         return 1; \
     }
 
-#endif //  _ASSERT_H_
+#endif // ASSERT_H
diff --git a/automated-tests/src/common/testcase.h b/automated-tests/src/common/testcase.h
index 011a452..308d539 100644
--- a/automated-tests/src/common/testcase.h
+++ b/automated-tests/src/common/testcase.h
@@ -1,5 +1,5 @@
-#ifndef _TESTCASE_H_
-#define _TESTCASE_H_
+#ifndef TESTCASE_H
+#define TESTCASE_H
 
 /* pointer to startup/cleanup functions */
 typedef void (*void_fun_ptr)(void);
@@ -15,4 +15,4 @@ typedef struct testcase_s {
     void_fun_ptr cleanup;
 } testcase;
 
-#endif // _TESTCASE_H_
+#endif // TESTCASE_H
diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-application.h b/automated-tests/src/dali/dali-test-suite-utils/test-application.h
index 27aafd3..99cb1ce 100644
--- a/automated-tests/src/dali/dali-test-suite-utils/test-application.h
+++ b/automated-tests/src/dali/dali-test-suite-utils/test-application.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_TEST_APPLICATION_H__
-#define __DALI_TEST_APPLICATION_H__
+#ifndef DALI_TEST_APPLICATION_H
+#define DALI_TEST_APPLICATION_H
 
 /*
  * Copyright (c) 2019 Samsung Electronics Co., Ltd.
@@ -114,4 +114,4 @@ protected:
 
 } // Dali
 
-#endif
+#endif // DALI_TEST_APPLICATION_H
diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-gl-sync-abstraction.h b/automated-tests/src/dali/dali-test-suite-utils/test-gl-sync-abstraction.h
index c2db8d2..775d209 100644
--- a/automated-tests/src/dali/dali-test-suite-utils/test-gl-sync-abstraction.h
+++ b/automated-tests/src/dali/dali-test-suite-utils/test-gl-sync-abstraction.h
@@ -1,8 +1,8 @@
-#ifndef __TEST_GL_SYNC_ABSTRACTION_H__
-#define __TEST_GL_SYNC_ABSTRACTION_H__
+#ifndef TEST_GL_SYNC_ABSTRACTION_H
+#define TEST_GL_SYNC_ABSTRACTION_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.
@@ -120,4 +120,4 @@ private:
 
 } // Dali
 
-#endif // __TEST_GL_SYNC_ABSTRACTION_H__
+#endif // TEST_GL_SYNC_ABSTRACTION_H
diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-intrusive-ptr.h b/automated-tests/src/dali/dali-test-suite-utils/test-intrusive-ptr.h
index 03aafe3..5fb17da 100644
--- a/automated-tests/src/dali/dali-test-suite-utils/test-intrusive-ptr.h
+++ b/automated-tests/src/dali/dali-test-suite-utils/test-intrusive-ptr.h
@@ -1,8 +1,8 @@
-#ifndef __TEST_INTRUSIVE_PTR_H__
-#define __TEST_INTRUSIVE_PTR_H__
+#ifndef TEST_INTRUSIVE_PTR_H
+#define TEST_INTRUSIVE_PTR_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.
@@ -55,6 +55,6 @@ struct UtcCoverageIntrusivePtr
 
 } // Dali
 
-#endif
+#endif // TEST_INTRUSIVE_PTR_H
 
 
diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-native-image.h b/automated-tests/src/dali/dali-test-suite-utils/test-native-image.h
index a664107..0c215b7 100644
--- a/automated-tests/src/dali/dali-test-suite-utils/test-native-image.h
+++ b/automated-tests/src/dali/dali-test-suite-utils/test-native-image.h
@@ -1,8 +1,8 @@
-#ifndef __TEST_NATIVE_IMAGE_H__
-#define __TEST_NATIVE_IMAGE_H__
+#ifndef TEST_NATIVE_IMAGE_H
+#define TEST_NATIVE_IMAGE_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.
@@ -100,4 +100,4 @@ public:
 
 } // Dali
 
-#endif
+#endif // TEST_NATIVE_IMAGE_H
diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-render-controller.h b/automated-tests/src/dali/dali-test-suite-utils/test-render-controller.h
index 7c785f1..d44e7b6 100644
--- a/automated-tests/src/dali/dali-test-suite-utils/test-render-controller.h
+++ b/automated-tests/src/dali/dali-test-suite-utils/test-render-controller.h
@@ -1,8 +1,8 @@
-#ifndef __TEST_RENDER_CONTROLLER_H__
-#define __TEST_RENDER_CONTROLLER_H__
+#ifndef TEST_RENDER_CONTROLLER_H
+#define TEST_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.
@@ -51,4 +51,4 @@ private:
 
 } // Dali
 
-#endif
+#endif // TEST_RENDER_CONTROLLER_H
diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-touch-utils.h b/automated-tests/src/dali/dali-test-suite-utils/test-touch-utils.h
index 28caca9..3a623cb 100644
--- a/automated-tests/src/dali/dali-test-suite-utils/test-touch-utils.h
+++ b/automated-tests/src/dali/dali-test-suite-utils/test-touch-utils.h
@@ -1,8 +1,8 @@
-#ifndef _TEST_TOUCH_UTILS_H_
-#define _TEST_TOUCH_UTILS_H_
+#ifndef TEST_TOUCH_UTILS_H
+#define TEST_TOUCH_UTILS_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.
@@ -78,4 +78,4 @@ struct TouchEventDataFunctor
 
 } // namespace Dali
 
-#endif //  _TEST_TOUCH_UTILS_H_
+#endif // TEST_TOUCH_UTILS_H
diff --git a/dali/devel-api/animation/animation-data.h b/dali/devel-api/animation/animation-data.h
index 6138d4e..d90b82b 100644
--- a/dali/devel-api/animation/animation-data.h
+++ b/dali/devel-api/animation/animation-data.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_ANIMATION_DATA_H__
-#define __DALI_ANIMATION_DATA_H__
+#ifndef DALI_ANIMATION_DATA_H
+#define DALI_ANIMATION_DATA_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.
@@ -108,5 +108,5 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_ANIMATION_DATA_H__
+#endif // DALI_ANIMATION_DATA_H
 
diff --git a/dali/devel-api/animation/path-constrainer.h b/dali/devel-api/animation/path-constrainer.h
index cb6f73b..2531108 100644
--- a/dali/devel-api/animation/path-constrainer.h
+++ b/dali/devel-api/animation/path-constrainer.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_PATH_CONSTRAINER_H__
-#define __DALI_PATH_CONSTRAINER_H__
+#ifndef DALI_PATH_CONSTRAINER_H
+#define DALI_PATH_CONSTRAINER_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.
@@ -133,4 +133,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-#endif // __DALI_PATH_CONSTRAINER_H__
+#endif // DALI_PATH_CONSTRAINER_H
diff --git a/dali/devel-api/common/hash.h b/dali/devel-api/common/hash.h
index 66b514d..3d4ae62 100644
--- a/dali/devel-api/common/hash.h
+++ b/dali/devel-api/common/hash.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_HASH__
-#define __DALI_HASH__
+#ifndef DALI_HASH
+#define DALI_HASH
 
 /*
- * 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.
@@ -50,4 +50,4 @@ DALI_CORE_API std::size_t CalculateHash( const std::string& string1, const std::
 
 } // namespace Dali
 
-#endif // __DALI_HASH__
+#endif // DALI_HASH
diff --git a/dali/devel-api/common/owner-container.h b/dali/devel-api/common/owner-container.h
index f35b278..62d59c1 100644
--- a/dali/devel-api/common/owner-container.h
+++ b/dali/devel-api/common/owner-container.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_OWNER_CONTAINER_H__
-#define __DALI_OWNER_CONTAINER_H__
+#ifndef DALI_OWNER_CONTAINER_H
+#define DALI_OWNER_CONTAINER_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.
@@ -201,4 +201,4 @@ private:
 
 } // namespace Dali
 
-#endif //__DALI_OWNER_CONTAINER_H__
+#endif //DALI_OWNER_CONTAINER_H
diff --git a/dali/devel-api/common/ref-counted-dali-vector.h b/dali/devel-api/common/ref-counted-dali-vector.h
index d3719d7..c6d57c9 100644
--- a/dali/devel-api/common/ref-counted-dali-vector.h
+++ b/dali/devel-api/common/ref-counted-dali-vector.h
@@ -1,8 +1,8 @@
-#ifndef __REF_COUNTED_DALI_VECTOR_H__
-#define __REF_COUNTED_DALI_VECTOR_H__
+#ifndef REF_COUNTED_DALI_VECTOR_H
+#define REF_COUNTED_DALI_VECTOR_H
 
 /*
- * Copyright (c) 2015 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.
@@ -70,4 +70,4 @@ private:
 
 } // namespace Dali
 
-#endif /* __REF_COUNTED_DALI_VECTOR_H__ */
+#endif // REF_COUNTED_DALI_VECTOR_H
diff --git a/dali/devel-api/images/distance-field.h b/dali/devel-api/images/distance-field.h
index 3b802eb..884a76d 100644
--- a/dali/devel-api/images/distance-field.h
+++ b/dali/devel-api/images/distance-field.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_DISTANCE_FIELD_H__
-#define __DALI_DISTANCE_FIELD_H__
+#ifndef DALI_DISTANCE_FIELD_H
+#define DALI_DISTANCE_FIELD_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.
@@ -49,4 +49,4 @@ DALI_CORE_API void GenerateDistanceFieldMap( const uint8_t* const imagePixels, c
 
 } //namespace Dali
 
-#endif // ifndef __DALI_DISTANCE_FIELD_H__
+#endif // DALI_DISTANCE_FIELD_H
diff --git a/dali/devel-api/images/native-image-interface-extension.h b/dali/devel-api/images/native-image-interface-extension.h
index dfc60d4..2ca3d9a 100644
--- a/dali/devel-api/images/native-image-interface-extension.h
+++ b/dali/devel-api/images/native-image-interface-extension.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTEGRATION_NATIVE_IMAGE_INTERFACE_EXTENSION_H__
-#define __DALI_INTEGRATION_NATIVE_IMAGE_INTERFACE_EXTENSION_H__
+#ifndef DALI_INTEGRATION_NATIVE_IMAGE_INTERFACE_EXTENSION_H
+#define DALI_INTEGRATION_NATIVE_IMAGE_INTERFACE_EXTENSION_H
 
 /*
- * Copyright (c) 2015 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.
@@ -78,4 +78,4 @@ protected:
 
 } // namespace Dali
 
-#endif // __DALI_INTEGRATION_NATIVE_IMAGE_INTERFACE_H__
+#endif // DALI_INTEGRATION_NATIVE_IMAGE_INTERFACE_EXTENSION_H
diff --git a/dali/devel-api/images/nine-patch-image.h b/dali/devel-api/images/nine-patch-image.h
index 7c644e2..11f692c 100644
--- a/dali/devel-api/images/nine-patch-image.h
+++ b/dali/devel-api/images/nine-patch-image.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_NINE_PATCH_IMAGE_H__
-#define __DALI_NINE_PATCH_IMAGE_H__
+#ifndef DALI_NINE_PATCH_IMAGE_H
+#define DALI_NINE_PATCH_IMAGE_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.
@@ -174,4 +174,4 @@ public: // Not intended for application developers
  */
 } // namespace Dali
 
-#endif // __DALI_NINE_PATCH_IMAGE_H__
+#endif // DALI_NINE_PATCH_IMAGE_H
diff --git a/dali/devel-api/object/csharp-type-info.h b/dali/devel-api/object/csharp-type-info.h
index 49472f1..ecffb2a 100644
--- a/dali/devel-api/object/csharp-type-info.h
+++ b/dali/devel-api/object/csharp-type-info.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_CSHARP_TYPE_INFO_H__
-#define __DALI_CSHARP_TYPE_INFO_H__
+#ifndef DALI_CSHARP_TYPE_INFO_H
+#define DALI_CSHARP_TYPE_INFO_H
 
 /*
- * Copyright (c) 2016 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.
@@ -61,4 +61,4 @@ namespace CSharpTypeInfo
 
 } // namespace Dali
 
-#endif // __DALI_CSHARP_INFO_H__
+#endif // DALI_CSHARP_TYPE_INFO_H
diff --git a/dali/devel-api/object/csharp-type-registry.h b/dali/devel-api/object/csharp-type-registry.h
index 7a6a360..0f28e32 100644
--- a/dali/devel-api/object/csharp-type-registry.h
+++ b/dali/devel-api/object/csharp-type-registry.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_CSHARP_TYPE_REGISTRY_H__
-#define __DALI_CSHARP_TYPE_REGISTRY_H__
+#ifndef DALI_CSHARP_TYPE_REGISTRY_H
+#define DALI_CSHARP_TYPE_REGISTRY_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.
@@ -72,4 +72,4 @@ namespace CSharpTypeRegistry
 
 } // namespace Dali
 
-#endif // header
+#endif // DALI_CSHARP_TYPE_REGISTRY_H
diff --git a/dali/devel-api/object/property-helper-devel.h b/dali/devel-api/object/property-helper-devel.h
index e6cae52..f680306 100644
--- a/dali/devel-api/object/property-helper-devel.h
+++ b/dali/devel-api/object/property-helper-devel.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_PROPERTY_HELPER_DEVEL_H__
-#define __DALI_PROPERTY_HELPER_DEVEL_H__
+#ifndef DALI_PROPERTY_HELPER_DEVEL_H
+#define DALI_PROPERTY_HELPER_DEVEL_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.
@@ -122,4 +122,4 @@
 #define DALI_DEVEL_ANIMATABLE_PROPERTY_COMPONENT_REGISTRATION( objectNamespace, objectType, text, enumIndex, baseEnumIndex, componentIndex ) \
   DALI_ANIMATABLE_PROPERTY_COMPONENT_REGISTRATION_INTERNAL( __COUNTER__, typeRegistration, objectNamespace, DALI_TOKEN_PASTE( Devel, objectType ), text, enumIndex, baseEnumIndex, componentIndex )
 
-#endif // __DALI_PROPERTY_HELPER_DEVEL_H__
+#endif // DALI_PROPERTY_HELPER_DEVEL_H
diff --git a/dali/devel-api/signals/signal-delegate.h b/dali/devel-api/signals/signal-delegate.h
index f9941b8..8d57176 100644
--- a/dali/devel-api/signals/signal-delegate.h
+++ b/dali/devel-api/signals/signal-delegate.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_SIGNAL_DELEGATE_H__
-#define __DALI_SIGNAL_DELEGATE_H__
+#ifndef DALI_SIGNAL_DELEGATE_H
+#define DALI_SIGNAL_DELEGATE_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.
@@ -168,4 +168,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_SIGNAL_DELEGATE_H__
+#endif // DALI_SIGNAL_DELEGATE_H
diff --git a/dali/devel-api/threading/conditional-wait.h b/dali/devel-api/threading/conditional-wait.h
index 79de016..d1c1d76 100755
--- a/dali/devel-api/threading/conditional-wait.h
+++ b/dali/devel-api/threading/conditional-wait.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_CONDITIONAL_WAIT_H__
-#define __DALI_CONDITIONAL_WAIT_H__
+#ifndef DALI_CONDITIONAL_WAIT_H
+#define DALI_CONDITIONAL_WAIT_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.
@@ -137,4 +137,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_CONDITIONAL_WAIT_H__
+#endif // DALI_CONDITIONAL_WAIT_H
diff --git a/dali/devel-api/threading/mutex.h b/dali/devel-api/threading/mutex.h
index 2173edc..d07ef8e 100755
--- a/dali/devel-api/threading/mutex.h
+++ b/dali/devel-api/threading/mutex.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_MUTEX_H__
-#define __DALI_MUTEX_H__
+#ifndef DALI_MUTEX_H
+#define DALI_MUTEX_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.
@@ -89,4 +89,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_MUTEX_H__
+#endif // DALI_MUTEX_H
diff --git a/dali/devel-api/threading/thread.h b/dali/devel-api/threading/thread.h
index 176aa81..be66c95 100644
--- a/dali/devel-api/threading/thread.h
+++ b/dali/devel-api/threading/thread.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_THREAD_H__
-#define __DALI_THREAD_H__
+#ifndef DALI_THREAD_H
+#define DALI_THREAD_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.
@@ -83,4 +83,4 @@ private:
 
 }
 
-#endif /* __DALI_THREAD_H__ */
+#endif // DALI_THREAD_H
diff --git a/dali/integration-api/bitmap.h b/dali/integration-api/bitmap.h
index 3058689..b3c2f98 100644
--- a/dali/integration-api/bitmap.h
+++ b/dali/integration-api/bitmap.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTEGRATION_BITMAP_H__
-#define __DALI_INTEGRATION_BITMAP_H__
+#ifndef DALI_INTEGRATION_BITMAP_H
+#define DALI_INTEGRATION_BITMAP_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.
@@ -375,4 +375,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTEGRATION_BITMAP_H__
+#endif // DALI_INTEGRATION_BITMAP_H
diff --git a/dali/integration-api/context-notifier.h b/dali/integration-api/context-notifier.h
index 86cbc6d..905b503 100644
--- a/dali/integration-api/context-notifier.h
+++ b/dali/integration-api/context-notifier.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTEGRATION_CONTEXT_NOTIFIER_H__
-#define __DALI_INTEGRATION_CONTEXT_NOTIFIER_H__
+#ifndef DALI_INTEGRATION_CONTEXT_NOTIFIER_H
+#define DALI_INTEGRATION_CONTEXT_NOTIFIER_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.
@@ -60,4 +60,4 @@ protected:
 } // namespace Dali
 
 
-#endif // __DALI_INTEGRATION_CONTEXT_NOTIFICATION_H__
+#endif // DALI_INTEGRATION_CONTEXT_NOTIFIER_H
diff --git a/dali/integration-api/debug.h b/dali/integration-api/debug.h
index 717c859..807c0d0 100755
--- a/dali/integration-api/debug.h
+++ b/dali/integration-api/debug.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTEGRATION_DEBUG_H__
-#define __DALI_INTEGRATION_DEBUG_H__
+#ifndef DALI_INTEGRATION_DEBUG_H
+#define DALI_INTEGRATION_DEBUG_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.
@@ -465,4 +465,4 @@ void GetNanoseconds( uint64_t& timeInNanoseconds );
 } // Dali
 
 
-#endif // __DALI_INTEGRATION_DEBUG_H__
+#endif // DALI_INTEGRATION_DEBUG_H
diff --git a/dali/integration-api/events/event.h b/dali/integration-api/events/event.h
index b745a30..bf56300 100644
--- a/dali/integration-api/events/event.h
+++ b/dali/integration-api/events/event.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_INTEGRATION_EVENT_H__
-#define __DALI_INTEGRATION_EVENT_H__
+#ifndef DALI_INTEGRATION_EVENT_H
+#define DALI_INTEGRATION_EVENT_H
 
 /*
  * Copyright (c) 2019 Samsung Electronics Co., Ltd.
@@ -70,4 +70,4 @@ protected: // Constructors only to be used by derived structures.
 
 } // namespace Dali
 
-#endif // __DALI_INTEGRATION_EVENT_H__
+#endif // DALI_INTEGRATION_EVENT_H
diff --git a/dali/integration-api/events/key-event-integ.h b/dali/integration-api/events/key-event-integ.h
index 52055e4..4eadad7 100755
--- a/dali/integration-api/events/key-event-integ.h
+++ b/dali/integration-api/events/key-event-integ.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTEGRATION_KEY_EVENT_H__
-#define __DALI_INTEGRATION_KEY_EVENT_H__
+#ifndef DALI_INTEGRATION_KEY_EVENT_H
+#define DALI_INTEGRATION_KEY_EVENT_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.
@@ -153,4 +153,4 @@ struct DALI_CORE_API KeyEvent : public Event
 
 } // namespace Dali
 
-#endif // __DALI_INTEGRATION_KEY_EVENT_H__
+#endif // DALI_INTEGRATION_KEY_EVENT_H
diff --git a/dali/integration-api/events/point.h b/dali/integration-api/events/point.h
index 543e86e..29498d7 100755
--- a/dali/integration-api/events/point.h
+++ b/dali/integration-api/events/point.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTEGRATION_POINT_H__
-#define __DALI_INTEGRATION_POINT_H__
+#ifndef DALI_INTEGRATION_POINT_H
+#define DALI_INTEGRATION_POINT_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.
@@ -241,4 +241,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_TOUCH_POINT_H__
+#endif // DALI_INTEGRATION_POINT_H
diff --git a/dali/integration-api/events/wheel-event-integ.h b/dali/integration-api/events/wheel-event-integ.h
index 79b6fc0..cf23ffb 100644
--- a/dali/integration-api/events/wheel-event-integ.h
+++ b/dali/integration-api/events/wheel-event-integ.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTEGRATION_WHEEL_EVENT_H__
-#define __DALI_INTEGRATION_WHEEL_EVENT_H__
+#ifndef DALI_INTEGRATION_WHEEL_EVENT_H
+#define DALI_INTEGRATION_WHEEL_EVENT_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.
@@ -108,4 +108,4 @@ struct DALI_CORE_API WheelEvent : public Event
 
 } // namespace Dali
 
-#endif // __DALI_INTEGRATION_WHEEL_EVENT_H__
+#endif // DALI_INTEGRATION_WHEEL_EVENT_H
diff --git a/dali/integration-api/gesture-manager.h b/dali/integration-api/gesture-manager.h
index 3cf597a..8b261e1 100644
--- a/dali/integration-api/gesture-manager.h
+++ b/dali/integration-api/gesture-manager.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTEGRATION_GESTURE_MANAGER_H__
-#define __DALI_INTEGRATION_GESTURE_MANAGER_H__
+#ifndef DALI_INTEGRATION_GESTURE_MANAGER_H
+#define DALI_INTEGRATION_GESTURE_MANAGER_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.
@@ -70,4 +70,4 @@ protected:
 
 } // namespace Dali
 
-#endif // __DALI_INTEGRATION_GESTURE_MANAGER_H__
+#endif // DALI_INTEGRATION_GESTURE_MANAGER_H
diff --git a/dali/integration-api/gl-abstraction.h b/dali/integration-api/gl-abstraction.h
index 98df443..121efc2 100644
--- a/dali/integration-api/gl-abstraction.h
+++ b/dali/integration-api/gl-abstraction.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_INTEGRATION_GL_ABSTRACTION_H__
-#define __DALI_INTEGRATION_GL_ABSTRACTION_H__
+#ifndef DALI_INTEGRATION_GL_ABSTRACTION_H
+#define DALI_INTEGRATION_GL_ABSTRACTION_H
 
 /*
  * Copyright (c) 2019 Samsung Electronics Co., Ltd.
@@ -393,4 +393,4 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_INTEGRATION_GL_ABSTRACTION_H__
+#endif // DALI_INTEGRATION_GL_ABSTRACTION_H
diff --git a/dali/integration-api/gl-defines.h b/dali/integration-api/gl-defines.h
index 8a2f740..3d71156 100644
--- a/dali/integration-api/gl-defines.h
+++ b/dali/integration-api/gl-defines.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_GL_DEFINES_H__
-#define __DALI_INTERNAL_GL_DEFINES_H__
+#ifndef DALI_INTERNAL_GL_DEFINES_H
+#define DALI_INTERNAL_GL_DEFINES_H
 
 /*
- * Copyright (c) 2016 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.
@@ -864,4 +864,4 @@
 #define GL_SAMPLER_EXTERNAL_OES                                 0x8D66
 #endif
 
-#endif // __DALI_INTERNAL_GL_DEFINES_H__
+#endif // DALI_INTERNAL_GL_DEFINES_H
diff --git a/dali/integration-api/gl-sync-abstraction.h b/dali/integration-api/gl-sync-abstraction.h
index a06cf8b..e4edabf 100644
--- a/dali/integration-api/gl-sync-abstraction.h
+++ b/dali/integration-api/gl-sync-abstraction.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTEGRATION_GL_SYNC_ABSTRACTION_H__
-#define __DALI_INTEGRATION_GL_SYNC_ABSTRACTION_H__
+#ifndef DALI_INTEGRATION_GL_SYNC_ABSTRACTION_H
+#define DALI_INTEGRATION_GL_SYNC_ABSTRACTION_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.
@@ -77,4 +77,4 @@ public:
 } // namespace Integration
 } // namespace Dali
 
-#endif // __DALI_INTEGRATION_GL_SYNC_ABSTRACTION_H__
+#endif // DALI_INTEGRATION_GL_SYNC_ABSTRACTION_H
diff --git a/dali/integration-api/lockless-buffer.h b/dali/integration-api/lockless-buffer.h
index 163eac7..a266a04 100644
--- a/dali/integration-api/lockless-buffer.h
+++ b/dali/integration-api/lockless-buffer.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTEGRATION_LOCKLESS_BUFFER_H__
-#define __DALI_INTEGRATION_LOCKLESS_BUFFER_H__
+#ifndef DALI_INTEGRATION_LOCKLESS_BUFFER_H
+#define DALI_INTEGRATION_LOCKLESS_BUFFER_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.
@@ -111,4 +111,4 @@ private:
 
 } // Dali
 
-#endif // __DALI_INTEGRATION_LOCKLESS_H__
+#endif // DALI_INTEGRATION_LOCKLESS_BUFFER_H
diff --git a/dali/integration-api/profiling.h b/dali/integration-api/profiling.h
index aec615c..e7889f2 100644
--- a/dali/integration-api/profiling.h
+++ b/dali/integration-api/profiling.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTEGRATION_PROFILING_H__
-#define __DALI_INTEGRATION_PROFILING_H__
+#ifndef DALI_INTEGRATION_PROFILING_H
+#define DALI_INTEGRATION_PROFILING_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.
@@ -69,4 +69,4 @@ DALI_CORE_API extern const std::size_t SHADER_MEMORY_SIZE;     ///< Total size o
 
 } // namespace Dali
 
-#endif // __DALI_INTEGRATION_PROFILING_H__
+#endif // DALI_INTEGRATION_PROFILING_H
diff --git a/dali/integration-api/render-controller.h b/dali/integration-api/render-controller.h
index 3bdb112..076fd55 100644
--- a/dali/integration-api/render-controller.h
+++ b/dali/integration-api/render-controller.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTEGRATION_RENDER_CONTROLLER_H__
-#define __DALI_INTEGRATION_RENDER_CONTROLLER_H__
+#ifndef DALI_INTEGRATION_RENDER_CONTROLLER_H
+#define DALI_INTEGRATION_RENDER_CONTROLLER_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.
@@ -60,4 +60,4 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_INTEGRATION_RENDER_CONTROLLER_H__
+#endif // DALI_INTEGRATION_RENDER_CONTROLLER_H
diff --git a/dali/integration-api/render-task-list-integ.h b/dali/integration-api/render-task-list-integ.h
index 3df930a..3ef3c5d 100755
--- a/dali/integration-api/render-task-list-integ.h
+++ b/dali/integration-api/render-task-list-integ.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTEGRATION_RENDER_TASK_LIST_H__
-#define __DALI_INTEGRATION_RENDER_TASK_LIST_H__
+#ifndef DALI_INTEGRATION_RENDER_TASK_LIST_H
+#define DALI_INTEGRATION_RENDER_TASK_LIST_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.
@@ -61,4 +61,4 @@ namespace RenderTaskList
 
 } // namespace Dali
 
-#endif // __DALI_INTEGRATION_RENDER_TASK_LIST_H__
+#endif // DALI_INTEGRATION_RENDER_TASK_LIST_H
diff --git a/dali/integration-api/resource-policies.h b/dali/integration-api/resource-policies.h
index 95a72f2..65c936a 100644
--- a/dali/integration-api/resource-policies.h
+++ b/dali/integration-api/resource-policies.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTEGRATION_RESOURCE_POLICIES_H__
-#define __DALI_INTEGRATION_RESOURCE_POLICIES_H__
+#ifndef DALI_INTEGRATION_RESOURCE_POLICIES_H
+#define DALI_INTEGRATION_RESOURCE_POLICIES_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.
@@ -44,4 +44,4 @@ enum Discardable
 } // namespace ResourcePolicy
 } // namespace Dali
 
-#endif // __DALI_INTEGRATION_DISCARD_POLICY_H__
+#endif // DALI_INTEGRATION_RESOURCE_POLICIES_H
diff --git a/dali/integration-api/resource-types.h b/dali/integration-api/resource-types.h
index 2ca2293..0532451 100644
--- a/dali/integration-api/resource-types.h
+++ b/dali/integration-api/resource-types.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTEGRATION_RESOURCE_TYPES_H__
-#define __DALI_INTEGRATION_RESOURCE_TYPES_H__
+#ifndef DALI_INTEGRATION_RESOURCE_TYPES_H
+#define DALI_INTEGRATION_RESOURCE_TYPES_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.
@@ -86,4 +86,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTEGRATION_RESOURCE_TYPES_H__
+#endif // DALI_INTEGRATION_RESOURCE_TYPES_H
diff --git a/dali/internal/common/buffer-index.h b/dali/internal/common/buffer-index.h
index 2c6fca0..4901d44 100644
--- a/dali/internal/common/buffer-index.h
+++ b/dali/internal/common/buffer-index.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_BUFFER_INDEX_H__
-#define __DALI_INTERNAL_BUFFER_INDEX_H__
+#ifndef DALI_INTERNAL_BUFFER_INDEX_H
+#define DALI_INTERNAL_BUFFER_INDEX_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.
@@ -33,4 +33,4 @@ typedef uint32_t BufferIndex;
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_BUFFER_INDEX_H__
+#endif // DALI_INTERNAL_BUFFER_INDEX_H
diff --git a/dali/internal/common/fixed-size-memory-pool.h b/dali/internal/common/fixed-size-memory-pool.h
index a3317ed..30d70c1 100644
--- a/dali/internal/common/fixed-size-memory-pool.h
+++ b/dali/internal/common/fixed-size-memory-pool.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_FIXED_SIZE_MEMORY_POOL_H__
-#define __DALI_INTERNAL_FIXED_SIZE_MEMORY_POOL_H__
+#ifndef DALI_INTERNAL_FIXED_SIZE_MEMORY_POOL_H
+#define DALI_INTERNAL_FIXED_SIZE_MEMORY_POOL_H
 
 /*
- * Copyright (c) 2015 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.
@@ -120,4 +120,4 @@ private:
 
 } // namespace Dali
 
-#endif /* __DALI_INTERNAL_FIXED_SIZE_MEMORY_POOL_H__ */
+#endif // DALI_INTERNAL_FIXED_SIZE_MEMORY_POOL_H
diff --git a/dali/internal/common/image-attributes.h b/dali/internal/common/image-attributes.h
index 94a2343..34e05a9 100644
--- a/dali/internal/common/image-attributes.h
+++ b/dali/internal/common/image-attributes.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_IMAGE_ATTRIBUTES_H__
-#define __DALI_INTERNAL_IMAGE_ATTRIBUTES_H__
+#ifndef DALI_INTERNAL_IMAGE_ATTRIBUTES_H
+#define DALI_INTERNAL_IMAGE_ATTRIBUTES_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.
@@ -300,4 +300,4 @@ bool operator!=(const ImageAttributes& a, const ImageAttributes& b);
 } // namespace Internal
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_IMAGE_ATTRIBUTES_H__
+#endif // DALI_INTERNAL_IMAGE_ATTRIBUTES_H
diff --git a/dali/internal/common/image-sampler.h b/dali/internal/common/image-sampler.h
index 836253e..299b07d 100644
--- a/dali/internal/common/image-sampler.h
+++ b/dali/internal/common/image-sampler.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_IMAGE_SAMPLER_H__
-#define __DALI_IMAGE_SAMPLER_H__
+#ifndef DALI_IMAGE_SAMPLER_H
+#define DALI_IMAGE_SAMPLER_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.
@@ -105,8 +105,4 @@ namespace ImageSampler
 
 } // namespace Dali
 
-
-#endif // __DALI_INTERNAL_IMAGE_SAMPLER_H__
-
-
-
+#endif // DALI_IMAGE_SAMPLER_H
diff --git a/dali/internal/common/internal-constants.h b/dali/internal/common/internal-constants.h
index b0b3a75..32b5d1c 100644
--- a/dali/internal/common/internal-constants.h
+++ b/dali/internal/common/internal-constants.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_CONSTANTS_H__
-#define __DALI_INTERNAL_CONSTANTS_H__
+#ifndef DALI_INTERNAL_CONSTANTS_H
+#define DALI_INTERNAL_CONSTANTS_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.
@@ -33,4 +33,4 @@ extern const float FULLY_TRANSPARENT; ///< Alpha values must rise above this, be
 } // namespace Dali
 
 
-#endif // __DALI_INTERNAL_CONSTANTS_H__
+#endif // DALI_INTERNAL_CONSTANTS_H
diff --git a/dali/internal/common/memory-pool-object-allocator.h b/dali/internal/common/memory-pool-object-allocator.h
index 93e1d18..0a9f70e 100644
--- a/dali/internal/common/memory-pool-object-allocator.h
+++ b/dali/internal/common/memory-pool-object-allocator.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_MEMORY_POOL_OBJECT_ALLOCATOR_H__
-#define __DALI_INTERNAL_MEMORY_POOL_OBJECT_ALLOCATOR_H__
+#ifndef DALI_INTERNAL_MEMORY_POOL_OBJECT_ALLOCATOR_H
+#define DALI_INTERNAL_MEMORY_POOL_OBJECT_ALLOCATOR_H
 
 /*
- * Copyright (c) 2016 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.
@@ -175,4 +175,4 @@ private:
 
 } // namespace Dali
 
-#endif /* __DALI_INTERNAL_MEMORY_POOL_OBJECT_ALLOCATOR_H__ */
+#endif // DALI_INTERNAL_MEMORY_POOL_OBJECT_ALLOCATOR_H
diff --git a/dali/internal/common/message-buffer.h b/dali/internal/common/message-buffer.h
index eabeb78..4285f5b 100644
--- a/dali/internal/common/message-buffer.h
+++ b/dali/internal/common/message-buffer.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_MESSAGE_BUFFER_H__
-#define __DALI_INTERNAL_MESSAGE_BUFFER_H__
+#ifndef DALI_INTERNAL_MESSAGE_BUFFER_H
+#define DALI_INTERNAL_MESSAGE_BUFFER_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.
@@ -150,4 +150,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_MESSAGE_BUFFER_H__
+#endif // DALI_INTERNAL_MESSAGE_BUFFER_H
diff --git a/dali/internal/common/message.h b/dali/internal/common/message.h
index 1aaa4c9..c6a294c 100644
--- a/dali/internal/common/message.h
+++ b/dali/internal/common/message.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_MESSAGE_H__
-#define __DALI_INTERNAL_MESSAGE_H__
+#ifndef DALI_INTERNAL_MESSAGE_H
+#define DALI_INTERNAL_MESSAGE_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.
@@ -833,4 +833,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_MESSAGE_H__
+#endif // DALI_INTERNAL_MESSAGE_H
diff --git a/dali/internal/common/owner-pointer.h b/dali/internal/common/owner-pointer.h
index 165747a..3d4c3e7 100644
--- a/dali/internal/common/owner-pointer.h
+++ b/dali/internal/common/owner-pointer.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_OWNER_POINTER_H__
-#define __DALI_INTERNAL_OWNER_POINTER_H__
+#ifndef DALI_INTERNAL_OWNER_POINTER_H
+#define DALI_INTERNAL_OWNER_POINTER_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.
@@ -249,4 +249,4 @@ private:
 
 } // namespace Dali
 
-#endif //__DALI_INTERNAL_OWNER_POINTER_H__
+#endif // DALI_INTERNAL_OWNER_POINTER_H
diff --git a/dali/internal/common/shader-data.h b/dali/internal/common/shader-data.h
index 2b486e9..5002b3e 100644
--- a/dali/internal/common/shader-data.h
+++ b/dali/internal/common/shader-data.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SHADER_DATA_H__
-#define __DALI_INTERNAL_SHADER_DATA_H__
+#ifndef DALI_INTERNAL_SHADER_DATA_H
+#define DALI_INTERNAL_SHADER_DATA_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.
@@ -175,4 +175,4 @@ private: // Data
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SHADER_DATA_H__
+#endif // DALI_INTERNAL_SHADER_DATA_H
diff --git a/dali/internal/common/shader-saver.h b/dali/internal/common/shader-saver.h
index 580cab6..b1333b1 100644
--- a/dali/internal/common/shader-saver.h
+++ b/dali/internal/common/shader-saver.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SHADER_DISPATCHER_H__
-#define __DALI_INTERNAL_SHADER_DISPATCHER_H__
+#ifndef DALI_INTERNAL_SHADER_DISPATCHER_H
+#define DALI_INTERNAL_SHADER_DISPATCHER_H
 
 /*
- * Copyright (c) 2015 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.
@@ -57,4 +57,4 @@ protected:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SHADER_DISPATCHER_H__
+#endif // DALI_INTERNAL_SHADER_DISPATCHER_H
diff --git a/dali/internal/common/type-abstraction.h b/dali/internal/common/type-abstraction.h
index cdf00d5..874e2d8 100644
--- a/dali/internal/common/type-abstraction.h
+++ b/dali/internal/common/type-abstraction.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_TYPE_ABSTRACTION_H__
-#define __DALI_INTERNAL_TYPE_ABSTRACTION_H__
+#ifndef DALI_INTERNAL_TYPE_ABSTRACTION_H
+#define DALI_INTERNAL_TYPE_ABSTRACTION_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.
@@ -97,4 +97,4 @@ template <class U> struct ParameterType< const U& > {};
 
 } //namespace Dali
 
-#endif // __DALI_INTERNAL_TYPE_ABSTRACTION_H__
+#endif // DALI_INTERNAL_TYPE_ABSTRACTION_H
diff --git a/dali/internal/event/actors/actor-declarations.h b/dali/internal/event/actors/actor-declarations.h
index 00264b4..0a54b53 100644
--- a/dali/internal/event/actors/actor-declarations.h
+++ b/dali/internal/event/actors/actor-declarations.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ACTOR_DECLARATIONS_H__
-#define __DALI_INTERNAL_ACTOR_DECLARATIONS_H__
+#ifndef DALI_INTERNAL_ACTOR_DECLARATIONS_H
+#define DALI_INTERNAL_ACTOR_DECLARATIONS_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.
@@ -41,4 +41,4 @@ typedef IntrusivePtr<Layer>       LayerPtr;
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_ACTOR_DECLARATIONS_H__
+#endif // DALI_INTERNAL_ACTOR_DECLARATIONS_H
diff --git a/dali/internal/event/actors/custom-actor-internal.h b/dali/internal/event/actors/custom-actor-internal.h
index 34b1a1b..c3b57b3 100644
--- a/dali/internal/event/actors/custom-actor-internal.h
+++ b/dali/internal/event/actors/custom-actor-internal.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_CUSTOM_ACTOR_H__
-#define __DALI_INTERNAL_CUSTOM_ACTOR_H__
+#ifndef DALI_INTERNAL_CUSTOM_ACTOR_H
+#define DALI_INTERNAL_CUSTOM_ACTOR_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.
@@ -277,4 +277,4 @@ inline const Internal::CustomActor& GetImpl(const Dali::CustomActor& actor)
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_CUSTOM_ACTOR_H__
+#endif // DALI_INTERNAL_CUSTOM_ACTOR_H
diff --git a/dali/internal/event/actors/layer-list.h b/dali/internal/event/actors/layer-list.h
index 22a18b6..acdf46a 100644
--- a/dali/internal/event/actors/layer-list.h
+++ b/dali/internal/event/actors/layer-list.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_LAYER_LIST_H__
-#define __DALI_INTERNAL_LAYER_LIST_H__
+#ifndef DALI_INTERNAL_LAYER_LIST_H
+#define DALI_INTERNAL_LAYER_LIST_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.
@@ -171,4 +171,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_LAYER_LIST_H__
+#endif // DALI_INTERNAL_LAYER_LIST_H
diff --git a/dali/internal/event/animation/animation-impl.h b/dali/internal/event/animation/animation-impl.h
index c605ec2..124140c 100644
--- a/dali/internal/event/animation/animation-impl.h
+++ b/dali/internal/event/animation/animation-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ANIMATION_H__
-#define __DALI_INTERNAL_ANIMATION_H__
+#ifndef DALI_INTERNAL_ANIMATION_H
+#define DALI_INTERNAL_ANIMATION_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.
@@ -567,4 +567,4 @@ inline const Internal::Animation& GetImplementation(const Dali::Animation& anima
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_ANIMATION_H__
+#endif // DALI_INTERNAL_ANIMATION_H
diff --git a/dali/internal/event/animation/animation-playlist-declarations.h b/dali/internal/event/animation/animation-playlist-declarations.h
index a180d94..fac0f96 100644
--- a/dali/internal/event/animation/animation-playlist-declarations.h
+++ b/dali/internal/event/animation/animation-playlist-declarations.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ANIMATION_PLAYLIST_DECLARATIONS_H__
-#define __DALI_INTERNAL_ANIMATION_PLAYLIST_DECLARATIONS_H__
+#ifndef DALI_INTERNAL_ANIMATION_PLAYLIST_DECLARATIONS_H
+#define DALI_INTERNAL_ANIMATION_PLAYLIST_DECLARATIONS_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.
@@ -35,5 +35,5 @@ typedef OwnerPointer<AnimationPlaylist> AnimationPlaylistOwner;
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_ANIMATION_PLAYLIST_DECLARATIONS_H__
+#endif // DALI_INTERNAL_ANIMATION_PLAYLIST_DECLARATIONS_H
 
diff --git a/dali/internal/event/animation/animation-playlist.h b/dali/internal/event/animation/animation-playlist.h
index c27bdb0..2fa0787 100644
--- a/dali/internal/event/animation/animation-playlist.h
+++ b/dali/internal/event/animation/animation-playlist.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ANIMATION_PLAYLIST_H__
-#define __DALI_INTERNAL_ANIMATION_PLAYLIST_H__
+#ifndef DALI_INTERNAL_ANIMATION_PLAYLIST_H
+#define DALI_INTERNAL_ANIMATION_PLAYLIST_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.
@@ -122,5 +122,5 @@ inline MessageBase* NotifyProgressReachedMessage( CompleteNotificationInterface&
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_NOTIFICATION_MANAGER_H__
+#endif // DALI_INTERNAL_ANIMATION_PLAYLIST_H
 
diff --git a/dali/internal/event/animation/animator-connector-base.h b/dali/internal/event/animation/animator-connector-base.h
index bcb383f..1bb2eab 100644
--- a/dali/internal/event/animation/animator-connector-base.h
+++ b/dali/internal/event/animation/animator-connector-base.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ANIMATOR_CONNECTOR_BASE_H__
-#define __DALI_INTERNAL_ANIMATOR_CONNECTOR_BASE_H__
+#ifndef DALI_INTERNAL_ANIMATOR_CONNECTOR_BASE_H
+#define DALI_INTERNAL_ANIMATOR_CONNECTOR_BASE_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.
@@ -224,4 +224,4 @@ protected:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_ANIMATOR_CONNECTOR_BASE_H__
+#endif // DALI_INTERNAL_ANIMATOR_CONNECTOR_BASE_H
diff --git a/dali/internal/event/animation/animator-connector.h b/dali/internal/event/animation/animator-connector.h
index df34741..846d45a 100644
--- a/dali/internal/event/animation/animator-connector.h
+++ b/dali/internal/event/animation/animator-connector.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ANIMATOR_CONNECTOR_H__
-#define __DALI_INTERNAL_ANIMATOR_CONNECTOR_H__
+#ifndef DALI_INTERNAL_ANIMATOR_CONNECTOR_H
+#define DALI_INTERNAL_ANIMATOR_CONNECTOR_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.
@@ -409,4 +409,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_ANIMATOR_CONNECTOR_H__
+#endif // DALI_INTERNAL_ANIMATOR_CONNECTOR_H
diff --git a/dali/internal/event/animation/constrainer.h b/dali/internal/event/animation/constrainer.h
index e7042b8..2d4e7c9 100644
--- a/dali/internal/event/animation/constrainer.h
+++ b/dali/internal/event/animation/constrainer.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_CONSTRAINER_H__
-#define __DALI_INTERNAL_CONSTRAINER_H__
+#ifndef DALI_INTERNAL_CONSTRAINER_H
+#define DALI_INTERNAL_CONSTRAINER_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.
@@ -104,4 +104,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_CONSTRAINER_H__
+#endif // DALI_INTERNAL_CONSTRAINER_H
diff --git a/dali/internal/event/animation/constraint-base.h b/dali/internal/event/animation/constraint-base.h
index 8b9caa9..b1b43c2 100644
--- a/dali/internal/event/animation/constraint-base.h
+++ b/dali/internal/event/animation/constraint-base.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ACTIVE_CONSTRAINT_BASE_H__
-#define __DALI_INTERNAL_ACTIVE_CONSTRAINT_BASE_H__
+#ifndef DALI_INTERNAL_ACTIVE_CONSTRAINT_BASE_H
+#define DALI_INTERNAL_ACTIVE_CONSTRAINT_BASE_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.
@@ -253,4 +253,4 @@ inline const Internal::ConstraintBase& GetImplementation(const Dali::Constraint&
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_ACTIVE_CONSTRAINT_BASE_H__
+#endif // DALI_INTERNAL_ACTIVE_CONSTRAINT_BASE_H
diff --git a/dali/internal/event/animation/constraint-impl.h b/dali/internal/event/animation/constraint-impl.h
index eb3327d..a7cf1e2 100644
--- a/dali/internal/event/animation/constraint-impl.h
+++ b/dali/internal/event/animation/constraint-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ACTIVE_CONSTRAINT_H__
-#define __DALI_INTERNAL_ACTIVE_CONSTRAINT_H__
+#ifndef DALI_INTERNAL_ACTIVE_CONSTRAINT_H
+#define DALI_INTERNAL_ACTIVE_CONSTRAINT_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.
@@ -434,4 +434,4 @@ protected:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_ACTIVE_CONSTRAINT_H__
+#endif // DALI_INTERNAL_ACTIVE_CONSTRAINT_H
diff --git a/dali/internal/event/animation/constraint-source-impl.h b/dali/internal/event/animation/constraint-source-impl.h
index 8e1d2c1..5b6f160 100644
--- a/dali/internal/event/animation/constraint-source-impl.h
+++ b/dali/internal/event/animation/constraint-source-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_CONSTRAINT_SOURCE_H__
-#define __DALI_INTERNAL_CONSTRAINT_SOURCE_H__
+#ifndef DALI_INTERNAL_CONSTRAINT_SOURCE_H
+#define DALI_INTERNAL_CONSTRAINT_SOURCE_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.
@@ -75,4 +75,4 @@ struct Source
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_CONSTRAINT_SOURCE_H__
+#endif // DALI_INTERNAL_CONSTRAINT_SOURCE_H
diff --git a/dali/internal/event/animation/key-frame-channel.h b/dali/internal/event/animation/key-frame-channel.h
index 548389c..8cc482c 100644
--- a/dali/internal/event/animation/key-frame-channel.h
+++ b/dali/internal/event/animation/key-frame-channel.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_KEY_FRAME_CHANNEL_H__
-#define __DALI_INTERNAL_KEY_FRAME_CHANNEL_H__
+#ifndef DALI_INTERNAL_KEY_FRAME_CHANNEL_H
+#define DALI_INTERNAL_KEY_FRAME_CHANNEL_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.
@@ -202,4 +202,4 @@ typedef KeyFrameChannel<AngleAxis>  KeyFrameChannelAngleAxis;
 } // Internal
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_KEY_FRAME_CHANNEL_H__
+#endif // DALI_INTERNAL_KEY_FRAME_CHANNEL_H
diff --git a/dali/internal/event/animation/key-frames-impl.h b/dali/internal/event/animation/key-frames-impl.h
index 051d419..d0b27cd 100644
--- a/dali/internal/event/animation/key-frames-impl.h
+++ b/dali/internal/event/animation/key-frames-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_KEY_FRAMES_H__
-#define __DALI_INTERNAL_KEY_FRAMES_H__
+#ifndef DALI_INTERNAL_KEY_FRAMES_H
+#define DALI_INTERNAL_KEY_FRAMES_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.
@@ -376,4 +376,4 @@ inline const Internal::KeyFrames& GetImplementation(const Dali::KeyFrames& keyFr
 
 } // Dali
 
-#endif //__DALI_INTERNAL_KEY_FRAMES_H__
+#endif // DALI_INTERNAL_KEY_FRAMES_H
diff --git a/dali/internal/event/animation/linear-constrainer-impl.h b/dali/internal/event/animation/linear-constrainer-impl.h
index 892ce4e..a5ffe29 100644
--- a/dali/internal/event/animation/linear-constrainer-impl.h
+++ b/dali/internal/event/animation/linear-constrainer-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_LINEAR_CONSTRAINER_H__
-#define __DALI_INTERNAL_LINEAR_CONSTRAINER_H__
+#ifndef DALI_INTERNAL_LINEAR_CONSTRAINER_H
+#define DALI_INTERNAL_LINEAR_CONSTRAINER_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.
@@ -219,4 +219,4 @@ inline const Internal::LinearConstrainer& GetImplementation(const Dali::LinearCo
 
 } // Dali
 
-#endif //__DALI_INTERNAL_PATH_CONSTRAINER_H__
+#endif // DALI_INTERNAL_PATH_CONSTRAINER_H
diff --git a/dali/internal/event/animation/path-constrainer-impl.h b/dali/internal/event/animation/path-constrainer-impl.h
index c1cd898..f663285 100644
--- a/dali/internal/event/animation/path-constrainer-impl.h
+++ b/dali/internal/event/animation/path-constrainer-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_PATH_CONSTRAINER_H__
-#define __DALI_INTERNAL_PATH_CONSTRAINER_H__
+#ifndef DALI_INTERNAL_PATH_CONSTRAINER_H
+#define DALI_INTERNAL_PATH_CONSTRAINER_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.
@@ -191,4 +191,4 @@ inline const Internal::PathConstrainer& GetImplementation(const Dali::PathConstr
 
 } // Dali
 
-#endif //__DALI_INTERNAL_PATH_CONSTRAINER_H__
+#endif // DALI_INTERNAL_PATH_CONSTRAINER_H
diff --git a/dali/internal/event/animation/path-impl.h b/dali/internal/event/animation/path-impl.h
index 62346c0..8b65e29 100644
--- a/dali/internal/event/animation/path-impl.h
+++ b/dali/internal/event/animation/path-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_PATH_H__
-#define __DALI_INTERNAL_PATH_H__
+#ifndef DALI_INTERNAL_PATH_H
+#define DALI_INTERNAL_PATH_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.
@@ -228,4 +228,4 @@ inline const Internal::Path& GetImplementation(const Dali::Path& path)
 
 } // Dali
 
-#endif //__DALI_INTERNAL_KEY_FRAMES_H__
+#endif // DALI_INTERNAL_PATH_H
diff --git a/dali/internal/event/animation/progress-value.h b/dali/internal/event/animation/progress-value.h
index b837131..0a7ca11 100644
--- a/dali/internal/event/animation/progress-value.h
+++ b/dali/internal/event/animation/progress-value.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_PROGRESS_VALUE_H__
-#define __DALI_INTERNAL_PROGRESS_VALUE_H__
+#ifndef DALI_INTERNAL_PROGRESS_VALUE_H
+#define DALI_INTERNAL_PROGRESS_VALUE_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.
@@ -179,4 +179,4 @@ inline void CubicInterpolate( AngleAxis& result, const AngleAxis& p0, const Angl
 
 } // namespace Dali
 
-#endif //__DALI_PROGRESS_VALUE_H__
+#endif // DALI_INTERNAL_PROGRESS_VALUE_H
diff --git a/dali/internal/event/animation/property-constraint-ptr.h b/dali/internal/event/animation/property-constraint-ptr.h
index 495607a..fa88173 100644
--- a/dali/internal/event/animation/property-constraint-ptr.h
+++ b/dali/internal/event/animation/property-constraint-ptr.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_PROPERTY_CONSTRAINT_PTR_H__
-#define __DALI_INTERNAL_PROPERTY_CONSTRAINT_PTR_H__
+#ifndef DALI_INTERNAL_PROPERTY_CONSTRAINT_PTR_H
+#define DALI_INTERNAL_PROPERTY_CONSTRAINT_PTR_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.
@@ -38,4 +38,4 @@ struct PropertyConstraintPtr
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_PROPERTY_CONSTRAINT_PTR_H__
+#endif // DALI_INTERNAL_PROPERTY_CONSTRAINT_PTR_H
diff --git a/dali/internal/event/animation/property-constraint.h b/dali/internal/event/animation/property-constraint.h
index f08c7d2..e31aa92 100644
--- a/dali/internal/event/animation/property-constraint.h
+++ b/dali/internal/event/animation/property-constraint.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_PROPERTY_CONSTRAINT_H__
-#define __DALI_PROPERTY_CONSTRAINT_H__
+#ifndef DALI_PROPERTY_CONSTRAINT_H
+#define DALI_PROPERTY_CONSTRAINT_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.
@@ -207,4 +207,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_PROPERTY_CONSTRAINT_H__
+#endif // DALI_PROPERTY_CONSTRAINT_H
diff --git a/dali/internal/event/animation/property-input-accessor.h b/dali/internal/event/animation/property-input-accessor.h
index 40893f7..6cc3d80 100644
--- a/dali/internal/event/animation/property-input-accessor.h
+++ b/dali/internal/event/animation/property-input-accessor.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_PROPERTY_INPUT_ACCESSOR_H__
-#define __DALI_PROPERTY_INPUT_ACCESSOR_H__
+#ifndef DALI_PROPERTY_INPUT_ACCESSOR_H
+#define DALI_PROPERTY_INPUT_ACCESSOR_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.
@@ -228,4 +228,4 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_PROPERTY_INPUT_ACCESSOR_H__
+#endif // DALI_PROPERTY_INPUT_ACCESSOR_H
diff --git a/dali/internal/event/animation/property-input-indexer.h b/dali/internal/event/animation/property-input-indexer.h
index e5626af..d1e24d0 100644
--- a/dali/internal/event/animation/property-input-indexer.h
+++ b/dali/internal/event/animation/property-input-indexer.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_PROPERTY_INPUT_INDEXER_H__
-#define __DALI_PROPERTY_INPUT_INDEXER_H__
+#ifndef DALI_PROPERTY_INPUT_INDEXER_H
+#define DALI_PROPERTY_INPUT_INDEXER_H
 
 /*
- * Copyright (c) 2016 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.
@@ -167,4 +167,4 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_PROPERTY_INPUT_INDEXER_H__
+#endif // DALI_PROPERTY_INPUT_INDEXER_H
diff --git a/dali/internal/event/common/complete-notification-interface.h b/dali/internal/event/common/complete-notification-interface.h
index ab33a5a..40ae686 100644
--- a/dali/internal/event/common/complete-notification-interface.h
+++ b/dali/internal/event/common/complete-notification-interface.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_COMPLETE_NOTIFICATION_INTERFACE_H__
-#define __DALI_INTERNAL_COMPLETE_NOTIFICATION_INTERFACE_H__
+#ifndef DALI_INTERNAL_COMPLETE_NOTIFICATION_INTERFACE_H
+#define DALI_INTERNAL_COMPLETE_NOTIFICATION_INTERFACE_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.
@@ -59,5 +59,5 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_COMPLETE_NOTIFICATION_INTERFACE_H__
+#endif // DALI_INTERNAL_COMPLETE_NOTIFICATION_INTERFACE_H
 
diff --git a/dali/internal/event/common/demangler.h b/dali/internal/event/common/demangler.h
index 9794099..3e63ac8 100644
--- a/dali/internal/event/common/demangler.h
+++ b/dali/internal/event/common/demangler.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_DEMANGLER_H__
-#define __DALI_DEMANGLER_H__
+#ifndef DALI_DEMANGLER_H
+#define DALI_DEMANGLER_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.
@@ -46,9 +46,8 @@ std::vector<std::string> DemangleNestedNames(const char *typeIdName);
  */
 const std::string DemangleClassName(const char *typeIdName);
 
-}
+} // namespace Internal
 
-}
+} // namespace Dali
 
-
-#endif // header
+#endif // DALI_DEMANGLER_H
diff --git a/dali/internal/event/common/event-thread-services.h b/dali/internal/event/common/event-thread-services.h
index b6db047..68e52e6 100644
--- a/dali/internal/event/common/event-thread-services.h
+++ b/dali/internal/event/common/event-thread-services.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_INTERNAL_EVENT_THREAD_SERVICES_H__
-#define __DALI_INTERNAL_EVENT_THREAD_SERVICES_H__
+#ifndef DALI_INTERNAL_EVENT_THREAD_SERVICES_H
+#define DALI_INTERNAL_EVENT_THREAD_SERVICES_H
 
 /*
  * Copyright (c) 2019 Samsung Electronics Co., Ltd.
@@ -128,4 +128,4 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_EVENT_THREAD_SERVICES_H__
+#endif // DALI_INTERNAL_EVENT_THREAD_SERVICES_H
diff --git a/dali/internal/event/common/notification-manager.h b/dali/internal/event/common/notification-manager.h
index a83efb5..00b310f 100644
--- a/dali/internal/event/common/notification-manager.h
+++ b/dali/internal/event/common/notification-manager.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_NOTIFICATION_MANAGER_H__
-#define __DALI_INTERNAL_NOTIFICATION_MANAGER_H__
+#ifndef DALI_INTERNAL_NOTIFICATION_MANAGER_H
+#define DALI_INTERNAL_NOTIFICATION_MANAGER_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.
@@ -98,5 +98,5 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_NOTIFICATION_MANAGER_H__
+#endif // DALI_INTERNAL_NOTIFICATION_MANAGER_H
 
diff --git a/dali/internal/event/common/object-impl.h b/dali/internal/event/common/object-impl.h
index ac62d37..95033e7 100644
--- a/dali/internal/event/common/object-impl.h
+++ b/dali/internal/event/common/object-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_OBJECT_H__
-#define __DALI_INTERNAL_OBJECT_H__
+#ifndef DALI_INTERNAL_OBJECT_H
+#define DALI_INTERNAL_OBJECT_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.
@@ -588,4 +588,4 @@ inline const Internal::Object& GetImplementation(const Dali::Handle& object)
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_OBJECT_H__
+#endif // DALI_INTERNAL_OBJECT_H
diff --git a/dali/internal/event/common/object-registry-impl.h b/dali/internal/event/common/object-registry-impl.h
index 13f225f..ff52b90 100644
--- a/dali/internal/event/common/object-registry-impl.h
+++ b/dali/internal/event/common/object-registry-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_OBJECT_REGISTRY_H__
-#define __DALI_INTERNAL_OBJECT_REGISTRY_H__
+#ifndef DALI_INTERNAL_OBJECT_REGISTRY_H
+#define DALI_INTERNAL_OBJECT_REGISTRY_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.
@@ -144,4 +144,4 @@ inline const Internal::ObjectRegistry& GetImplementation(const Dali::ObjectRegis
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_OBJECT_REGISTRY_H__
+#endif // DALI_INTERNAL_OBJECT_REGISTRY_H
diff --git a/dali/internal/event/common/projection.h b/dali/internal/event/common/projection.h
index 4d562db..cee4c0d 100644
--- a/dali/internal/event/common/projection.h
+++ b/dali/internal/event/common/projection.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_PROJECTION_H__
-#define __DALI_INTERNAL_PROJECTION_H__
+#ifndef DALI_INTERNAL_PROJECTION_H
+#define DALI_INTERNAL_PROJECTION_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.
@@ -59,5 +59,5 @@ bool ProjectFull( const Vector4& position,
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_PROJECTION_H__
+#endif // DALI_INTERNAL_PROJECTION_H
 
diff --git a/dali/internal/event/common/property-conditions-impl.h b/dali/internal/event/common/property-conditions-impl.h
index 2a40d61..6c25076 100644
--- a/dali/internal/event/common/property-conditions-impl.h
+++ b/dali/internal/event/common/property-conditions-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_PROPERTY_CONDITIONS_H__
-#define __DALI_INTERNAL_PROPERTY_CONDITIONS_H__
+#ifndef DALI_INTERNAL_PROPERTY_CONDITIONS_H
+#define DALI_INTERNAL_PROPERTY_CONDITIONS_H
 
 /*
- * Copyright (c) 2015 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.
@@ -103,4 +103,4 @@ inline const Internal::PropertyCondition& GetImplementation(const Dali::Property
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_PROPERTY_CONDITIONS_H__
+#endif // DALI_INTERNAL_PROPERTY_CONDITIONS_H
diff --git a/dali/internal/event/common/property-input-impl.h b/dali/internal/event/common/property-input-impl.h
index 8a700ca..ca46246 100644
--- a/dali/internal/event/common/property-input-impl.h
+++ b/dali/internal/event/common/property-input-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_PROPERTY_INPUT_IMPL_H__
-#define __DALI_INTERNAL_PROPERTY_INPUT_IMPL_H__
+#ifndef DALI_INTERNAL_PROPERTY_INPUT_IMPL_H
+#define DALI_INTERNAL_PROPERTY_INPUT_IMPL_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.
@@ -381,4 +381,4 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_PROPERTY_INPUT_IMPL_H__
+#endif // DALI_INTERNAL_PROPERTY_INPUT_IMPL_H
diff --git a/dali/internal/event/common/property-metadata.h b/dali/internal/event/common/property-metadata.h
index a058ed7..432122e 100644
--- a/dali/internal/event/common/property-metadata.h
+++ b/dali/internal/event/common/property-metadata.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_PROPERTY_METADATA_H__
-#define __DALI_INTERNAL_PROPERTY_METADATA_H__
+#ifndef DALI_INTERNAL_PROPERTY_METADATA_H
+#define DALI_INTERNAL_PROPERTY_METADATA_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.
@@ -318,4 +318,4 @@ public: // Data
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_PROPERTY_METADATA_H__
+#endif // DALI_INTERNAL_PROPERTY_METADATA_H
diff --git a/dali/internal/event/common/property-notification-impl.h b/dali/internal/event/common/property-notification-impl.h
index 03e2d58..6810b4f 100644
--- a/dali/internal/event/common/property-notification-impl.h
+++ b/dali/internal/event/common/property-notification-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_PROPERTY_NOTIFICATION_H__
-#define __DALI_INTERNAL_PROPERTY_NOTIFICATION_H__
+#ifndef DALI_INTERNAL_PROPERTY_NOTIFICATION_H
+#define DALI_INTERNAL_PROPERTY_NOTIFICATION_H
 
 /*
- * Copyright (c) 2015 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.
@@ -222,4 +222,4 @@ inline const Internal::PropertyNotification& GetImplementation(const Dali::Prope
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_PROPERTY_NOTIFICATION_H__
+#endif // DALI_INTERNAL_PROPERTY_NOTIFICATION_H
diff --git a/dali/internal/event/common/property-notification-manager.h b/dali/internal/event/common/property-notification-manager.h
index a5eef94..1a8b0a0 100644
--- a/dali/internal/event/common/property-notification-manager.h
+++ b/dali/internal/event/common/property-notification-manager.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_PROPERTY_NOTIFICATION_MANAGER_H__
-#define __DALI_INTERNAL_PROPERTY_NOTIFICATION_MANAGER_H__
+#ifndef DALI_INTERNAL_PROPERTY_NOTIFICATION_MANAGER_H
+#define DALI_INTERNAL_PROPERTY_NOTIFICATION_MANAGER_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.
@@ -91,5 +91,5 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_PROPERTY_NOTIFICATION_MANAGER_H__
+#endif // DALI_INTERNAL_PROPERTY_NOTIFICATION_MANAGER_H
 
diff --git a/dali/internal/event/common/property-notifier.h b/dali/internal/event/common/property-notifier.h
index 76859d9..6fd0ea5 100644
--- a/dali/internal/event/common/property-notifier.h
+++ b/dali/internal/event/common/property-notifier.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_PROPERTY_NOTIFIER_H__
-#define __DALI_INTERNAL_PROPERTY_NOTIFIER_H__
+#ifndef DALI_INTERNAL_PROPERTY_NOTIFIER_H
+#define DALI_INTERNAL_PROPERTY_NOTIFIER_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.
@@ -72,4 +72,4 @@ inline MessageBase* PropertyChangedMessage( PropertyNotifier& notifier, SceneGra
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_PROPERTY_NOTIFIER_H__
+#endif // DALI_INTERNAL_PROPERTY_NOTIFIER_H
diff --git a/dali/internal/event/common/stage-def.h b/dali/internal/event/common/stage-def.h
index 7df5cc1..923f2ca 100644
--- a/dali/internal/event/common/stage-def.h
+++ b/dali/internal/event/common/stage-def.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_STAGE_DEF_H__
-#define __DALI_INTERNAL_STAGE_DEF H__
+#ifndef DALI_INTERNAL_STAGE_DEF_H
+#define DALI_INTERNAL_STAGE_DEF_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.
@@ -35,4 +35,4 @@ typedef Stage* StagePtr;
 
 } // Dali
 
-#endif // __DALI_INTERNAL_STAGE_DEF H__
+#endif // DALI_INTERNAL_STAGE_DEF_H
diff --git a/dali/internal/event/common/thread-local-storage.h b/dali/internal/event/common/thread-local-storage.h
index 0e6e400..448a61f 100644
--- a/dali/internal/event/common/thread-local-storage.h
+++ b/dali/internal/event/common/thread-local-storage.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_INTERNAL_THREAD_LOCAL_STORAGE_H__
-#define __DALI_INTERNAL_THREAD_LOCAL_STORAGE_H__
+#ifndef DALI_INTERNAL_THREAD_LOCAL_STORAGE_H
+#define DALI_INTERNAL_THREAD_LOCAL_STORAGE_H
 
 /*
  * Copyright (c) 2019 Samsung Electronics Co., Ltd.
@@ -182,4 +182,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_THREAD_LOCAL_STORAGE_H__
+#endif // DALI_INTERNAL_THREAD_LOCAL_STORAGE_H
diff --git a/dali/internal/event/common/type-info-impl.h b/dali/internal/event/common/type-info-impl.h
index d704040..0e4e479 100644
--- a/dali/internal/event/common/type-info-impl.h
+++ b/dali/internal/event/common/type-info-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_TYPE_INFO_H__
-#define __DALI_INTERNAL_TYPE_INFO_H__
+#ifndef DALI_INTERNAL_TYPE_INFO_H
+#define DALI_INTERNAL_TYPE_INFO_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.
@@ -447,4 +447,4 @@ inline const Internal::TypeInfo& GetImplementation(const Dali::TypeInfo& typeInf
 
 } // namespace Dali
 
-#endif // header
+#endif // DALI_INTERNAL_TYPE_INFO_H
diff --git a/dali/internal/event/common/type-registry-impl.h b/dali/internal/event/common/type-registry-impl.h
index 1da2c19..be637a4 100644
--- a/dali/internal/event/common/type-registry-impl.h
+++ b/dali/internal/event/common/type-registry-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_TYPE_REGISTRY_H__
-#define __DALI_INTERNAL_TYPE_REGISTRY_H__
+#ifndef DALI_INTERNAL_TYPE_REGISTRY_H
+#define DALI_INTERNAL_TYPE_REGISTRY_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.
@@ -290,4 +290,4 @@ inline const Internal::TypeRegistry& GetImplementation(const Dali::TypeRegistry&
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_TYPE_REGISTRY_H__
+#endif // DALI_INTERNAL_TYPE_REGISTRY_H
diff --git a/dali/internal/event/effects/shader-factory.h b/dali/internal/event/effects/shader-factory.h
index ab3051f..9bd4011 100644
--- a/dali/internal/event/effects/shader-factory.h
+++ b/dali/internal/event/effects/shader-factory.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SHADER_FACTORY_H__
-#define __DALI_INTERNAL_SHADER_FACTORY_H__
+#ifndef DALI_INTERNAL_SHADER_FACTORY_H
+#define DALI_INTERNAL_SHADER_FACTORY_H
 
 /*
- * Copyright (c) 2016 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.
@@ -105,4 +105,4 @@ inline MessageBase* ShaderCompiledMessage( ShaderSaver& factory, Internal::Shade
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SHADER_FACTORY_H__
+#endif // DALI_INTERNAL_SHADER_FACTORY_H
diff --git a/dali/internal/event/events/actor-gesture-data.h b/dali/internal/event/events/actor-gesture-data.h
index 2742ef1..47eb9ed 100644
--- a/dali/internal/event/events/actor-gesture-data.h
+++ b/dali/internal/event/events/actor-gesture-data.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ACTOR_GESTURE_DATA_H__
-#define __DALI_INTERNAL_ACTOR_GESTURE_DATA_H__
+#ifndef DALI_INTERNAL_ACTOR_GESTURE_DATA_H
+#define DALI_INTERNAL_ACTOR_GESTURE_DATA_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.
@@ -100,5 +100,5 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_ACTOR_GESTURE_DATA_H__
+#endif // DALI_INTERNAL_ACTOR_GESTURE_DATA_H
 
diff --git a/dali/internal/event/events/actor-observer.h b/dali/internal/event/events/actor-observer.h
index bb9e5aa..9742b1f 100644
--- a/dali/internal/event/events/actor-observer.h
+++ b/dali/internal/event/events/actor-observer.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ACTOR_OBSERVER_H__
-#define __DALI_INTERNAL_ACTOR_OBSERVER_H__
+#ifndef DALI_INTERNAL_ACTOR_OBSERVER_H
+#define DALI_INTERNAL_ACTOR_OBSERVER_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.
@@ -124,5 +124,5 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_ACTOR_OBSERVER_H__
+#endif // DALI_INTERNAL_ACTOR_OBSERVER_H
 
diff --git a/dali/internal/event/events/hover-event-processor.h b/dali/internal/event/events/hover-event-processor.h
index d5d6cc1..7cae6ca 100644
--- a/dali/internal/event/events/hover-event-processor.h
+++ b/dali/internal/event/events/hover-event-processor.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_HOVER_EVENT_PROCESSOR_H__
-#define __DALI_INTERNAL_HOVER_EVENT_PROCESSOR_H__
+#ifndef DALI_INTERNAL_HOVER_EVENT_PROCESSOR_H
+#define DALI_INTERNAL_HOVER_EVENT_PROCESSOR_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.
@@ -88,4 +88,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_HOVER_EVENT_PROCESSOR_H__
+#endif // DALI_INTERNAL_HOVER_EVENT_PROCESSOR_H
diff --git a/dali/internal/event/events/key-event-impl.h b/dali/internal/event/events/key-event-impl.h
index 1f581dc..eed0cb9 100755
--- a/dali/internal/event/events/key-event-impl.h
+++ b/dali/internal/event/events/key-event-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_KEY_EVENT_H__
-#define __DALI_INTERNAL_KEY_EVENT_H__
+#ifndef DALI_INTERNAL_KEY_EVENT_H
+#define DALI_INTERNAL_KEY_EVENT_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.
@@ -145,4 +145,4 @@ const Internal::KeyEventImpl* GetImplementation( const KeyEvent* keyEvent );
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_KEY_EVENT_H__
+#endif // DALI_INTERNAL_KEY_EVENT_H
diff --git a/dali/internal/event/events/key-event-processor.h b/dali/internal/event/events/key-event-processor.h
index c6b732b..998b4d9 100644
--- a/dali/internal/event/events/key-event-processor.h
+++ b/dali/internal/event/events/key-event-processor.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_KEY_EVENT_PROCESSOR_H__
-#define __DALI_INTERNAL_KEY_EVENT_PROCESSOR_H__
+#ifndef DALI_INTERNAL_KEY_EVENT_PROCESSOR_H
+#define DALI_INTERNAL_KEY_EVENT_PROCESSOR_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.
@@ -79,4 +79,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_KEY_EVENT_PROCESSOR_H__
+#endif // DALI_INTERNAL_KEY_EVENT_PROCESSOR_H
diff --git a/dali/internal/event/events/long-press-gesture-detector-impl.h b/dali/internal/event/events/long-press-gesture-detector-impl.h
index fc72eb4..b049433 100644
--- a/dali/internal/event/events/long-press-gesture-detector-impl.h
+++ b/dali/internal/event/events/long-press-gesture-detector-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_LONG_PRESS_GESTURE_DETECTOR_H__
-#define __DALI_INTERNAL_LONG_PRESS_GESTURE_DETECTOR_H__
+#ifndef DALI_INTERNAL_LONG_PRESS_GESTURE_DETECTOR_IMPL_H
+#define DALI_INTERNAL_LONG_PRESS_GESTURE_DETECTOR_IMPL_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.
@@ -190,4 +190,4 @@ inline const Internal::LongPressGestureDetector& GetImplementation(const Dali::L
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_LONG_PRESS_GESTURE_DETECTOR_H__
+#endif // DALI_INTERNAL_LONG_PRESS_GESTURE_DETECTOR_IMPL_H
diff --git a/dali/internal/event/events/long-press-gesture-recognizer.h b/dali/internal/event/events/long-press-gesture-recognizer.h
index 18f19e3..89730ce 100644
--- a/dali/internal/event/events/long-press-gesture-recognizer.h
+++ b/dali/internal/event/events/long-press-gesture-recognizer.h
@@ -1,5 +1,5 @@
-#ifndef DALI_INTERNAL_LONG_PRESS_GESTURE_DETECTOR_H
-#define DALI_INTERNAL_LONG_PRESS_GESTURE_DETECTOR_H
+#ifndef DALI_INTERNAL_LONG_PRESS_GESTURE_RECOGNIZER_H
+#define DALI_INTERNAL_LONG_PRESS_GESTURE_RECOGNIZER_H
 
 /*
  * Copyright (c) 2019 Samsung Electronics Co., Ltd.
@@ -127,4 +127,4 @@ private:
 
 } // namespace Dali
 
-#endif // DALI_INTERNAL_LONG_PRESS_GESTURE_DETECTOR_H
+#endif // DALI_INTERNAL_LONG_PRESS_GESTURE_RECOGNIZER_H
diff --git a/dali/internal/event/events/multi-point-event-util.h b/dali/internal/event/events/multi-point-event-util.h
index 780c174..82e2003 100644
--- a/dali/internal/event/events/multi-point-event-util.h
+++ b/dali/internal/event/events/multi-point-event-util.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_MULTI_POINT_EVENT_UTIL_H__
-#define __DALI_INTERNAL_MULTI_POINT_EVENT_UTIL_H__
+#ifndef DALI_INTERNAL_MULTI_POINT_EVENT_UTIL_H
+#define DALI_INTERNAL_MULTI_POINT_EVENT_UTIL_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.
@@ -62,5 +62,5 @@ bool IsActuallySensitive( Actor* actor );
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_MULTI_POINT_EVENT_UTIL_H__
+#endif // DALI_INTERNAL_MULTI_POINT_EVENT_UTIL_H
 
diff --git a/dali/internal/event/events/pan-gesture-detector-impl.h b/dali/internal/event/events/pan-gesture-detector-impl.h
index 0adab6d..03aa7e2 100644
--- a/dali/internal/event/events/pan-gesture-detector-impl.h
+++ b/dali/internal/event/events/pan-gesture-detector-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_PAN_GESTURE_DETECTOR_H__
-#define __DALI_INTERNAL_PAN_GESTURE_DETECTOR_H__
+#ifndef DALI_INTERNAL_PAN_GESTURE_DETECTOR_H
+#define DALI_INTERNAL_PAN_GESTURE_DETECTOR_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.
@@ -267,4 +267,4 @@ inline const Internal::PanGestureDetector& GetImplementation(const Dali::PanGest
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_PAN_GESTURE_DETECTOR_H__
+#endif // DALI_INTERNAL_PAN_GESTURE_DETECTOR_H
diff --git a/dali/internal/event/events/pan-gesture-recognizer.h b/dali/internal/event/events/pan-gesture-recognizer.h
index 506ab88..3953a0b 100644
--- a/dali/internal/event/events/pan-gesture-recognizer.h
+++ b/dali/internal/event/events/pan-gesture-recognizer.h
@@ -1,5 +1,5 @@
-#ifndef DALI_INTERNAL_EVENT_PAN_GESTURE_DETECTOR_H
-#define DALI_INTERNAL_EVENT_PAN_GESTURE_DETECTOR_H
+#ifndef DALI_INTERNAL_EVENT_PAN_GESTURE_RECOGNIZER_H
+#define DALI_INTERNAL_EVENT_PAN_GESTURE_RECOGNIZER_H
 
 /*
  * Copyright (c) 2019 Samsung Electronics Co., Ltd.
@@ -123,4 +123,4 @@ private:
 
 } // namespace Dali
 
-#endif // DALI_INTERNAL_EVENT_PAN_GESTURE_DETECTOR_BASE_H
+#endif // DALI_INTERNAL_EVENT_PAN_GESTURE_RECOGNIZER_H
diff --git a/dali/internal/event/events/pinch-gesture-detector-impl.h b/dali/internal/event/events/pinch-gesture-detector-impl.h
index 0b7d50c..41113a3 100644
--- a/dali/internal/event/events/pinch-gesture-detector-impl.h
+++ b/dali/internal/event/events/pinch-gesture-detector-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_PINCH_GESTURE_DETECTOR_H__
-#define __DALI_INTERNAL_PINCH_GESTURE_DETECTOR_H__
+#ifndef DALI_INTERNAL_PINCH_GESTURE_DETECTOR_H
+#define DALI_INTERNAL_PINCH_GESTURE_DETECTOR_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.
@@ -143,4 +143,4 @@ inline const Internal::PinchGestureDetector& GetImplementation(const Dali::Pinch
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_PINCH_GESTURE_DETECTOR_H__
+#endif // DALI_INTERNAL_PINCH_GESTURE_DETECTOR_H
diff --git a/dali/internal/event/events/tap-gesture-detector-impl.h b/dali/internal/event/events/tap-gesture-detector-impl.h
index 9e26d20..5d368b2 100644
--- a/dali/internal/event/events/tap-gesture-detector-impl.h
+++ b/dali/internal/event/events/tap-gesture-detector-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_TAP_GESTURE_DETECTOR_H__
-#define __DALI_INTERNAL_TAP_GESTURE_DETECTOR_H__
+#ifndef DALI_INTERNAL_TAP_GESTURE_DETECTOR_H
+#define DALI_INTERNAL_TAP_GESTURE_DETECTOR_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.
@@ -192,4 +192,4 @@ inline const Internal::TapGestureDetector& GetImplementation(const Dali::TapGest
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_TAP_GESTURE_DETECTOR_H__
+#endif // DALI_INTERNAL_TAP_GESTURE_DETECTOR_H
diff --git a/dali/internal/event/events/touch-data-impl.h b/dali/internal/event/events/touch-data-impl.h
index 19e56a2..5135e83 100755
--- a/dali/internal/event/events/touch-data-impl.h
+++ b/dali/internal/event/events/touch-data-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_TOUCH_DATA_H__
-#define __DALI_INTERNAL_TOUCH_DATA_H__
+#ifndef DALI_INTERNAL_TOUCH_DATA_H
+#define DALI_INTERNAL_TOUCH_DATA_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.
@@ -218,4 +218,4 @@ inline const Internal::TouchData& GetImplementation( const Dali::TouchData& touc
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_TOUCH_DATA_H__
+#endif // DALI_INTERNAL_TOUCH_DATA_H
diff --git a/dali/internal/event/events/touch-event-processor.h b/dali/internal/event/events/touch-event-processor.h
index 245961a..61edcca 100644
--- a/dali/internal/event/events/touch-event-processor.h
+++ b/dali/internal/event/events/touch-event-processor.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_TOUCH_EVENT_PROCESSOR_H__
-#define __DALI_INTERNAL_TOUCH_EVENT_PROCESSOR_H__
+#ifndef DALI_INTERNAL_TOUCH_EVENT_PROCESSOR_H
+#define DALI_INTERNAL_TOUCH_EVENT_PROCESSOR_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.
@@ -99,4 +99,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_TOUCH_EVENT_PROCESSOR_H__
+#endif // DALI_INTERNAL_TOUCH_EVENT_PROCESSOR_H
diff --git a/dali/internal/event/events/wheel-event-processor.h b/dali/internal/event/events/wheel-event-processor.h
index 3e1bdc1..596bc7e 100644
--- a/dali/internal/event/events/wheel-event-processor.h
+++ b/dali/internal/event/events/wheel-event-processor.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_WHEEL_EVENT_PROCESSOR_H__
-#define __DALI_INTERNAL_WHEEL_EVENT_PROCESSOR_H__
+#ifndef DALI_INTERNAL_WHEEL_EVENT_PROCESSOR_H
+#define DALI_INTERNAL_WHEEL_EVENT_PROCESSOR_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.
@@ -78,4 +78,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_WHEEL_EVENT_PROCESSOR_H__
+#endif // DALI_INTERNAL_WHEEL_EVENT_PROCESSOR_H
diff --git a/dali/internal/event/images/bitmap-compressed.h b/dali/internal/event/images/bitmap-compressed.h
index 2ee839a..6a42b0f 100644
--- a/dali/internal/event/images/bitmap-compressed.h
+++ b/dali/internal/event/images/bitmap-compressed.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_COMPRESSED_BITMAP_H__
-#define __DALI_INTERNAL_COMPRESSED_BITMAP_H__
+#ifndef DALI_INTERNAL_COMPRESSED_BITMAP_H
+#define DALI_INTERNAL_COMPRESSED_BITMAP_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.
@@ -115,4 +115,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_COMPRESSED_BITMAP_H__
+#endif // DALI_INTERNAL_COMPRESSED_BITMAP_H
diff --git a/dali/internal/event/images/bitmap-packed-pixel.h b/dali/internal/event/images/bitmap-packed-pixel.h
index 85fb666..23f92b8 100644
--- a/dali/internal/event/images/bitmap-packed-pixel.h
+++ b/dali/internal/event/images/bitmap-packed-pixel.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_BITMAP_H__
-#define __DALI_INTERNAL_BITMAP_H__
+#ifndef DALI_INTERNAL_BITMAP_H
+#define DALI_INTERNAL_BITMAP_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.
@@ -185,4 +185,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_BITMAP_H__
+#endif // DALI_INTERNAL_BITMAP_H
diff --git a/dali/internal/event/images/buffer-image-impl.h b/dali/internal/event/images/buffer-image-impl.h
index 008c8a0..17bf270 100644
--- a/dali/internal/event/images/buffer-image-impl.h
+++ b/dali/internal/event/images/buffer-image-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_BUFFER_IMAGE_H__
-#define __DALI_INTERNAL_BUFFER_IMAGE_H__
+#ifndef DALI_INTERNAL_BUFFER_IMAGE_H
+#define DALI_INTERNAL_BUFFER_IMAGE_H
 
 /*
- * Copyright (c) 2015 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.
@@ -222,4 +222,4 @@ inline const Internal::BufferImage& GetImplementation(const Dali::BufferImage& i
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_BUFFER_IMAGE_H__
+#endif // DALI_INTERNAL_BUFFER_IMAGE_H
diff --git a/dali/internal/event/images/context-recovery-interface.h b/dali/internal/event/images/context-recovery-interface.h
index 4ba86bc..1779b89 100644
--- a/dali/internal/event/images/context-recovery-interface.h
+++ b/dali/internal/event/images/context-recovery-interface.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_CONTEXT_RECOVERY_INTERFACE_H__
-#define __DALI_INTERNAL_CONTEXT_RECOVERY_INTERFACE_H__
+#ifndef DALI_INTERNAL_CONTEXT_RECOVERY_INTERFACE_H
+#define DALI_INTERNAL_CONTEXT_RECOVERY_INTERFACE_H
 
 /*
- * Copyright (c) 2015 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.
@@ -68,4 +68,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_CONTEXT_RECOVERY_INTERFACE_H__
+#endif // DALI_INTERNAL_CONTEXT_RECOVERY_INTERFACE_H
diff --git a/dali/internal/event/images/encoded-buffer-image-impl.h b/dali/internal/event/images/encoded-buffer-image-impl.h
index 26fb1ae..b565f18 100644
--- a/dali/internal/event/images/encoded-buffer-image-impl.h
+++ b/dali/internal/event/images/encoded-buffer-image-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ENCODED_BUFFER_IMAGE_H__
-#define __DALI_INTERNAL_ENCODED_BUFFER_IMAGE_H__
+#ifndef DALI_INTERNAL_ENCODED_BUFFER_IMAGE_H
+#define DALI_INTERNAL_ENCODED_BUFFER_IMAGE_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.
@@ -97,4 +97,4 @@ inline const Internal::EncodedBufferImage& GetImplementation(const Dali::Encoded
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_ENCODED_BUFFER_IMAGE_H__
+#endif // DALI_INTERNAL_ENCODED_BUFFER_IMAGE_H
diff --git a/dali/internal/event/images/frame-buffer-image-impl.h b/dali/internal/event/images/frame-buffer-image-impl.h
index 7e69797..97e5ecb 100644
--- a/dali/internal/event/images/frame-buffer-image-impl.h
+++ b/dali/internal/event/images/frame-buffer-image-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_FRAME_BUFFER_IMAGE_H__
-#define __DALI_INTERNAL_FRAME_BUFFER_IMAGE_H__
+#ifndef DALI_INTERNAL_FRAME_BUFFER_IMAGE_H
+#define DALI_INTERNAL_FRAME_BUFFER_IMAGE_H
 
 /*
- * Copyright (c) 2015 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.
@@ -110,4 +110,4 @@ inline const Internal::FrameBufferImage& GetImplementation(const Dali::FrameBuff
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_FRAME_BUFFER_IMAGE_H__
+#endif // DALI_INTERNAL_FRAME_BUFFER_IMAGE_H
diff --git a/dali/internal/event/images/image-impl.h b/dali/internal/event/images/image-impl.h
index de6df50..88fdd0b 100644
--- a/dali/internal/event/images/image-impl.h
+++ b/dali/internal/event/images/image-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_IMAGE_H__
-#define __DALI_INTERNAL_IMAGE_H__
+#ifndef DALI_INTERNAL_IMAGE_H
+#define DALI_INTERNAL_IMAGE_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.
@@ -149,4 +149,4 @@ inline const Internal::Image& GetImplementation(const Dali::Image& image)
 }
 
 } // namespace Dali
-#endif // __DALI_INTERNAL_IMAGE_H__
+#endif // DALI_INTERNAL_IMAGE_H
diff --git a/dali/internal/event/images/native-image-impl.h b/dali/internal/event/images/native-image-impl.h
index 8c2c00b..3d70688 100644
--- a/dali/internal/event/images/native-image-impl.h
+++ b/dali/internal/event/images/native-image-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_NATIVE_IMAGE_H__
-#define __DALI_INTERNAL_NATIVE_IMAGE_H__
+#ifndef DALI_INTERNAL_NATIVE_IMAGE_H
+#define DALI_INTERNAL_NATIVE_IMAGE_H
 
 /*
- * Copyright (c) 2015 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.
@@ -102,4 +102,4 @@ inline const Internal::NativeImage& GetImplementation(const Dali::NativeImage& i
 }
 
 } // namespace Dali
-#endif // __DALI_INTERNAL_NATIVE_IMAGE_H__
+#endif // DALI_INTERNAL_NATIVE_IMAGE_H
diff --git a/dali/internal/event/images/nine-patch-image-impl.h b/dali/internal/event/images/nine-patch-image-impl.h
index 31b2f54..b7c1e65 100644
--- a/dali/internal/event/images/nine-patch-image-impl.h
+++ b/dali/internal/event/images/nine-patch-image-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_NINE_PATCH_IMAGE_H__
-#define __DALI_INTERNAL_NINE_PATCH_IMAGE_H__
+#ifndef DALI_INTERNAL_NINE_PATCH_IMAGE_H
+#define DALI_INTERNAL_NINE_PATCH_IMAGE_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.
@@ -160,4 +160,4 @@ inline const Internal::NinePatchImage& GetImplementation(const Dali::NinePatchIm
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_NINE_PATCH_IMAGE_H__
+#endif // DALI_INTERNAL_NINE_PATCH_IMAGE_H
diff --git a/dali/internal/event/images/resource-image-impl.h b/dali/internal/event/images/resource-image-impl.h
index ce1d227..00f3fbf 100644
--- a/dali/internal/event/images/resource-image-impl.h
+++ b/dali/internal/event/images/resource-image-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_RESOURCE_IMAGE_H__
-#define __DALI_INTERNAL_RESOURCE_IMAGE_H__
+#ifndef DALI_INTERNAL_RESOURCE_IMAGE_H
+#define DALI_INTERNAL_RESOURCE_IMAGE_H
 
 /*
- * Copyright (c) 2015 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.
@@ -158,4 +158,4 @@ inline const Internal::ResourceImage& GetImplementation(const Dali::ResourceImag
 }
 
 } // namespace Dali
-#endif // __DALI_INTERNAL_RESOURCE_IMAGE_H__
+#endif // DALI_INTERNAL_RESOURCE_IMAGE_H
diff --git a/dali/internal/event/render-tasks/render-task-defaults.h b/dali/internal/event/render-tasks/render-task-defaults.h
index 392f870..8163f92 100644
--- a/dali/internal/event/render-tasks/render-task-defaults.h
+++ b/dali/internal/event/render-tasks/render-task-defaults.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_RENDER_TASK_DEFAULTS_H__
-#define __DALI_INTERNAL_RENDER_TASK_DEFAULTS_H__
+#ifndef DALI_INTERNAL_RENDER_TASK_DEFAULTS_H
+#define DALI_INTERNAL_RENDER_TASK_DEFAULTS_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.
@@ -58,4 +58,4 @@ protected:
 
 } // namespace Dali
 
-#endif //__DALI_INTERNAL_RENDER_TASK_DEFAULTS_H__
+#endif // DALI_INTERNAL_RENDER_TASK_DEFAULTS_H
diff --git a/dali/internal/event/render-tasks/render-task-impl.h b/dali/internal/event/render-tasks/render-task-impl.h
index b32c451..04a817d 100644
--- a/dali/internal/event/render-tasks/render-task-impl.h
+++ b/dali/internal/event/render-tasks/render-task-impl.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_INTERNAL_RENDER_TASK_H__
-#define __DALI_INTERNAL_RENDER_TASK_H__
+#ifndef DALI_INTERNAL_RENDER_TASK_H
+#define DALI_INTERNAL_RENDER_TASK_H
 
 /*
  * Copyright (c) 2019 Samsung Electronics Co., Ltd.
@@ -404,4 +404,4 @@ inline const Internal::RenderTask& GetImplementation(const Dali::RenderTask& tas
 
 } // namespace Dali
 
-#endif //__DALI_INTERNAL_RENDER_TASK_H__
+#endif // DALI_INTERNAL_RENDER_TASK_H
diff --git a/dali/internal/event/render-tasks/render-task-list-impl.h b/dali/internal/event/render-tasks/render-task-list-impl.h
index 9f203d8..cef6a29 100644
--- a/dali/internal/event/render-tasks/render-task-list-impl.h
+++ b/dali/internal/event/render-tasks/render-task-list-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_RENDER_TASK_LIST_H__
-#define __DALI_INTERNAL_RENDER_TASK_LIST_H__
+#ifndef DALI_INTERNAL_RENDER_TASK_LIST_H
+#define DALI_INTERNAL_RENDER_TASK_LIST_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.
@@ -205,4 +205,4 @@ inline const Internal::RenderTaskList& GetImplementation(const Dali::RenderTaskL
 
 } // namespace Dali
 
-#endif //__DALI_INTERNAL_RENDER_TASK_LIST_H__
+#endif // DALI_INTERNAL_RENDER_TASK_LIST_H
diff --git a/dali/internal/event/size-negotiation/memory-pool-relayout-container.h b/dali/internal/event/size-negotiation/memory-pool-relayout-container.h
index 02eda8f..181351f 100644
--- a/dali/internal/event/size-negotiation/memory-pool-relayout-container.h
+++ b/dali/internal/event/size-negotiation/memory-pool-relayout-container.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_MEMORY_POOL_RELAYOUT_CONTAINER_H__
-#define __DALI_INTERNAL_MEMORY_POOL_RELAYOUT_CONTAINER_H__
+#ifndef DALI_INTERNAL_MEMORY_POOL_RELAYOUT_CONTAINER_H
+#define DALI_INTERNAL_MEMORY_POOL_RELAYOUT_CONTAINER_H
 
 /*
- * Copyright (c) 2015 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.
@@ -120,4 +120,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_MEMORY_POOL_RELAYOUT_CONTAINER_H__
+#endif // DALI_INTERNAL_MEMORY_POOL_RELAYOUT_CONTAINER_H
diff --git a/dali/internal/event/size-negotiation/relayout-controller-impl.h b/dali/internal/event/size-negotiation/relayout-controller-impl.h
index 5f7fb1f..be5cd5d 100644
--- a/dali/internal/event/size-negotiation/relayout-controller-impl.h
+++ b/dali/internal/event/size-negotiation/relayout-controller-impl.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_INTERNAL_RELAYOUT_CONTROLLER_IMPL_H__
-#define __DALI_INTERNAL_RELAYOUT_CONTROLLER_IMPL_H__
+#ifndef DALI_INTERNAL_RELAYOUT_CONTROLLER_IMPL_H
+#define DALI_INTERNAL_RELAYOUT_CONTROLLER_IMPL_H
 
 /*
  * Copyright (c) 2019 Samsung Electronics Co., Ltd.
@@ -223,4 +223,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_RELAYOUT_CONTROLLER_IMPL_H__
+#endif // DALI_INTERNAL_RELAYOUT_CONTROLLER_IMPL_H
diff --git a/dali/internal/render/common/performance-monitor.h b/dali/internal/render/common/performance-monitor.h
index cba8ec0..8f4b42d 100644
--- a/dali/internal/render/common/performance-monitor.h
+++ b/dali/internal/render/common/performance-monitor.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_PERFORMANCE_MONITOR_H__
-#define __DALI_INTERNAL_PERFORMANCE_MONITOR_H__
+#ifndef DALI_INTERNAL_PERFORMANCE_MONITOR_H
+#define DALI_INTERNAL_PERFORMANCE_MONITOR_H
 
 /*
- * Copyright (c) 2015 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.
@@ -70,4 +70,4 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_PERFORMANCE_MONITOR_H_
+#endif // DALI_INTERNAL_PERFORMANCE_MONITOR_H_
diff --git a/dali/internal/render/common/render-debug.h b/dali/internal/render/common/render-debug.h
index 5cb25be..6eae241 100644
--- a/dali/internal/render/common/render-debug.h
+++ b/dali/internal/render/common/render-debug.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_RENDER_DEBUG_H__
-#define __DALI_INTERNAL_RENDER_DEBUG_H__
+#ifndef DALI_INTERNAL_RENDER_DEBUG_H
+#define DALI_INTERNAL_RENDER_DEBUG_H
 
 /*
- * Copyright (c) 2015 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.
@@ -123,4 +123,4 @@ void DumpNode( const SceneGraph::Node* node, unsigned int indent = 0 );
 
 } // Dali
 
-#endif // __DALI_INTERNAL_RENDER_DEBUG_H__
+#endif // DALI_INTERNAL_RENDER_DEBUG_H
diff --git a/dali/internal/render/common/render-instruction-container.h b/dali/internal/render/common/render-instruction-container.h
index ec632ed..11e7451 100644
--- a/dali/internal/render/common/render-instruction-container.h
+++ b/dali/internal/render/common/render-instruction-container.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_RENDER_INSTRUCTION_CONTAINER_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_RENDER_INSTRUCTION_CONTAINER_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_RENDER_INSTRUCTION_CONTAINER_H
+#define DALI_INTERNAL_SCENE_GRAPH_RENDER_INSTRUCTION_CONTAINER_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.
@@ -96,4 +96,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_RENDER_INSTRUCTION_CONTAINER_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_RENDER_INSTRUCTION_CONTAINER_H
diff --git a/dali/internal/render/common/render-manager.h b/dali/internal/render/common/render-manager.h
index b2b41d9..e5082fb 100644
--- a/dali/internal/render/common/render-manager.h
+++ b/dali/internal/render/common/render-manager.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_RENDER_MANAGER_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_RENDER_MANAGER_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_RENDER_MANAGER_H
+#define DALI_INTERNAL_SCENE_GRAPH_RENDER_MANAGER_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.
@@ -362,4 +362,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_RENDER_MANAGER_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_RENDER_MANAGER_H
diff --git a/dali/internal/render/common/render-tracker-debug.h b/dali/internal/render/common/render-tracker-debug.h
index 78c3ef9..5fae91d 100755
--- a/dali/internal/render/common/render-tracker-debug.h
+++ b/dali/internal/render/common/render-tracker-debug.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_RENDER_TRACKER_DEBUG_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_RENDER_TRACKER_DEBUG_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_RENDER_TRACKER_DEBUG_H
+#define DALI_INTERNAL_SCENE_GRAPH_RENDER_TRACKER_DEBUG_H
 
 /*
- * Copyright (c) 2015 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.
@@ -47,4 +47,4 @@ Debug::Filter* gRenderTrackerLogFilter = Debug::Filter::New(Debug::NoLogging, fa
 
 } // Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_RENDER_TRACKER_DEBUG_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_RENDER_TRACKER_DEBUG_H
diff --git a/dali/internal/render/common/render-tracker.h b/dali/internal/render/common/render-tracker.h
index 307e101..9612e8a 100644
--- a/dali/internal/render/common/render-tracker.h
+++ b/dali/internal/render/common/render-tracker.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_RENDER_RENDER_TRACKER_H
-#define __DALI_INTERNAL_RENDER_RENDER_TRACKER_H
+#ifndef DALI_INTERNAL_RENDER_RENDER_TRACKER_H
+#define DALI_INTERNAL_RENDER_RENDER_TRACKER_H
 
 /*
- * Copyright (c) 2015 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.
@@ -88,4 +88,4 @@ private:
 } // Dali
 
 
-#endif // __DALI_INTERNAL_RENDER_RENDER_TRACKER_H
+#endif // DALI_INTERNAL_RENDER_RENDER_TRACKER_H
diff --git a/dali/internal/render/data-providers/node-data-provider.h b/dali/internal/render/data-providers/node-data-provider.h
index 3a4f27a..f792ad6 100644
--- a/dali/internal/render/data-providers/node-data-provider.h
+++ b/dali/internal/render/data-providers/node-data-provider.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_NODE_DATA_PROVIDER_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_NODE_DATA_PROVIDER_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_NODE_DATA_PROVIDER_H
+#define DALI_INTERNAL_SCENE_GRAPH_NODE_DATA_PROVIDER_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.
@@ -75,4 +75,4 @@ protected:
 } // Internal
 } // Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_NODE_DATA_PROVIDER_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_NODE_DATA_PROVIDER_H
diff --git a/dali/internal/render/data-providers/render-data-provider.h b/dali/internal/render/data-providers/render-data-provider.h
index aae4262..3d5573e 100755
--- a/dali/internal/render/data-providers/render-data-provider.h
+++ b/dali/internal/render/data-providers/render-data-provider.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_RENDER_DATA_PROVIDER_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_RENDER_DATA_PROVIDER_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_RENDER_DATA_PROVIDER_H
+#define DALI_INTERNAL_SCENE_GRAPH_RENDER_DATA_PROVIDER_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.
@@ -124,4 +124,4 @@ private:
 } // Internal
 } // Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_RENDER_DATA_PROVIDER_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_RENDER_DATA_PROVIDER_H
diff --git a/dali/internal/render/gl-resources/context.h b/dali/internal/render/gl-resources/context.h
index a9ad4a2..8757774 100644
--- a/dali/internal/render/gl-resources/context.h
+++ b/dali/internal/render/gl-resources/context.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_INTERNAL_CONTEXT_H__
-#define __DALI_INTERNAL_CONTEXT_H__
+#ifndef DALI_INTERNAL_CONTEXT_H
+#define DALI_INTERNAL_CONTEXT_H
 
 /*
  * Copyright (c) 2019 Samsung Electronics Co., Ltd.
@@ -1788,4 +1788,4 @@ private: // Data
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_CONTEXT_H__
+#endif // DALI_INTERNAL_CONTEXT_H
diff --git a/dali/internal/render/gl-resources/frame-buffer-state-cache.h b/dali/internal/render/gl-resources/frame-buffer-state-cache.h
index 2594aa9..fc04b08 100644
--- a/dali/internal/render/gl-resources/frame-buffer-state-cache.h
+++ b/dali/internal/render/gl-resources/frame-buffer-state-cache.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_CONTEXT_FRAME_BUFFER_STATE_CACHE_H__
-#define __DALI_INTERNAL_CONTEXT_FRAME_BUFFER_STATE_CACHE_H__
+#ifndef DALI_INTERNAL_CONTEXT_FRAME_BUFFER_STATE_CACHE_H
+#define DALI_INTERNAL_CONTEXT_FRAME_BUFFER_STATE_CACHE_H
 
 /*
- * Copyright (c) 2015 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.
@@ -162,4 +162,4 @@ private: // data
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_CONTEXT_FRAME_BUFFER_STATE_CACHE_H__
+#endif // DALI_INTERNAL_CONTEXT_FRAME_BUFFER_STATE_CACHE_H
diff --git a/dali/internal/render/gl-resources/gl-call-debug.h b/dali/internal/render/gl-resources/gl-call-debug.h
index dcd440e..4ac6f7a 100755
--- a/dali/internal/render/gl-resources/gl-call-debug.h
+++ b/dali/internal/render/gl-resources/gl-call-debug.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_GL_CALL_DEBUG_H__
-#define __DALI_INTERNAL_GL_CALL_DEBUG_H__
+#ifndef DALI_INTERNAL_GL_CALL_DEBUG_H
+#define DALI_INTERNAL_GL_CALL_DEBUG_H
 
 /*
- * Copyright (c) 2016 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.
@@ -59,5 +59,5 @@ extern Debug::Filter* gGlLogFilter;
 
 }
 
-#endif // __DALI_INTERNAL_GL_CALL_DEBUG_H__
+#endif // DALI_INTERNAL_GL_CALL_DEBUG_H
 
diff --git a/dali/internal/render/gl-resources/gl-resource-owner.h b/dali/internal/render/gl-resources/gl-resource-owner.h
index 59cef51..a0642ee 100644
--- a/dali/internal/render/gl-resources/gl-resource-owner.h
+++ b/dali/internal/render/gl-resources/gl-resource-owner.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_GL_RESOURCE_OWNER_H__
-#define __DALI_INTERNAL_GL_RESOURCE_OWNER_H__
+#ifndef DALI_INTERNAL_GL_RESOURCE_OWNER_H
+#define DALI_INTERNAL_GL_RESOURCE_OWNER_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.
@@ -60,4 +60,4 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_GL_RESOURCE_OWNER_H__
+#endif // DALI_INTERNAL_GL_RESOURCE_OWNER_H
diff --git a/dali/internal/render/gl-resources/gpu-buffer.h b/dali/internal/render/gl-resources/gpu-buffer.h
index 662a180..55aa244 100644
--- a/dali/internal/render/gl-resources/gpu-buffer.h
+++ b/dali/internal/render/gl-resources/gpu-buffer.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_GPU_BUFFER_H__
-#define __DALI_INTERNAL_GPU_BUFFER_H__
+#ifndef DALI_INTERNAL_GPU_BUFFER_H
+#define DALI_INTERNAL_GPU_BUFFER_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.
@@ -135,4 +135,4 @@ private: // Data
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_GPU_BUFFER_H__
+#endif // DALI_INTERNAL_GPU_BUFFER_H
diff --git a/dali/internal/render/gl-resources/texture-units.h b/dali/internal/render/gl-resources/texture-units.h
index 6b8a44b..c2b8d4e 100644
--- a/dali/internal/render/gl-resources/texture-units.h
+++ b/dali/internal/render/gl-resources/texture-units.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_TEXTURE_UNITS_H__
-#define __DALI_INTERNAL_TEXTURE_UNITS_H__
+#ifndef DALI_INTERNAL_TEXTURE_UNITS_H
+#define DALI_INTERNAL_TEXTURE_UNITS_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.
@@ -49,4 +49,4 @@ inline unsigned int TextureUnitAsGLenum( TextureUnit unit )
 
 }//Dali
 
-#endif // __DALI_INTERNAL_TEXTURE_UNITS_H__
+#endif // DALI_INTERNAL_TEXTURE_UNITS_H
diff --git a/dali/internal/render/queue/render-queue.h b/dali/internal/render/queue/render-queue.h
index 40fd234..381b25e 100644
--- a/dali/internal/render/queue/render-queue.h
+++ b/dali/internal/render/queue/render-queue.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_RENDER_QUEUE_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_RENDER_QUEUE_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_RENDER_QUEUE_H
+#define DALI_INTERNAL_SCENE_GRAPH_RENDER_QUEUE_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.
@@ -101,4 +101,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_RENDER_QUEUE_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_RENDER_QUEUE_H
diff --git a/dali/internal/render/shaders/program-cache.h b/dali/internal/render/shaders/program-cache.h
index 4a20377..6d91e34 100644
--- a/dali/internal/render/shaders/program-cache.h
+++ b/dali/internal/render/shaders/program-cache.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_PROGRAM_CACHE_H__
-#define __DALI_INTERNAL_PROGRAM_CACHE_H__
+#ifndef DALI_INTERNAL_PROGRAM_CACHE_H
+#define DALI_INTERNAL_PROGRAM_CACHE_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.
@@ -109,5 +109,5 @@ private: // not implemented as non-copyable
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_PROGRAM_CACHE_H__
+#endif // DALI_INTERNAL_PROGRAM_CACHE_H
 
diff --git a/dali/internal/render/shaders/program-controller.h b/dali/internal/render/shaders/program-controller.h
index 25c40ca..7701e30 100644
--- a/dali/internal/render/shaders/program-controller.h
+++ b/dali/internal/render/shaders/program-controller.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_PROGRAM_CONTROLLER_H__
-#define __DALI_INTERNAL_PROGRAM_CONTROLLER_H__
+#ifndef DALI_INTERNAL_PROGRAM_CONTROLLER_H
+#define DALI_INTERNAL_PROGRAM_CONTROLLER_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.
@@ -195,5 +195,5 @@ private: // Data
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_PROGRAM_CONTROLLER_H__
+#endif // DALI_INTERNAL_PROGRAM_CONTROLLER_H
 
diff --git a/dali/internal/render/shaders/program.h b/dali/internal/render/shaders/program.h
index ce0cb11..a03302d 100644
--- a/dali/internal/render/shaders/program.h
+++ b/dali/internal/render/shaders/program.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_PROGRAM_H__
-#define __DALI_INTERNAL_PROGRAM_H__
+#ifndef DALI_INTERNAL_PROGRAM_H
+#define DALI_INTERNAL_PROGRAM_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.
@@ -394,4 +394,4 @@ private:  // Data
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_PROGRAM_H__
+#endif // DALI_INTERNAL_PROGRAM_H
diff --git a/dali/internal/render/shaders/scene-graph-shader.h b/dali/internal/render/shaders/scene-graph-shader.h
index 5caeda6..d38e2fc 100644
--- a/dali/internal/render/shaders/scene-graph-shader.h
+++ b/dali/internal/render/shaders/scene-graph-shader.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_SHADER_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_SHADER_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_SHADER_H
+#define DALI_INTERNAL_SCENE_GRAPH_SHADER_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.
@@ -148,4 +148,4 @@ private: // Data
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_SHADER_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_SHADER_H
diff --git a/dali/internal/update/animation/property-accessor.h b/dali/internal/update/animation/property-accessor.h
index cf37c1f..e512628 100644
--- a/dali/internal/update/animation/property-accessor.h
+++ b/dali/internal/update/animation/property-accessor.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_ACCESSOR_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_ACCESSOR_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_PROPERTY_ACCESSOR_H
+#define DALI_INTERNAL_SCENE_GRAPH_PROPERTY_ACCESSOR_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.
@@ -311,4 +311,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_ACCESSOR_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_PROPERTY_ACCESSOR_H
diff --git a/dali/internal/update/animation/property-component-accessor.h b/dali/internal/update/animation/property-component-accessor.h
index 4faf682..180dda3 100644
--- a/dali/internal/update/animation/property-component-accessor.h
+++ b/dali/internal/update/animation/property-component-accessor.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_COMPONENT_ACCESSOR_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_COMPONENT_ACCESSOR_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_PROPERTY_COMPONENT_ACCESSOR_H
+#define DALI_INTERNAL_SCENE_GRAPH_PROPERTY_COMPONENT_ACCESSOR_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.
@@ -398,4 +398,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_COMPONENT_ACCESSOR_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_PROPERTY_COMPONENT_ACCESSOR_H
diff --git a/dali/internal/update/animation/scene-graph-animation.h b/dali/internal/update/animation/scene-graph-animation.h
index 426d694..a4e309f 100644
--- a/dali/internal/update/animation/scene-graph-animation.h
+++ b/dali/internal/update/animation/scene-graph-animation.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_ANIMATION_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_ANIMATION_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_ANIMATION_H
+#define DALI_INTERNAL_SCENE_GRAPH_ANIMATION_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.
@@ -523,4 +523,4 @@ inline void SetLoopingModeMessage( EventThreadServices& eventThreadServices, con
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_ANIMATION_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_ANIMATION_H
diff --git a/dali/internal/update/animation/scene-graph-animator.h b/dali/internal/update/animation/scene-graph-animator.h
index 13c4d07..06679a2 100644
--- a/dali/internal/update/animation/scene-graph-animator.h
+++ b/dali/internal/update/animation/scene-graph-animator.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_ANIMATOR_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_ANIMATOR_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_ANIMATOR_H
+#define DALI_INTERNAL_SCENE_GRAPH_ANIMATOR_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.
@@ -1213,4 +1213,4 @@ struct PathRotationFunctor : public AnimatorFunctionBase
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_ANIMATOR_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_ANIMATOR_H
diff --git a/dali/internal/update/animation/scene-graph-constraint-base.h b/dali/internal/update/animation/scene-graph-constraint-base.h
index 4f360e3..5911fbf 100644
--- a/dali/internal/update/animation/scene-graph-constraint-base.h
+++ b/dali/internal/update/animation/scene-graph-constraint-base.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_CONSTRAINT_BASE_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_CONSTRAINT_BASE_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_CONSTRAINT_BASE_H
+#define DALI_INTERNAL_SCENE_GRAPH_CONSTRAINT_BASE_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.
@@ -266,4 +266,4 @@ inline void  SetRemoveActionMessage( EventThreadServices& eventThreadServices, c
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_CONSTRAINT_BASE_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_CONSTRAINT_BASE_H
diff --git a/dali/internal/update/animation/scene-graph-constraint-declarations.h b/dali/internal/update/animation/scene-graph-constraint-declarations.h
index e453a2d..9c6bf41 100644
--- a/dali/internal/update/animation/scene-graph-constraint-declarations.h
+++ b/dali/internal/update/animation/scene-graph-constraint-declarations.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_CONSTRAINT_DECLARATIONS_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_CONSTRAINT_DECLARATIONS_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_CONSTRAINT_DECLARATIONS_H
+#define DALI_INTERNAL_SCENE_GRAPH_CONSTRAINT_DECLARATIONS_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.
@@ -42,4 +42,4 @@ typedef ConstraintOwnerContainer::Iterator ConstraintIter;
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_CONSTRAINT_DECLARATIONS_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_CONSTRAINT_DECLARATIONS_H
diff --git a/dali/internal/update/animation/scene-graph-constraint.h b/dali/internal/update/animation/scene-graph-constraint.h
index 349ab20..19149b3 100644
--- a/dali/internal/update/animation/scene-graph-constraint.h
+++ b/dali/internal/update/animation/scene-graph-constraint.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_CONSTRAINT_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_CONSTRAINT_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_CONSTRAINT_H
+#define DALI_INTERNAL_SCENE_GRAPH_CONSTRAINT_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.
@@ -151,4 +151,4 @@ protected:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_CONSTRAINT_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_CONSTRAINT_H
diff --git a/dali/internal/update/common/animatable-property.h b/dali/internal/update/common/animatable-property.h
index 94730ad..348d849 100644
--- a/dali/internal/update/common/animatable-property.h
+++ b/dali/internal/update/common/animatable-property.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_ANIMATABLE_PROPERTY_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_ANIMATABLE_PROPERTY_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_ANIMATABLE_PROPERTY_H
+#define DALI_INTERNAL_SCENE_GRAPH_ANIMATABLE_PROPERTY_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.
@@ -2229,4 +2229,4 @@ void SetWComponentMessage( EventThreadServices& eventThreadServices,
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_ANIMATABLE_PROPERTY_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_ANIMATABLE_PROPERTY_H
diff --git a/dali/internal/update/common/discard-queue.h b/dali/internal/update/common/discard-queue.h
index e71fe61..157b2d6 100644
--- a/dali/internal/update/common/discard-queue.h
+++ b/dali/internal/update/common/discard-queue.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_DISCARD_QUEUE_H__
-#define __DALI_INTERNAL_DISCARD_QUEUE_H__
+#ifndef DALI_INTERNAL_DISCARD_QUEUE_H
+#define DALI_INTERNAL_DISCARD_QUEUE_H
 
 /*
- * Copyright (c) 2016 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.
@@ -132,4 +132,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_RESOURCE_DISCARD_QUEUE_H__
+#endif // DALI_INTERNAL_DISCARD_QUEUE_H
diff --git a/dali/internal/update/common/double-buffered.h b/dali/internal/update/common/double-buffered.h
index 79c1642..b884938 100644
--- a/dali/internal/update/common/double-buffered.h
+++ b/dali/internal/update/common/double-buffered.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_DOUBLE_BUFFERED_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_DOUBLE_BUFFERED_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_DOUBLE_BUFFERED_H
+#define DALI_INTERNAL_SCENE_GRAPH_DOUBLE_BUFFERED_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.
@@ -226,4 +226,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_DOUBLE_BUFFERED_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_DOUBLE_BUFFERED_H
diff --git a/dali/internal/update/common/inherited-property.h b/dali/internal/update/common/inherited-property.h
index eaea49a..47aaa9c 100644
--- a/dali/internal/update/common/inherited-property.h
+++ b/dali/internal/update/common/inherited-property.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_INHERITED_PROPERTY_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_INHERITED_PROPERTY_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_INHERITED_PROPERTY_H
+#define DALI_INTERNAL_SCENE_GRAPH_INHERITED_PROPERTY_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.
@@ -683,4 +683,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_INHERITED_PROPERTY_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_INHERITED_PROPERTY_H
diff --git a/dali/internal/update/common/property-base.h b/dali/internal/update/common/property-base.h
index a66db11..568216b 100644
--- a/dali/internal/update/common/property-base.h
+++ b/dali/internal/update/common/property-base.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_BASE_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_BASE_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_PROPERTY_BASE_H
+#define DALI_INTERNAL_SCENE_GRAPH_PROPERTY_BASE_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.
@@ -88,4 +88,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_BASE_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_PROPERTY_BASE_H
diff --git a/dali/internal/update/common/property-condition-functions.h b/dali/internal/update/common/property-condition-functions.h
index a45685f..152d55c 100644
--- a/dali/internal/update/common/property-condition-functions.h
+++ b/dali/internal/update/common/property-condition-functions.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_CONDITION_FUNCTIONS_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_CONDITION_FUNCTIONS_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_PROPERTY_CONDITION_FUNCTIONS_H
+#define DALI_INTERNAL_SCENE_GRAPH_PROPERTY_CONDITION_FUNCTIONS_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.
@@ -380,4 +380,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_CONDITION_FUNCTIONS_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_PROPERTY_CONDITION_FUNCTIONS_H
diff --git a/dali/internal/update/common/property-condition-step-functions.h b/dali/internal/update/common/property-condition-step-functions.h
index 00a9ee2..c500b8e 100644
--- a/dali/internal/update/common/property-condition-step-functions.h
+++ b/dali/internal/update/common/property-condition-step-functions.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_CONDITION_STEP_FUNCTIONS_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_CONDITION_STEP_FUNCTIONS_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_PROPERTY_CONDITION_STEP_FUNCTIONS_H
+#define DALI_INTERNAL_SCENE_GRAPH_PROPERTY_CONDITION_STEP_FUNCTIONS_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.
@@ -115,4 +115,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_CONDITION_STEP_FUNCTIONS_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_PROPERTY_CONDITION_STEP_FUNCTIONS_H
diff --git a/dali/internal/update/common/property-condition-variable-step-functions.h b/dali/internal/update/common/property-condition-variable-step-functions.h
index 412f283..3b8e944 100644
--- a/dali/internal/update/common/property-condition-variable-step-functions.h
+++ b/dali/internal/update/common/property-condition-variable-step-functions.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_CONDITION_VARIABLE_STEP_FUNCTIONS_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_CONDITION_VARIABLE_STEP_FUNCTIONS_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_PROPERTY_CONDITION_VARIABLE_STEP_FUNCTIONS_H
+#define DALI_INTERNAL_SCENE_GRAPH_PROPERTY_CONDITION_VARIABLE_STEP_FUNCTIONS_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.
@@ -120,4 +120,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_CONDITION_VARIABLE_STEP_FUNCTIONS_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_PROPERTY_CONDITION_VARIABLE_STEP_FUNCTIONS_H
diff --git a/dali/internal/update/common/property-owner-messages.h b/dali/internal/update/common/property-owner-messages.h
index c2dafca..1e31299 100644
--- a/dali/internal/update/common/property-owner-messages.h
+++ b/dali/internal/update/common/property-owner-messages.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_OWNER_MESSAGES_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_OWNER_MESSAGES_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_PROPERTY_OWNER_MESSAGES_H
+#define DALI_INTERNAL_SCENE_GRAPH_PROPERTY_OWNER_MESSAGES_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.
@@ -286,4 +286,4 @@ inline void RemoveUniformMapMessage( EventThreadServices& eventThreadServices, c
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_OWNER_MESSAGES_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_PROPERTY_OWNER_MESSAGES_H
diff --git a/dali/internal/update/common/property-owner.h b/dali/internal/update/common/property-owner.h
index e5ab8bf..843a19b 100644
--- a/dali/internal/update/common/property-owner.h
+++ b/dali/internal/update/common/property-owner.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_OWNER_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_OWNER_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_PROPERTY_OWNER_H
+#define DALI_INTERNAL_SCENE_GRAPH_PROPERTY_OWNER_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.
@@ -244,4 +244,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_OWNER_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_PROPERTY_OWNER_H
diff --git a/dali/internal/update/common/scene-graph-buffers.h b/dali/internal/update/common/scene-graph-buffers.h
index b9fb6e0..9d59e87 100644
--- a/dali/internal/update/common/scene-graph-buffers.h
+++ b/dali/internal/update/common/scene-graph-buffers.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_BUFFERS_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_BUFFERS_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_BUFFERS_H
+#define DALI_INTERNAL_SCENE_GRAPH_BUFFERS_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.
@@ -88,4 +88,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_BUFFERS_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_BUFFERS_H
diff --git a/dali/internal/update/common/scene-graph-property-notification.h b/dali/internal/update/common/scene-graph-property-notification.h
index 2a4bea6..5f124b9 100644
--- a/dali/internal/update/common/scene-graph-property-notification.h
+++ b/dali/internal/update/common/scene-graph-property-notification.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_NOTIFICATION_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_NOTIFICATION_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_PROPERTY_NOTIFICATION_H
+#define DALI_INTERNAL_SCENE_GRAPH_PROPERTY_NOTIFICATION_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.
@@ -159,4 +159,4 @@ protected:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_NOTIFICATION_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_PROPERTY_NOTIFICATION_H
diff --git a/dali/internal/update/controllers/render-message-dispatcher.h b/dali/internal/update/controllers/render-message-dispatcher.h
index 9fd218b..30e1866 100644
--- a/dali/internal/update/controllers/render-message-dispatcher.h
+++ b/dali/internal/update/controllers/render-message-dispatcher.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_RENDER_MESSAGE_DISPATCHER_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_RENDER_MESSAGE_DISPATCHER_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_RENDER_MESSAGE_DISPATCHER_H
+#define DALI_INTERNAL_SCENE_GRAPH_RENDER_MESSAGE_DISPATCHER_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.
@@ -100,4 +100,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_RENDERER_DISPATCHER_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_RENDER_MESSAGE_DISPATCHER_H
diff --git a/dali/internal/update/controllers/scene-controller-impl.h b/dali/internal/update/controllers/scene-controller-impl.h
index acef137..724c549 100644
--- a/dali/internal/update/controllers/scene-controller-impl.h
+++ b/dali/internal/update/controllers/scene-controller-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_SCENE_CONTROLLER_IMPL_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_SCENE_CONTROLLER_IMPL_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_SCENE_CONTROLLER_IMPL_H
+#define DALI_INTERNAL_SCENE_GRAPH_SCENE_CONTROLLER_IMPL_H
 
 /*
- * Copyright (c) 2016 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.
@@ -91,4 +91,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_SCENE_CONTROLLER_IMPL_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_SCENE_CONTROLLER_IMPL_H
diff --git a/dali/internal/update/controllers/scene-controller.h b/dali/internal/update/controllers/scene-controller.h
index f810622..a30bb49 100644
--- a/dali/internal/update/controllers/scene-controller.h
+++ b/dali/internal/update/controllers/scene-controller.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_SCENE_CONTROLLER_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_SCENE_CONTROLLER_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_SCENE_CONTROLLER_H
+#define DALI_INTERNAL_SCENE_GRAPH_SCENE_CONTROLLER_H
 
 /*
- * Copyright (c) 2016 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.
@@ -85,4 +85,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_SCENE_CONTROLLER_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_SCENE_CONTROLLER_H
diff --git a/dali/internal/update/gestures/gesture-properties.h b/dali/internal/update/gestures/gesture-properties.h
index 4a277f2..4657685 100644
--- a/dali/internal/update/gestures/gesture-properties.h
+++ b/dali/internal/update/gestures/gesture-properties.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_GESTURE_PROPERTIES_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_GESTURE_PROPERTIES_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_GESTURE_PROPERTIES_H
+#define DALI_INTERNAL_SCENE_GRAPH_GESTURE_PROPERTIES_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.
@@ -193,4 +193,4 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_GESTURE_PROPERTIES_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_GESTURE_PROPERTIES_H
diff --git a/dali/internal/update/gestures/pan-gesture-profiling.h b/dali/internal/update/gestures/pan-gesture-profiling.h
index 0ab89b1..1b01aa2 100644
--- a/dali/internal/update/gestures/pan-gesture-profiling.h
+++ b/dali/internal/update/gestures/pan-gesture-profiling.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_PAN_GESTURE_PROFILING_H__
-#define __DALI_INTERNAL_PAN_GESTURE_PROFILING_H__
+#ifndef DALI_INTERNAL_PAN_GESTURE_PROFILING_H
+#define DALI_INTERNAL_PAN_GESTURE_PROFILING_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.
@@ -62,4 +62,4 @@ struct PanGestureProfiling
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_PAN_GESTURE_PROFILING_H__
+#endif // DALI_INTERNAL_PAN_GESTURE_PROFILING_H
diff --git a/dali/internal/update/gestures/scene-graph-pan-gesture.h b/dali/internal/update/gestures/scene-graph-pan-gesture.h
index d766a18..70ebdfb 100644
--- a/dali/internal/update/gestures/scene-graph-pan-gesture.h
+++ b/dali/internal/update/gestures/scene-graph-pan-gesture.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_PAN_GESTURE_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_PAN_GESTURE_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_PAN_GESTURE_H
+#define DALI_INTERNAL_SCENE_GRAPH_PAN_GESTURE_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.
@@ -594,4 +594,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_PAN_GESTURE_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_PAN_GESTURE_H
diff --git a/dali/internal/update/manager/sorted-layers.h b/dali/internal/update/manager/sorted-layers.h
index 3e51fd1..30cbe4c 100644
--- a/dali/internal/update/manager/sorted-layers.h
+++ b/dali/internal/update/manager/sorted-layers.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_SORTED_LAYERS_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_SORTED_LAYERS_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_SORTED_LAYERS_H
+#define DALI_INTERNAL_SCENE_GRAPH_SORTED_LAYERS_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.
@@ -46,4 +46,4 @@ typedef SortedLayerPointers::const_iterator SortedLayersConstIter;
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_SORTED_LAYERS_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_SORTED_LAYERS_H
diff --git a/dali/internal/update/manager/update-algorithms.h b/dali/internal/update/manager/update-algorithms.h
index 8bfa09a..fd5236f 100644
--- a/dali/internal/update/manager/update-algorithms.h
+++ b/dali/internal/update/manager/update-algorithms.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_UPDATE_ALGORITHMS_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_UPDATE_ALGORITHMS_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_UPDATE_ALGORITHMS_H
+#define DALI_INTERNAL_SCENE_GRAPH_UPDATE_ALGORITHMS_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.
@@ -60,5 +60,5 @@ NodePropertyFlags UpdateNodeTree( Layer& rootNode,
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_UPDATE_ALGORITHMS_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_UPDATE_ALGORITHMS_H
 
diff --git a/dali/internal/update/nodes/node-declarations.h b/dali/internal/update/nodes/node-declarations.h
index 0c288f8..a0a382f 100644
--- a/dali/internal/update/nodes/node-declarations.h
+++ b/dali/internal/update/nodes/node-declarations.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_NODE_DECLARATIONS_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_NODE_DECLARATIONS_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_NODE_DECLARATIONS_H
+#define DALI_INTERNAL_SCENE_GRAPH_NODE_DECLARATIONS_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.
@@ -62,4 +62,4 @@ template<> struct EnableBitMaskOperators< Internal::SceneGraph::NodePropertyFlag
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_NODE_DECLARATIONS_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_NODE_DECLARATIONS_H
diff --git a/dali/internal/update/nodes/node-messages.h b/dali/internal/update/nodes/node-messages.h
index df7e628..3fdb2e2 100644
--- a/dali/internal/update/nodes/node-messages.h
+++ b/dali/internal/update/nodes/node-messages.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_NODE_MESSAGES_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_NODE_MESSAGES_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_NODE_MESSAGES_H
+#define DALI_INTERNAL_SCENE_GRAPH_NODE_MESSAGES_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.
@@ -386,4 +386,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_NODE_MESSAGES_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_NODE_MESSAGES_H
diff --git a/dali/internal/update/queue/update-message-queue.h b/dali/internal/update/queue/update-message-queue.h
index 217e7b9..aad9b10 100644
--- a/dali/internal/update/queue/update-message-queue.h
+++ b/dali/internal/update/queue/update-message-queue.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_UPDATE_MESSAGE_QUEUE_H__
-#define __DALI_INTERNAL_UPDATE_MESSAGE_QUEUE_H__
+#ifndef DALI_INTERNAL_UPDATE_MESSAGE_QUEUE_H
+#define DALI_INTERNAL_UPDATE_MESSAGE_QUEUE_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.
@@ -130,4 +130,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_UPDATE_MESSAGE_QUEUE_H__
+#endif // DALI_INTERNAL_UPDATE_MESSAGE_QUEUE_H
diff --git a/dali/internal/update/render-tasks/scene-graph-render-task-debug.h b/dali/internal/update/render-tasks/scene-graph-render-task-debug.h
index 655fa26..bb2a63c 100755
--- a/dali/internal/update/render-tasks/scene-graph-render-task-debug.h
+++ b/dali/internal/update/render-tasks/scene-graph-render-task-debug.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_RENDER_TASK_DEBUG_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_RENDER_TASK_DEBUG_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_RENDER_TASK_DEBUG_H
+#define DALI_INTERNAL_SCENE_GRAPH_RENDER_TASK_DEBUG_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.
@@ -38,4 +38,4 @@ Debug::Filter* gRenderTaskLogFilter = Debug::Filter::New(Debug::NoLogging, false
 #define TASK_LOG_FMT(level, format, ...)
 #endif
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_RENDER_TASK_DEBUG_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_RENDER_TASK_DEBUG_H
diff --git a/dali/internal/update/render-tasks/scene-graph-render-task-list.h b/dali/internal/update/render-tasks/scene-graph-render-task-list.h
index bf96442..b005b67 100644
--- a/dali/internal/update/render-tasks/scene-graph-render-task-list.h
+++ b/dali/internal/update/render-tasks/scene-graph-render-task-list.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_RENDER_TASK_LIST_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_RENDER_TASK_LIST_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_RENDER_TASK_LIST_H
+#define DALI_INTERNAL_SCENE_GRAPH_RENDER_TASK_LIST_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.
@@ -167,4 +167,4 @@ inline void RemoveTaskMessage( EventThreadServices& eventThreadServices, const R
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_RENDER_TASK_LIST_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_RENDER_TASK_LIST_H
diff --git a/dali/public-api/actors/camera-actor.h b/dali/public-api/actors/camera-actor.h
index 36cfeef..731bf29 100644
--- a/dali/public-api/actors/camera-actor.h
+++ b/dali/public-api/actors/camera-actor.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_CAMERA_ACTOR_H__
-#define __DALI_CAMERA_ACTOR_H__
+#ifndef DALI_CAMERA_ACTOR_H
+#define DALI_CAMERA_ACTOR_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.
@@ -388,4 +388,4 @@ public: // Not intended for use by Application developers
  */
 } // namespace Dali
 
-#endif // __DALI_CAMERA_ACTOR_H__
+#endif // DALI_CAMERA_ACTOR_H
diff --git a/dali/public-api/actors/custom-actor-impl.h b/dali/public-api/actors/custom-actor-impl.h
index 6fc6240..73d6b2f 100644
--- a/dali/public-api/actors/custom-actor-impl.h
+++ b/dali/public-api/actors/custom-actor-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_CUSTOM_ACTOR_IMPL_H__
-#define __DALI_CUSTOM_ACTOR_IMPL_H__
+#ifndef DALI_CUSTOM_ACTOR_IMPL_H
+#define DALI_CUSTOM_ACTOR_IMPL_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.
@@ -463,4 +463,4 @@ private:
  */
 } // namespace Dali
 
-#endif // __DALI_CUSTOM_ACTOR_IMPL_H__
+#endif // DALI_CUSTOM_ACTOR_IMPL_H
diff --git a/dali/public-api/actors/custom-actor.h b/dali/public-api/actors/custom-actor.h
index ae31d67..5f31322 100644
--- a/dali/public-api/actors/custom-actor.h
+++ b/dali/public-api/actors/custom-actor.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_CUSTOM_ACTOR_H__
-#define __DALI_CUSTOM_ACTOR_H__
+#ifndef DALI_CUSTOM_ACTOR_H
+#define DALI_CUSTOM_ACTOR_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.
@@ -131,4 +131,4 @@ public: // Not intended for application developers
  */
 } // namespace Dali
 
-#endif // __DALI_CUSTOM_ACTOR_H__
+#endif // DALI_CUSTOM_ACTOR_H
diff --git a/dali/public-api/actors/draw-mode.h b/dali/public-api/actors/draw-mode.h
index 0759b0b..a9b9c56 100644
--- a/dali/public-api/actors/draw-mode.h
+++ b/dali/public-api/actors/draw-mode.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_DRAW_MODE_H__
-#define __DALI_DRAW_MODE_H__
+#ifndef DALI_DRAW_MODE_H
+#define DALI_DRAW_MODE_H
 
 /*
- * Copyright (c) 2015 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.
@@ -54,4 +54,4 @@ enum Type
  */
 } // namespace Dali
 
-#endif // __DALI_DRAW_MODE_H__
+#endif // DALI_DRAW_MODE_H
diff --git a/dali/public-api/actors/sampling.h b/dali/public-api/actors/sampling.h
index 8cdb78d..0a6dc5a 100755
--- a/dali/public-api/actors/sampling.h
+++ b/dali/public-api/actors/sampling.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_SAMPLING_H__
-#define __DALI_SAMPLING_H__
+#ifndef DALI_SAMPLING_H
+#define DALI_SAMPLING_H
 
 /*
- * Copyright (c) 2015 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.
@@ -126,4 +126,4 @@ enum Type
  */
 } // namespace Dali
 
-#endif // __DALI_SAMPLING_H__
+#endif // DALI_SAMPLING_H
diff --git a/dali/public-api/animation/alpha-function.h b/dali/public-api/animation/alpha-function.h
index 5f92d43..81133e1 100755
--- a/dali/public-api/animation/alpha-function.h
+++ b/dali/public-api/animation/alpha-function.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_ALPHA_FUNCTION_H__
-#define __DALI_ALPHA_FUNCTION_H__
+#ifndef DALI_ALPHA_FUNCTION_H
+#define DALI_ALPHA_FUNCTION_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.
@@ -170,4 +170,4 @@ private:
  */
 } // namespace Dali
 
-#endif // __DALI_ALPHA_FUNCTION_H__
+#endif // DALI_ALPHA_FUNCTION_H
diff --git a/dali/public-api/animation/constraint-source.h b/dali/public-api/animation/constraint-source.h
index bc20d06..b3b618f 100644
--- a/dali/public-api/animation/constraint-source.h
+++ b/dali/public-api/animation/constraint-source.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_CONSTRAINT_SOURCE_H__
-#define __DALI_CONSTRAINT_SOURCE_H__
+#ifndef DALI_CONSTRAINT_SOURCE_H
+#define DALI_CONSTRAINT_SOURCE_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.
@@ -139,4 +139,4 @@ struct DALI_CORE_API ConstraintSource
  */
 } // namespace Dali
 
-#endif // __DALI_CONSTRAINT_SOURCE_H__
+#endif // DALI_CONSTRAINT_SOURCE_H
diff --git a/dali/public-api/animation/constraint.h b/dali/public-api/animation/constraint.h
index c2722fb..046d991 100644
--- a/dali/public-api/animation/constraint.h
+++ b/dali/public-api/animation/constraint.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_CONSTRAINT_H__
-#define __DALI_CONSTRAINT_H__
+#ifndef DALI_CONSTRAINT_H
+#define DALI_CONSTRAINT_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.
@@ -545,4 +545,4 @@ private: // Not intended for use by Application developers
  */
 } // namespace Dali
 
-#endif // __DALI_CONSTRAINT_H__
+#endif // DALI_CONSTRAINT_H
diff --git a/dali/public-api/animation/constraints.h b/dali/public-api/animation/constraints.h
index 6ff2789..2adc24f 100644
--- a/dali/public-api/animation/constraints.h
+++ b/dali/public-api/animation/constraints.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_CONSTRAINTS_H__
-#define __DALI_CONSTRAINTS_H__
+#ifndef DALI_CONSTRAINTS_H
+#define DALI_CONSTRAINTS_H
 
 /*
- * Copyright (c) 2015 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.
@@ -251,4 +251,4 @@ inline void LookAt( Dali::Quaternion& current, const Dali::PropertyInputContaine
  */
 } // namespace Dali
 
-#endif // __DALI_CONSTRAINTS_H__
+#endif // DALI_CONSTRAINTS_H
diff --git a/dali/public-api/animation/key-frames.h b/dali/public-api/animation/key-frames.h
index 998def3..c38778a 100644
--- a/dali/public-api/animation/key-frames.h
+++ b/dali/public-api/animation/key-frames.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_KEY_FRAMES_H__
-#define __DALI_KEY_FRAMES_H__
+#ifndef DALI_KEY_FRAMES_H
+#define DALI_KEY_FRAMES_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.
@@ -149,4 +149,4 @@ public: // Not intended for application developers
  */
 } // namespace Dali
 
-#endif // __DALI_KEY_FRAMES_H__
+#endif // DALI_KEY_FRAMES_H
diff --git a/dali/public-api/animation/linear-constrainer.h b/dali/public-api/animation/linear-constrainer.h
index 4b08838..e236837 100644
--- a/dali/public-api/animation/linear-constrainer.h
+++ b/dali/public-api/animation/linear-constrainer.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_LINEAR_CONSTRAINER_H__
-#define __DALI_LINEAR_CONSTRAINER_H__
+#ifndef DALI_LINEAR_CONSTRAINER_H
+#define DALI_LINEAR_CONSTRAINER_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.
@@ -164,4 +164,4 @@ public: // Not intended for application developers
  */
 } // namespace Dali
 
-#endif // __DALI_LINEAR_CONSTRAINER_H__
+#endif // DALI_LINEAR_CONSTRAINER_H
diff --git a/dali/public-api/animation/path.h b/dali/public-api/animation/path.h
index 5557639..e3e28be 100644
--- a/dali/public-api/animation/path.h
+++ b/dali/public-api/animation/path.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_PATH_H__
-#define __DALI_PATH_H__
+#ifndef DALI_PATH_H
+#define DALI_PATH_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.
@@ -204,4 +204,4 @@ public: // Not intended for application developers
  */
 } // namespace Dali
 
-#endif // __DALI_KEY_FRAMES_H__
+#endif // DALI_PATH_H
diff --git a/dali/public-api/animation/time-period.h b/dali/public-api/animation/time-period.h
index 20b7785..d8ac294 100644
--- a/dali/public-api/animation/time-period.h
+++ b/dali/public-api/animation/time-period.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TIME_PERIOD_H__
-#define __DALI_TIME_PERIOD_H__
+#ifndef DALI_TIME_PERIOD_H
+#define DALI_TIME_PERIOD_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.
@@ -66,4 +66,4 @@ struct DALI_CORE_API TimePeriod
  */
 } // namespace Dali
 
-#endif // __DALI_TIME_PERIOD_H__
+#endif // DALI_TIME_PERIOD_H
diff --git a/dali/public-api/common/compile-time-assert.h b/dali/public-api/common/compile-time-assert.h
index d30c694..7fd4098 100644
--- a/dali/public-api/common/compile-time-assert.h
+++ b/dali/public-api/common/compile-time-assert.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_COMPILE_TIME_ASSERT_H__
-#define __DALI_COMPILE_TIME_ASSERT_H__
+#ifndef DALI_COMPILE_TIME_ASSERT_H
+#define DALI_COMPILE_TIME_ASSERT_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.
@@ -43,4 +43,4 @@ namespace Dali
  */
 } // namespace Dali
 
-#endif // __DALI_COMPILE_TIME_ASSERT_H__
+#endif // DALI_COMPILE_TIME_ASSERT_H
diff --git a/dali/public-api/common/constants.h b/dali/public-api/common/constants.h
index 8a2a94f..9750c43 100644
--- a/dali/public-api/common/constants.h
+++ b/dali/public-api/common/constants.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_CONSTANTS_H__
-#define __DALI_CONSTANTS_H__
+#ifndef DALI_CONSTANTS_H
+#define DALI_CONSTANTS_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.
@@ -137,4 +137,4 @@ static const float ONE80_OVER_PI = 180.0f/Dali::Math::PI; ///< Constant used to
  */
 } // namespace Dali
 
-#endif // __DALI_CONSTANTS_H__
+#endif // DALI_CONSTANTS_H
diff --git a/dali/public-api/common/dali-common.h b/dali/public-api/common/dali-common.h
index cc73979..32711ec 100755
--- a/dali/public-api/common/dali-common.h
+++ b/dali/public-api/common/dali-common.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_COMMON_H__
-#define __DALI_COMMON_H__
+#ifndef DALI_COMMON_H
+#define DALI_COMMON_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.
@@ -199,4 +199,4 @@ public:
 #define DALI_ASSERT_DEBUG(cond)
 #endif
 
-#endif // __DALI_COMMON_H__
+#endif // DALI_COMMON_H
diff --git a/dali/public-api/common/dali-vector.h b/dali/public-api/common/dali-vector.h
index 0efb790..6d8dcee 100755
--- a/dali/public-api/common/dali-vector.h
+++ b/dali/public-api/common/dali-vector.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_VECTOR_H__
-#define __DALI_VECTOR_H__
+#ifndef DALI_VECTOR_H
+#define DALI_VECTOR_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.
@@ -802,4 +802,4 @@ public: // API
  */
 } // namespace Dali
 
-#endif /* __DALI_VECTOR_H__ */
+#endif // DALI_VECTOR_H
diff --git a/dali/public-api/common/intrusive-ptr.h b/dali/public-api/common/intrusive-ptr.h
index f3628a6..02e5bad 100644
--- a/dali/public-api/common/intrusive-ptr.h
+++ b/dali/public-api/common/intrusive-ptr.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTRUSIVE_PTR_H__
-#define __DALI_INTRUSIVE_PTR_H__
+#ifndef DALI_INTRUSIVE_PTR_H
+#define DALI_INTRUSIVE_PTR_H
 
 /*
- * Copyright (c) 2015 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.
@@ -328,4 +328,4 @@ inline bool operator!=( T* lhs, IntrusivePtr<U>const& rhs )
  */
 } // namespace Dali
 
-#endif /* __DALI_INTRUSIVE_PTR_H__ */
+#endif // DALI_INTRUSIVE_PTR_H
diff --git a/dali/public-api/common/loading-state.h b/dali/public-api/common/loading-state.h
index 7f90f14..0ea3e07 100644
--- a/dali/public-api/common/loading-state.h
+++ b/dali/public-api/common/loading-state.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_LOADING_STATE_H__
-#define __DALI_LOADING_STATE_H__
+#ifndef DALI_LOADING_STATE_H
+#define DALI_LOADING_STATE_H
 
 /*
- * Copyright (c) 2015 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.
@@ -44,4 +44,4 @@ enum LoadingState
  */
 } // namespace Dali
 
-#endif // __DALI_LOADING_STATE_H__
+#endif // DALI_LOADING_STATE_H
diff --git a/dali/public-api/common/stage.h b/dali/public-api/common/stage.h
index ede3983..2925cc3 100644
--- a/dali/public-api/common/stage.h
+++ b/dali/public-api/common/stage.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_STAGE_H__
-#define __DALI_STAGE_H__
+#ifndef DALI_STAGE_H
+#define DALI_STAGE_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.
@@ -393,4 +393,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-#endif // __DALI_STAGE_H__
+#endif // DALI_STAGE_H
diff --git a/dali/public-api/common/type-traits.h b/dali/public-api/common/type-traits.h
index 5732eec..bafc98c 100644
--- a/dali/public-api/common/type-traits.h
+++ b/dali/public-api/common/type-traits.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TYPE_TRAITS_H__
-#define __DALI_TYPE_TRAITS_H__
+#ifndef DALI_TYPE_TRAITS_H
+#define DALI_TYPE_TRAITS_H
 
 /*
- * Copyright (c) 2015 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.
@@ -71,4 +71,4 @@ struct TypeTraits : public BasicTypes< Type >
  */
 } // namespace Dali
 
-#endif /* __DALI_TYPE_TRAITS_H__ */
+#endif // DALI_TYPE_TRAITS_H
diff --git a/dali/public-api/common/view-mode.h b/dali/public-api/common/view-mode.h
index 0057ac3..70f5239 100644
--- a/dali/public-api/common/view-mode.h
+++ b/dali/public-api/common/view-mode.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_VIEW_MODE_H__
-#define __DALI_VIEW_MODE_H__
+#ifndef DALI_VIEW_MODE_H
+#define DALI_VIEW_MODE_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.
@@ -41,4 +41,4 @@ enum ViewMode
  */
 } // namespace Dali
 
-#endif // __DALI_VIEW_MODE_H__
+#endif // DALI_VIEW_MODE_H
diff --git a/dali/public-api/dali-core-version.h b/dali/public-api/dali-core-version.h
index e8658bb..098d22a 100644
--- a/dali/public-api/dali-core-version.h
+++ b/dali/public-api/dali-core-version.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_CORE_VERSION_H__
-#define __DALI_CORE_VERSION_H__
+#ifndef DALI_CORE_VERSION_H
+#define DALI_CORE_VERSION_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.
@@ -32,4 +32,4 @@ DALI_CORE_API extern const uint32_t CORE_MICRO_VERSION; ///< The micro version n
 DALI_CORE_API extern const char * const CORE_BUILD_DATE;    ///< The date/time the Core library was built.
 } // namespace Dali
 
-#endif // __DALI_CORE_VERSION_H__
+#endif // DALI_CORE_VERSION_H
diff --git a/dali/public-api/dali-core.h b/dali/public-api/dali-core.h
index 66c5f80..4c9f6ad 100644
--- a/dali/public-api/dali-core.h
+++ b/dali/public-api/dali-core.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_CORE_H__
-#define __DALI_CORE_H__
+#ifndef DALI_CORE_H
+#define DALI_CORE_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.
@@ -135,4 +135,4 @@
 
 #include <dali/public-api/dali-core-version.h>
 
-#endif // __DALI_CORE_H__
+#endif // DALI_CORE_H
diff --git a/dali/public-api/events/gesture-detector.h b/dali/public-api/events/gesture-detector.h
index b866818..9d90bf2 100644
--- a/dali/public-api/events/gesture-detector.h
+++ b/dali/public-api/events/gesture-detector.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_GESTURE_DETECTOR_H__
-#define __DALI_GESTURE_DETECTOR_H__
+#ifndef DALI_GESTURE_DETECTOR_H
+#define DALI_GESTURE_DETECTOR_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.
@@ -167,4 +167,4 @@ protected:
  */
 } // namespace Dali
 
-#endif // __DALI_GESTURE_DETECTOR_H__
+#endif // DALI_GESTURE_DETECTOR_H
diff --git a/dali/public-api/events/gesture.h b/dali/public-api/events/gesture.h
index 2696f7b..0dcdc14 100644
--- a/dali/public-api/events/gesture.h
+++ b/dali/public-api/events/gesture.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_GESTURE_H__
-#define __DALI_GESTURE_H__
+#ifndef DALI_GESTURE_H
+#define DALI_GESTURE_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.
@@ -135,4 +135,4 @@ protected: // Creation
  */
 } // namespace Dali
 
-#endif // __DALI_GESTURE_H__
+#endif // DALI_GESTURE_H
diff --git a/dali/public-api/events/hover-event.h b/dali/public-api/events/hover-event.h
index e5c9f48..de77507 100644
--- a/dali/public-api/events/hover-event.h
+++ b/dali/public-api/events/hover-event.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_HOVER_EVENT_H__
-#define __DALI_HOVER_EVENT_H__
+#ifndef DALI_HOVER_EVENT_H
+#define DALI_HOVER_EVENT_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.
@@ -106,4 +106,4 @@ struct DALI_CORE_API HoverEvent
  */
 } // namespace Dali
 
-#endif // __DALI_HOVER_EVENT_H__
+#endif // DALI_HOVER_EVENT_H
diff --git a/dali/public-api/events/key-event.h b/dali/public-api/events/key-event.h
index 336e737..6cd17ad 100755
--- a/dali/public-api/events/key-event.h
+++ b/dali/public-api/events/key-event.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_KEY_EVENT_H__
-#define __DALI_KEY_EVENT_H__
+#ifndef DALI_KEY_EVENT_H
+#define DALI_KEY_EVENT_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.
@@ -207,4 +207,4 @@ struct DALI_CORE_API KeyEvent
  */
 } // namespace Dali
 
-#endif // __DALI_KEY_EVENT_H__
+#endif // DALI_KEY_EVENT_H
diff --git a/dali/public-api/events/long-press-gesture-detector.h b/dali/public-api/events/long-press-gesture-detector.h
index 3696df0..97049c9 100644
--- a/dali/public-api/events/long-press-gesture-detector.h
+++ b/dali/public-api/events/long-press-gesture-detector.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_LONG_PRESS_GESTURE_DETECTOR_H__
-#define __DALI_LONG_PRESS_GESTURE_DETECTOR_H__
+#ifndef DALI_LONG_PRESS_GESTURE_DETECTOR_H
+#define DALI_LONG_PRESS_GESTURE_DETECTOR_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.
@@ -229,4 +229,4 @@ public: // Not intended for Application developers
  */
 } // namespace Dali
 
-#endif // __DALI_LONG_PRESS_GESTURE_DETECTOR_H__
+#endif // DALI_LONG_PRESS_GESTURE_DETECTOR_H
diff --git a/dali/public-api/events/long-press-gesture.h b/dali/public-api/events/long-press-gesture.h
index d994ea5..893bcaf 100644
--- a/dali/public-api/events/long-press-gesture.h
+++ b/dali/public-api/events/long-press-gesture.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_LONG_PRESS_GESTURE_H__
-#define __DALI_LONG_PRESS_GESTURE_H__
+#ifndef DALI_LONG_PRESS_GESTURE_H
+#define DALI_LONG_PRESS_GESTURE_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.
@@ -102,4 +102,4 @@ struct DALI_CORE_API LongPressGesture : public Gesture
  */
 } // namespace Dali
 
-#endif // __DALI_LONG_PRESS_GESTURE_H__
+#endif // DALI_LONG_PRESS_GESTURE_H
diff --git a/dali/public-api/events/pan-gesture-detector.h b/dali/public-api/events/pan-gesture-detector.h
index 3f6449d..024e8ec 100644
--- a/dali/public-api/events/pan-gesture-detector.h
+++ b/dali/public-api/events/pan-gesture-detector.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_PAN_GESTURE_DETECTOR_H__
-#define __DALI_PAN_GESTURE_DETECTOR_H__
+#ifndef DALI_PAN_GESTURE_DETECTOR_H
+#define DALI_PAN_GESTURE_DETECTOR_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.
@@ -361,4 +361,4 @@ public: // Not intended for Application developers
 
 } // namespace Dali
 
-#endif // __DALI_PAN_GESTURE_DETECTOR_H__
+#endif // DALI_PAN_GESTURE_DETECTOR_H
diff --git a/dali/public-api/events/pan-gesture.h b/dali/public-api/events/pan-gesture.h
index 8c6dbfb..8c2432b 100644
--- a/dali/public-api/events/pan-gesture.h
+++ b/dali/public-api/events/pan-gesture.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_PAN_GESTURE_H__
-#define __DALI_PAN_GESTURE_H__
+#ifndef DALI_PAN_GESTURE_H
+#define DALI_PAN_GESTURE_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.
@@ -189,4 +189,4 @@ struct DALI_CORE_API PanGesture: public Gesture
  */
 } // namespace Dali
 
-#endif // __DALI_PAN_GESTURE_H__
+#endif // DALI_PAN_GESTURE_H
diff --git a/dali/public-api/events/pinch-gesture-detector.h b/dali/public-api/events/pinch-gesture-detector.h
index 0202d34..db06235 100644
--- a/dali/public-api/events/pinch-gesture-detector.h
+++ b/dali/public-api/events/pinch-gesture-detector.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_PINCH_GESTURE_DETECTOR_H__
-#define __DALI_PINCH_GESTURE_DETECTOR_H__
+#ifndef DALI_PINCH_GESTURE_DETECTOR_H
+#define DALI_PINCH_GESTURE_DETECTOR_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.
@@ -156,4 +156,4 @@ public: // Not intended for Application developers
  */
 } // namespace Dali
 
-#endif // __DALI_PINCH_GESTURE_DETECTOR_H__
+#endif // DALI_PINCH_GESTURE_DETECTOR_H
diff --git a/dali/public-api/events/pinch-gesture.h b/dali/public-api/events/pinch-gesture.h
index 384269c..9125b5e 100644
--- a/dali/public-api/events/pinch-gesture.h
+++ b/dali/public-api/events/pinch-gesture.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_PINCH_GESTURE_H__
-#define __DALI_PINCH_GESTURE_H__
+#ifndef DALI_PINCH_GESTURE_H
+#define DALI_PINCH_GESTURE_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.
@@ -108,4 +108,4 @@ struct DALI_CORE_API PinchGesture: public Gesture
  */
 } // namespace Dali
 
-#endif // __DALI_PINCH_GESTURE_H__
+#endif // DALI_PINCH_GESTURE_H
diff --git a/dali/public-api/events/point-state.h b/dali/public-api/events/point-state.h
index ee52d01..b970c5e 100644
--- a/dali/public-api/events/point-state.h
+++ b/dali/public-api/events/point-state.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_POINT_STATE_H__
-#define __DALI_POINT_STATE_H__
+#ifndef DALI_POINT_STATE_H
+#define DALI_POINT_STATE_H
 
 /*
- * Copyright (c) 2016 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.
@@ -56,4 +56,4 @@ enum Type
  */
 } // namespace Dali
 
-#endif // __DALI_POINT_H__
+#endif // DALI_POINT_H
diff --git a/dali/public-api/events/tap-gesture-detector.h b/dali/public-api/events/tap-gesture-detector.h
index 274b0ec..02406c2 100644
--- a/dali/public-api/events/tap-gesture-detector.h
+++ b/dali/public-api/events/tap-gesture-detector.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_TAP_GESTURE_DETECTOR_H__
-#define __DALI_TAP_GESTURE_DETECTOR_H__
+#ifndef DALI_TAP_GESTURE_DETECTOR_H
+#define DALI_TAP_GESTURE_DETECTOR_H
 
 /*
  * Copyright (c) 2019 Samsung Electronics Co., Ltd.
@@ -219,4 +219,4 @@ public: // Not intended for Application developers
 
 } // namespace Dali
 
-#endif // __DALI_TAP_GESTURE_DETECTOR_H__
+#endif // DALI_TAP_GESTURE_DETECTOR_H
diff --git a/dali/public-api/events/tap-gesture.h b/dali/public-api/events/tap-gesture.h
index 6fc6852..3584c26 100644
--- a/dali/public-api/events/tap-gesture.h
+++ b/dali/public-api/events/tap-gesture.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TAP_GESTURE_H__
-#define __DALI_TAP_GESTURE_H__
+#ifndef DALI_TAP_GESTURE_H
+#define DALI_TAP_GESTURE_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.
@@ -101,4 +101,4 @@ struct DALI_CORE_API TapGesture : public Gesture
  */
 } // namespace Dali
 
-#endif // __DALI_TAP_GESTURE_H__
+#endif // DALI_TAP_GESTURE_H
diff --git a/dali/public-api/events/touch-data.h b/dali/public-api/events/touch-data.h
index d395427..ada2252 100755
--- a/dali/public-api/events/touch-data.h
+++ b/dali/public-api/events/touch-data.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOUCH_DATA_H__
-#define __DALI_TOUCH_DATA_H__
+#ifndef DALI_TOUCH_DATA_H
+#define DALI_TOUCH_DATA_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.
@@ -271,4 +271,4 @@ public: // Not intended for application developers
  */
 } // namespace Dali
 
-#endif // __DALI_TOUCH_DATA_H__
+#endif // DALI_TOUCH_DATA_H
diff --git a/dali/public-api/events/touch-event.h b/dali/public-api/events/touch-event.h
index f4adbf8..83c03d1 100644
--- a/dali/public-api/events/touch-event.h
+++ b/dali/public-api/events/touch-event.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOUCH_EVENT_H__
-#define __DALI_TOUCH_EVENT_H__
+#ifndef DALI_TOUCH_EVENT_H
+#define DALI_TOUCH_EVENT_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.
@@ -112,4 +112,4 @@ struct DALI_CORE_API TouchEvent
  */
 } // namespace Dali
 
-#endif // __DALI_TOUCH_EVENT_H__
+#endif // DALI_TOUCH_EVENT_H
diff --git a/dali/public-api/events/touch-point.h b/dali/public-api/events/touch-point.h
index e6f099b..ce6f371 100644
--- a/dali/public-api/events/touch-point.h
+++ b/dali/public-api/events/touch-point.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOUCH_POINT_H__
-#define __DALI_TOUCH_POINT_H__
+#ifndef DALI_TOUCH_POINT_H
+#define DALI_TOUCH_POINT_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.
@@ -136,4 +136,4 @@ typedef TouchPointContainer::const_iterator TouchPointContainerConstIterator; //
  */
 } // namespace Dali
 
-#endif // __DALI_TOUCH_POINT_H__
+#endif // DALI_TOUCH_POINT_H
diff --git a/dali/public-api/events/wheel-event.h b/dali/public-api/events/wheel-event.h
index 541b33e..7e310ee 100644
--- a/dali/public-api/events/wheel-event.h
+++ b/dali/public-api/events/wheel-event.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_WHEEL_EVENT_H__
-#define __DALI_WHEEL_EVENT_H__
+#ifndef DALI_WHEEL_EVENT_H
+#define DALI_WHEEL_EVENT_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.
@@ -152,4 +152,4 @@ struct DALI_CORE_API WheelEvent
  */
 } // namespace Dali
 
-#endif // __DALI_WHEEL_EVENT_H__
+#endif // DALI_WHEEL_EVENT_H
diff --git a/dali/public-api/images/buffer-image.h b/dali/public-api/images/buffer-image.h
index a6d72ad..4c823de 100644
--- a/dali/public-api/images/buffer-image.h
+++ b/dali/public-api/images/buffer-image.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_BUFFER_IMAGE_H__
-#define __DALI_BUFFER_IMAGE_H__
+#ifndef DALI_BUFFER_IMAGE_H
+#define DALI_BUFFER_IMAGE_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.
@@ -277,4 +277,4 @@ public: // Not intended for application developers
  */
 } // namespace Dali
 
-#endif // __DALI_BUFFER_IMAGE_H__
+#endif // DALI_BUFFER_IMAGE_H
diff --git a/dali/public-api/images/encoded-buffer-image.h b/dali/public-api/images/encoded-buffer-image.h
index 49893c5..3e58260 100644
--- a/dali/public-api/images/encoded-buffer-image.h
+++ b/dali/public-api/images/encoded-buffer-image.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_ENCODED_BUFFER_IMAGE_H__
-#define __DALI_ENCODED_BUFFER_IMAGE_H__
+#ifndef DALI_ENCODED_BUFFER_IMAGE_H
+#define DALI_ENCODED_BUFFER_IMAGE_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.
@@ -173,4 +173,4 @@ public: // Not intended for application developers
  */
 } // namespace Dali
 
-#endif // __DALI_ENCODED_BUFFER_IMAGE_H__
+#endif // DALI_ENCODED_BUFFER_IMAGE_H
diff --git a/dali/public-api/images/frame-buffer-image.h b/dali/public-api/images/frame-buffer-image.h
index 6230932..de7bb80 100644
--- a/dali/public-api/images/frame-buffer-image.h
+++ b/dali/public-api/images/frame-buffer-image.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_FRAME_BUFFER_IMAGE_H__
-#define __DALI_FRAME_BUFFER_IMAGE_H__
+#ifndef DALI_FRAME_BUFFER_IMAGE_H
+#define DALI_FRAME_BUFFER_IMAGE_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.
@@ -162,4 +162,4 @@ public: // Not intended for application developers
  */
 } // namespace Dali
 
-#endif // __DALI_FRAME_BUFFER_IMAGE_H__
+#endif // DALI_FRAME_BUFFER_IMAGE_H
diff --git a/dali/public-api/images/image-operations.h b/dali/public-api/images/image-operations.h
index 765ef28..2253bdb 100644
--- a/dali/public-api/images/image-operations.h
+++ b/dali/public-api/images/image-operations.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_IMAGE_OPERATIONS_H__
-#define __DALI_IMAGE_OPERATIONS_H__
+#ifndef DALI_IMAGE_OPERATIONS_H
+#define DALI_IMAGE_OPERATIONS_H
 
 /*
- * Copyright (c) 2015 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.
@@ -128,4 +128,4 @@ namespace SamplingMode
  */
 } // namespace Dali
 
-#endif // __DALI_IMAGE_OPERATIONS_H__
+#endif // DALI_IMAGE_OPERATIONS_H
diff --git a/dali/public-api/images/image.h b/dali/public-api/images/image.h
index 7c649a2..f226a64 100644
--- a/dali/public-api/images/image.h
+++ b/dali/public-api/images/image.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_IMAGE_H__
-#define __DALI_IMAGE_H__
+#ifndef DALI_IMAGE_H
+#define DALI_IMAGE_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.
@@ -178,4 +178,4 @@ public: // Not intended for application developers
  */
 } // namespace Dali
 
-#endif // __DALI_IMAGE_H__
+#endif // DALI_IMAGE_H
diff --git a/dali/public-api/images/native-image-interface.h b/dali/public-api/images/native-image-interface.h
index a3b4531..ebffdff 100644
--- a/dali/public-api/images/native-image-interface.h
+++ b/dali/public-api/images/native-image-interface.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTEGRATION_NATIVE_IMAGE_INTERFACE_H__
-#define __DALI_INTEGRATION_NATIVE_IMAGE_INTERFACE_H__
+#ifndef DALI_INTEGRATION_NATIVE_IMAGE_INTERFACE_H
+#define DALI_INTEGRATION_NATIVE_IMAGE_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.
@@ -140,4 +140,4 @@ typedef Dali::IntrusivePtr<NativeImageInterface>  NativeImageInterfacePtr;
  */
 } // namespace Dali
 
-#endif // __DALI_INTEGRATION_NATIVE_IMAGE_INTERFACE_H__
+#endif // DALI_INTEGRATION_NATIVE_IMAGE_INTERFACE_H
diff --git a/dali/public-api/images/native-image.h b/dali/public-api/images/native-image.h
index 47dc0b7..21aa0a3 100644
--- a/dali/public-api/images/native-image.h
+++ b/dali/public-api/images/native-image.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_NATIVE_IMAGE_H__
-#define __DALI_NATIVE_IMAGE_H__
+#ifndef DALI_NATIVE_IMAGE_H
+#define DALI_NATIVE_IMAGE_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.
@@ -157,4 +157,4 @@ public: // Not intended for application developers
  */
 } // namespace Dali
 
-#endif // __DALI_NATIVE_IMAGE_H__
+#endif // DALI_NATIVE_IMAGE_H
diff --git a/dali/public-api/images/pixel.h b/dali/public-api/images/pixel.h
index f699af4..26134b8 100644
--- a/dali/public-api/images/pixel.h
+++ b/dali/public-api/images/pixel.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_PIXEL_H__
-#define __DALI_PIXEL_H__
+#ifndef DALI_PIXEL_H
+#define DALI_PIXEL_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.
@@ -172,4 +172,4 @@ DALI_CORE_API void GetAlphaOffsetAndMask(Format pixelFormat, int& byteOffset, in
  */
 } // namespace Dali
 
-#endif // __DALI_PIXEL_H__
+#endif // DALI_PIXEL_H
diff --git a/dali/public-api/images/resource-image.h b/dali/public-api/images/resource-image.h
index 5dcdd98..35feec2 100644
--- a/dali/public-api/images/resource-image.h
+++ b/dali/public-api/images/resource-image.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_RESOURCE_IMAGE_H__
-#define __DALI_RESOURCE_IMAGE_H__
+#ifndef DALI_RESOURCE_IMAGE_H
+#define DALI_RESOURCE_IMAGE_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.
@@ -246,4 +246,4 @@ public: // Not intended for application developers
  */
 } // namespace Dali
 
-#endif // __DALI_RESOURCE_IMAGE_H__
+#endif // DALI_RESOURCE_IMAGE_H
diff --git a/dali/public-api/math/angle-axis.h b/dali/public-api/math/angle-axis.h
index 177d70e..e376dc6 100644
--- a/dali/public-api/math/angle-axis.h
+++ b/dali/public-api/math/angle-axis.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_ANGLE_AXIS_H__
-#define __DALI_ANGLE_AXIS_H__
+#ifndef DALI_ANGLE_AXIS_H
+#define DALI_ANGLE_AXIS_H
 
 /*
- * Copyright (c) 2015 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.
@@ -103,4 +103,4 @@ inline std::ostream& operator<< (std::ostream& o, const Dali::AngleAxis& angleAx
  */
 } // namespace Dali
 
-#endif // __DALI_ANGLE_AXIS_H__
+#endif // DALI_ANGLE_AXIS_H
diff --git a/dali/public-api/math/compile-time-math.h b/dali/public-api/math/compile-time-math.h
index 6a84f8f..7aecd85 100644
--- a/dali/public-api/math/compile-time-math.h
+++ b/dali/public-api/math/compile-time-math.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_COMPILE_TIME_MATH_H__
-#define __DALI_COMPILE_TIME_MATH_H__
+#ifndef DALI_COMPILE_TIME_MATH_H
+#define DALI_COMPILE_TIME_MATH_H
 
 /*
- * Copyright (c) 2015 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.
@@ -172,4 +172,4 @@ struct Epsilon< 0 >
  */
 } // namespace Dali
 
-#endif // __DALI_COMPILE_TIME_MATH_H__
+#endif // DALI_COMPILE_TIME_MATH_H
diff --git a/dali/public-api/math/degree.h b/dali/public-api/math/degree.h
index a185159..1929a03 100644
--- a/dali/public-api/math/degree.h
+++ b/dali/public-api/math/degree.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_DEGREE_H__
-#define __DALI_DEGREE_H__
+#ifndef DALI_DEGREE_H
+#define DALI_DEGREE_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.
@@ -133,4 +133,4 @@ inline Degree Clamp( Degree angle, float min, float max )
  */
 } // namespace Dali
 
-#endif // __DALI_DEGREE_H__
+#endif // DALI_DEGREE_H
diff --git a/dali/public-api/math/math-utils.h b/dali/public-api/math/math-utils.h
index e9b92d9..d91c198 100644
--- a/dali/public-api/math/math-utils.h
+++ b/dali/public-api/math/math-utils.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_MATH_UTILS_H__
-#define __DALI_MATH_UTILS_H__
+#ifndef DALI_MATH_UTILS_H
+#define DALI_MATH_UTILS_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.
@@ -347,4 +347,4 @@ int32_t Sign( T value )
  */
 } // namespace Dali
 
-#endif // __DALI_MATH_UTILS_H__
+#endif // DALI_MATH_UTILS_H
diff --git a/dali/public-api/math/matrix.h b/dali/public-api/math/matrix.h
index 247acea..0229ce9 100755
--- a/dali/public-api/math/matrix.h
+++ b/dali/public-api/math/matrix.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_MATRIX_H__
-#define __DALI_MATRIX_H__
+#ifndef DALI_MATRIX_H
+#define DALI_MATRIX_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.
@@ -428,4 +428,4 @@ template <> struct TypeTraits< Matrix > : public BasicTypes< Matrix > { enum { I
  */
 } // namespace Dali
 
-#endif // __DALI_MATRIX_H__
+#endif // DALI_MATRIX_H
diff --git a/dali/public-api/math/matrix3.h b/dali/public-api/math/matrix3.h
index 91cf7f4..a4724a1 100755
--- a/dali/public-api/math/matrix3.h
+++ b/dali/public-api/math/matrix3.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_MATRIX3_H__
-#define __DALI_MATRIX3_H__
+#ifndef DALI_MATRIX3_H
+#define DALI_MATRIX3_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.
@@ -263,4 +263,4 @@ template <> struct TypeTraits< Matrix3 > : public BasicTypes< Matrix3 > { enum {
  */
 } // namespace Dali
 
-#endif //__DALI_MATRIX3_H__
+#endif //DALI_MATRIX3_H
diff --git a/dali/public-api/math/quaternion.h b/dali/public-api/math/quaternion.h
index a41f39f..4856282 100644
--- a/dali/public-api/math/quaternion.h
+++ b/dali/public-api/math/quaternion.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_QUATERNION_H__
-#define __DALI_QUATERNION_H__
+#ifndef DALI_QUATERNION_H
+#define DALI_QUATERNION_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.
@@ -490,4 +490,4 @@ template <> struct TypeTraits< Quaternion > : public BasicTypes< Quaternion > {
  */
 } // namespace Dali
 
-#endif // __DALI_QUATERNION_H__
+#endif // DALI_QUATERNION_H
diff --git a/dali/public-api/math/radian.h b/dali/public-api/math/radian.h
index 22027b2..9236217 100644
--- a/dali/public-api/math/radian.h
+++ b/dali/public-api/math/radian.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_RADIAN_H__
-#define __DALI_RADIAN_H__
+#ifndef DALI_RADIAN_H
+#define DALI_RADIAN_H
 
 /*
- * Copyright (c) 2015 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.
@@ -310,4 +310,4 @@ inline Radian Clamp( Radian angle, float min, float max )
  */
 } // namespace Dali
 
-#endif // __DALI_RADIAN_H__
+#endif // DALI_RADIAN_H
diff --git a/dali/public-api/math/random.h b/dali/public-api/math/random.h
index 1b08956..c5cf47e 100644
--- a/dali/public-api/math/random.h
+++ b/dali/public-api/math/random.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_RANDOM_H__
-#define __DALI_RANDOM_H__
+#ifndef DALI_RANDOM_H
+#define DALI_RANDOM_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.
@@ -92,4 +92,4 @@ inline Vector4 Axis()
  */
 } // namespace Dali
 
-#endif // __DALI_RANDOM_H__
+#endif // DALI_RANDOM_H
diff --git a/dali/public-api/math/rect.h b/dali/public-api/math/rect.h
index 9d14f59..4a052e3 100644
--- a/dali/public-api/math/rect.h
+++ b/dali/public-api/math/rect.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_RECT_H__
-#define __DALI_RECT_H__
+#ifndef DALI_RECT_H
+#define DALI_RECT_H
 
 /*
- * Copyright (c) 2015 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.
@@ -326,4 +326,4 @@ inline std::ostream& operator<< (std::ostream& stream, const Rect<T>& rectangle)
  */
 } // namespace Dali
 
-#endif // __DALI_RECT_H__
+#endif // DALI_RECT_H
diff --git a/dali/public-api/math/uint-16-pair.h b/dali/public-api/math/uint-16-pair.h
index d802fb2..c72c684 100644
--- a/dali/public-api/math/uint-16-pair.h
+++ b/dali/public-api/math/uint-16-pair.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_UINT_16_PAIR_H__
-#define __DALI_UINT_16_PAIR_H__
+#ifndef DALI_UINT_16_PAIR_H
+#define DALI_UINT_16_PAIR_H
 
 /*
- * Copyright (c) 2015 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.
@@ -275,4 +275,4 @@ template <> struct TypeTraits< Uint16Pair > : public BasicTypes< Uint16Pair > {
  */
 } // namespace Dali
 
-#endif // __DALI_UINT_16_PAIR_H__
+#endif // DALI_UINT_16_PAIR_H
diff --git a/dali/public-api/math/vector2.h b/dali/public-api/math/vector2.h
index 2d7df33..f248994 100644
--- a/dali/public-api/math/vector2.h
+++ b/dali/public-api/math/vector2.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_VECTOR_2_H__
-#define __DALI_VECTOR_2_H__
+#ifndef DALI_VECTOR_2_H
+#define DALI_VECTOR_2_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.
@@ -518,4 +518,4 @@ template <> struct TypeTraits< Vector2 > : public BasicTypes< Vector2 > { enum {
  */
 } // namespace Dali
 
-#endif // __DALI_VECTOR_2_H__
+#endif // DALI_VECTOR_2_H
diff --git a/dali/public-api/math/vector3.h b/dali/public-api/math/vector3.h
index 1a98005..097505d 100644
--- a/dali/public-api/math/vector3.h
+++ b/dali/public-api/math/vector3.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_VECTOR_3_H__
-#define __DALI_VECTOR_3_H__
+#ifndef DALI_VECTOR_3_H
+#define DALI_VECTOR_3_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.
@@ -612,4 +612,4 @@ template <> struct TypeTraits< Vector3 > : public BasicTypes< Vector3 > { enum {
  */
 } // namespace Dali
 
-#endif // __DALI_VECTOR_3_H__
+#endif // DALI_VECTOR_3_H
diff --git a/dali/public-api/math/vector4.h b/dali/public-api/math/vector4.h
index a42c55a..7da924f 100644
--- a/dali/public-api/math/vector4.h
+++ b/dali/public-api/math/vector4.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_VECTOR_4_H__
-#define __DALI_VECTOR_4_H__
+#ifndef DALI_VECTOR_4_H
+#define DALI_VECTOR_4_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.
@@ -625,4 +625,4 @@ template <> struct TypeTraits< Vector4 > : public BasicTypes< Vector4 > { enum {
  */
 } // namespace Dali
 
-#endif // __DALI_VECTOR_4_H__
+#endif // DALI_VECTOR_4_H
diff --git a/dali/public-api/math/viewport.h b/dali/public-api/math/viewport.h
index b137a64..fa239c4 100644
--- a/dali/public-api/math/viewport.h
+++ b/dali/public-api/math/viewport.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_VIEWPORT_H__
-#define __DALI_VIEWPORT_H__
+#ifndef DALI_VIEWPORT_H
+#define DALI_VIEWPORT_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.
@@ -42,4 +42,4 @@ typedef Rect<int32_t> Viewport;
  */
 } // namespace Dali
 
-#endif // __DALI_VIEWPORT_H__
+#endif // DALI_VIEWPORT_H
diff --git a/dali/public-api/object/any.h b/dali/public-api/object/any.h
index e3fac2a..b093822 100644
--- a/dali/public-api/object/any.h
+++ b/dali/public-api/object/any.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_ANY_TYPE_H__
-#define __DALI_ANY_TYPE_H__
+#ifndef DALI_ANY_TYPE_H
+#define DALI_ANY_TYPE_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.
@@ -494,4 +494,4 @@ inline const Type& AnyCastReference( const Any& any )
  */
 } // namespace Dali
 
-#endif // __DALI_ANY_TYPE_H__
+#endif // DALI_ANY_TYPE_H
diff --git a/dali/public-api/object/base-handle.h b/dali/public-api/object/base-handle.h
index 36b1887..cca565a 100644
--- a/dali/public-api/object/base-handle.h
+++ b/dali/public-api/object/base-handle.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_BASE_HANDLE_H__
-#define __DALI_BASE_HANDLE_H__
+#ifndef DALI_BASE_HANDLE_H
+#define DALI_BASE_HANDLE_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.
@@ -329,4 +329,4 @@ inline bool operator<(const BaseHandle& lhs, const BaseHandle& rhs)
  */
 } // namespace Dali
 
-#endif // __DALI_BASE_HANDLE_H__
+#endif // DALI_BASE_HANDLE_H
diff --git a/dali/public-api/object/base-object.h b/dali/public-api/object/base-object.h
index 30e3503..00d261c 100644
--- a/dali/public-api/object/base-object.h
+++ b/dali/public-api/object/base-object.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_BASE_OBJECT_H__
-#define __DALI_BASE_OBJECT_H__
+#ifndef DALI_BASE_OBJECT_H
+#define DALI_BASE_OBJECT_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.
diff --git a/dali/public-api/object/handle.h b/dali/public-api/object/handle.h
index 1894235..1e61d6c 100644
--- a/dali/public-api/object/handle.h
+++ b/dali/public-api/object/handle.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_HANDLE_H__
-#define __DALI_HANDLE_H__
+#ifndef DALI_HANDLE_H
+#define DALI_HANDLE_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.
@@ -418,4 +418,4 @@ DALI_CORE_API Handle New();
  */
 } // namespace Dali
 
-#endif // __DALI_HANDLE_H__
+#endif // DALI_HANDLE_H
diff --git a/dali/public-api/object/object-registry.h b/dali/public-api/object/object-registry.h
index 203d676..4724b77 100644
--- a/dali/public-api/object/object-registry.h
+++ b/dali/public-api/object/object-registry.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_OBJECT_REGISTRY_H__
-#define __DALI_OBJECT_REGISTRY_H__
+#ifndef DALI_OBJECT_REGISTRY_H
+#define DALI_OBJECT_REGISTRY_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.
@@ -165,4 +165,4 @@ public: // Not intended for application developers
  */
 } // namespace Dali
 
-#endif // __DALI_OBJECT_REGISTRY_H__
+#endif // DALI_OBJECT_REGISTRY_H
diff --git a/dali/public-api/object/property-conditions.h b/dali/public-api/object/property-conditions.h
index 16dee73..a5ab046 100644
--- a/dali/public-api/object/property-conditions.h
+++ b/dali/public-api/object/property-conditions.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_PROPERTY_CONDITIONS_H__
-#define __DALI_PROPERTY_CONDITIONS_H__
+#ifndef DALI_PROPERTY_CONDITIONS_H
+#define DALI_PROPERTY_CONDITIONS_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.
@@ -190,4 +190,4 @@ DALI_CORE_API PropertyCondition VariableStepCondition( const Dali::Vector<float>
  */
 } // namespace Dali
 
-#endif // __DALI_PROPERTY_CONDITIONS_H__
+#endif // DALI_PROPERTY_CONDITIONS_H
diff --git a/dali/public-api/object/property-index-ranges.h b/dali/public-api/object/property-index-ranges.h
index 4d90b6c..f8b8daf 100644
--- a/dali/public-api/object/property-index-ranges.h
+++ b/dali/public-api/object/property-index-ranges.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_PROPERTY_INDEX_RANGES_H__
-#define __DALI_PROPERTY_INDEX_RANGES_H__
+#ifndef DALI_PROPERTY_INDEX_RANGES_H
+#define DALI_PROPERTY_INDEX_RANGES_H
 
 /*
- * Copyright (c) 2016 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.
@@ -73,4 +73,4 @@ enum PropertyRanges
  */
 } // namespace Dali
 
-#endif // __DALI_PROPERTY_INDEX_RANGES_H__
+#endif // DALI_PROPERTY_INDEX_RANGES_H
diff --git a/dali/public-api/object/property-input.h b/dali/public-api/object/property-input.h
index d74532b..84a752b 100644
--- a/dali/public-api/object/property-input.h
+++ b/dali/public-api/object/property-input.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_PROPERTY_INPUT_H__
-#define __DALI_PROPERTY_INPUT_H__
+#ifndef DALI_PROPERTY_INPUT_H
+#define DALI_PROPERTY_INPUT_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.
@@ -157,4 +157,4 @@ public:
  */
 } // namespace Dali
 
-#endif // __DALI_PROPERTY_INPUT_H__
+#endif // DALI_PROPERTY_INPUT_H
diff --git a/dali/public-api/object/property-notification-declarations.h b/dali/public-api/object/property-notification-declarations.h
index 4918658..e88c5ce 100644
--- a/dali/public-api/object/property-notification-declarations.h
+++ b/dali/public-api/object/property-notification-declarations.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_PROPERTY_NOTIFICATION_DECLARATIONS_H__
-#define __DALI_PROPERTY_NOTIFICATION_DECLARATIONS_H__
+#ifndef DALI_PROPERTY_NOTIFICATION_DECLARATIONS_H
+#define DALI_PROPERTY_NOTIFICATION_DECLARATIONS_H
 
 /*
- * Copyright (c) 2015 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.
@@ -42,4 +42,4 @@ typedef Signal< void (PropertyNotification& source) > PropertyNotifySignalType;
  */
 } // namespace Dali
 
-#endif // __DALI_PROPERTY_NOTIFICATION_DECLARATIONS_H__
+#endif // DALI_PROPERTY_NOTIFICATION_DECLARATIONS_H
diff --git a/dali/public-api/object/property-notification.h b/dali/public-api/object/property-notification.h
index ba61d6c..a340049 100644
--- a/dali/public-api/object/property-notification.h
+++ b/dali/public-api/object/property-notification.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_PROPERTY_NOTIFICATION_H__
-#define __DALI_PROPERTY_NOTIFICATION_H__
+#ifndef DALI_PROPERTY_NOTIFICATION_H
+#define DALI_PROPERTY_NOTIFICATION_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.
@@ -192,4 +192,4 @@ public: // Not intended for use by Application developers
  */
 } // namespace Dali
 
-#endif // __DALI_PROPERTY_NOTIFICATION_H__
+#endif // DALI_PROPERTY_NOTIFICATION_H
diff --git a/dali/public-api/object/property-types.h b/dali/public-api/object/property-types.h
index 29b52a0..2d8429e 100644
--- a/dali/public-api/object/property-types.h
+++ b/dali/public-api/object/property-types.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_PROPERTY_TYPES_H__
-#define __DALI_PROPERTY_TYPES_H__
+#ifndef DALI_PROPERTY_TYPES_H
+#define DALI_PROPERTY_TYPES_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.
@@ -103,4 +103,4 @@ inline Property::Type Get<Extents>()          { return Property::EXTENTS; }
  */
 } // namespace Dali
 
-#endif // __DALI_PROPERTY_TYPES_H__
+#endif // DALI_PROPERTY_TYPES_H
diff --git a/dali/public-api/object/property.h b/dali/public-api/object/property.h
index 60236e9..6553591 100644
--- a/dali/public-api/object/property.h
+++ b/dali/public-api/object/property.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_PROPERTY_H__
-#define __DALI_PROPERTY_H__
+#ifndef DALI_PROPERTY_H
+#define DALI_PROPERTY_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.
@@ -172,4 +172,4 @@ struct DALI_CORE_API Property
  */
 } // namespace Dali
 
-#endif // __DALI_PROPERTY_H__
+#endif // DALI_PROPERTY_H
diff --git a/dali/public-api/object/ref-object.h b/dali/public-api/object/ref-object.h
index 553a1fe..473b08f 100644
--- a/dali/public-api/object/ref-object.h
+++ b/dali/public-api/object/ref-object.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_REF_OBJECT_H__
-#define __DALI_REF_OBJECT_H__
+#ifndef DALI_REF_OBJECT_H
+#define DALI_REF_OBJECT_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.
@@ -112,4 +112,4 @@ private:
  */
 } // namespace Dali
 
-#endif // __DALI_REF_OBJECT_H__
+#endif // DALI_REF_OBJECT_H
diff --git a/dali/public-api/object/type-info.h b/dali/public-api/object/type-info.h
index bf861eb..f2dc401 100644
--- a/dali/public-api/object/type-info.h
+++ b/dali/public-api/object/type-info.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TYPE_INFO_H__
-#define __DALI_TYPE_INFO_H__
+#ifndef DALI_TYPE_INFO_H
+#define DALI_TYPE_INFO_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.
@@ -275,4 +275,4 @@ public: // Not intended for application developers
  */
 } // namespace Dali
 
-#endif // __DALI_TYPE_INFO_H__
+#endif // DALI_TYPE_INFO_H
diff --git a/dali/public-api/object/type-registry-helper.h b/dali/public-api/object/type-registry-helper.h
index f3cd7da..9c184aa 100644
--- a/dali/public-api/object/type-registry-helper.h
+++ b/dali/public-api/object/type-registry-helper.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TYPE_REGISTRY_HELPER_H__
-#define __DALI_TYPE_REGISTRY_HELPER_H__
+#ifndef DALI_TYPE_REGISTRY_HELPER_H
+#define DALI_TYPE_REGISTRY_HELPER_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.
@@ -144,4 +144,4 @@
 #define DALI_TYPE_REGISTRATION_END( ) // This macro exists for consistency and readability.
 
 
-#endif // __DALI_TYPE_REGISTRY_HELPER_H__
+#endif // DALI_TYPE_REGISTRY_HELPER_H
diff --git a/dali/public-api/object/type-registry.h b/dali/public-api/object/type-registry.h
index 21a9a30..cb84ba2 100644
--- a/dali/public-api/object/type-registry.h
+++ b/dali/public-api/object/type-registry.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TYPE_REGISTRY_H__
-#define __DALI_TYPE_REGISTRY_H__
+#ifndef DALI_TYPE_REGISTRY_H
+#define DALI_TYPE_REGISTRY_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.
diff --git a/dali/public-api/render-tasks/render-task-list.h b/dali/public-api/render-tasks/render-task-list.h
index 47bcb7a..c27d13c 100644
--- a/dali/public-api/render-tasks/render-task-list.h
+++ b/dali/public-api/render-tasks/render-task-list.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_RENDER_TASK_LIST_H__
-#define __DALI_RENDER_TASK_LIST_H__
+#ifndef DALI_RENDER_TASK_LIST_H
+#define DALI_RENDER_TASK_LIST_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.
@@ -146,4 +146,4 @@ public: // Not intended for application developers
  */
 } // namespace Dali
 
-#endif //__DALI_RENDER_TASK_LIST_H__
+#endif //DALI_RENDER_TASK_LIST_H
diff --git a/dali/public-api/render-tasks/render-task.h b/dali/public-api/render-tasks/render-task.h
index 064f535..bd88e6b 100644
--- a/dali/public-api/render-tasks/render-task.h
+++ b/dali/public-api/render-tasks/render-task.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_RENDER_TASK_H__
-#define __DALI_RENDER_TASK_H__
+#ifndef DALI_RENDER_TASK_H
+#define DALI_RENDER_TASK_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.
@@ -535,4 +535,4 @@ public: // Not intended for application developers
  */
 } // namespace Dali
 
-#endif //__DALI_RENDER_TASK_H__
+#endif //DALI_RENDER_TASK_H
diff --git a/dali/public-api/signals/base-signal.h b/dali/public-api/signals/base-signal.h
index 5de0137..f127d1d 100755
--- a/dali/public-api/signals/base-signal.h
+++ b/dali/public-api/signals/base-signal.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_BASE_SIGNAL_H__
-#define __DALI_BASE_SIGNAL_H__
+#ifndef DALI_BASE_SIGNAL_H
+#define DALI_BASE_SIGNAL_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.
@@ -526,4 +526,4 @@ private:
  */
 } // namespace Dali
 
-#endif // __DALI_BASE_SIGNAL_H__
+#endif // DALI_BASE_SIGNAL_H
diff --git a/dali/public-api/signals/callback.h b/dali/public-api/signals/callback.h
index 5224ee8..efcb09d 100644
--- a/dali/public-api/signals/callback.h
+++ b/dali/public-api/signals/callback.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_CALLBACK_H__
-#define __DALI_CALLBACK_H__
+#ifndef DALI_CALLBACK_H
+#define DALI_CALLBACK_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.
@@ -1784,4 +1784,4 @@ inline CallbackBase* MakeCallback( T& object, void(Base::*function)(void) )
  */
 } // namespace DALI
 
-#endif // __DALI_CALLBACK_H__
+#endif // DALI_CALLBACK_H
diff --git a/dali/public-api/signals/connection-tracker-interface.h b/dali/public-api/signals/connection-tracker-interface.h
index 06afe92..849ea22 100644
--- a/dali/public-api/signals/connection-tracker-interface.h
+++ b/dali/public-api/signals/connection-tracker-interface.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_CONNECTION_TRACKER_INTERFACE_H__
-#define __DALI_CONNECTION_TRACKER_INTERFACE_H__
+#ifndef DALI_CONNECTION_TRACKER_INTERFACE_H
+#define DALI_CONNECTION_TRACKER_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.
@@ -87,4 +87,4 @@ private:
  */
 } // namespace Dali
 
-#endif // __DALI_CONNECTION_TRACKER_INTERFACE_H__
+#endif // DALI_CONNECTION_TRACKER_INTERFACE_H
diff --git a/dali/public-api/signals/connection-tracker.h b/dali/public-api/signals/connection-tracker.h
index 0bb1e9d..6c690f1 100644
--- a/dali/public-api/signals/connection-tracker.h
+++ b/dali/public-api/signals/connection-tracker.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_CONNECTION_TRACKER_H__
-#define __DALI_CONNECTION_TRACKER_H__
+#ifndef DALI_CONNECTION_TRACKER_H
+#define DALI_CONNECTION_TRACKER_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.
@@ -92,4 +92,4 @@ private:
  */
 } // namespace Dali
 
-#endif // __DALI_CONNECTION_TRACKER_H__
+#endif // DALI_CONNECTION_TRACKER_H
diff --git a/dali/public-api/signals/dali-signal.h b/dali/public-api/signals/dali-signal.h
index b313936..75eb45e 100644
--- a/dali/public-api/signals/dali-signal.h
+++ b/dali/public-api/signals/dali-signal.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_SIGNAL_H__
-#define __DALI_SIGNAL_H__
+#ifndef DALI_SIGNAL_H
+#define DALI_SIGNAL_H
 
 /*
- * Copyright (c) 2015 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.
@@ -1489,4 +1489,4 @@ private:
  */
 } // namespace Dali
 
-#endif // __DALI_SIGNAL_H__
+#endif // DALI_SIGNAL_H
diff --git a/dali/public-api/signals/functor-delegate.h b/dali/public-api/signals/functor-delegate.h
index 858c1ce..7cfa51c 100644
--- a/dali/public-api/signals/functor-delegate.h
+++ b/dali/public-api/signals/functor-delegate.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_FUNCTOR_DELEGATE_H__
-#define __DALI_FUNCTOR_DELEGATE_H__
+#ifndef DALI_FUNCTOR_DELEGATE_H
+#define DALI_FUNCTOR_DELEGATE_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.
@@ -152,4 +152,4 @@ public: // Data for deriving classes & Dispatchers
  */
 } // namespace DALI
 
-#endif // __DALI_FUNCTOR_DELEGATE_H__
+#endif // DALI_FUNCTOR_DELEGATE_H
diff --git a/dali/public-api/signals/signal-slot-connections.h b/dali/public-api/signals/signal-slot-connections.h
index 30be4c3..e3b1e76 100644
--- a/dali/public-api/signals/signal-slot-connections.h
+++ b/dali/public-api/signals/signal-slot-connections.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_SIGNAL_SLOT_CONNECTIONS_H__
-#define __DALI_SIGNAL_SLOT_CONNECTIONS_H__
+#ifndef DALI_SIGNAL_SLOT_CONNECTIONS_H
+#define DALI_SIGNAL_SLOT_CONNECTIONS_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.
@@ -162,4 +162,4 @@ private:
  */
 } // namespace Dali
 
-#endif // __DALI_SIGNAL_SLOT_CONNECTIONS_H__
+#endif // DALI_SIGNAL_SLOT_CONNECTIONS_H
diff --git a/dali/public-api/signals/signal-slot-observers.h b/dali/public-api/signals/signal-slot-observers.h
index 6f7abf7..0d0fbe4 100644
--- a/dali/public-api/signals/signal-slot-observers.h
+++ b/dali/public-api/signals/signal-slot-observers.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_SIGNAL_SLOT_OBSERVERS_H__
-#define __DALI_SIGNAL_SLOT_OBSERVERS_H__
+#ifndef DALI_SIGNAL_SLOT_OBSERVERS_H
+#define DALI_SIGNAL_SLOT_OBSERVERS_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.
@@ -99,4 +99,4 @@ public:
  */
 } // namespace Dali
 
-#endif // __DALI_SIGNAL_SLOT_OBSERVERS_H__
+#endif // DALI_SIGNAL_SLOT_OBSERVERS_H
diff --git a/dali/public-api/signals/slot-delegate.h b/dali/public-api/signals/slot-delegate.h
index 8b5f260..405ed65 100644
--- a/dali/public-api/signals/slot-delegate.h
+++ b/dali/public-api/signals/slot-delegate.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_SLOT_DELEGATE_H__
-#define __DALI_SLOT_DELEGATE_H__
+#ifndef DALI_SLOT_DELEGATE_H
+#define DALI_SLOT_DELEGATE_H
 
 /*
- * Copyright (c) 2015 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.
@@ -155,4 +155,4 @@ private:
  */
 } // namespace Dali
 
-#endif // __DALI_SLOT_DELEGATE_H__
+#endif // DALI_SLOT_DELEGATE_H
diff --git a/dali/public-api/size-negotiation/relayout-container.h b/dali/public-api/size-negotiation/relayout-container.h
index 3a8341a..95e4dec 100644
--- a/dali/public-api/size-negotiation/relayout-container.h
+++ b/dali/public-api/size-negotiation/relayout-container.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_RELAYOUT_CONTAINER_H__
-#define __DALI_RELAYOUT_CONTAINER_H__
+#ifndef DALI_RELAYOUT_CONTAINER_H
+#define DALI_RELAYOUT_CONTAINER_H
 
 /*
- * Copyright (c) 2015 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.
@@ -63,4 +63,4 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_RELAYOUT_CONTAINER_H__
+#endif // DALI_RELAYOUT_CONTAINER_H
diff --git a/doc/dali-core-doc.h b/doc/dali-core-doc.h
index 54405f5..312f3bd 100644
--- a/doc/dali-core-doc.h
+++ b/doc/dali-core-doc.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_DOC_H__
-#define __DALI_DOC_H__
+#ifndef DALI_DOC_H
+#define DALI_DOC_H
 
 /*
- * Copyright (c) 2016 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.
@@ -119,4 +119,4 @@
  * @}
  */
 
-#endif  /* __DALI_DOC_H__ */
+#endif  /* DALI_DOC_H */
diff --git a/docs/coding-style.html b/docs/coding-style.html
index 99afe14..e33504a 100644
--- a/docs/coding-style.html
+++ b/docs/coding-style.html
@@ -305,10 +305,10 @@ function toggleVisibility( button, obj )
     <ARTICLE class="detail" id="macro_name_examples">
       <CODE class="good">
         #define DEBUG_TRACE( __FILE__, __LINE__ ) ...
-        #ifndef __ACTOR_H__
-        #define __ACTOR_H__
+        #ifndef ACTOR_H
+        #define ACTOR_H
         ...
-        #endif // __ACTOR_H__
+        #endif // ACTOR_H
       </CODE>
     </ARTICLE>
   </ARTICLE>
diff --git a/docs/templates/example-class-internal.h b/docs/templates/example-class-internal.h
index 4e54729..c51bbbb 100644
--- a/docs/templates/example-class-internal.h
+++ b/docs/templates/example-class-internal.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_EXAMPLE_CLASS_H__
-#define __DALI_INTERNAL_EXAMPLE_CLASS_H__
+#ifndef DALI_INTERNAL_EXAMPLE_CLASS_H
+#define DALI_INTERNAL_EXAMPLE_CLASS_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.
@@ -151,5 +151,5 @@ inline const Internal::ExampleClass& GetImplementation(const Dali::ExampleClass&
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_EXAMPLE_CLASS_H__
+#endif // DALI_INTERNAL_EXAMPLE_CLASS_H