diff --git a/etk/archive/Archive.h b/etk/archive/Archive.h
index 5404603..4e8e97d 100644
--- a/etk/archive/Archive.h
+++ b/etk/archive/Archive.h
@@ -11,7 +11,7 @@
 
 #include <map>
 #include <mutex>
-#include <memory>
+#include <ememory/memory.h>
 
 namespace etk {
 	/**
diff --git a/lutin_etk.py b/lutin_etk.py
index 6706e94..cf0fa8d 100644
--- a/lutin_etk.py
+++ b/lutin_etk.py
@@ -88,6 +88,7 @@ def create(target, module_name):
 	# add dependency of the generic math library:
 	my_module.add_module_depend('m')
 	my_module.add_module_depend('elog')
+	my_module.add_module_depend('ememory')
 	# add some optionnal libraries
 	my_module.add_optionnal_module_depend('minizip', ["c++", "-DETK_BUILD_MINIZIP"])
 	my_module.add_optionnal_module_depend('linearmath', ["c", "-DETK_BUILD_LINEARMATH"], export=True)
diff --git a/test/testStdShared.hpp b/test/testStdShared.hpp
index 45a551e..3a7f95f 100644
--- a/test/testStdShared.hpp
+++ b/test/testStdShared.hpp
@@ -7,11 +7,11 @@
  */
 
 #include <gtest/gtest.h>
-#include <memory>
+#include <ememory/memory.h>
 #undef NAME
 #define NAME "Shared_ptr"
 
-class Example : public std::enable_shared_from_this<Example> {
+class Example : public ememory::EnableSharedFromThis<Example> {
 	protected:
 		int32_t m_id;
 	public:
@@ -32,17 +32,17 @@ TEST(TestSTDSharedPtr, testBaseLocal) {
 }
 
 TEST(TestSTDSharedPtr, testBaseShared) {
-	std::shared_ptr<Example> tmp = std::make_shared<Example>();
+	ememory::SharedPtr<Example> tmp = ememory::makeShared<Example>();
 }
 
 
 TEST(TestSTDSharedPtr, testBaseSharedDouble) {
-	std::shared_ptr<Example> tmp = std::make_shared<Example>();
-	std::shared_ptr<Example> tmp2 = tmp;
+	ememory::SharedPtr<Example> tmp = ememory::makeShared<Example>();
+	ememory::SharedPtr<Example> tmp2 = tmp;
 }
 /*
 TEST(TestSTDSharedPtr, testBaseSharedDirectAndShared) {
 	Example tmp;
-	std::shared_ptr<Example> tmp2 = std::make_shared<tmp>;
+	ememory::SharedPtr<Example> tmp2 = ememory::makeShared<tmp>;
 }
 */
\ No newline at end of file