diff --git a/Source/OpenTK/OpenGL/Bindings/GL.cs b/Source/OpenTK/OpenGL/Bindings/GL.cs
index 63900e7f..68ae88b8 100644
--- a/Source/OpenTK/OpenGL/Bindings/GL.cs
+++ b/Source/OpenTK/OpenGL/Bindings/GL.cs
@@ -2,8 +2,10 @@ namespace OpenTK.OpenGL
 {
     using System;
     using System.Runtime.InteropServices;
+    #pragma warning disable 3019
+    #pragma warning disable 1591
 
-    public static partial class GL
+    static partial class GL
     {
 
         [System.CLSCompliant(false)]
@@ -12831,6 +12833,243 @@ namespace OpenTK.OpenGL
             Delegates.glUniformMatrix4x3fv((Int32)location, (Int32)count, (bool)transpose, (Single*)value);
         }
 
+        public static 
+        void PolygonOffsetEXT(Single factor, Single bias)
+        {
+            Delegates.glPolygonOffsetEXT((Single)factor, (Single)bias);
+        }
+
+        [System.CLSCompliant(false)]
+        public static 
+        bool AreTexturesResidentEXT(Int32 n, UInt32[] textures, [Out] bool[] residences)
+        {
+            unsafe
+            {
+                fixed (UInt32* textures_ptr = textures)
+                fixed (bool* residences_ptr = residences)
+                {
+                    return Delegates.glAreTexturesResidentEXT((Int32)n, (UInt32*)textures_ptr, (bool*)residences_ptr);
+                }
+            }
+        }
+
+        public static 
+        bool AreTexturesResidentEXT(Int32 n, Int32[] textures, [Out] bool[] residences)
+        {
+            unsafe
+            {
+                fixed (Int32* textures_ptr = textures)
+                fixed (bool* residences_ptr = residences)
+                {
+                    return Delegates.glAreTexturesResidentEXT((Int32)n, (UInt32*)textures_ptr, (bool*)residences_ptr);
+                }
+            }
+        }
+
+        [System.CLSCompliant(false)]
+        public static 
+        bool AreTexturesResidentEXT(Int32 n, ref UInt32 textures, [Out] out bool residences)
+        {
+            unsafe
+            {
+                fixed (UInt32* textures_ptr = &textures)
+                fixed (bool* residences_ptr = &residences)
+                {
+                    bool retval = Delegates.glAreTexturesResidentEXT((Int32)n, (UInt32*)textures_ptr, (bool*)residences_ptr);
+                    residences = *residences_ptr;
+                    return retval;
+                }
+            }
+        }
+
+        public static 
+        bool AreTexturesResidentEXT(Int32 n, ref Int32 textures, [Out] out bool residences)
+        {
+            unsafe
+            {
+                fixed (Int32* textures_ptr = &textures)
+                fixed (bool* residences_ptr = &residences)
+                {
+                    bool retval = Delegates.glAreTexturesResidentEXT((Int32)n, (UInt32*)textures_ptr, (bool*)residences_ptr);
+                    residences = *residences_ptr;
+                    return retval;
+                }
+            }
+        }
+
+        [System.CLSCompliant(false)]
+        public static 
+        unsafe bool AreTexturesResidentEXT(Int32 n, UInt32* textures, [Out] bool* residences)
+        {
+            return Delegates.glAreTexturesResidentEXT((Int32)n, (UInt32*)textures, (bool*)residences);
+        }
+
+        [System.CLSCompliant(false)]
+        public static 
+        unsafe bool AreTexturesResidentEXT(Int32 n, Int32* textures, [Out] bool* residences)
+        {
+            return Delegates.glAreTexturesResidentEXT((Int32)n, (UInt32*)textures, (bool*)residences);
+        }
+
+        public static 
+        void ArrayElementEXT(Int32 i)
+        {
+            Delegates.glArrayElementEXT((Int32)i);
+        }
+
+        public static 
+        void TextureLightEXT(OpenTK.OpenGL.Enums.All pname)
+        {
+            Delegates.glTextureLightEXT((OpenTK.OpenGL.Enums.All)pname);
+        }
+
+        [System.CLSCompliant(false)]
+        public static 
+        void InsertComponentEXT(UInt32 res, UInt32 src, UInt32 num)
+        {
+            Delegates.glInsertComponentEXT((UInt32)res, (UInt32)src, (UInt32)num);
+        }
+
+        public static 
+        void InsertComponentEXT(Int32 res, Int32 src, Int32 num)
+        {
+            Delegates.glInsertComponentEXT((UInt32)res, (UInt32)src, (UInt32)num);
+        }
+
+        [System.CLSCompliant(false)]
+        public static 
+        void ExtractComponentEXT(UInt32 res, UInt32 src, UInt32 num)
+        {
+            Delegates.glExtractComponentEXT((UInt32)res, (UInt32)src, (UInt32)num);
+        }
+
+        public static 
+        void ExtractComponentEXT(Int32 res, Int32 src, Int32 num)
+        {
+            Delegates.glExtractComponentEXT((UInt32)res, (UInt32)src, (UInt32)num);
+        }
+
+        [System.CLSCompliant(false)]
+        public static 
+        void SetInvariantEXT(UInt32 id, OpenTK.OpenGL.Enums.All type, IntPtr addr)
+        {
+            unsafe
+            {
+                Delegates.glSetInvariantEXT((UInt32)id, (OpenTK.OpenGL.Enums.All)type, (IntPtr)addr);
+            }
+        }
+
+        public static 
+        void SetInvariantEXT(Int32 id, OpenTK.OpenGL.Enums.All type, IntPtr addr)
+        {
+            unsafe
+            {
+                Delegates.glSetInvariantEXT((UInt32)id, (OpenTK.OpenGL.Enums.All)type, (IntPtr)addr);
+            }
+        }
+
+        [System.CLSCompliant(false)]
+        public static 
+        void SetInvariantEXT(UInt32 id, OpenTK.OpenGL.Enums.All type, [In, Out] object addr)
+        {
+            unsafe
+            {
+                System.Runtime.InteropServices.GCHandle addr_ptr = System.Runtime.InteropServices.GCHandle.Alloc(addr, System.Runtime.InteropServices.GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glSetInvariantEXT((UInt32)id, (OpenTK.OpenGL.Enums.All)type, (IntPtr)addr_ptr.AddrOfPinnedObject());
+                }
+                finally
+                {
+                    addr_ptr.Free();
+                }
+            }
+        }
+
+        public static 
+        void SetInvariantEXT(Int32 id, OpenTK.OpenGL.Enums.All type, [In, Out] object addr)
+        {
+            unsafe
+            {
+                System.Runtime.InteropServices.GCHandle addr_ptr = System.Runtime.InteropServices.GCHandle.Alloc(addr, System.Runtime.InteropServices.GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glSetInvariantEXT((UInt32)id, (OpenTK.OpenGL.Enums.All)type, (IntPtr)addr_ptr.AddrOfPinnedObject());
+                }
+                finally
+                {
+                    addr_ptr.Free();
+                }
+            }
+        }
+
+        [System.CLSCompliant(false)]
+        public static 
+        void SetLocalConstantEXT(UInt32 id, OpenTK.OpenGL.Enums.All type, IntPtr addr)
+        {
+            unsafe
+            {
+                Delegates.glSetLocalConstantEXT((UInt32)id, (OpenTK.OpenGL.Enums.All)type, (IntPtr)addr);
+            }
+        }
+
+        public static 
+        void SetLocalConstantEXT(Int32 id, OpenTK.OpenGL.Enums.All type, IntPtr addr)
+        {
+            unsafe
+            {
+                Delegates.glSetLocalConstantEXT((UInt32)id, (OpenTK.OpenGL.Enums.All)type, (IntPtr)addr);
+            }
+        }
+
+        [System.CLSCompliant(false)]
+        public static 
+        void SetLocalConstantEXT(UInt32 id, OpenTK.OpenGL.Enums.All type, [In, Out] object addr)
+        {
+            unsafe
+            {
+                System.Runtime.InteropServices.GCHandle addr_ptr = System.Runtime.InteropServices.GCHandle.Alloc(addr, System.Runtime.InteropServices.GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glSetLocalConstantEXT((UInt32)id, (OpenTK.OpenGL.Enums.All)type, (IntPtr)addr_ptr.AddrOfPinnedObject());
+                }
+                finally
+                {
+                    addr_ptr.Free();
+                }
+            }
+        }
+
+        public static 
+        void SetLocalConstantEXT(Int32 id, OpenTK.OpenGL.Enums.All type, [In, Out] object addr)
+        {
+            unsafe
+            {
+                System.Runtime.InteropServices.GCHandle addr_ptr = System.Runtime.InteropServices.GCHandle.Alloc(addr, System.Runtime.InteropServices.GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glSetLocalConstantEXT((UInt32)id, (OpenTK.OpenGL.Enums.All)type, (IntPtr)addr_ptr.AddrOfPinnedObject());
+                }
+                finally
+                {
+                    addr_ptr.Free();
+                }
+            }
+        }
+
+        [System.CLSCompliant(false)]
+        public static 
+        IntPtr GetUniformOffsetEXT(UInt32 program, Int32 location)
+        {
+            return Delegates.glGetUniformOffsetEXT((UInt32)program, (Int32)location);
+        }
+
+        public static 
+        IntPtr GetUniformOffsetEXT(Int32 program, Int32 location)
+        {
+            return Delegates.glGetUniformOffsetEXT((UInt32)program, (Int32)location);
+        }
+
         public static partial class NV
         {
             public static 
@@ -27043,12 +27282,6 @@ namespace OpenTK.OpenGL
                 Delegates.glBlendColorEXT((Single)red, (Single)green, (Single)blue, (Single)alpha);
             }
 
-            public static 
-            void PolygonOffset(Single factor, Single bias)
-            {
-                Delegates.glPolygonOffsetEXT((Single)factor, (Single)bias);
-            }
-
             public static 
             void TexImage3D(OpenTK.OpenGL.Enums.TextureTarget target, Int32 level, OpenTK.OpenGL.Enums.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.OpenGL.Enums.PixelFormat format, OpenTK.OpenGL.Enums.PixelType type, IntPtr pixels)
             {
@@ -27692,78 +27925,6 @@ namespace OpenTK.OpenGL
                 }
             }
 
