3 files changed, 5 insertions, 34 deletions
diff --git a/source/Asura.Editor/System/ContainerWindow.h b/source/Asura.Editor/System/ContainerWindow.h
index ee72b72..5893aff 100644
--- a/source/Asura.Editor/System/ContainerWindow.h
+++ b/source/Asura.Editor/System/ContainerWindow.h
@@ -4,8 +4,8 @@
 #include <windows.h>
 #include <string.h>
 
-#include <asura-utils/Scripting/Portable.hpp>
-#include <asura-utils/Classes.h>
+#include <asura-base/Scripting/Scripting.h>
+#include <asura-base/Classes.h>
 
 #include "../Type.h"
 
diff --git a/source/Asura.Editor/System/Input.h b/source/Asura.Editor/System/Input.h
index 682e69f..9401981 100644
--- a/source/Asura.Editor/System/Input.h
+++ b/source/Asura.Editor/System/Input.h
@@ -3,42 +3,13 @@
 
 #include <windows.h>
 
-#include <asura-utils/Classes.h>
-#include <asura-utils/Math/Vector2.hpp>
+#include <asura-base/Classes.h>
+#include <asura-base/Math/Vector2.hpp>
 #include <asura-core/Input/InputDevice.h>
 
 namespace_begin(AsuraEditor)
 
-// Win32 input entry 
-class Input : public AEInput::InputDevice
-{
-public:
 
-	Input();
-	~Input();
-
-	bool Open(HWND window);
-	void Close(void);
-
-	bool GetJoystickNames(std::vector<std::string> &names);
-
-	bool Activate(bool active);
-	bool ToggleFullscreen(bool fullscreen, HWND window);
-
-	bool Process(bool discard);
-	LRESULT OnKey(HWND window, UINT message, WPARAM wParam, LPARAM lParam);
-	LRESULT OnInput(HWND window, UINT message, WPARAM wParam, LPARAM lParam);
-	LRESULT OnDeviceChange(LPCWSTR name, bool add);
-
-	static bool ConvertPositionToClientAreaCoord(HWND activeWindow, POINT position, AEMath::Vector2f& newPos);
-
-private: 
-
-	bool UpdateState();
-
-};
-
-extern Input g_Input;
 
 namespace_end
 
diff --git a/source/Asura.Editor/System/MenuController.h b/source/Asura.Editor/System/MenuController.h
index 591cbd9..2deb21e 100644
--- a/source/Asura.Editor/System/MenuController.h
+++ b/source/Asura.Editor/System/MenuController.h
@@ -1,7 +1,7 @@
 #ifndef _ASURA_EDITOR_MENU_CONTROLLER_H_
 #define _ASURA_EDITOR_MENU_CONTROLLER_H_
 
-#include <asura-utils/Classes.h>
+#include <asura-base/Classes.h>
 
 namespace_begin(AsuraEditor)