diff --git a/NazaraModuleTemplate/include/Nazara/ModuleName/ClassName.hpp b/NazaraModuleTemplate/include/Nazara/ModuleName/ClassName.hpp
index 46bdc8cd9..e4866c2bc 100644
--- a/NazaraModuleTemplate/include/Nazara/ModuleName/ClassName.hpp
+++ b/NazaraModuleTemplate/include/Nazara/ModuleName/ClassName.hpp
@@ -7,11 +7,11 @@
 #ifndef NAZARA_CLASSNAME_HPP
 #define NAZARA_CLASSNAME_HPP
 
-#include <Nazara/Prerequesites.hpp>
+#include <Nazara/ModuleName/Config.hpp>
 
 namespace Nz
 {
-	class NAZARA_MODULENAME_API API ClassName
+	class NAZARA_MODULENAME_API ClassName
 	{
 		public:
 			ClassName();
diff --git a/NazaraModuleTemplate/include/Nazara/ModuleName/Config.hpp b/NazaraModuleTemplate/include/Nazara/ModuleName/Config.hpp
index a72f02c69..7f620bb59 100644
--- a/NazaraModuleTemplate/include/Nazara/ModuleName/Config.hpp
+++ b/NazaraModuleTemplate/include/Nazara/ModuleName/Config.hpp
@@ -40,4 +40,14 @@
 /// Vérification des valeurs et types de certaines constantes
 #include <Nazara/ModuleName/ConfigCheck.hpp>
 
+#if !defined(NAZARA_STATIC)
+	#ifdef NAZARA_MODULENAME_BUILD
+		#define NAZARA_MODULENAME_API NAZARA_EXPORT
+	#else
+		#define NAZARA_MODULENAME_API NAZARA_IMPORT
+	#endif
+#else
+	#define NAZARA_MODULENAME_API
+#endif
+
 #endif // NAZARA_CONFIG_MODULENAME_HPP
diff --git a/NazaraModuleTemplate/include/Nazara/ModuleName/DebugOff.hpp b/NazaraModuleTemplate/include/Nazara/ModuleName/DebugOff.hpp
index b2106a5f4..3e9cda8eb 100644
--- a/NazaraModuleTemplate/include/Nazara/ModuleName/DebugOff.hpp
+++ b/NazaraModuleTemplate/include/Nazara/ModuleName/DebugOff.hpp
@@ -1,9 +1,9 @@
-// Copyright (C) 2014 AUTHORS
+// Copyright (C) YEAR AUTHORS
 // This file is part of the "Nazara Engine - Module name"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 // On suppose que Debug.hpp a déjà été inclus, tout comme Config.hpp
-#if NAZARA_MODULENAME_HPP
+#if NAZARA_MODULENAME_MANAGE_MEMORY
 	#undef delete
 	#undef new
 #endif
diff --git a/NazaraModuleTemplate/include/Nazara/ModuleName/ModuleName.hpp b/NazaraModuleTemplate/include/Nazara/ModuleName/ModuleName.hpp
index 58284f519..031f37d9a 100644
--- a/NazaraModuleTemplate/include/Nazara/ModuleName/ModuleName.hpp
+++ b/NazaraModuleTemplate/include/Nazara/ModuleName/ModuleName.hpp
@@ -9,6 +9,7 @@
 
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Core/Initializer.hpp>
+#include <Nazara/ModuleName/Config.hpp>
 
 namespace Nz
 {
diff --git a/NazaraModuleTemplate/src/Nazara/ModuleName/ModuleName.cpp b/NazaraModuleTemplate/src/Nazara/ModuleName/ModuleName.cpp
index 1ae75d7ad..e286520f8 100644
--- a/NazaraModuleTemplate/src/Nazara/ModuleName/ModuleName.cpp
+++ b/NazaraModuleTemplate/src/Nazara/ModuleName/ModuleName.cpp
@@ -21,7 +21,7 @@ namespace Nz
 		}
 
 		// Initialize module dependencies
-		if (!NzCore::Initialize())
+		if (!Core::Initialize())
 		{
 			NazaraError("Failed to initialize core module");
 			return false;
@@ -48,7 +48,7 @@ namespace Nz
 	{
 		if (s_moduleReferenceCounter != 1)
 		{
-			// Le module est soit encore utilisé, soit pas initialisé
+			// Either the module is not initialized, either it was initialized multiple times
 			if (s_moduleReferenceCounter > 1)
 				s_moduleReferenceCounter--;