diff --git a/include/Nazara/Lua/LuaInstance.hpp b/include/Nazara/Lua/LuaInstance.hpp
index 26d4d0e41..f36ee1ae5 100644
--- a/include/Nazara/Lua/LuaInstance.hpp
+++ b/include/Nazara/Lua/LuaInstance.hpp
@@ -14,6 +14,7 @@
 #include <Nazara/Core/String.hpp>
 #include <Nazara/Lua/Enums.hpp>
 #include <cstddef>
+#include <functional>
 
 struct lua_Debug;
 struct lua_State;
@@ -21,7 +22,7 @@ struct lua_State;
 class NzLuaInstance;
 
 using NzLuaCFunction = int (*)(lua_State* state);
-using NzLuaFunction = int (*)(NzLuaInstance& instance);
+using NzLuaFunction = std::function<int(NzLuaInstance& instance)>;
 
 class NAZARA_API NzLuaInstance : NzNonCopyable
 {
diff --git a/include/Nazara/Utility/PixelFormat.hpp b/include/Nazara/Utility/PixelFormat.hpp
index 81338a9ae..9f864e9ad 100644
--- a/include/Nazara/Utility/PixelFormat.hpp
+++ b/include/Nazara/Utility/PixelFormat.hpp
@@ -10,6 +10,7 @@
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Core/String.hpp>
 #include <Nazara/Utility/Enums.hpp>
+#include <functional>
 #include <map>
 
 class NzPixelFormat
@@ -17,8 +18,8 @@ class NzPixelFormat
 	friend class NzUtility;
 
 	public:
-		using ConvertFunction = nzUInt8* (*)(const nzUInt8* start, const nzUInt8* end, nzUInt8* dst);
-		using FlipFunction = void (*)(unsigned int width, unsigned int height, unsigned int depth, const nzUInt8* src, nzUInt8* dst);
+		using ConvertFunction = std::function<nzUInt8*(const nzUInt8* start, const nzUInt8* end, nzUInt8* dst)>;
+		using FlipFunction = std::function<void(unsigned int width, unsigned int height, unsigned int depth, const nzUInt8* src, nzUInt8* dst)>;
 
 		static bool Convert(nzPixelFormat srcFormat, nzPixelFormat dstFormat, const void* src, void* dst);
 		static bool Convert(nzPixelFormat srcFormat, nzPixelFormat dstFormat, const void* start, const void* end, void* dst);
diff --git a/src/Nazara/Lua/LuaInstance.cpp b/src/Nazara/Lua/LuaInstance.cpp
index e32436253..76feebd35 100644
--- a/src/Nazara/Lua/LuaInstance.cpp
+++ b/src/Nazara/Lua/LuaInstance.cpp
@@ -583,7 +583,7 @@ void NzLuaInstance::PushCFunction(NzLuaCFunction func, int upvalueCount)
 void NzLuaInstance::PushFunction(NzLuaFunction func)
 {
 	NzLuaFunction* luaFunc = reinterpret_cast<NzLuaFunction*>(lua_newuserdata(m_state, sizeof(NzLuaFunction)));
-	*luaFunc = func;
+	*luaFunc = std::move(func);
 
 	lua_pushcclosure(m_state, ProxyFunc, 1);
 }