diff --git a/include/Nazara/Core/CallOnExit.hpp b/include/Nazara/Core/CallOnExit.hpp
index 4d95042a6..3f8fc1f2f 100644
--- a/include/Nazara/Core/CallOnExit.hpp
+++ b/include/Nazara/Core/CallOnExit.hpp
@@ -8,10 +8,12 @@
 #define NAZARA_CALLONEXIT_HPP
 
 #include <Nazara/Prerequesites.hpp>
+#include <Nazara/Core/NonCopyable.hpp>
+#include <functional>
 
-class NzCallOnExit
+class NzCallOnExit : NzNonCopyable
 {
-	using Func = void (*)();
+	using Func = std::function<void()>;
 
 	public:
 		NzCallOnExit(Func func = nullptr);