diff --git a/doxy_exml.py b/doxy_exml.py
index 9344653..6dbddfd 100644
--- a/doxy_exml.py
+++ b/doxy_exml.py
@@ -26,10 +26,10 @@ def create(target, module_name):
 	    '*operator<<*',
 	    ])
 	my_module.add_exclude_file([
-	    'debug.h',
+	    'debug.hpp',
 	    ])
 	my_module.add_file_patterns([
-	    '*.h',
+	    '*.hpp',
 	    '*.md',
 	    ])
 	
diff --git a/exml/Attribute.cpp b/exml/Attribute.cpp
index 95cfd93..9b9c07a 100644
--- a/exml/Attribute.cpp
+++ b/exml/Attribute.cpp
@@ -4,9 +4,9 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <exml/Attribute.h>
-#include <exml/debug.h>
-#include <exml/internal/Attribute.h>
+#include <exml/Attribute.hpp>
+#include <exml/debug.hpp>
+#include <exml/internal/Attribute.hpp>
 
 exml::Attribute::Attribute(ememory::SharedPtr<exml::internal::Node> _internalNode) :
   exml::Node(_internalNode) {
diff --git a/exml/Attribute.h b/exml/Attribute.hpp
similarity index 98%
rename from exml/Attribute.h
rename to exml/Attribute.hpp
index 116baa6..2b05f24 100644
--- a/exml/Attribute.h
+++ b/exml/Attribute.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <exml/Node.h>
+#include <exml/Node.hpp>
 #include <vector>
 
 namespace exml {
diff --git a/exml/AttributeList.cpp b/exml/AttributeList.cpp
index b807cd1..4e45ea6 100644
--- a/exml/AttributeList.cpp
+++ b/exml/AttributeList.cpp
@@ -4,9 +4,9 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <exml/debug.h>
-#include <exml/AttributeList.h>
-#include <exml/internal/AttributeList.h>
+#include <exml/debug.hpp>
+#include <exml/AttributeList.hpp>
+#include <exml/internal/AttributeList.hpp>
 
 
 exml::AttributeList::AttributeList(const ememory::SharedPtr<exml::internal::Node>& _internalNode) :
diff --git a/exml/AttributeList.h b/exml/AttributeList.hpp
similarity index 97%
rename from exml/AttributeList.h
rename to exml/AttributeList.hpp
index 077f751..d2cb85f 100644
--- a/exml/AttributeList.h
+++ b/exml/AttributeList.hpp
@@ -5,9 +5,9 @@
  */
 #pragma once
 
-#include <exml/Node.h>
-#include <exml/Attribute.h>
-#include <exml/iterator.h>
+#include <exml/Node.hpp>
+#include <exml/Attribute.hpp>
+#include <exml/iterator.hpp>
 
 namespace exml {
 	class AttributeList;
diff --git a/exml/Comment.cpp b/exml/Comment.cpp
index ed0a40b..e92e351 100644
--- a/exml/Comment.cpp
+++ b/exml/Comment.cpp
@@ -4,9 +4,9 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <exml/Comment.h>
-#include <exml/debug.h>
-#include <exml/internal/Comment.h>
+#include <exml/Comment.hpp>
+#include <exml/debug.hpp>
+#include <exml/internal/Comment.hpp>
 
 exml::Comment::Comment(ememory::SharedPtr<exml::internal::Node> _internalNode) :
   exml::Node(_internalNode) {
diff --git a/exml/Comment.h b/exml/Comment.hpp
similarity index 97%
rename from exml/Comment.h
rename to exml/Comment.hpp
index 5655a03..4b4e9ed 100644
--- a/exml/Comment.h
+++ b/exml/Comment.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <exml/Node.h>
+#include <exml/Node.hpp>
 #include <vector>
 
 namespace exml {
diff --git a/exml/Declaration.cpp b/exml/Declaration.cpp
index 2991d7b..6c75695 100644
--- a/exml/Declaration.cpp
+++ b/exml/Declaration.cpp
@@ -4,9 +4,9 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <exml/Declaration.h>
-#include <exml/debug.h>
-#include <exml/internal/Declaration.h>
+#include <exml/Declaration.hpp>
+#include <exml/debug.hpp>
+#include <exml/internal/Declaration.hpp>
 
 exml::Declaration::Declaration(ememory::SharedPtr<exml::internal::Node> _internalNode) :
   exml::AttributeList(_internalNode) {
diff --git a/exml/Declaration.h b/exml/Declaration.hpp
similarity index 97%
rename from exml/Declaration.h
rename to exml/Declaration.hpp
index 61b52a0..5f9716d 100644
--- a/exml/Declaration.h
+++ b/exml/Declaration.hpp
@@ -5,8 +5,8 @@
  */
 #pragma once
 
-#include <exml/Node.h>
-#include <exml/AttributeList.h>
+#include <exml/Node.hpp>
+#include <exml/AttributeList.hpp>
 
 namespace exml {
 	/**
diff --git a/exml/Document.cpp b/exml/Document.cpp
index 78a5b96..ee6b591 100644
--- a/exml/Document.cpp
+++ b/exml/Document.cpp
@@ -4,9 +4,9 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <exml/Document.h>
-#include <exml/debug.h>
-#include <exml/internal/Document.h>
+#include <exml/Document.hpp>
+#include <exml/debug.hpp>
+#include <exml/internal/Document.hpp>
 
 exml::Document::Document(ememory::SharedPtr<exml::internal::Node> _internalNode) :
   exml::Element(_internalNode) {
diff --git a/exml/Document.h b/exml/Document.hpp
similarity index 98%
rename from exml/Document.h
rename to exml/Document.hpp
index 5e0c767..be484b3 100644
--- a/exml/Document.h
+++ b/exml/Document.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <exml/Element.h>
+#include <exml/Element.hpp>
 #include <vector>
 
 namespace exml {
diff --git a/exml/Element.cpp b/exml/Element.cpp
index ed38ec7..f3035fd 100644
--- a/exml/Element.cpp
+++ b/exml/Element.cpp
@@ -4,9 +4,9 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <exml/Element.h>
-#include <exml/debug.h>
-#include <exml/internal/Element.h>
+#include <exml/Element.hpp>
+#include <exml/debug.hpp>
+#include <exml/internal/Element.hpp>
 
 
 exml::Element::Element(const ememory::SharedPtr<exml::internal::Node>& _internalNode) :
diff --git a/exml/Element.h b/exml/Element.hpp
similarity index 98%
rename from exml/Element.h
rename to exml/Element.hpp
index 8028974..b201296 100644
--- a/exml/Element.h
+++ b/exml/Element.hpp
@@ -5,10 +5,10 @@
  */
 #pragma once
 
-#include <exml/Node.h>
+#include <exml/Node.hpp>
 #include <vector>
-#include <exml/AttributeList.h>
-#include <exml/iterator.h>
+#include <exml/AttributeList.hpp>
+#include <exml/iterator.hpp>
 
 namespace exml {
 	
diff --git a/exml/FilePos.cpp b/exml/FilePos.cpp
index 7b93a52..1d4afc6 100644
--- a/exml/FilePos.cpp
+++ b/exml/FilePos.cpp
@@ -3,7 +3,7 @@
  * @copyright 2011, Edouard DUPIN, all right reserved
  * @license APACHE v2.0 (see license file)
  */
-#include <exml/FilePos.h>
+#include <exml/FilePos.hpp>
 
 exml::FilePos::FilePos() :
   m_col(0),
diff --git a/exml/FilePos.h b/exml/FilePos.hpp
similarity index 98%
rename from exml/FilePos.h
rename to exml/FilePos.hpp
index 44e86a5..88e758c 100644
--- a/exml/FilePos.h
+++ b/exml/FilePos.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <etk/types.h>
+#include <etk/types.hpp>
 
 namespace exml {
 	/**
diff --git a/exml/Node.cpp b/exml/Node.cpp
index 802e886..4abf5eb 100644
--- a/exml/Node.cpp
+++ b/exml/Node.cpp
@@ -4,15 +4,15 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <exml/Node.h>
-#include <exml/internal/Node.h>
-#include <exml/debug.h>
-#include <exml/Attribute.h>
-#include <exml/Comment.h>
-#include <exml/Declaration.h>
-#include <exml/Document.h>
-#include <exml/Element.h>
-#include <exml/Text.h>
+#include <exml/Node.hpp>
+#include <exml/internal/Node.hpp>
+#include <exml/debug.hpp>
+#include <exml/Attribute.hpp>
+#include <exml/Comment.hpp>
+#include <exml/Declaration.hpp>
+#include <exml/Document.hpp>
+#include <exml/Element.hpp>
+#include <exml/Text.hpp>
 
 std::ostream& exml::operator <<(std::ostream& _os, const exml::Node& _obj) {
 	_os << "{";
diff --git a/exml/Node.h b/exml/Node.hpp
similarity index 96%
rename from exml/Node.h
rename to exml/Node.hpp
index d74c76e..afb77b1 100644
--- a/exml/Node.h
+++ b/exml/Node.hpp
@@ -5,12 +5,12 @@
  */
 #pragma once
 
-#include <ememory/memory.h>
-#include <etk/types.h>
-#include <etk/math/Vector2D.h>
-#include <exml/FilePos.h>
-#include <exml/internal/Node.h>
-#include <exml/nodeType.h>
+#include <ememory/memory.hpp>
+#include <etk/types.hpp>
+#include <etk/math/Vector2D.hpp>
+#include <exml/FilePos.hpp>
+#include <exml/internal/Node.hpp>
+#include <exml/nodeType.hpp>
 
 /**
  * @brief exml namespace containing all function for XML interpretor
diff --git a/exml/Text.cpp b/exml/Text.cpp
index d6ca016..22ede8f 100644
--- a/exml/Text.cpp
+++ b/exml/Text.cpp
@@ -4,9 +4,9 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <exml/Text.h>
-#include <exml/internal/Text.h>
-#include <exml/debug.h>
+#include <exml/Text.hpp>
+#include <exml/internal/Text.hpp>
+#include <exml/debug.hpp>
 #include <regex>
 
 exml::Text::Text(ememory::SharedPtr<exml::internal::Node> _internalNode) :
diff --git a/exml/Text.h b/exml/Text.hpp
similarity index 97%
rename from exml/Text.h
rename to exml/Text.hpp
index a38d221..30de1e2 100644
--- a/exml/Text.h
+++ b/exml/Text.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <exml/Node.h>
+#include <exml/Node.hpp>
 #include <vector>
 
 namespace exml {
diff --git a/exml/debug.cpp b/exml/debug.cpp
index 4ffe837..7c73282 100644
--- a/exml/debug.cpp
+++ b/exml/debug.cpp
@@ -4,7 +4,7 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <exml/debug.h>
+#include <exml/debug.hpp>
 
 int32_t exml::getLogId() {
 	static int32_t g_val = elog::registerInstance("exml");
diff --git a/exml/debug.h b/exml/debug.hpp
similarity index 97%
rename from exml/debug.h
rename to exml/debug.hpp
index 8279ee0..c076263 100644
--- a/exml/debug.h
+++ b/exml/debug.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <elog/log.h>
+#include <elog/log.hpp>
 
 namespace exml {
 	int32_t getLogId();
diff --git a/exml/exml.h b/exml/exml.h
deleted file mode 100644
index 827e40a..0000000
--- a/exml/exml.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/** @file
- * @author Edouard DUPIN
- * @copyright 2011, Edouard DUPIN, all right reserved
- * @license APACHE v2.0 (see license file)
- */
-#pragma once
-
-#include <exml/Document.h>
-#include <exml/Node.h>
-#include <exml/Element.h>
-#include <exml/Attribute.h>
-#include <exml/Declaration.h>
-#include <exml/Comment.h>
-#include <exml/Text.h>
-
diff --git a/exml/exml.hpp b/exml/exml.hpp
new file mode 100644
index 0000000..7b45327
--- /dev/null
+++ b/exml/exml.hpp
@@ -0,0 +1,15 @@
+/** @file
+ * @author Edouard DUPIN
+ * @copyright 2011, Edouard DUPIN, all right reserved
+ * @license APACHE v2.0 (see license file)
+ */
+#pragma once
+
+#include <exml/Document.hpp>
+#include <exml/Node.hpp>
+#include <exml/Element.hpp>
+#include <exml/Attribute.hpp>
+#include <exml/Declaration.hpp>
+#include <exml/Comment.hpp>
+#include <exml/Text.hpp>
+
diff --git a/exml/internal/Attribute.cpp b/exml/internal/Attribute.cpp
index 0dc6ccf..9d4778c 100644
--- a/exml/internal/Attribute.cpp
+++ b/exml/internal/Attribute.cpp
@@ -4,9 +4,9 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <exml/internal/Attribute.h>
-#include <exml/debug.h>
-#include <exml/internal/Document.h>
+#include <exml/internal/Attribute.hpp>
+#include <exml/debug.hpp>
+#include <exml/internal/Document.hpp>
 
 ememory::SharedPtr<exml::internal::Attribute> exml::internal::Attribute::create(const std::string& _name, const std::string& _value) {
 	return ememory::SharedPtr<exml::internal::Attribute>(new exml::internal::Attribute(_name, _value));
diff --git a/exml/internal/Attribute.h b/exml/internal/Attribute.hpp
similarity index 98%
rename from exml/internal/Attribute.h
rename to exml/internal/Attribute.hpp
index e4bc21d..b5de070 100644
--- a/exml/internal/Attribute.h
+++ b/exml/internal/Attribute.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <exml/internal/Node.h>
+#include <exml/internal/Node.hpp>
 #include <vector>
 
 namespace exml {
diff --git a/exml/internal/AttributeList.cpp b/exml/internal/AttributeList.cpp
index 44caf7e..f7e6fe4 100644
--- a/exml/internal/AttributeList.cpp
+++ b/exml/internal/AttributeList.cpp
@@ -4,8 +4,8 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <exml/internal/AttributeList.h>
-#include <exml/debug.h>
+#include <exml/internal/AttributeList.hpp>
+#include <exml/debug.hpp>
 
 ememory::SharedPtr<exml::internal::Attribute> exml::internal::AttributeList::getAttr(int32_t _id) {
 	if (    _id < 0
diff --git a/exml/internal/AttributeList.h b/exml/internal/AttributeList.hpp
similarity index 97%
rename from exml/internal/AttributeList.h
rename to exml/internal/AttributeList.hpp
index 93e0698..1c8280d 100644
--- a/exml/internal/AttributeList.h
+++ b/exml/internal/AttributeList.hpp
@@ -5,9 +5,9 @@
  */
 #pragma once
 
-#include <exml/internal/Node.h>
+#include <exml/internal/Node.hpp>
 #include <vector>
-#include <exml/internal/Attribute.h>
+#include <exml/internal/Attribute.hpp>
 #include <utility>
 
 namespace exml {
diff --git a/exml/internal/Comment.cpp b/exml/internal/Comment.cpp
index 722c834..9ed7d91 100644
--- a/exml/internal/Comment.cpp
+++ b/exml/internal/Comment.cpp
@@ -4,9 +4,9 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <exml/internal/Comment.h>
-#include <exml/debug.h>
-#include <exml/internal/Document.h>
+#include <exml/internal/Comment.hpp>
+#include <exml/debug.hpp>
+#include <exml/internal/Document.hpp>
 
 static bool isWhiteChar(char32_t _val) {
 	if(    _val == ' '
diff --git a/exml/internal/Comment.h b/exml/internal/Comment.hpp
similarity index 97%
rename from exml/internal/Comment.h
rename to exml/internal/Comment.hpp
index 244ced0..00c202d 100644
--- a/exml/internal/Comment.h
+++ b/exml/internal/Comment.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <exml/internal/Node.h>
+#include <exml/internal/Node.hpp>
 #include <vector>
 
 namespace exml {
diff --git a/exml/internal/Declaration.cpp b/exml/internal/Declaration.cpp
index ed17013..a702ec2 100644
--- a/exml/internal/Declaration.cpp
+++ b/exml/internal/Declaration.cpp
@@ -4,9 +4,9 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <exml/internal/Declaration.h>
-#include <exml/debug.h>
-#include <exml/internal/Document.h>
+#include <exml/internal/Declaration.hpp>
+#include <exml/debug.hpp>
+#include <exml/internal/Document.hpp>
 
 /* basic declaration have 3 attributes:
 	version
diff --git a/exml/internal/Declaration.h b/exml/internal/Declaration.hpp
similarity index 98%
rename from exml/internal/Declaration.h
rename to exml/internal/Declaration.hpp
index 0ef7853..e2cbb6f 100644
--- a/exml/internal/Declaration.h
+++ b/exml/internal/Declaration.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <exml/internal/AttributeList.h>
+#include <exml/internal/AttributeList.hpp>
 
 namespace exml {
 	namespace internal {
diff --git a/exml/internal/Document.cpp b/exml/internal/Document.cpp
index be90ad9..68a3b5b 100644
--- a/exml/internal/Document.cpp
+++ b/exml/internal/Document.cpp
@@ -4,9 +4,9 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <exml/internal/Document.h>
-#include <exml/debug.h>
-#include <etk/os/FSNode.h>
+#include <exml/internal/Document.hpp>
+#include <exml/debug.hpp>
+#include <etk/os/FSNode.hpp>
 
 ememory::SharedPtr<exml::internal::Document> exml::internal::Document::create() {
 	return ememory::SharedPtr<exml::internal::Document>(new exml::internal::Document());
diff --git a/exml/internal/Document.h b/exml/internal/Document.hpp
similarity index 99%
rename from exml/internal/Document.h
rename to exml/internal/Document.hpp
index 2b4b30c..8f80d1c 100644
--- a/exml/internal/Document.h
+++ b/exml/internal/Document.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <exml/internal/Element.h>
+#include <exml/internal/Element.hpp>
 #include <vector>
 
 namespace exml {
diff --git a/exml/internal/Element.cpp b/exml/internal/Element.cpp
index 661cefe..d48ce4d 100644
--- a/exml/internal/Element.cpp
+++ b/exml/internal/Element.cpp
@@ -4,13 +4,13 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <exml/internal/Element.h>
-#include <exml/debug.h>
-#include <exml/internal/Text.h>
-#include <exml/internal/Comment.h>
-#include <exml/internal/Attribute.h>
-#include <exml/internal/Declaration.h>
-#include <exml/internal/Document.h>
+#include <exml/internal/Element.hpp>
+#include <exml/debug.hpp>
+#include <exml/internal/Text.hpp>
+#include <exml/internal/Comment.hpp>
+#include <exml/internal/Attribute.hpp>
+#include <exml/internal/Declaration.hpp>
+#include <exml/internal/Document.hpp>
 
 static bool isWhiteChar(char32_t _val) {
 	if(    _val == ' '
diff --git a/exml/internal/Element.h b/exml/internal/Element.hpp
similarity index 98%
rename from exml/internal/Element.h
rename to exml/internal/Element.hpp
index 57456dd..7139154 100644
--- a/exml/internal/Element.h
+++ b/exml/internal/Element.hpp
@@ -5,9 +5,9 @@
  */
 #pragma once
 
-#include <exml/internal/Node.h>
+#include <exml/internal/Node.hpp>
 #include <vector>
-#include <exml/internal/AttributeList.h>
+#include <exml/internal/AttributeList.hpp>
 
 namespace exml {
 	namespace internal {
diff --git a/exml/internal/Node.cpp b/exml/internal/Node.cpp
index b8d5fb4..630291a 100644
--- a/exml/internal/Node.cpp
+++ b/exml/internal/Node.cpp
@@ -4,14 +4,14 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <exml/internal/Node.h>
-#include <exml/internal/Document.h>
-#include <exml/internal/Attribute.h>
-#include <exml/internal/Comment.h>
-#include <exml/internal/Declaration.h>
-#include <exml/internal/Element.h>
-#include <exml/internal/Text.h>
-#include <exml/debug.h>
+#include <exml/internal/Node.hpp>
+#include <exml/internal/Document.hpp>
+#include <exml/internal/Attribute.hpp>
+#include <exml/internal/Comment.hpp>
+#include <exml/internal/Declaration.hpp>
+#include <exml/internal/Element.hpp>
+#include <exml/internal/Text.hpp>
+#include <exml/debug.hpp>
 
 static bool isWhiteChar(char32_t _val) {
 	if(    _val == ' '
diff --git a/exml/internal/Node.h b/exml/internal/Node.hpp
similarity index 98%
rename from exml/internal/Node.h
rename to exml/internal/Node.hpp
index 481d751..fb7ad00 100644
--- a/exml/internal/Node.h
+++ b/exml/internal/Node.hpp
@@ -5,11 +5,11 @@
  */
 #pragma once
 
-#include <ememory/memory.h>
-#include <etk/types.h>
-#include <etk/math/Vector2D.h>
-#include <exml/FilePos.h>
-#include <exml/nodeType.h>
+#include <ememory/memory.hpp>
+#include <etk/types.hpp>
+#include <etk/math/Vector2D.hpp>
+#include <exml/FilePos.hpp>
+#include <exml/nodeType.hpp>
 
 /**
  * @brief exml namespace containing all function for XML interpretor
diff --git a/exml/internal/Text.cpp b/exml/internal/Text.cpp
index 7ec4f76..41e61df 100644
--- a/exml/internal/Text.cpp
+++ b/exml/internal/Text.cpp
@@ -4,9 +4,9 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <exml/internal/Text.h>
-#include <exml/debug.h>
-#include <exml/internal/Document.h>
+#include <exml/internal/Text.hpp>
+#include <exml/debug.hpp>
+#include <exml/internal/Document.hpp>
 #include <regex>
 
 // transform the Text with :
diff --git a/exml/internal/Text.h b/exml/internal/Text.hpp
similarity index 98%
rename from exml/internal/Text.h
rename to exml/internal/Text.hpp
index 43e921f..e585656 100644
--- a/exml/internal/Text.h
+++ b/exml/internal/Text.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <exml/internal/Node.h>
+#include <exml/internal/Node.hpp>
 #include <vector>
 
 namespace exml {
diff --git a/exml/iterator.h b/exml/iterator.hpp
similarity index 98%
rename from exml/iterator.h
rename to exml/iterator.hpp
index 94f0e5f..5e811ce 100644
--- a/exml/iterator.h
+++ b/exml/iterator.hpp
@@ -5,8 +5,8 @@
  */
 #pragma once
 
-#include <ememory/memory.h>
-#include <etk/types.h>
+#include <ememory/memory.hpp>
+#include <etk/types.hpp>
 
 namespace exml {
 	/**
diff --git a/exml/nodeType.cpp b/exml/nodeType.cpp
index 02a2d63..807ea38 100644
--- a/exml/nodeType.cpp
+++ b/exml/nodeType.cpp
@@ -4,8 +4,8 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <exml/nodeType.h>
-#include <exml/debug.h>
+#include <exml/nodeType.hpp>
+#include <exml/debug.hpp>
 
 
 
diff --git a/exml/nodeType.h b/exml/nodeType.hpp
similarity index 100%
rename from exml/nodeType.h
rename to exml/nodeType.hpp
diff --git a/lutin_exml.py b/lutin_exml.py
index 9e21b26..b0ffae9 100644
--- a/lutin_exml.py
+++ b/lutin_exml.py
@@ -52,26 +52,26 @@ def create(target, module_name):
 		'exml/internal/Text.cpp'
 		])
 	my_module.add_header_file([
-		'exml/FilePos.h',
-		'exml/nodeType.h',
-		'exml/exml.h',
-		'exml/iterator.h',
-		'exml/Attribute.h',
-		'exml/AttributeList.h',
-		'exml/Comment.h',
-		'exml/Declaration.h',
-		'exml/Document.h',
-		'exml/Element.h',
-		'exml/Node.h',
-		'exml/Text.h',
-		'exml/internal/Attribute.h',
-		'exml/internal/AttributeList.h',
-		'exml/internal/Comment.h',
-		'exml/internal/Declaration.h',
-		'exml/internal/Document.h',
-		'exml/internal/Element.h',
-		'exml/internal/Node.h',
-		'exml/internal/Text.h'
+		'exml/FilePos.hpp',
+		'exml/nodeType.hpp',
+		'exml/exml.hpp',
+		'exml/iterator.hpp',
+		'exml/Attribute.hpp',
+		'exml/AttributeList.hpp',
+		'exml/Comment.hpp',
+		'exml/Declaration.hpp',
+		'exml/Document.hpp',
+		'exml/Element.hpp',
+		'exml/Node.hpp',
+		'exml/Text.hpp',
+		'exml/internal/Attribute.hpp',
+		'exml/internal/AttributeList.hpp',
+		'exml/internal/Comment.hpp',
+		'exml/internal/Declaration.hpp',
+		'exml/internal/Document.hpp',
+		'exml/internal/Element.hpp',
+		'exml/internal/Node.hpp',
+		'exml/internal/Text.hpp'
 		])
 	my_module.add_path(tools.get_current_path(__file__))
 	return my_module
diff --git a/sample/main.cpp b/sample/main.cpp
index e535cd9..33248cd 100644
--- a/sample/main.cpp
+++ b/sample/main.cpp
@@ -4,10 +4,10 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <test-debug/debug.h>
-#include <etk/etk.h>
-#include "read.h"
-#include "write.h"
+#include <test-debug/debug.hpp>
+#include <etk/etk.hpp>
+#include "read.hpp"
+#include "write.hpp"
 
 int main(int argc, const char *argv[]) {
 	// the only one init for etk:
diff --git a/sample/read.cpp b/sample/read.cpp
index b5bf89f..27cd135 100644
--- a/sample/read.cpp
+++ b/sample/read.cpp
@@ -4,11 +4,12 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <test-debug/debug.h>
+//! [exml_sample_read_all]
+#include <test-debug/debug.hpp>
 //! [exml_sample_include]
-#include <exml/exml.h>
+#include <exml/exml.hpp>
 //! [exml_sample_include]
-#include "read.h"
+#include "read.hpp"
 
 
 static void readFromFile() {
diff --git a/sample/read.h b/sample/read.hpp
similarity index 100%
rename from sample/read.h
rename to sample/read.hpp
diff --git a/sample/write.cpp b/sample/write.cpp
index 4b502bd..1a84a70 100644
--- a/sample/write.cpp
+++ b/sample/write.cpp
@@ -4,9 +4,10 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <test-debug/debug.h>
-#include <exml/exml.h>
-#include "write.h"
+//! [exml_sample_write_all]
+#include <test-debug/debug.hpp>
+#include <exml/exml.hpp>
+#include "write.hpp"
 
 
 static void writeToFile() {
diff --git a/sample/write.h b/sample/write.hpp
similarity index 100%
rename from sample/write.h
rename to sample/write.hpp
diff --git a/test/exmlTestAll.cpp b/test/exmlTestAll.cpp
index aa117b9..ac48e92 100644
--- a/test/exmlTestAll.cpp
+++ b/test/exmlTestAll.cpp
@@ -4,7 +4,7 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include "exmlTestCommon.h"
+#include "exmlTestCommon.hpp"
 #include <gtest/gtest.h>
 
 
diff --git a/test/exmlTestAttribute.cpp b/test/exmlTestAttribute.cpp
index 9281f24..55d17e7 100644
--- a/test/exmlTestAttribute.cpp
+++ b/test/exmlTestAttribute.cpp
@@ -5,8 +5,8 @@
  */
 
 #include <gtest/gtest.h>
-#include <exml/exml.h>
-#include <exml/Attribute.h>
+#include <exml/exml.hpp>
+#include <exml/Attribute.hpp>
 
 
 TEST(TestAttribute, create) {
diff --git a/test/exmlTestComment.cpp b/test/exmlTestComment.cpp
index 8f7fe40..0561dce 100644
--- a/test/exmlTestComment.cpp
+++ b/test/exmlTestComment.cpp
@@ -5,8 +5,8 @@
  */
 
 #include <gtest/gtest.h>
-#include <exml/exml.h>
-#include <exml/Comment.h>
+#include <exml/exml.hpp>
+#include <exml/Comment.hpp>
 
 TEST(TestComment, create) {
 	exml::Comment myComment("my Comment");
diff --git a/test/exmlTestCommon.cpp b/test/exmlTestCommon.cpp
index 57a3c77..bc5aedb 100644
--- a/test/exmlTestCommon.cpp
+++ b/test/exmlTestCommon.cpp
@@ -4,9 +4,9 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <etk/types.h>
-#include <test-debug/debug.h>
-#include <exml/exml.h>
+#include <etk/types.hpp>
+#include <test-debug/debug.hpp>
+#include <exml/exml.hpp>
 #include <gtest/gtest.h>
 
 // _errorPos : -1 : no error , 1 : parsing error, 2 generation error, 3 comparaison error ????
diff --git a/test/exmlTestCommon.h b/test/exmlTestCommon.hpp
similarity index 94%
rename from test/exmlTestCommon.h
rename to test/exmlTestCommon.hpp
index 5a9a63b..0dbb2de 100644
--- a/test/exmlTestCommon.h
+++ b/test/exmlTestCommon.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <etk/types.h>
+#include <etk/types.hpp>
 
 // _errorPos : -1 : no error , 1 : parsing error, 2 generation error, 3 comparaison error ????
 void exmlLocalTest(const std::string& _ref,
diff --git a/test/exmlTestDeclaration.cpp b/test/exmlTestDeclaration.cpp
index b283265..346a389 100644
--- a/test/exmlTestDeclaration.cpp
+++ b/test/exmlTestDeclaration.cpp
@@ -5,8 +5,8 @@
  */
 
 #include <gtest/gtest.h>
-#include <exml/exml.h>
-#include <exml/Declaration.h>
+#include <exml/exml.hpp>
+#include <exml/Declaration.hpp>
 
 TEST(TestDeclaration, create) {
 	exml::Declaration myDeclaration("type");
diff --git a/test/exmlTestDeclarationXML.cpp b/test/exmlTestDeclarationXML.cpp
index b5811f6..3499f15 100644
--- a/test/exmlTestDeclarationXML.cpp
+++ b/test/exmlTestDeclarationXML.cpp
@@ -5,8 +5,8 @@
  */
 
 #include <gtest/gtest.h>
-#include <exml/exml.h>
-#include <exml/Declaration.h>
+#include <exml/exml.hpp>
+#include <exml/Declaration.hpp>
 
 TEST(TestDeclarationXML, create) {
 	exml::DeclarationXML myDeclarationXML("1.0", "UTF-8", true);
diff --git a/test/exmlTestElement.cpp b/test/exmlTestElement.cpp
index f9ced79..8872d35 100644
--- a/test/exmlTestElement.cpp
+++ b/test/exmlTestElement.cpp
@@ -5,10 +5,10 @@
  */
 
 #include <gtest/gtest.h>
-#include <test-debug/debug.h>
-#include <exml/exml.h>
-#include <exml/Element.h>
-#include <exml/Comment.h>
+#include <test-debug/debug.hpp>
+#include <exml/exml.hpp>
+#include <exml/Element.hpp>
+#include <exml/Comment.hpp>
 
 
 TEST(TestElement, create) {
diff --git a/test/exmlTestParseAttribute.cpp b/test/exmlTestParseAttribute.cpp
index a949616..7e8872e 100644
--- a/test/exmlTestParseAttribute.cpp
+++ b/test/exmlTestParseAttribute.cpp
@@ -4,7 +4,7 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include "exmlTestCommon.h"
+#include "exmlTestCommon.hpp"
 #include <gtest/gtest.h>
 
 
diff --git a/test/exmlTestParseComment.cpp b/test/exmlTestParseComment.cpp
index 76c0901..4bb9db6 100644
--- a/test/exmlTestParseComment.cpp
+++ b/test/exmlTestParseComment.cpp
@@ -4,7 +4,7 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include "exmlTestCommon.h"
+#include "exmlTestCommon.hpp"
 #include <gtest/gtest.h>
 
 
diff --git a/test/exmlTestParseDeclaration.cpp b/test/exmlTestParseDeclaration.cpp
index eddf778..ad106ac 100644
--- a/test/exmlTestParseDeclaration.cpp
+++ b/test/exmlTestParseDeclaration.cpp
@@ -4,7 +4,7 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include "exmlTestCommon.h"
+#include "exmlTestCommon.hpp"
 #include <gtest/gtest.h>
 
 
diff --git a/test/exmlTestParseElement.cpp b/test/exmlTestParseElement.cpp
index b6e11f6..cbaa135 100644
--- a/test/exmlTestParseElement.cpp
+++ b/test/exmlTestParseElement.cpp
@@ -4,7 +4,7 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include "exmlTestCommon.h"
+#include "exmlTestCommon.hpp"
 #include <gtest/gtest.h>
 
 
diff --git a/test/main.cpp b/test/main.cpp
index 9002a73..33a0cf4 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -4,10 +4,10 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <test-debug/debug.h>
+#include <test-debug/debug.hpp>
 #include <gtest/gtest.h>
-#include <etk/os/FSNode.h>
-#include <etk/etk.h>
+#include <etk/os/FSNode.hpp>
+#include <etk/etk.hpp>
 
 int main(int argc, const char *argv[]) {
 	// init Google test :