diff --git a/include/Nazara/Core/Bitset.hpp b/include/Nazara/Core/Bitset.hpp
index ba60ae062..9c45b3689 100644
--- a/include/Nazara/Core/Bitset.hpp
+++ b/include/Nazara/Core/Bitset.hpp
@@ -9,6 +9,7 @@
 
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Core/String.hpp>
+#include <limits>
 #include <memory>
 #include <type_traits>
 
@@ -89,9 +90,9 @@ namespace Nz
 			Bitset& operator|=(const Bitset& bitset);
 			Bitset& operator^=(const Bitset& bitset);
 
-			static Block fullBitMask;
-			static unsigned int bitsPerBlock;
-			static unsigned int npos;
+			static constexpr Block fullBitMask = std::numeric_limits<Block>::max();
+			static constexpr unsigned int bitsPerBlock = std::numeric_limits<Block>::digits;
+			static constexpr unsigned int npos = std::numeric_limits<unsigned int>::max();
 
 		private:
 			unsigned int FindFirstFrom(unsigned int blockIndex) const;
diff --git a/include/Nazara/Core/Bitset.inl b/include/Nazara/Core/Bitset.inl
index 54edf9f67..68104b093 100644
--- a/include/Nazara/Core/Bitset.inl
+++ b/include/Nazara/Core/Bitset.inl
@@ -521,15 +521,6 @@ namespace Nz
 		return bit / bitsPerBlock;
 	}
 
-	template<typename Block, class Allocator>
-	Block Bitset<Block, Allocator>::fullBitMask = std::numeric_limits<Block>::max();
-
-	template<typename Block, class Allocator>
-	unsigned int Bitset<Block, Allocator>::bitsPerBlock = std::numeric_limits<Block>::digits;
-
-	template<typename Block, class Allocator>
-	unsigned int Bitset<Block, Allocator>::npos = std::numeric_limits<unsigned int>::max();
-
 
 	template<typename Block, class Allocator>
 	typename Bitset<Block, Allocator>::Bit& Bitset<Block, Allocator>::Bit::Flip()