diff --git a/Source/OpenTK/Platform/SDL2/Sdl2.cs b/Source/OpenTK/Platform/SDL2/Sdl2.cs
index 11c8c468..28a348de 100644
--- a/Source/OpenTK/Platform/SDL2/Sdl2.cs
+++ b/Source/OpenTK/Platform/SDL2/Sdl2.cs
@@ -1565,8 +1565,8 @@ namespace OpenTK.Platform.SDL2
         public UInt32 Which;
         public Button Button;
         public State State;
+        public byte Clicks;
         byte padding1;
-        byte padding2;
         public Int32 X;
         public Int32 Y;
     }
@@ -1577,10 +1577,7 @@ namespace OpenTK.Platform.SDL2
         public uint Timestamp;
         public uint WindowID;
         public uint Which;
-        public State State;
-        byte padding1;
-        byte padding2;
-        byte padding3;
+        public ButtonFlags State;
         public Int32 X;
         public Int32 Y;
         public Int32 Xrel;
@@ -1610,10 +1607,6 @@ namespace OpenTK.Platform.SDL2
         }
 
         public const uint TouchMouseID = 0xffffffff;
-
-        public static class GL
-        {
-        }
     }
 
     struct Rect