diff --git a/algue/base64.cpp b/algue/base64.cpp
index 4f067ab..69896fb 100644
--- a/algue/base64.cpp
+++ b/algue/base64.cpp
@@ -3,8 +3,8 @@
  * @copyright 2011, Edouard DUPIN, all right reserved
  * @license APACHE v2.0 (see license file)
  */
-#include <etk/types.h>
-#include <algue/base64.h>
+#include <etk/types.hpp>
+#include <algue/base64.hpp>
 
 static const std::string base64Elements = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
diff --git a/algue/base64.h b/algue/base64.hpp
similarity index 95%
rename from algue/base64.h
rename to algue/base64.hpp
index a7c5066..97e6b84 100644
--- a/algue/base64.h
+++ b/algue/base64.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <etk/types.h>
+#include <etk/types.hpp>
 
 namespace algue {
 	namespace base64 {
diff --git a/algue/debug.cpp b/algue/debug.cpp
index 3c4d7b0..b60accb 100644
--- a/algue/debug.cpp
+++ b/algue/debug.cpp
@@ -4,7 +4,7 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <algue/debug.h>
+#include <algue/debug.hpp>
 
 int32_t algue::getLogId() {
 	static int32_t g_val = elog::registerInstance("algue");
diff --git a/algue/debug.h b/algue/debug.hpp
similarity index 97%
rename from algue/debug.h
rename to algue/debug.hpp
index 20743c7..bb386aa 100644
--- a/algue/debug.h
+++ b/algue/debug.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <elog/log.h>
+#include <elog/log.hpp>
 
 namespace algue {
 	int32_t getLogId();
diff --git a/algue/md5.cpp b/algue/md5.cpp
index 0be8f99..ccace6a 100644
--- a/algue/md5.cpp
+++ b/algue/md5.cpp
@@ -3,8 +3,8 @@
  * @copyright 2011, Edouard DUPIN, all right reserved
  * @license APACHE v2.0 (see license file)
  */
-#include <etk/types.h>
-#include <algue/md5.h>
+#include <etk/types.hpp>
+#include <algue/md5.hpp>
 #include <openssl/md5.h>
 
 std::vector<uint8_t> algue::md5::encode(const uint8_t* _data, int32_t _len) {
diff --git a/algue/md5.h b/algue/md5.hpp
similarity index 96%
rename from algue/md5.h
rename to algue/md5.hpp
index e160d45..482b1c0 100644
--- a/algue/md5.h
+++ b/algue/md5.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <etk/types.h>
+#include <etk/types.hp>
 
 /**
  * @brief Basic Algue library namespace
diff --git a/algue/sha1.cpp b/algue/sha1.cpp
index e896a94..b36f3e5 100644
--- a/algue/sha1.cpp
+++ b/algue/sha1.cpp
@@ -3,8 +3,8 @@
  * @copyright 2011, Edouard DUPIN, all right reserved
  * @license APACHE v2.0 (see license file)
  */
-#include <etk/types.h>
-#include <algue/sha1.h>
+#include <etk/types.hpp>
+#include <algue/sha1.hpp>
 #include <openssl/sha.h>
 
 std::vector<uint8_t> algue::sha1::encode(const uint8_t* _data, int32_t _len) {
diff --git a/algue/sha1.h b/algue/sha1.hpp
similarity index 95%
rename from algue/sha1.h
rename to algue/sha1.hpp
index b799899..694f935 100644
--- a/algue/sha1.h
+++ b/algue/sha1.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <etk/types.h>
+#include <etk/types.hpp>
 
 namespace algue {
 	namespace sha1 {
diff --git a/algue/sha512.cpp b/algue/sha512.cpp
index bc4335c..5b86a09 100644
--- a/algue/sha512.cpp
+++ b/algue/sha512.cpp
@@ -3,8 +3,8 @@
  * @copyright 2011, Edouard DUPIN, all right reserved
  * @license APACHE v2.0 (see license file)
  */
-#include <etk/types.h>
-#include <algue/sha512.h>
+#include <etk/types.hpp>
+#include <algue/sha512.hpp>
 #include <openssl/sha.h>
 
 std::vector<uint8_t> algue::sha512::encode(const uint8_t* _data, int32_t _len) {
diff --git a/algue/sha512.h b/algue/sha512.hpp
similarity index 95%
rename from algue/sha512.h
rename to algue/sha512.hpp
index 1ea1b72..78815d3 100644
--- a/algue/sha512.h
+++ b/algue/sha512.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <etk/types.h>
+#include <etk/types.hpp>
 
 namespace algue {
 	namespace sha512 {
diff --git a/lutin_algue.py b/lutin_algue.py
index 8c4d23c..fc7218e 100644
--- a/lutin_algue.py
+++ b/lutin_algue.py
@@ -36,10 +36,10 @@ def create(target, module_name):
 		'algue/md5.cpp'
 		])
 	my_module.add_header_file([
-		'algue/base64.h',
-		'algue/sha1.h',
-		'algue/sha512.h',
-		'algue/md5.h',
+		'algue/base64.hpp',
+		'algue/sha1.hpp',
+		'algue/sha512.hpp',
+		'algue/md5.hpp',
 		])
 	my_module.add_path(tools.get_current_path(__file__))
 	return my_module