diff --git a/StgSharp.Common/Controlling/KeyEnum.cs b/StgSharp.Common/Controlling/KeyEnum.cs
index 5ae32daa..4168a2b1 100644
--- a/StgSharp.Common/Controlling/KeyEnum.cs
+++ b/StgSharp.Common/Controlling/KeyEnum.cs
@@ -171,22 +171,22 @@ namespace StgSharp
     #pragma warning restore CA1027
     {
 
-        Joystick_1 = FrameworkConstant.GLFW_JOYSTICK_1,
-        Joystick_2 = FrameworkConstant.GLFW_JOYSTICK_2,
-        Joystick_3 = FrameworkConstant.GLFW_JOYSTICK_3,
-        Joystick_4 = FrameworkConstant.GLFW_JOYSTICK_4,
-        Joystick_5 = FrameworkConstant.GLFW_JOYSTICK_5,
-        Joystick_6 = FrameworkConstant.GLFW_JOYSTICK_6,
-        Joystick_7 = FrameworkConstant.GLFW_JOYSTICK_7,
-        Joystick_8 = FrameworkConstant.GLFW_JOYSTICK_8,
-        Joystick_9 = FrameworkConstant.GLFW_JOYSTICK_9,
-        Joystick_10 = FrameworkConstant.GLFW_JOYSTICK_10,
-        Joystick_11 = FrameworkConstant.GLFW_JOYSTICK_11,
-        Joystick_12 = FrameworkConstant.GLFW_JOYSTICK_12,
-        Joystick_13 = FrameworkConstant.GLFW_JOYSTICK_13,
-        Joystick_14 = FrameworkConstant.GLFW_JOYSTICK_14,
-        Joystick_15 = FrameworkConstant.GLFW_JOYSTICK_15,
-        Joystick_16 = FrameworkConstant.GLFW_JOYSTICK_16,
+        Joystick_1 = FrameworkConstant. JOYSTICK_1,
+        Joystick_2 = FrameworkConstant. JOYSTICK_2,
+        Joystick_3 = FrameworkConstant. JOYSTICK_3,
+        Joystick_4 = FrameworkConstant. JOYSTICK_4,
+        Joystick_5 = FrameworkConstant. JOYSTICK_5,
+        Joystick_6 = FrameworkConstant. JOYSTICK_6,
+        Joystick_7 = FrameworkConstant. JOYSTICK_7,
+        Joystick_8 = FrameworkConstant. JOYSTICK_8,
+        Joystick_9 = FrameworkConstant. JOYSTICK_9,
+        Joystick_10 = FrameworkConstant.JOYSTICK_10,
+        Joystick_11 = FrameworkConstant.JOYSTICK_11,
+        Joystick_12 = FrameworkConstant.JOYSTICK_12,
+        Joystick_13 = FrameworkConstant.JOYSTICK_13,
+        Joystick_14 = FrameworkConstant.JOYSTICK_14,
+        Joystick_15 = FrameworkConstant.JOYSTICK_15,
+        Joystick_16 = FrameworkConstant.JOYSTICK_16,
         First = Joystick_1,
         Last = Joystick_16
 
diff --git a/StgSharp.Common/Graphics/Define/BufferObjectBase.cs b/StgSharp.Common/Graphics/Define/BufferObjectBase.cs
index 54ad2d78..7047e002 100644
--- a/StgSharp.Common/Graphics/Define/BufferObjectBase.cs
+++ b/StgSharp.Common/Graphics/Define/BufferObjectBase.cs
@@ -26,6 +26,7 @@
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
 using StgSharp.Graphics;
+using StgSharp.Graphics.OpenGL;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/StgSharp.Common/Internal/StructDefine.cs b/StgSharp.Common/Internal/StructDefine.cs
index eb3c8ab0..9c37a230 100644
--- a/StgSharp.Common/Internal/StructDefine.cs
+++ b/StgSharp.Common/Internal/StructDefine.cs
@@ -287,8 +287,8 @@ namespace StgSharp.Internal
         private IntPtr cursor; // _GLFWcursor* cursor;
         // glfwVideomode videoMode; // 根据GLFWvidmode的定义转换
         private IntPtr monitor; // _GLFWmonitor* monitor;
-        public fixed byte keys[FrameworkConstant.GLFW_KEY_LAST + 1];
-        public fixed byte mouseButtons[FrameworkConstant.GLFW_MOUSE_BUTTON_LAST + 1];
+        public fixed byte keys[FrameworkConstant.KEY_LAST + 1];
+        public fixed byte mouseButtons[FrameworkConstant.MOUSE_BUTTON_LAST + 1];
 
         // _GLFWcontext viewPortDisplay; // 根据_GLFWcontext的定义转换
 
@@ -497,8 +497,8 @@ namespace StgSharp.Internal
     internal unsafe struct GLFWlibrary
     {
 
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = FrameworkConstant.GLFW_JOYSTICK_LAST + 1)]
-        private GLFWjoystick[] joysticks = new GLFWjoystick[FrameworkConstant.GLFW_JOYSTICK_LAST + 1];
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = FrameworkConstant.JOYSTICK_LAST + 1)]
+        private GLFWjoystick[] joysticks = new GLFWjoystick[FrameworkConstant.JOYSTICK_LAST + 1];
 
         private GLFWallocator allocator;
 
diff --git a/StgSharp.Common/PipeLine/PipelineNode.cs b/StgSharp.Common/PipeLine/PipelineNode.cs
index 341e5dc4..30707116 100644
--- a/StgSharp.Common/PipeLine/PipelineNode.cs
+++ b/StgSharp.Common/PipeLine/PipelineNode.cs
@@ -25,7 +25,6 @@
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-using StgSharp.Entities;
 
 using System;
 using System.Collections.Generic;