1 files changed, 8 insertions, 15 deletions
diff --git a/source/libs/asura-lib-core/input/cursor.h b/source/libs/asura-lib-core/input/cursor.h
index da4a765..a8e53a6 100644
--- a/source/libs/asura-lib-core/input/cursor.h
+++ b/source/libs/asura-lib-core/input/cursor.h
@@ -4,16 +4,18 @@
 
 #include <SDL2/SDL.h>
 
-#include "Scripting/Portable.h"
-#include "Graphics/ImageData.h"
-#include "InputDevice.hpp"
+#include <asura-lib-utils/scripting/portable.hpp>
+
+#include "../graphics/image_data.h"
+
+#include "input_device.hpp"
 
 namespace AsuraEngine
 {
 	namespace Input
 	{
 
-		class Cursor : public Scripting::Portable
+		class Cursor ASURA_FINAL : public AEScripting::Portable<Cursor>
 		{
 		public:
 
@@ -29,6 +31,8 @@ namespace AsuraEngine
 			CursorType GetType() const;
 			SystemCursor GetSystemType() const;
 
+			LUAX_DECL_FACTORY(Cursor);
+
 		private:
 
 			SDL_Cursor* mCursorHandle;
@@ -36,17 +40,6 @@ namespace AsuraEngine
 			CursorType mType;
 			SystemCursor mSystemType;
 
-		public:
-
-			//----------------------------------------------------------------------------------------------------------
-
-			LUAX_DECL_FACTORY(Cursor);
-
-			LUAX_DECL_ENUM(EnumCursorType);
-			LUAX_DECL_ENUM(EnumSystemCursor);
-
-			//----------------------------------------------------------------------------------------------------------
-
 		};
 
 	}