diff --git a/include/Nazara/Noise/ComplexNoiseBase.hpp b/include/Nazara/Noise/ComplexNoiseBase.hpp
index c242eea81..a9db6870e 100644
--- a/include/Nazara/Noise/ComplexNoiseBase.hpp
+++ b/include/Nazara/Noise/ComplexNoiseBase.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#ifndef COMPLEXNOISEBASE_H
-#define COMPLEXNOISEBASE_H
+#ifndef COMPLEXNOISEBASE_HPP
+#define COMPLEXNOISEBASE_HPP
 
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Noise/NoiseBase.hpp>
@@ -14,7 +14,7 @@ class NAZARA_API NzComplexNoiseBase : public NzNoiseBase
 {
     public:
         NzComplexNoiseBase();
-        ~NzComplexNoiseBase();
+        ~NzComplexNoiseBase() = default;
 
         void SetLacunarity(float lacunarity);
         void SetHurstParameter(float h);
@@ -32,4 +32,4 @@ class NAZARA_API NzComplexNoiseBase : public NzNoiseBase
 
 };
 
-#endif // COMPLEXNOISEBASE_H
+#endif // COMPLEXNOISEBASE_HPP
diff --git a/include/Nazara/Noise/Debug.hpp b/include/Nazara/Noise/Debug.hpp
index d06344f48..c26ad1c80 100644
--- a/include/Nazara/Noise/Debug.hpp
+++ b/include/Nazara/Noise/Debug.hpp
@@ -3,7 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Noise/Config.hpp>
-#if NAZARA_MODULENAME_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG)
+#if NAZARA_NOISE_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG)
 	#include <Nazara/Core/Debug/MemoryLeakTracker.hpp>
 
 	#define delete NzMemoryManager::NextFree(__FILE__, __LINE__), delete
diff --git a/include/Nazara/Noise/Noise.hpp b/include/Nazara/Noise/Noise.hpp
index 61b062b5b..a42cad927 100644
--- a/include/Nazara/Noise/Noise.hpp
+++ b/include/Nazara/Noise/Noise.hpp
@@ -24,4 +24,4 @@ class NAZARA_API NzNoise
 		static bool s_initialized;
 };
 
-#endif // NOISE_H
+#endif // NOISE_HPP
diff --git a/include/Nazara/Noise/NoiseBase.hpp b/include/Nazara/Noise/NoiseBase.hpp
index 3bab56163..331d227df 100644
--- a/include/Nazara/Noise/NoiseBase.hpp
+++ b/include/Nazara/Noise/NoiseBase.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#ifndef NOISEBASE_H
-#define NOISEBASE_H
+#ifndef NOISEBASE_HPP
+#define NOISEBASE_HPP
 
 #include <Nazara/Prerequesites.hpp>
 
@@ -13,7 +13,7 @@ class NAZARA_API NzNoiseBase
 {
     public:
         NzNoiseBase(int seed = 0);
-        virtual ~NzNoiseBase();
+        ~NzNoiseBase() = default;
 
         void SetNewSeed(int seed);
         int GetUniformRandomValue();
@@ -30,4 +30,4 @@ class NAZARA_API NzNoiseBase
 
 };
 
-#endif // NOISEBASE_H
+#endif // NOISEBASE_HPP
diff --git a/include/Nazara/Noise/NoiseMachine.hpp b/include/Nazara/Noise/NoiseMachine.hpp
index 83315ab3c..4c221628f 100644
--- a/include/Nazara/Noise/NoiseMachine.hpp
+++ b/include/Nazara/Noise/NoiseMachine.hpp
@@ -13,9 +13,6 @@
 #include <Nazara/Math/Vector3.hpp>
 #include <Nazara/Math/Vector4.hpp>
 
-//TODO : AMELIORER MELANGE TABLE PERMUTATION
-//       PB MULTIPLES APPELS SHUFFLEPERMUTATIONTABLE()
-
 class NAZARA_API NzNoiseMachine : public NzComplexNoiseBase
 {
     public:
@@ -93,4 +90,4 @@ class NAZARA_API NzNoiseMachine : public NzComplexNoiseBase
 
 };
 