-            [System.CLSCompliant(false)]
-            public static 
-            bool AreTexturesResident(Int32 n, UInt32[] textures, [Out] bool[] residences)
-            {
-                unsafe
-                {
-                    fixed (UInt32* textures_ptr = textures)
-                    fixed (bool* residences_ptr = residences)
-                    {
-                        return Delegates.glAreTexturesResidentEXT((Int32)n, (UInt32*)textures_ptr, (bool*)residences_ptr);
-                    }
-                }
-            }
-
-            public static 
-            bool AreTexturesResident(Int32 n, Int32[] textures, [Out] bool[] residences)
-            {
-                unsafe
-                {
-                    fixed (Int32* textures_ptr = textures)
-                    fixed (bool* residences_ptr = residences)
-                    {
-                        return Delegates.glAreTexturesResidentEXT((Int32)n, (UInt32*)textures_ptr, (bool*)residences_ptr);
-                    }
-                }
-            }
-
-            [System.CLSCompliant(false)]
-            public static 
-            bool AreTexturesResident(Int32 n, ref UInt32 textures, [Out] out bool residences)
-            {
-                unsafe
-                {
-                    fixed (UInt32* textures_ptr = &textures)
-                    fixed (bool* residences_ptr = &residences)
-                    {
-                        bool retval = Delegates.glAreTexturesResidentEXT((Int32)n, (UInt32*)textures_ptr, (bool*)residences_ptr);
-                        residences = *residences_ptr;
-                        return retval;
-                    }
-                }
-            }
-
-            public static 
-            bool AreTexturesResident(Int32 n, ref Int32 textures, [Out] out bool residences)
-            {
-                unsafe
-                {
-                    fixed (Int32* textures_ptr = &textures)
-                    fixed (bool* residences_ptr = &residences)
-                    {
-                        bool retval = Delegates.glAreTexturesResidentEXT((Int32)n, (UInt32*)textures_ptr, (bool*)residences_ptr);
-                        residences = *residences_ptr;
-                        return retval;
-                    }
-                }
-            }
-
-            [System.CLSCompliant(false)]
-            public static 
-            unsafe bool AreTexturesResident(Int32 n, UInt32* textures, [Out] bool* residences)
-            {
-                return Delegates.glAreTexturesResidentEXT((Int32)n, (UInt32*)textures, (bool*)residences);
-            }
-
-            [System.CLSCompliant(false)]
-            public static 
-            unsafe bool AreTexturesResident(Int32 n, Int32* textures, [Out] bool* residences)
-            {
-                return Delegates.glAreTexturesResidentEXT((Int32)n, (UInt32*)textures, (bool*)residences);
-            }
-
             [System.CLSCompliant(false)]
             public static 
             void BindTexture(OpenTK.OpenGL.Enums.TextureTarget target, UInt32 texture)
