diff --git a/doc/tutorial/001_HelloWord.md b/doc/tutorial/001_HelloWord.md
index 619e96a4..a76b3a33 100644
--- a/doc/tutorial/001_HelloWord.md
+++ b/doc/tutorial/001_HelloWord.md
@@ -13,9 +13,9 @@ debug tools:                                     {#ewol_tutorial_hello_world_deb
 
 I will use for all test a basic template [elog](http://atria-soft.github.io/elog) for debug logger that redirect logs in Android and IOs
 
-File ```appl/debug.h```:
+File ```appl/debug.hpp```:
 
-@include HelloWord/appl/debug.h
+@include HelloWord/appl/debug.hpp
 
 File ```appl/debug.cpp```:
 
@@ -109,7 +109,7 @@ Create the main Windows:
 
 For this point we will create a class that herited form the basic ewol::widget::Windows class:
 
-@include HelloWord/appl/Windows.h
+@include HelloWord/appl/Windows.hpp
 
 The C macro "DECLARE_FACTORY" create a simple factory function "create" that return the ewol::Object well create.
 
diff --git a/doc/tutorial/010_ObjectModel.md b/doc/tutorial/010_ObjectModel.md
index d90039ff..bb56ac92 100644
--- a/doc/tutorial/010_ObjectModel.md
+++ b/doc/tutorial/010_ObjectModel.md
@@ -87,7 +87,7 @@ Find a global Object (ouside an Object)
 ---------------------------------------
 
 ```{.cpp}
-	#include <ewol/context/Context.h>
+	#include <ewol/context/Context.hpp>
 	
 	ewol::ObjectShared tmpObject = ewol::getContext().getEObjectManager().getObjectNamed("obj Name");
 	if (tmpObject == nullptr) {
diff --git a/doc/tutorial/011_ObjectConfig.md b/doc/tutorial/011_ObjectConfig.md
index 711c974d..09b92a0d 100644
--- a/doc/tutorial/011_ObjectConfig.md
+++ b/doc/tutorial/011_ObjectConfig.md
@@ -54,7 +54,7 @@ Implement configuration                                {#ewol_tutorial_object_co
 =======================
 
 ```{.cpp}
-#include <ewol/object/Object.h>
+#include <ewol/object/Object.hpp>
 namespace appl {
 	class MyObj : public ewol::Object {
 		public:
diff --git a/doc/tutorial/012_ObjectMessage.md b/doc/tutorial/012_ObjectMessage.md
index 1e105b5e..4da3a946 100644
--- a/doc/tutorial/012_ObjectMessage.md
+++ b/doc/tutorial/012_ObjectMessage.md
@@ -39,8 +39,8 @@ simple signal connection:
 -------------------------
 
 ```{.cpp}
-#include <ewol/object/Object.h>
-#include <ewol/widget/Button.h>
+#include <ewol/object/Object.hpp>
+#include <ewol/widget/Button.hpp>
 namespace appl {
 	class MyObj : public ewol::Object {
 		private:
@@ -107,8 +107,8 @@ source
 -------
 
 ```{.cpp}
-#include <ewol/object/Object.h>
-#include <ewol/widget/Button.h>
+#include <ewol/object/Object.hpp>
+#include <ewol/widget/Button.hpp>
 namespace appl {
 	class MyObj : public ewol::Object {
 		public:
diff --git a/doc/tutorial/020_FileAccess.md b/doc/tutorial/020_FileAccess.md
index f3b650d0..46b4abb1 100644
--- a/doc/tutorial/020_FileAccess.md
+++ b/doc/tutorial/020_FileAccess.md
@@ -69,7 +69,7 @@ Read a file                                {#ewol_tutorial_file_access_read}
 
 
 ```{.cpp}
-	#include <etk/os/FSNode.h>
+	#include <etk/os/FSNode.hpp>
 	
 	...
 	
@@ -97,7 +97,7 @@ Write a file                                {#ewol_tutorial_file_access_write}
 ============
 
 ```{.cpp}
-	#include <etk/os/FSNode.h>
+	#include <etk/os/FSNode.hpp>
 	
 	...
 	
diff --git a/doc/tutorial/021_Resources.md b/doc/tutorial/021_Resources.md
index dd476fca..4b4c2ad4 100644
--- a/doc/tutorial/021_Resources.md
+++ b/doc/tutorial/021_Resources.md
@@ -27,8 +27,8 @@ Get a resource:                                {#ewol_tutorial_resources_get}
 
 For this example we will load a configuration file:
 ```{.cpp}
-#include <ewol/object/Object.h>
-#include <ewol/resource/ConfigFile.h>
+#include <ewol/object/Object.hpp>
+#include <ewol/resource/ConfigFile.hpp>
 namespace appl {
 	class MyObj : public ewol::Object {
 		public:
@@ -90,7 +90,7 @@ The resources are loaded fron 0 to 5.
 Then for basic resource:
 
 ```{.cpp}
-#include <ewol/object/Resource.h>
+#include <ewol/object/Resource.hpp>
 namespace appl {
 	class MyResource : public gale::Resource {
 		protected:
diff --git a/doc/tutorial/030_ConplexeXmlGui.md b/doc/tutorial/030_ConplexeXmlGui.md
index 3aa8ca82..43e2044c 100644
--- a/doc/tutorial/030_ConplexeXmlGui.md
+++ b/doc/tutorial/030_ConplexeXmlGui.md
@@ -76,7 +76,7 @@ Call generic factory system (compositing)
 -----------------------------------------
 
 ```{.cpp}
-	#include <ewol::widget::Composer.h>
+	#include <ewol::widget::Composer.hpp>
 	ewol::widget::WidgetShared tmpWidget = ewol::widget::composerGenerateString("<button name='my name' expand='true,false' fill='true,true'/>");
 	if (tmpWidget == nullptr) {
 		APPL_CRITICAL("The widget can not be created");
@@ -97,7 +97,7 @@ File ```gui.xml```
 ```
 
 ```{.cpp}
-	#include <ewol::widget::Composer.h>
+	#include <ewol::widget::Composer.hpp>
 	ewol::widget::WidgetShared tmpWidget = ewol::widget::composerGenerateFile("DATA:gui.xml");
 	if (tmpWidget == nullptr) {
 		APPL_CRITICAL("The widget can not be created");
diff --git a/doc/tutorial/050_CreateCustomWidget.md b/doc/tutorial/050_CreateCustomWidget.md
index 9fb07e97..a3fdb399 100644
--- a/doc/tutorial/050_CreateCustomWidget.md
+++ b/doc/tutorial/050_CreateCustomWidget.md
@@ -20,8 +20,8 @@ Header
 ------
 
 ```{.cpp}
-	#include <ewol/widget/Widget.h>
-	#include <ewol/compisiting/Widget.h>
+	#include <ewol/widget/Widget.hpp>
+	#include <ewol/compisiting/Widget.hpp>
 	namespace appl {
 		class myWidget : public ewol::Widget {
 			private:
diff --git a/ewol/compositing/TextDF.cpp b/ewol/compositing/TextDF.cpp
index cded6255..3a574c63 100644
--- a/ewol/compositing/TextDF.cpp
+++ b/ewol/compositing/TextDF.cpp
@@ -7,7 +7,7 @@
 #include <ewol/debug.hpp>
 #include <ewol/compositing/TextDF.hpp>
 #include <ewol/context/Context.hpp>
-#include <etk/types.h>
+#include <etk/types.hpp>
 
 ewol::compositing::TextDF::TextDF(const std::string& _fontName, int32_t _fontSize) :
   ewol::compositing::TextBase("", false),
diff --git a/ewol/resource/DistanceFieldFont.cpp b/ewol/resource/DistanceFieldFont.cpp
index 3e494135..bc154c58 100644
--- a/ewol/resource/DistanceFieldFont.cpp
+++ b/ewol/resource/DistanceFieldFont.cpp
@@ -15,7 +15,7 @@
 #include <ewol/resource/FontFreeType.hpp>
 #include <ewol/context/Context.hpp>
 #include <ewol/resource/DistanceFieldFont.hpp>
-#include <edtaa3/edtaa3func.hpp>
+#include <edtaa3/edtaa3func.h>
 #include <ejson/ejson.hpp>
 
 #define SIZE_GENERATION (30)
diff --git a/ewol/resource/ImageDF.cpp b/ewol/resource/ImageDF.cpp
index 71ef20b2..a4e286fc 100644
--- a/ewol/resource/ImageDF.cpp
+++ b/ewol/resource/ImageDF.cpp
@@ -10,7 +10,7 @@
 #include <gale/resource/Manager.hpp>
 #include <ewol/resource/ImageDF.hpp>
 #include <ewol/resource/Texture.hpp>
-#include <edtaa3/edtaa3func.hpp>
+#include <edtaa3/edtaa3func.h>
 
 ewol::resource::ImageDF::ImageDF() {
 	addResourceType("ewol::resource::ImageDF");
diff --git a/ewol/resource/Texture.cpp b/ewol/resource/Texture.cpp
index 373fc563..b24751c8 100644
--- a/ewol/resource/Texture.cpp
+++ b/ewol/resource/Texture.cpp
@@ -47,7 +47,7 @@ ewol::resource::Texture::~Texture() {
 	removeContext();
 }
 
-#include <egami/egami.h>
+#include <egami/egami.hpp>
 
 bool ewol::resource::Texture::updateContext() {
 	EWOL_INFO("updateContext [START]");
diff --git a/sample/CustomWidgets/appl/Main.cpp b/sample/CustomWidgets/appl/Main.cpp
index 570cd39f..32634798 100644
--- a/sample/CustomWidgets/appl/Main.cpp
+++ b/sample/CustomWidgets/appl/Main.cpp
@@ -5,16 +5,16 @@
  */
 
 
-#include <etk/types.h>
-#include <ewol/ewol.h>
-#include <gale/context/commandLine.h>
+#include <etk/types.hpp>
+#include <ewol/ewol.hpp>
+#include <gale/context/commandLine.hpp>
 
-#include <appl/debug.h>
-#include <appl/Windows.h>
-#include <ewol/object/Object.h>
-#include <ewol/widget/Manager.h>
-#include <ewol/context/Context.h>
-#include <appl/widget/VectorDisplay.h>
+#include <appl/debug.hpp>
+#include <appl/Windows.hpp>
+#include <ewol/object/Object.hpp>
+#include <ewol/widget/Manager.hpp>
+#include <ewol/context/Context.hpp>
+#include <appl/widget/VectorDisplay.hpp>
 
 
 class MainApplication : public ewol::context::Application {
diff --git a/sample/CustomWidgets/appl/Main.h b/sample/CustomWidgets/appl/Main.hpp
similarity index 100%
rename from sample/CustomWidgets/appl/Main.h
rename to sample/CustomWidgets/appl/Main.hpp
diff --git a/sample/CustomWidgets/appl/Windows.cpp b/sample/CustomWidgets/appl/Windows.cpp
index 4593518a..fe0971b5 100644
--- a/sample/CustomWidgets/appl/Windows.cpp
+++ b/sample/CustomWidgets/appl/Windows.cpp
@@ -4,13 +4,13 @@
  * @license BSD 3 clauses (see license file)
  */
 
-#include <ewol/ewol.h>
-#include <appl/debug.h>
-#include <appl/Windows.h>
-#include <ewol/widget/Label.h>
-#include <ewol/widget/Button.h>
-#include <appl/widget/VectorDisplay.h>
-#include <etk/tool.h>
+#include <ewol/ewol.hpp>
+#include <appl/debug.hpp>
+#include <appl/Windows.hpp>
+#include <ewol/widget/Label.hpp>
+#include <ewol/widget/Button.hpp>
+#include <appl/widget/VectorDisplay.hpp>
+#include <etk/tool.hpp>
 
 appl::Windows::Windows() :
   m_composer(nullptr) {
diff --git a/sample/CustomWidgets/appl/Windows.h b/sample/CustomWidgets/appl/Windows.hpp
similarity index 89%
rename from sample/CustomWidgets/appl/Windows.h
rename to sample/CustomWidgets/appl/Windows.hpp
index e39abc43..a7d994c9 100644
--- a/sample/CustomWidgets/appl/Windows.h
+++ b/sample/CustomWidgets/appl/Windows.hpp
@@ -5,8 +5,8 @@
  */
 #pragma once
 
-#include <ewol/widget/Windows.h>
-#include <ewol/widget/Composer.h>
+#include <ewol/widget/Windows.hpp>
+#include <ewol/widget/Composer.hpp>
 
 namespace appl {
 	class Windows;
diff --git a/sample/CustomWidgets/appl/debug.cpp b/sample/CustomWidgets/appl/debug.cpp
index 8e444769..f8d78989 100644
--- a/sample/CustomWidgets/appl/debug.cpp
+++ b/sample/CustomWidgets/appl/debug.cpp
@@ -5,7 +5,7 @@
  */
 
 
-#include <appl/debug.h>
+#include <appl/debug.hpp>
 
 int32_t appl::getLogId() {
 	static int32_t g_val = elog::registerInstance("example");
diff --git a/sample/CustomWidgets/appl/debug.h b/sample/CustomWidgets/appl/debug.hpp
similarity index 97%
rename from sample/CustomWidgets/appl/debug.h
rename to sample/CustomWidgets/appl/debug.hpp
index df7cc99e..2d0dae61 100644
--- a/sample/CustomWidgets/appl/debug.h
+++ b/sample/CustomWidgets/appl/debug.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <elog/log.h>
+#include <elog/log.hpp>
 
 namespace appl {
 	int32_t getLogId();
diff --git a/sample/CustomWidgets/appl/widget/VectorDisplay.cpp b/sample/CustomWidgets/appl/widget/VectorDisplay.cpp
index 5b6943f4..71d7a08e 100644
--- a/sample/CustomWidgets/appl/widget/VectorDisplay.cpp
+++ b/sample/CustomWidgets/appl/widget/VectorDisplay.cpp
@@ -4,10 +4,10 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <appl/debug.h>
-#include <appl/widget/VectorDisplay.h>
-#include <ewol/object/Manager.h>
-#include <etk/tool.h>
+#include <appl/debug.hpp>
+#include <appl/widget/VectorDisplay.hpp>
+#include <ewol/object/Manager.hpp>
+#include <etk/tool.hpp>
 
 //! [EWOL_SAMPLE_CW_CONSTRUCTOR]
 appl::widget::VectorDisplay::VectorDisplay() :
diff --git a/sample/CustomWidgets/appl/widget/VectorDisplay.h b/sample/CustomWidgets/appl/widget/VectorDisplay.hpp
similarity index 89%
rename from sample/CustomWidgets/appl/widget/VectorDisplay.h
rename to sample/CustomWidgets/appl/widget/VectorDisplay.hpp
index c6f6bd1a..df90d897 100644
--- a/sample/CustomWidgets/appl/widget/VectorDisplay.h
+++ b/sample/CustomWidgets/appl/widget/VectorDisplay.hpp
@@ -7,9 +7,9 @@
 
 //! [EWOL_SAMPLE_CW_HEADER]
 
-#include <ewol/widget/Widget.h>
-#include <ewol/compositing/Drawing.h>
-#include <ewol/widget/Manager.h>
+#include <ewol/widget/Widget.hpp>
+#include <ewol/compositing/Drawing.hpp>
+#include <ewol/widget/Manager.hpp>
 
 namespace appl {
 	namespace widget {
@@ -24,7 +24,7 @@ namespace appl {
 				DECLARE_WIDGET_FACTORY(VectorDisplay, "VectorDisplay");
 				//! @brief destructor
 				virtual ~VectorDisplay();
-			public
+			public:
 				void onDraw() override;
 				void onRegenerateDisplay() override;
 			//! [EWOL_SAMPLE_CW_HEADER]
diff --git a/sample/HelloWord/appl/Main.cpp b/sample/HelloWord/appl/Main.cpp
index 2cc37887..7ba79646 100644
--- a/sample/HelloWord/appl/Main.cpp
+++ b/sample/HelloWord/appl/Main.cpp
@@ -6,17 +6,17 @@
 //! [ewol_sample_HW_main_all]
 
 //! [ewol_sample_HW_main_include]
-#include <etk/types.h>
-#include <ewol/ewol.h>
-#include <gale/context/commandLine.h>
+#include <etk/types.hpp>
+#include <ewol/ewol.hpp>
+#include <gale/context/commandLine.hpp>
 //! [ewol_sample_HW_main_include]
 
 
-#include <appl/debug.h>
-#include <appl/Windows.h>
-#include <ewol/object/Object.h>
-#include <ewol/widget/Manager.h>
-#include <ewol/context/Context.h>
+#include <appl/debug.hpp>
+#include <appl/Windows.hpp>
+#include <ewol/object/Object.hpp>
+#include <ewol/widget/Manager.hpp>
+#include <ewol/context/Context.hpp>
 
 //! [ewol_sample_HW_main_application]
 namespace appl {
diff --git a/sample/HelloWord/appl/Main.h b/sample/HelloWord/appl/Main.hpp
similarity index 100%
rename from sample/HelloWord/appl/Main.h
rename to sample/HelloWord/appl/Main.hpp
diff --git a/sample/HelloWord/appl/Windows.cpp b/sample/HelloWord/appl/Windows.cpp
index 6a922407..de25d2fd 100644
--- a/sample/HelloWord/appl/Windows.cpp
+++ b/sample/HelloWord/appl/Windows.cpp
@@ -4,10 +4,10 @@
  * @license GPL v3 (see license file)
  */
 
-#include <ewol/ewol.h>
-#include <appl/debug.h>
-#include <appl/Windows.h>
-#include <ewol/widget/Label.h>
+#include <ewol/ewol.hpp>
+#include <appl/debug.hpp>
+#include <appl/Windows.hpp>
+#include <ewol/widget/Label.hpp>
 
 appl::Windows::Windows() {
 	addObjectType("appl::Windows");
diff --git a/sample/HelloWord/appl/Windows.h b/sample/HelloWord/appl/Windows.hpp
similarity index 92%
rename from sample/HelloWord/appl/Windows.h
rename to sample/HelloWord/appl/Windows.hpp
index 6941682c..21e19289 100644
--- a/sample/HelloWord/appl/Windows.h
+++ b/sample/HelloWord/appl/Windows.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <ewol/widget/Windows.h>
+#include <ewol/widget/Windows.hpp>
 
 namespace appl {
 	class Windows;
diff --git a/sample/HelloWord/appl/debug.cpp b/sample/HelloWord/appl/debug.cpp
index c9ccfa83..a7abd69e 100644
--- a/sample/HelloWord/appl/debug.cpp
+++ b/sample/HelloWord/appl/debug.cpp
@@ -5,7 +5,7 @@
  */
 
 
-#include <appl/debug.h>
+#include <appl/debug.hpp>
 
 int32_t appl::getLogId() {
 	static int32_t g_val = elog::registerInstance("example");
diff --git a/sample/HelloWord/appl/debug.h b/sample/HelloWord/appl/debug.hpp
similarity index 97%
rename from sample/HelloWord/appl/debug.h
rename to sample/HelloWord/appl/debug.hpp
index 40a691d8..1bff2479 100644
--- a/sample/HelloWord/appl/debug.h
+++ b/sample/HelloWord/appl/debug.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <elog/log.h>
+#include <elog/log.hpp>
 
 namespace appl {
 	int32_t getLogId();
diff --git a/sample/wallpaper/appl/Main.cpp b/sample/wallpaper/appl/Main.cpp
index 58decd34..0bb2ecbb 100644
--- a/sample/wallpaper/appl/Main.cpp
+++ b/sample/wallpaper/appl/Main.cpp
@@ -5,15 +5,15 @@
  */
 
 
-#include <etk/types.h>
-#include <ewol/ewol.h>
-#include <gale/context/commandLine.h>
+#include <etk/types.hpp>
+#include <ewol/ewol.hpp>
+#include <gale/context/commandLine.hpp>
 
-#include <appl/debug.h>
-#include <appl/Windows.h>
-#include <ewol/object/Object.h>
-#include <ewol/widget/Manager.h>
-#include <ewol/context/Context.h>
+#include <appl/debug.hpp>
+#include <appl/Windows.hpp>
+#include <ewol/object/Object.hpp>
+#include <ewol/widget/Manager.hpp>
+#include <ewol/context/Context.hpp>
 
 
 class MainApplication : public ewol::context::Application {
diff --git a/sample/wallpaper/appl/Main.h b/sample/wallpaper/appl/Main.hpp
similarity index 100%
rename from sample/wallpaper/appl/Main.h
rename to sample/wallpaper/appl/Main.hpp
diff --git a/sample/wallpaper/appl/WidgetDisplay.cpp b/sample/wallpaper/appl/WidgetDisplay.cpp
index c39d4358..a0989303 100644
--- a/sample/wallpaper/appl/WidgetDisplay.cpp
+++ b/sample/wallpaper/appl/WidgetDisplay.cpp
@@ -4,10 +4,10 @@
  * @license GPL v3 (see license file)
  */
 
-#include <appl/WidgetDisplay.h>
+#include <appl/WidgetDisplay.hpp>
 
-#include <appl/debug.h>
-#include <etk/tool.h>
+#include <appl/debug.hpp>
+#include <etk/tool.hpp>
 
 appl::WidgetDisplay::WidgetDisplay() {
 	addObjectType("appl::WidgetDisplay");
diff --git a/sample/wallpaper/appl/WidgetDisplay.h b/sample/wallpaper/appl/WidgetDisplay.hpp
similarity index 91%
rename from sample/wallpaper/appl/WidgetDisplay.h
rename to sample/wallpaper/appl/WidgetDisplay.hpp
index 86c73208..af5df99b 100644
--- a/sample/wallpaper/appl/WidgetDisplay.h
+++ b/sample/wallpaper/appl/WidgetDisplay.hpp
@@ -5,9 +5,9 @@
  */
 #pragma once
 
-#include <etk/Color.h>
-#include <ewol/widget/Widget.h>
-#include <ewol/compositing/Image.h>
+#include <etk/Color.hpp>
+#include <ewol/widget/Widget.hpp>
+#include <ewol/compositing/Image.hpp>
 
 namespace appl {
 	class WidgetDisplay;
diff --git a/sample/wallpaper/appl/Windows.cpp b/sample/wallpaper/appl/Windows.cpp
index 4e6a9580..31c1167b 100644
--- a/sample/wallpaper/appl/Windows.cpp
+++ b/sample/wallpaper/appl/Windows.cpp
@@ -4,10 +4,10 @@
  * @license GPL v3 (see license file)
  */
 
-#include <ewol/ewol.h>
-#include <appl/debug.h>
-#include <appl/WidgetDisplay.h>
-#include <appl/Windows.h>
+#include <ewol/ewol.hpp>
+#include <appl/debug.hpp>
+#include <appl/WidgetDisplay.hpp>
+#include <appl/Windows.hpp>
 
 appl::Windows::Windows() {
 	addObjectType("appl::Windows");
diff --git a/sample/wallpaper/appl/Windows.h b/sample/wallpaper/appl/Windows.hpp
similarity index 86%
rename from sample/wallpaper/appl/Windows.h
rename to sample/wallpaper/appl/Windows.hpp
index 71f84bb0..eee33f04 100644
--- a/sample/wallpaper/appl/Windows.h
+++ b/sample/wallpaper/appl/Windows.hpp
@@ -5,8 +5,8 @@
  */
 #pragma once
 
-#include <appl/WidgetDisplay.h>
-#include <ewol/widget/Windows.h>
+#include <appl/WidgetDisplay.hpp>
+#include <ewol/widget/Windows.hpp>
 
 namespace appl {
 	class Windows;
diff --git a/sample/wallpaper/appl/debug.cpp b/sample/wallpaper/appl/debug.cpp
index c9ccfa83..a7abd69e 100644
--- a/sample/wallpaper/appl/debug.cpp
+++ b/sample/wallpaper/appl/debug.cpp
@@ -5,7 +5,7 @@
  */
 
 
-#include <appl/debug.h>
+#include <appl/debug.hpp>
 
 int32_t appl::getLogId() {
 	static int32_t g_val = elog::registerInstance("example");
diff --git a/sample/wallpaper/appl/debug.h b/sample/wallpaper/appl/debug.hpp
similarity index 97%
rename from sample/wallpaper/appl/debug.h
rename to sample/wallpaper/appl/debug.hpp
index 80aaaf02..daa2cae8 100644
--- a/sample/wallpaper/appl/debug.h
+++ b/sample/wallpaper/appl/debug.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <elog/log.h>
+#include <elog/log.hpp>
 
 namespace appl {
 	int32_t getLogId();
diff --git a/test/main.cpp b/test/main.cpp
index cb4045ca..30a69c0f 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -4,16 +4,16 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <etk/types.h>
-#include <test-debug/debug.h>
+#include <etk/types.hpp>
+#include <test-debug/debug.hpp>
 #include <vector>
 #include <string>
-#include <etk/Hash.h>
-#include <etk/os/FSNode.h>
-#include <etk/archive/Archive.h>
-#include <etk/etk.h>
-#include <etk/Color.h>
-#include <etk/stdTools.h>
+#include <etk/Hash.hpp>
+#include <etk/os/FSNode.hpp>
+#include <etk/archive/Archive.hpp>
+#include <etk/etk.hpp>
+#include <etk/Color.hpp>
+#include <etk/stdTools.hpp>
 #include <string>
 
 #define NAME "Empty"
diff --git a/test/testApplication.cpp b/test/testApplication.cpp
index b0d0769b..ae71c03a 100644
--- a/test/testApplication.cpp
+++ b/test/testApplication.cpp
@@ -4,8 +4,8 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <test-debug/debug.h>
-#include <ewol/context/Context.h>
+#include <test-debug/debug.hpp>
+#include <ewol/context/Context.hpp>
 #include <gtest/gtest.h>
 #define NAME "Application"
 
diff --git a/test/testWindows.cpp b/test/testWindows.cpp
index 26b5c1ad..6ea62962 100644
--- a/test/testWindows.cpp
+++ b/test/testWindows.cpp
@@ -4,8 +4,8 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <test-debug/debug.h>
-#include <ewol/widget/Windows.h>
+#include <test-debug/debug.hpp>
+#include <ewol/widget/Windows.hpp>
 #include <gtest/gtest.h>
 #define NAME "Windows"
 
diff --git a/tools/visual_test/appl/MainWindows.cpp b/tools/visual_test/appl/MainWindows.cpp
index f2b98703..8ae38808 100644
--- a/tools/visual_test/appl/MainWindows.cpp
+++ b/tools/visual_test/appl/MainWindows.cpp
@@ -5,28 +5,28 @@
  */
 
 
-#include <appl/debug.h>
-#include <appl/MainWindows.h>
+#include <appl/debug.hpp>
+#include <appl/MainWindows.hpp>
 
-#include <ewol/widget/Button.h>
-#include <ewol/widget/CheckBox.h>
-#include <ewol/widget/Sizer.h>
-#include <ewol/widget/Label.h>
-#include <ewol/widget/Entry.h>
-#include <ewol/widget/List.h>
-#include <ewol/widget/ContextMenu.h>
-#include <ewol/widget/PopUp.h>
-#include <ewol/widget/Slider.h>
-#include <ewol/widget/Menu.h>
-#include <ewol/widget/meta/FileChooser.h>
-#include <ewol/widget/meta/Parameter.h>
-#include <ewol/widget/Select.h>
-#include <ewol/widget/Manager.h>
-#include <ewol/widget/Spin.h>
-#include <ewol/context/Context.h>
-#include <appl/TestDistanceField.h>
-#include <etk/os/FSNode.h>
-#include <eproperty/Value.h>
+#include <ewol/widget/Button.hpp>
+#include <ewol/widget/CheckBox.hpp>
+#include <ewol/widget/Sizer.hpp>
+#include <ewol/widget/Label.hpp>
+#include <ewol/widget/Entry.hpp>
+#include <ewol/widget/List.hpp>
+#include <ewol/widget/ContextMenu.hpp>
+#include <ewol/widget/PopUp.hpp>
+#include <ewol/widget/Slider.hpp>
+#include <ewol/widget/Menu.hpp>
+#include <ewol/widget/meta/FileChooser.hpp>
+#include <ewol/widget/meta/Parameter.hpp>
+#include <ewol/widget/Select.hpp>
+#include <ewol/widget/Manager.hpp>
+#include <ewol/widget/Spin.hpp>
+#include <ewol/context/Context.hpp>
+#include <appl/TestDistanceField.hpp>
+#include <etk/os/FSNode.hpp>
+#include <eproperty/Value.hpp>
 
 appl::MainWindows::MainWindows() :
   m_gravity(ewol::gravity_buttomLeft),
diff --git a/tools/visual_test/appl/MainWindows.h b/tools/visual_test/appl/MainWindows.hpp
similarity index 76%
rename from tools/visual_test/appl/MainWindows.h
rename to tools/visual_test/appl/MainWindows.hpp
index 6806d251..85124351 100644
--- a/tools/visual_test/appl/MainWindows.h
+++ b/tools/visual_test/appl/MainWindows.hpp
@@ -5,14 +5,14 @@
  */
 #pragma once
 
-#include <appl/debug.h>
-#include <ewol/widget/Widget.h>
-#include <ewol/widget/Windows.h>
-#include <ewol/widget/Sizer.h>
-#include <ewol/widget/Button.h>
-#include <ewol/widget/Label.h>
-#include <ewol/widget/Spacer.h>
-#include <ewol/widget/Composer.h>
+#include <appl/debug.hpp>
+#include <ewol/widget/Widget.hpp>
+#include <ewol/widget/Windows.hpp>
+#include <ewol/widget/Sizer.hpp>
+#include <ewol/widget/Button.hpp>
+#include <ewol/widget/Label.hpp>
+#include <ewol/widget/Spacer.hpp>
+#include <ewol/widget/Composer.hpp>
 namespace appl {
 	class MainWindows : public ewol::widget::Windows {
 		private:
diff --git a/tools/visual_test/appl/TestDistanceField.cpp b/tools/visual_test/appl/TestDistanceField.cpp
index f95f95b8..6c6117b4 100644
--- a/tools/visual_test/appl/TestDistanceField.cpp
+++ b/tools/visual_test/appl/TestDistanceField.cpp
@@ -5,23 +5,23 @@
  */
 
 
-#include <appl/debug.h>
-#include <appl/TestDistanceField.h>
+#include <appl/debug.hpp>
+#include <appl/TestDistanceField.hpp>
 
-#include <ewol/widget/Button.h>
-#include <ewol/widget/CheckBox.h>
-#include <ewol/widget/Sizer.h>
-#include <ewol/widget/Label.h>
-#include <ewol/widget/Entry.h>
-#include <ewol/widget/List.h>
-#include <ewol/widget/ContextMenu.h>
-#include <ewol/widget/PopUp.h>
-#include <ewol/widget/Slider.h>
-#include <ewol/widget/Composer.h>
-#include <ewol/widget/Menu.h>
-#include <ewol/widget/meta/FileChooser.h>
-#include <ewol/widget/meta/Parameter.h>
-#include <ewol/widget/Manager.h>
+#include <ewol/widget/Button.hpp>
+#include <ewol/widget/CheckBox.hpp>
+#include <ewol/widget/Sizer.hpp>
+#include <ewol/widget/Label.hpp>
+#include <ewol/widget/Entry.hpp>
+#include <ewol/widget/List.hpp>
+#include <ewol/widget/ContextMenu.hpp>
+#include <ewol/widget/PopUp.hpp>
+#include <ewol/widget/Slider.hpp>
+#include <ewol/widget/Composer.hpp>
+#include <ewol/widget/Menu.hpp>
+#include <ewol/widget/meta/FileChooser.hpp>
+#include <ewol/widget/meta/Parameter.hpp>
+#include <ewol/widget/Manager.hpp>
 
 appl::TestDistanceField::TestDistanceField(){
 	addObjectType("appl::TestDistanceField");
diff --git a/tools/visual_test/appl/TestDistanceField.h b/tools/visual_test/appl/TestDistanceField.hpp
similarity index 76%
rename from tools/visual_test/appl/TestDistanceField.h
rename to tools/visual_test/appl/TestDistanceField.hpp
index c8fb17a5..75d95cfa 100644
--- a/tools/visual_test/appl/TestDistanceField.h
+++ b/tools/visual_test/appl/TestDistanceField.hpp
@@ -5,12 +5,12 @@
  */
 #pragma once
 
-#include <appl/debug.h>
-#include <ewol/widget/Widget.h>
-#include <ewol/compositing/Text.h>
-#include <ewol/compositing/TextDF.h>
-#include <gale/resource/Program.h>
-#include <ewol/resource/DistanceFieldFont.h>
+#include <appl/debug.hpp>
+#include <ewol/widget/Widget.hpp>
+#include <ewol/compositing/Text.hpp>
+#include <ewol/compositing/TextDF.hpp>
+#include <gale/resource/Program.hpp>
+#include <ewol/resource/DistanceFieldFont.hpp>
 
 namespace appl {
 	class TestDistanceField : public ewol::Widget {
diff --git a/tools/visual_test/appl/debug.cpp b/tools/visual_test/appl/debug.cpp
index 06caf514..c5ce98cd 100644
--- a/tools/visual_test/appl/debug.cpp
+++ b/tools/visual_test/appl/debug.cpp
@@ -5,7 +5,7 @@
  */
 
 
-#include <appl/debug.h>
+#include <appl/debug.hpp>
 
 int32_t appl::getLogId() {
 	static int32_t g_val = elog::registerInstance("test_ewol");
diff --git a/tools/visual_test/appl/debug.h b/tools/visual_test/appl/debug.hpp
similarity index 96%
rename from tools/visual_test/appl/debug.h
rename to tools/visual_test/appl/debug.hpp
index 14cf1f1e..5c66e6b0 100644
--- a/tools/visual_test/appl/debug.h
+++ b/tools/visual_test/appl/debug.hpp
@@ -5,8 +5,8 @@
  */
 #pragma once
 
-#include <elog/log.h>
-#include <assert.h>
+#include <elog/log.hpp>
+#include <cassert>
 
 namespace appl {
 	/**
diff --git a/tools/visual_test/appl/init.cpp b/tools/visual_test/appl/init.cpp
index da0956a6..f899b9b2 100644
--- a/tools/visual_test/appl/init.cpp
+++ b/tools/visual_test/appl/init.cpp
@@ -4,17 +4,17 @@
  * @license BSD v3 (see license file)
  */
 
-#include <etk/types.h>
-#include <etk/types.h>
-#include <etk/os/FSNode.h>
-#include <ewol/ewol.h>
-#include <ewol/object/Object.h>
-#include <ewol/context/Context.h>
-#include <ewol/widget/Manager.h>
+#include <etk/types.hpp>
+#include <etk/types.hpp>
+#include <etk/os/FSNode.hpp>
+#include <ewol/ewol.hpp>
+#include <ewol/object/Object.hpp>
+#include <ewol/context/Context.hpp>
+#include <ewol/widget/Manager.hpp>
 
-#include <appl/debug.h>
-#include <appl/MainWindows.h>
-#include <appl/widget/SizerColor.h>
+#include <appl/debug.hpp>
+#include <appl/MainWindows.hpp>
+#include <appl/widget/SizerColor.hpp>
 
 class MainApplication : public ewol::context::Application {
 	public:
diff --git a/tools/visual_test/appl/widget/SizerColor.cpp b/tools/visual_test/appl/widget/SizerColor.cpp
index 9a2918cb..36fe2efc 100644
--- a/tools/visual_test/appl/widget/SizerColor.cpp
+++ b/tools/visual_test/appl/widget/SizerColor.cpp
@@ -4,8 +4,8 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <appl/debug.h>
-#include <appl/widget/SizerColor.h>
+#include <appl/debug.hpp>
+#include <appl/widget/SizerColor.hpp>
 
 appl::widget::SizerColor::SizerColor() :
   propertyBorderColor(this, "border-color", etk::color::none, "Color of the border"),
diff --git a/tools/visual_test/appl/widget/SizerColor.h b/tools/visual_test/appl/widget/SizerColor.hpp
similarity index 91%
rename from tools/visual_test/appl/widget/SizerColor.h
rename to tools/visual_test/appl/widget/SizerColor.hpp
index 4f268a58..0eef9dc4 100644
--- a/tools/visual_test/appl/widget/SizerColor.h
+++ b/tools/visual_test/appl/widget/SizerColor.hpp
@@ -5,10 +5,10 @@
  */
 #pragma once
 
-#include <etk/types.h>
-#include <ewol/widget/Sizer.h>
-#include <etk/Color.h>
-#include <ewol/compositing/Drawing.h>
+#include <etk/types.hpp>
+#include <ewol/widget/Sizer.hpp>
+#include <etk/Color.hpp>
+#include <ewol/compositing/Drawing.hpp>
 
 namespace appl {
 	namespace widget {