-#endif // NOISEMACHINE_H
+#endif // NOISEMACHINE_HPP
diff --git a/include/Nazara/Noise/Perlin2D.hpp b/include/Nazara/Noise/Perlin2D.hpp
index 286228dc2..18e7ae875 100644
--- a/include/Nazara/Noise/Perlin2D.hpp
+++ b/include/Nazara/Noise/Perlin2D.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#ifndef PERLIN2D_H
-#define PERLIN2D_H
+#ifndef PERLIN2D_HPP
+#define PERLIN2D_HPP
 
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Noise/NoiseBase.hpp>
@@ -34,5 +34,5 @@ typedef NzPerlin2D<double> NzPerlin2Dd;
 
 #include <Nazara/Noise/Perlin2D.inl>
 
-#endif // PERLIN2D_H
+#endif // PERLIN2D_HPP
 
diff --git a/include/Nazara/Noise/Perlin3D.hpp b/include/Nazara/Noise/Perlin3D.hpp
index 736d63bde..a425dc384 100644
--- a/include/Nazara/Noise/Perlin3D.hpp
+++ b/include/Nazara/Noise/Perlin3D.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#ifndef PERLIN3D_H
-#define PERLIN3D_H
+#ifndef PERLIN3D_HPP
+#define PERLIN3D_HPP
 
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Noise/NoiseBase.hpp>
@@ -37,4 +37,4 @@ typedef NzPerlin3D<double> NzPerlin3Dd;
 
 #include <Nazara/Noise/Perlin3D.inl>
 
-#endif // PERLIN3D_H
+#endif // PERLIN3D_HPP
diff --git a/include/Nazara/Noise/Perlin4D.hpp b/include/Nazara/Noise/Perlin4D.hpp
index 165583b00..b5a25ee4d 100644
--- a/include/Nazara/Noise/Perlin4D.hpp
+++ b/include/Nazara/Noise/Perlin4D.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#ifndef PERLIN4D_H
-#define PERLIN4D_H
+#ifndef PERLIN4D_HPP
+#define PERLIN4D_HPP
 
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Noise/NoiseBase.hpp>
@@ -37,4 +37,4 @@ typedef NzPerlin4D<double> NzPerlin4Dd;
 
 #include <Nazara/Noise/Perlin4D.inl>
 
-#endif // PERLIN4D_H
+#endif // PERLIN4D_HPP
diff --git a/include/Nazara/Noise/Simplex2D.hpp b/include/Nazara/Noise/Simplex2D.hpp
index 8905fda22..78d896f7d 100644
--- a/include/Nazara/Noise/Simplex2D.hpp
+++ b/include/Nazara/Noise/Simplex2D.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#ifndef SIMPLEX2D_H
-#define SIMPLEX2D_H
+#ifndef SIMPLEX2D_HPP
+#define SIMPLEX2D_HPP
 
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Noise/NoiseBase.hpp>
@@ -39,5 +39,5 @@ typedef NzSimplex2D<double> NzSimplex2Dd;
 
 #include <Nazara/Noise/Simplex2D.inl>
 
-#endif // SIMPLEX2D_H
+#endif // SIMPLEX2D_HPP
 
diff --git a/include/Nazara/Noise/Simplex3D.hpp b/include/Nazara/Noise/Simplex3D.hpp
index 0e49cecbf..399705072 100644
--- a/include/Nazara/Noise/Simplex3D.hpp
+++ b/include/Nazara/Noise/Simplex3D.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#ifndef SIMPLEX3D_H
-#define SIMPLEX3D_H
+#ifndef SIMPLEX3D_HPP
+#define SIMPLEX3D_HPP
 
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Noise/NoiseBase.hpp>
@@ -39,5 +39,5 @@ typedef NzSimplex3D<double> NzSimplex3Dd;
 
 #include <Nazara/Noise/Simplex3D.inl>
 
-#endif // SIMPLEX3D_H
+#endif // SIMPLEX3D_HPP
 