@@ -27988,12 +28149,6 @@ namespace OpenTK.OpenGL
                 Delegates.glPrioritizeTexturesEXT((Int32)n, (UInt32*)textures, (Single*)priorities);
             }
 
-            public static 
-            void ArrayElement(Int32 i)
-            {
-                Delegates.glArrayElementEXT((Int32)i);
-            }
-
             public static 
             void ColorPointer(Int32 size, OpenTK.OpenGL.Enums.ColorPointerType type, Int32 stride, Int32 count, IntPtr pointer)
             {
@@ -28526,12 +28681,6 @@ namespace OpenTK.OpenGL
                 Delegates.glApplyTextureEXT((OpenTK.OpenGL.Enums.All)mode);
             }
 
-            public static 
-            void TextureLight(OpenTK.OpenGL.Enums.All pname)
-            {
-                Delegates.glTextureLightEXT((OpenTK.OpenGL.Enums.All)pname);
-            }
-
             public static 
             void TextureMaterial(OpenTK.OpenGL.Enums.MaterialFace face, OpenTK.OpenGL.Enums.MaterialParameter mode)
             {
@@ -29830,32 +29979,6 @@ namespace OpenTK.OpenGL
                 Delegates.glWriteMaskEXT((UInt32)res, (UInt32)@in, (OpenTK.OpenGL.Enums.All)outX, (OpenTK.OpenGL.Enums.All)outY, (OpenTK.OpenGL.Enums.All)outZ, (OpenTK.OpenGL.Enums.All)outW);
             }
 
