diff --git a/etk/Color.h b/etk/Color.h
index a6b570e..fe12baf 100644
--- a/etk/Color.h
+++ b/etk/Color.h
@@ -6,11 +6,11 @@
  * @license BSD v3 (see license file)
  */
 
+#include <etk/types.h>
+
 #ifndef __ETK_COLOR_H__
 #define __ETK_COLOR_H__
 
-#include <etk/types.h>
-
 namespace etk {
 	/**
 	 * @brief The color class is a template to abstract the color implementation choice.
diff --git a/etk/Hash.h b/etk/Hash.h
index 255bc87..a160b45 100644
--- a/etk/Hash.h
+++ b/etk/Hash.h
@@ -6,11 +6,11 @@
  * @license BSD v3 (see license file)
  */
 
+#include <etk/types.h>
+
 #ifndef __ETK_HACH_H__
 #define __ETK_HACH_H__
 
-#include <etk/types.h>
-
 #undef __class__
 #define __class__ "etk::Hash"
 
diff --git a/etk/Noise.h b/etk/Noise.h
index 620ae32..9ed6406 100644
--- a/etk/Noise.h
+++ b/etk/Noise.h
@@ -6,10 +6,11 @@
  * @license BSD v3 (see license file)
  */
 
+#include <etk/types.h>
+
 #ifndef __ETK_NOISE_H__
 #define __ETK_NOISE_H__
 
-#include <etk/types.h>
 #include <etk/math/Vector2D.h>
 
 namespace etk {
diff --git a/etk/RegExp.h b/etk/RegExp.h
index 06cf81d..39ae922 100644
--- a/etk/RegExp.h
+++ b/etk/RegExp.h
@@ -6,10 +6,11 @@
  * @license BSD v3 (see license file)
  */
 
+#include <etk/types.h>
+
 #ifndef __TK_REG_EXP_H__
 #define __TK_REG_EXP_H__
 
-#include <etk/types.h>
 #include <etk/debug.h>
 #include <etk/stdTools.h>
 #include <vector>
@@ -1415,7 +1416,7 @@ template<class CLASS_TYPE> class RegExp {
 		 * @return the string representing the RegExp
 		 */
 		std::string getRegExp(void) const {
-			return to_u8string(m_expressionRequested);
+			return std::to_string(m_expressionRequested);
 		};
 		/**
 		 * @previous
diff --git a/etk/archive/Archive.h b/etk/archive/Archive.h
index 5b3a09c..064e373 100644
--- a/etk/archive/Archive.h
+++ b/etk/archive/Archive.h
@@ -6,10 +6,11 @@
  * @license BSD v3 (see license file)
  */
 
+#include <etk/types.h>
+
 #ifndef __ETK_ARCHIVE_H__
 #define __ETK_ARCHIVE_H__
 
-#include <etk/types.h>
 #include <etk/Hash.h>
 
 namespace etk {
diff --git a/etk/debug.h b/etk/debug.h
index 6326714..7fa7464 100644
--- a/etk/debug.h
+++ b/etk/debug.h
@@ -6,10 +6,11 @@
  * @license BSD v3 (see license file)
  */
 
+#include <etk/types.h>
+
 #ifndef __ETK_DEBUG_H__
 #define __ETK_DEBUG_H__
 
-#include <etk/types.h>
 #include <etk/debugGeneric.h>
 
 extern const char * etkLibName;
diff --git a/etk/debugGeneric.h b/etk/debugGeneric.h
index e97e806..dcbcacc 100644
--- a/etk/debugGeneric.h
+++ b/etk/debugGeneric.h
@@ -6,10 +6,11 @@
  * @license BSD v3 (see license file)
  */
 
+#include <etk/types.h>
+
 #ifndef __ETK_DEBUG_GENERIC_H__
 #define __ETK_DEBUG_GENERIC_H__
 
-#include <etk/types.h>
 #include <etk/Stream.h>
 
 namespace debug {
diff --git a/etk/math/Matrix4.h b/etk/math/Matrix4.h
index 3070bc1..297a501 100644
--- a/etk/math/Matrix4.h
+++ b/etk/math/Matrix4.h
@@ -6,20 +6,19 @@
  * @license BSD v3 (see license file)
  */
 
+#include <etk/types.h>
+
 #ifndef __ETK_TYPES_MATRIX4_H__
 #define __ETK_TYPES_MATRIX4_H__
 
-#include <etk/types.h>
 #include <math.h>
 #include <etk/math/Vector3D.h>
 
 #define DEG_TO_RAD(a)       ((a)*M_PI/180.0f)
 #define RAD_TO_DEG(a)       ((a)*180.0f/M_PI)
 
-namespace etk
-{
-	class Matrix4
-	{
+namespace etk {
+	class Matrix4 {
 		public:
 			float m_mat[4*4];
 			void identity(void) {
diff --git a/etk/math/Plane.h b/etk/math/Plane.h
index 3e2df9b..a03c4b8 100644
--- a/etk/math/Plane.h
+++ b/etk/math/Plane.h
@@ -6,6 +6,8 @@
  * @license BSD v3 (see license file)
  */
 
+#include <etk/types.h>
+
 #ifndef __ETK_TYPES_PLANE_H__
 #define __ETK_TYPES_PLANE_H__
 
diff --git a/etk/math/Vector2D.h b/etk/math/Vector2D.h
index a79a346..0ec83e1 100644
--- a/etk/math/Vector2D.h
+++ b/etk/math/Vector2D.h
@@ -6,10 +6,11 @@
  * @license BSD v3 (see license file)
  */
 
+#include <etk/types.h>
+
 #ifndef __ETK_MATH_VECTOR2D_H__
 #define __ETK_MATH_VECTOR2D_H__
 
-#include <etk/types.h>
 #include <etk/Stream.h>
 #include <etk/math/Vector3D.h>
 #include <math.h>
diff --git a/etk/math/Vector3D.h b/etk/math/Vector3D.h
index beb9f95..db1b104 100644
--- a/etk/math/Vector3D.h
+++ b/etk/math/Vector3D.h
@@ -6,10 +6,11 @@
  * @license BSD v3 (see license file)
  */
 
+#include <etk/types.h>
+
 #ifndef __ETK_MATH_VECTOR3D_H__
 #define __ETK_MATH_VECTOR3D_H__
 
-#include <etk/types.h>
 #include <etk/debug.h>
 #include <math.h>
 #include <etk/Stream.h>
diff --git a/etk/math/Vector4D.h b/etk/math/Vector4D.h
index fde0ebe..b8b193c 100644
--- a/etk/math/Vector4D.h
+++ b/etk/math/Vector4D.h
@@ -6,10 +6,11 @@
  * @license BSD v3 (see license file)
  */
 
+#include <etk/types.h>
+
 #ifndef __ETK_MATH_VECTOR4D_H__
 #define __ETK_MATH_VECTOR4D_H__
 
-#include <etk/types.h>
 #include <etk/debug.h>
 #include <math.h>
 #include <etk/Stream.h>
diff --git a/etk/os/FSNode.h b/etk/os/FSNode.h
index e121917..3b21221 100644
--- a/etk/os/FSNode.h
+++ b/etk/os/FSNode.h
@@ -6,10 +6,11 @@
  * @license BSD v3 (see license file)
  */
 
+#include <etk/types.h>
+
 #ifndef __ETK_FILE_SYSTEM_NODE_H__
 #define __ETK_FILE_SYSTEM_NODE_H__
 
-#include <etk/types.h>
 #include <etk/os/FSNodeRight.h>
 
 #ifdef __TARGET_OS__Android
diff --git a/etk/os/FSNodeRight.h b/etk/os/FSNodeRight.h
index a53e950..7b6007a 100644
--- a/etk/os/FSNodeRight.h
+++ b/etk/os/FSNodeRight.h
@@ -6,15 +6,13 @@
  * @license BSD v3 (see license file)
  */
 
+#include <etk/types.h>
+
 #ifndef __ETK_FILE_SYSTEM_NODE_RIGHT_H__
 #define __ETK_FILE_SYSTEM_NODE_RIGHT_H__
 
-#include <etk/types.h>
-
-namespace etk
-{
-	class FSNodeRight
-	{
+namespace etk {
+	class FSNodeRight {
 		private:
 			uint16_t m_rights;
 		public:
diff --git a/etk/os/Fifo.h b/etk/os/Fifo.h
index 0475298..3f1bb9f 100644
--- a/etk/os/Fifo.h
+++ b/etk/os/Fifo.h
@@ -6,6 +6,8 @@
  * @license BSD v3 (see license file)
  */
 
+#include <etk/types.h>
+
 #ifndef __ETK_MESSAGE_FIFO_H__
 #define __ETK_MESSAGE_FIFO_H__
 
@@ -33,6 +35,7 @@ namespace etk {
 			};
 			/**
 			 * @brief Remove the fifo and all message inside.
+			 */
 			~Fifo(void) {
 				// nothing to do ...
 			};
@@ -94,6 +97,7 @@ namespace etk {
 			/**
 			 * @brief Get the number of message in the fifo.
 			 * @return Number of message in the fifo.
+			 */
 			int32_t count(void) {
 				m_mutex.lock();
 				int32_t nbElement = m_data.size();
diff --git a/etk/tool.h b/etk/tool.h
index 2ccf457..7de11c0 100644
--- a/etk/tool.h
+++ b/etk/tool.h
@@ -6,11 +6,11 @@
  * @license BSD v3 (see license file)
  */
 
+#include <etk/types.h>
+
 #ifndef __ETK_TOOL_H__
 #define __ETK_TOOL_H__
 
-#include <etk/types.h>
-
 namespace etk {
 	namespace tool {
 		float   frand(float _a, float _b);
diff --git a/test/main.cpp b/test/main.cpp
index a95cd2a..e0727d1 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -6,6 +6,7 @@
  * @license BSD v3 (see license file)
  */
 
+#include <etk/types.h>
 #include <etk/debug.h>
 #include <vector>
 #include <string>