diff --git a/Source/OpenTK/Input/Mouse.cs b/Source/OpenTK/Input/Mouse.cs
index 6caeb835..132b0590 100644
--- a/Source/OpenTK/Input/Mouse.cs
+++ b/Source/OpenTK/Input/Mouse.cs
@@ -53,7 +53,7 @@ namespace OpenTK.Input
         /// typically between 200 and 2000 DPI.
         /// Use <see cref="OpenTK.Input.Mouse.GetState(int)"/> to retrieve the state of a specific mouse device.
         /// Use <see cref="OpenTK.Input.Mouse.GetCursorState()"/> to retrieve the absolute coordinates of the mouse cursor.
-        /// Use <see cref="OpenTK.GameWindow.MouseMove"/> for event-based mouse input.
+        /// Use <see cref="OpenTK.INativeWindow.MouseMove"/> for event-based mouse input.
         /// </summary>
         /// <returns>A <see cref="OpenTK.Input.MouseState"/> structure representing the combined state of all mouse devices.</returns>
         public static MouseState GetState()
@@ -71,7 +71,7 @@ namespace OpenTK.Input
         /// typically between 200 and 2000 DPI.
         /// Use <see cref="OpenTK.Input.Mouse.GetState()"/> to retrieve the combined state of all mouse devices.
         /// Use <see cref="OpenTK.Input.Mouse.GetCursorState()"/> to retrieve the absolute coordinates of the mouse cursor.
-        /// Use <see cref="OpenTK.GameWindow.MouseMove"/> for event-based mouse input.
+        /// Use <see cref="OpenTK.INativeWindow.MouseMove"/> for event-based mouse input.
         /// </summary>
         /// <param name="index">The index of the mouse device.</param>
         /// <returns>A <see cref="OpenTK.Input.MouseState"/> structure representing the state for the specified mouse device.</returns>
diff --git a/Source/OpenTK/Platform/Linux/LinuxNativeWindow.cs b/Source/OpenTK/Platform/Linux/LinuxNativeWindow.cs
index 961381ee..db8ebd1c 100644
--- a/Source/OpenTK/Platform/Linux/LinuxNativeWindow.cs
+++ b/Source/OpenTK/Platform/Linux/LinuxNativeWindow.cs
@@ -58,8 +58,6 @@ namespace OpenTK.Platform.Linux
         BufferObject cursor_default;
         BufferObject cursor_empty;
 
-        IntPtr gbm_surface;
-
         public LinuxNativeWindow(IntPtr display, IntPtr gbm, int fd,
             int x, int y, int width, int height, string title,
             GraphicsMode mode, GameWindowFlags options,
diff --git a/Source/OpenTK/Platform/SDL2/Sdl2Keyboard.cs b/Source/OpenTK/Platform/SDL2/Sdl2Keyboard.cs
index d58c5f73..bb84d4a9 100644
--- a/Source/OpenTK/Platform/SDL2/Sdl2Keyboard.cs
+++ b/Source/OpenTK/Platform/SDL2/Sdl2Keyboard.cs
@@ -37,7 +37,6 @@ namespace OpenTK.Platform.SDL2
 
         readonly List<KeyboardDevice> keyboards =
             new List<KeyboardDevice>();
-        readonly IList<KeyboardDevice> keyboards_readonly;
 
         public Sdl2Keyboard()
         {
diff --git a/Source/OpenTK/Platform/Windows/API.cs b/Source/OpenTK/Platform/Windows/API.cs
index 167dcb5c..d8fa2955 100644
--- a/Source/OpenTK/Platform/Windows/API.cs
+++ b/Source/OpenTK/Platform/Windows/API.cs
@@ -3141,6 +3141,9 @@ namespace OpenTK.Platform.Windows
         /// </summary>
         public IntPtr ExtraInfo;
 
+        /// <summary>
+        /// Returns the size of a MouseMovePoint in bytes.
+        /// </summary>
         public static readonly int SizeInBytes = Marshal.SizeOf(default(MouseMovePoint));
     }
 
diff --git a/Source/OpenTK/Platform/X11/X11GLNative.cs b/Source/OpenTK/Platform/X11/X11GLNative.cs
index 388c45a5..2ee94bb9 100644
--- a/Source/OpenTK/Platform/X11/X11GLNative.cs
+++ b/Source/OpenTK/Platform/X11/X11GLNative.cs
@@ -85,20 +85,12 @@ namespace OpenTK.Platform.X11
 
         IntPtr _atom_net_frame_extents;
 
-        IntPtr _atom_wm_class;
-
         readonly IntPtr _atom_xa_cardinal = new IntPtr(6);
-        
-        //IntPtr _atom_motif_wm_hints;
-        //IntPtr _atom_kde_wm_hints;
-        //IntPtr _atom_kde_net_wm_hints;
 
         static readonly IntPtr _atom_remove = (IntPtr)0;
         static readonly IntPtr _atom_add = (IntPtr)1;
         static readonly IntPtr _atom_toggle = (IntPtr)2;
 
-        // Used by OpenTK to detect mouse warp events
-
         Rectangle bounds, client_rectangle;
         int border_left, border_right, border_top, border_bottom;
         Icon icon;