-            [System.CLSCompliant(false)]
-            public static 
-            void InsertComponent(UInt32 res, UInt32 src, UInt32 num)
-            {
-                Delegates.glInsertComponentEXT((UInt32)res, (UInt32)src, (UInt32)num);
-            }
-
-            public static 
-            void InsertComponent(Int32 res, Int32 src, Int32 num)
-            {
-                Delegates.glInsertComponentEXT((UInt32)res, (UInt32)src, (UInt32)num);
-            }
-
-            [System.CLSCompliant(false)]
-            public static 
-            void ExtractComponent(UInt32 res, UInt32 src, UInt32 num)
-            {
-                Delegates.glExtractComponentEXT((UInt32)res, (UInt32)src, (UInt32)num);
-            }
-
-            public static 
-            void ExtractComponent(Int32 res, Int32 src, Int32 num)
-            {
-                Delegates.glExtractComponentEXT((UInt32)res, (UInt32)src, (UInt32)num);
-            }
-
             [System.CLSCompliant(false)]
             public static 
             Int32 GenSymbol(OpenTK.OpenGL.Enums.All datatype, OpenTK.OpenGL.Enums.All storagetype, OpenTK.OpenGL.Enums.All range, UInt32 components)
@@ -29869,114 +29992,6 @@ namespace OpenTK.OpenGL
                 return Delegates.glGenSymbolsEXT((OpenTK.OpenGL.Enums.All)datatype, (OpenTK.OpenGL.Enums.All)storagetype, (OpenTK.OpenGL.Enums.All)range, (UInt32)components);
             }
 
