diff --git a/include/Nazara/Core/MovablePtr.inl b/include/Nazara/Core/MovablePtr.inl
index 10b1b26f8..80d342e4a 100644
--- a/include/Nazara/Core/MovablePtr.inl
+++ b/include/Nazara/Core/MovablePtr.inl
@@ -3,7 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Core/MovablePtr.hpp>
-#include <cassert>
+#include <utility>
 
 namespace Nz
 {
diff --git a/include/Nazara/Core/Semaphore.hpp b/include/Nazara/Core/Semaphore.hpp
index 8c18cf6f4..985b49ba6 100644
--- a/include/Nazara/Core/Semaphore.hpp
+++ b/include/Nazara/Core/Semaphore.hpp
@@ -8,6 +8,7 @@
 #define NAZARA_SEMAPHORE_HPP
 
 #include <Nazara/Prerequesites.hpp>
+#include <Nazara/Core/MovablePtr.hpp>
 
 namespace Nz
 {
@@ -18,7 +19,7 @@ namespace Nz
 		public:
 			Semaphore(unsigned int count);
 			Semaphore(const Semaphore&) = delete;
-			Semaphore(Semaphore&&) = delete; ///TODO
+			Semaphore(Semaphore&&) noexcept = default;
 			~Semaphore();
 
 			unsigned int GetCount() const;
@@ -29,10 +30,10 @@ namespace Nz
 			bool Wait(UInt32 timeout);
 
 			Semaphore& operator=(const Semaphore&) = delete;
-			Semaphore& operator=(Semaphore&&) = delete; ///TODO
+			Semaphore& operator=(Semaphore&&) noexcept = default;
 
 		private:
-			SemaphoreImpl* m_impl;
+			MovablePtr<SemaphoreImpl> m_impl;
 	};
 }