diff --git a/include/Nazara/Noise/Simplex4D.hpp b/include/Nazara/Noise/Simplex4D.hpp
index bf53d7a5b..f932d212b 100644
--- a/include/Nazara/Noise/Simplex4D.hpp
+++ b/include/Nazara/Noise/Simplex4D.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#ifndef SIMPLEX4D_H
-#define SIMPLEX4D_H
+#ifndef SIMPLEX4D_HPP
+#define SIMPLEX4D_HPP
 
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Noise/NoiseBase.hpp>
diff --git a/src/Nazara/Noise/ComplexNoiseBase.cpp b/src/Nazara/Noise/ComplexNoiseBase.cpp
index 7a94422da..0388a7786 100644
--- a/src/Nazara/Noise/ComplexNoiseBase.cpp
+++ b/src/Nazara/Noise/ComplexNoiseBase.cpp
@@ -60,9 +60,3 @@ void NzComplexNoiseBase::RecomputeExponentArray()
         m_parametersModified = false;
     }
 }
-
-
-NzComplexNoiseBase::~NzComplexNoiseBase()
-{
-    //dtor
-}
diff --git a/src/Nazara/Noise/Debug/Leaks.cpp b/src/Nazara/Noise/Debug/Leaks.cpp
index c2566bb3f..81ed5eb4d 100644
--- a/src/Nazara/Noise/Debug/Leaks.cpp
+++ b/src/Nazara/Noise/Debug/Leaks.cpp
@@ -3,7 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Noise/Config.hpp>
-#if NAZARA_MODULENAME_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG)
+#if NAZARA_NOISE_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG)
 #include <Nazara/Core/Debug/MemoryLeakTracker.hpp>
 #include <new>
 
@@ -26,4 +26,5 @@ void operator delete[](void* pointer) throw()
 {
 	NzMemoryManager::Free(pointer, true);
 }
+
 #endif
diff --git a/src/Nazara/Noise/Noise.cpp b/src/Nazara/Noise/Noise.cpp
index 59a5889fb..8d5dd92f5 100644
--- a/src/Nazara/Noise/Noise.cpp
+++ b/src/Nazara/Noise/Noise.cpp
@@ -55,3 +55,5 @@ bool NzNoise::IsInitialized()
 }
 
 bool NzNoise::s_initialized = false;
+
+//#include <Nazara/Core/DebugOff.hpp> //A INCLURE ?
diff --git a/src/Nazara/Noise/NoiseBase.cpp b/src/Nazara/Noise/NoiseBase.cpp
index e718b01be..410e2b95d 100644
--- a/src/Nazara/Noise/NoiseBase.cpp
+++ b/src/Nazara/Noise/NoiseBase.cpp
@@ -40,6 +40,9 @@ void NzNoiseBase::ShufflePermutationTable()
     int xchanger;
     unsigned int ncase;
 
+    for(int i(0) ; i < 256 ; i++)
+        perm[i] = i;
+
     for(int j(0) ; j < 20 ; ++j)
         for (int i(0); i < 256 ; ++i)
         {
@@ -72,21 +75,4 @@ int NzNoiseBase::JenkinsHash(int a, int b, int c)
     return c;
 }
 
-/*
-//key = 64 bits
-public long hash64shift(long key)
-{
-  key = (~key) + (key << 21); // key = (key << 21) - key - 1;
-  key = key ^ (key >>> 24);
-  key = (key + (key << 3)) + (key << 8); // key * 265
-  key = key ^ (key >>> 14);
-  key = (key + (key << 2)) + (key << 4); // key * 21
-  key = key ^ (key >>> 28);
-  key = key + (key << 31);
-  return key;
-}*/
-
-NzNoiseBase::~NzNoiseBase()
-{
-    //dtor
-}
+#include <Nazara/Core/DebugOff.hpp>
diff --git a/src/Nazara/Noise/NoiseMachine.cpp b/src/Nazara/Noise/NoiseMachine.cpp
index 194e73049..e695d46fe 100644
--- a/src/Nazara/Noise/NoiseMachine.cpp
+++ b/src/Nazara/Noise/NoiseMachine.cpp
@@ -758,3 +758,5 @@ float NzNoiseMachine::Get3DHybridMultiFractalNoiseValue(float x, float y, float
 
     return result;
 }
+
+#include <Nazara/Core/DebugOff.hpp>