-            [System.CLSCompliant(false)]
-            public static 
-            void SetInvariant(UInt32 id, OpenTK.OpenGL.Enums.All type, IntPtr addr)
-            {
-                unsafe
-                {
-                    Delegates.glSetInvariantEXT((UInt32)id, (OpenTK.OpenGL.Enums.All)type, (IntPtr)addr);
-                }
-            }
-
-            public static 
-            void SetInvariant(Int32 id, OpenTK.OpenGL.Enums.All type, IntPtr addr)
-            {
-                unsafe
-                {
-                    Delegates.glSetInvariantEXT((UInt32)id, (OpenTK.OpenGL.Enums.All)type, (IntPtr)addr);
-                }
-            }
-
-            [System.CLSCompliant(false)]
-            public static 
-            void SetInvariant(UInt32 id, OpenTK.OpenGL.Enums.All type, [In, Out] object addr)
-            {
-                unsafe
-                {
-                    System.Runtime.InteropServices.GCHandle addr_ptr = System.Runtime.InteropServices.GCHandle.Alloc(addr, System.Runtime.InteropServices.GCHandleType.Pinned);
-                    try
-                    {
-                        Delegates.glSetInvariantEXT((UInt32)id, (OpenTK.OpenGL.Enums.All)type, (IntPtr)addr_ptr.AddrOfPinnedObject());
-                    }
-                    finally
-                    {
-                        addr_ptr.Free();
-                    }
-                }
-            }
-
-            public static 
-            void SetInvariant(Int32 id, OpenTK.OpenGL.Enums.All type, [In, Out] object addr)
-            {
-                unsafe
-                {
-                    System.Runtime.InteropServices.GCHandle addr_ptr = System.Runtime.InteropServices.GCHandle.Alloc(addr, System.Runtime.InteropServices.GCHandleType.Pinned);
-                    try
-                    {
-                        Delegates.glSetInvariantEXT((UInt32)id, (OpenTK.OpenGL.Enums.All)type, (IntPtr)addr_ptr.AddrOfPinnedObject());
-                    }
-                    finally
-                    {
-                        addr_ptr.Free();
-                    }
-                }
-            }
-
-            [System.CLSCompliant(false)]
-            public static 
-            void SetLocalConstant(UInt32 id, OpenTK.OpenGL.Enums.All type, IntPtr addr)
-            {
-                unsafe
-                {
-                    Delegates.glSetLocalConstantEXT((UInt32)id, (OpenTK.OpenGL.Enums.All)type, (IntPtr)addr);
-                }
-            }
-
-            public static 
-            void SetLocalConstant(Int32 id, OpenTK.OpenGL.Enums.All type, IntPtr addr)
-            {
-                unsafe
-                {
-                    Delegates.glSetLocalConstantEXT((UInt32)id, (OpenTK.OpenGL.Enums.All)type, (IntPtr)addr);
-                }
-            }
-
-            [System.CLSCompliant(false)]
-            public static 
-            void SetLocalConstant(UInt32 id, OpenTK.OpenGL.Enums.All type, [In, Out] object addr)
-            {
-                unsafe
-                {
-                    System.Runtime.InteropServices.GCHandle addr_ptr = System.Runtime.InteropServices.GCHandle.Alloc(addr, System.Runtime.InteropServices.GCHandleType.Pinned);
-                    try
-                    {
-                        Delegates.glSetLocalConstantEXT((UInt32)id, (OpenTK.OpenGL.Enums.All)type, (IntPtr)addr_ptr.AddrOfPinnedObject());
-                    }
-                    finally
-                    {
-                        addr_ptr.Free();
-                    }
-                }
-            }
-
-            public static 
-            void SetLocalConstant(Int32 id, OpenTK.OpenGL.Enums.All type, [In, Out] object addr)
-            {
-                unsafe
-                {
-                    System.Runtime.InteropServices.GCHandle addr_ptr = System.Runtime.InteropServices.GCHandle.Alloc(addr, System.Runtime.InteropServices.GCHandleType.Pinned);
-                    try
-                    {
-                        Delegates.glSetLocalConstantEXT((UInt32)id, (OpenTK.OpenGL.Enums.All)type, (IntPtr)addr_ptr.AddrOfPinnedObject());
-                    }
-                    finally
-                    {
-                        addr_ptr.Free();
-                    }
-                }
-            }
-
             [System.CLSCompliant(false)]
             public static 
             void Variant(UInt32 id, SByte[] addr)
@@ -33439,19 +33454,6 @@ namespace OpenTK.OpenGL
                 return Delegates.glGetUniformBufferSizeEXT((UInt32)program, (Int32)location);
             }
 
-            [System.CLSCompliant(false)]
-            public static 
-            IntPtr GetUniformOffset(UInt32 program, Int32 location)
-            {
-                return Delegates.glGetUniformOffsetEXT((UInt32)program, (Int32)location);
-            }
-
-            public static 
-            IntPtr GetUniformOffset(Int32 program, Int32 location)
-            {
-                return Delegates.glGetUniformOffsetEXT((UInt32)program, (Int32)location);
-            }
-
             [System.CLSCompliant(false)]
             public static 
             void TexParameterIv(OpenTK.OpenGL.Enums.TextureTarget target, OpenTK.OpenGL.Enums.TextureParameterName pname, UInt32[] @params)
diff --git a/Source/OpenTK/OpenGL/Bindings/GLCore.cs b/Source/OpenTK/OpenGL/Bindings/GLCore.cs
index e5a6192f..a4ccfbd7 100644
--- a/Source/OpenTK/OpenGL/Bindings/GLCore.cs
+++ b/Source/OpenTK/OpenGL/Bindings/GLCore.cs
@@ -2,6 +2,8 @@ namespace OpenTK.OpenGL
 {
     using System;
     using System.Runtime.InteropServices;
+    #pragma warning disable 3019
+    #pragma warning disable 1591
 
     partial class GL
     {
@@ -1755,6 +1757,33 @@ namespace OpenTK.OpenGL
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glUniformMatrix4x3fv", ExactSpelling = true)]
             internal extern static unsafe void UniformMatrix4x3fv(Int32 location, Int32 count, bool transpose, Single* value);
+            [System.Security.SuppressUnmanagedCodeSecurity()]
+            [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glPolygonOffsetEXT", ExactSpelling = true)]
+            internal extern static void PolygonOffsetEXT(Single factor, Single bias);
+            [System.Security.SuppressUnmanagedCodeSecurity()]
+            [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glAreTexturesResidentEXT", ExactSpelling = true)]
+            internal extern static unsafe bool AreTexturesResidentEXT(Int32 n, UInt32* textures, [Out] bool* residences);
+            [System.Security.SuppressUnmanagedCodeSecurity()]
+            [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glArrayElementEXT", ExactSpelling = true)]
+            internal extern static void ArrayElementEXT(Int32 i);
+            [System.Security.SuppressUnmanagedCodeSecurity()]
+            [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTextureLightEXT", ExactSpelling = true)]
+            internal extern static void TextureLightEXT(OpenTK.OpenGL.Enums.All pname);
+            [System.Security.SuppressUnmanagedCodeSecurity()]
+            [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glInsertComponentEXT", ExactSpelling = true)]
+            internal extern static void InsertComponentEXT(UInt32 res, UInt32 src, UInt32 num);
+            [System.Security.SuppressUnmanagedCodeSecurity()]
+            [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glExtractComponentEXT", ExactSpelling = true)]
+            internal extern static void ExtractComponentEXT(UInt32 res, UInt32 src, UInt32 num);
+            [System.Security.SuppressUnmanagedCodeSecurity()]
+            [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glSetInvariantEXT", ExactSpelling = true)]
+            internal extern static void SetInvariantEXT(UInt32 id, OpenTK.OpenGL.Enums.All type, IntPtr addr);
+            [System.Security.SuppressUnmanagedCodeSecurity()]
+            [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glSetLocalConstantEXT", ExactSpelling = true)]
+            internal extern static void SetLocalConstantEXT(UInt32 id, OpenTK.OpenGL.Enums.All type, IntPtr addr);
+            [System.Security.SuppressUnmanagedCodeSecurity()]
+            [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetUniformOffsetEXT", ExactSpelling = true)]
+            internal extern static IntPtr GetUniformOffsetEXT(UInt32 program, Int32 location);
         }
     }
 }
diff --git a/Source/OpenTK/OpenGL/Bindings/GLDelegates.cs b/Source/OpenTK/OpenGL/Bindings/GLDelegates.cs
index 677c3579..f458cef5 100644
--- a/Source/OpenTK/OpenGL/Bindings/GLDelegates.cs
+++ b/Source/OpenTK/OpenGL/Bindings/GLDelegates.cs
@@ -3,6 +3,8 @@ namespace OpenTK.OpenGL
     using System;
     using System.Runtime.InteropServices;
     #pragma warning disable 0649
+    #pragma warning disable 3019
+    #pragma warning disable 1591
 
     partial class GL
     {
@@ -4594,5 +4596,4 @@ namespace OpenTK.OpenGL
             internal static ClearColorIuiEXT glClearColorIuiEXT;
         }
     }
-    #pragma warning restore 0649
 }
diff --git a/Source/OpenTK/OpenGL/Bindings/GLEnums.cs b/Source/OpenTK/OpenGL/Bindings/GLEnums.cs
index fc7825de..8f87486f 100644
--- a/Source/OpenTK/OpenGL/Bindings/GLEnums.cs
+++ b/Source/OpenTK/OpenGL/Bindings/GLEnums.cs
@@ -1,9 +1,9 @@
-#pragma warning disable 3019
-#pragma warning disable 1591
 namespace OpenTK.OpenGL
 {
     namespace Enums
     {
+        #pragma warning disable 3019
+        #pragma warning disable 1591
         public enum DrawElementsType
         {
             UnsignedByte = ((int)0x1401),