diff --git a/Source/Bind/Specifications/GL2/overrides.xml b/Source/Bind/Specifications/GL2/overrides.xml
index 669cc057..d370d7b6 100644
--- a/Source/Bind/Specifications/GL2/overrides.xml
+++ b/Source/Bind/Specifications/GL2/overrides.xml
@@ -1062,7 +1062,7 @@
       </param>
     </function>
     
-    <function name="GetMessageDebugLog" extension="Core">
+    <function name="GetDebugMessageLog" extension="Core">
       <param name="sources">
         <type>DebugSource</type>
       </param>
diff --git a/Source/OpenTK/Graphics/OpenGL/GL.cs b/Source/OpenTK/Graphics/OpenGL/GL.cs
index d4dfb5f9..cd619335 100644
--- a/Source/OpenTK/Graphics/OpenGL/GL.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GL.cs
@@ -70069,7 +70069,7 @@ namespace OpenTK.Graphics.OpenGL
                 /// </param>
         [AutoGenerated(Category = "KHR_debug|VERSION_4_3", Version = "4.3", EntryPoint = "glGetDebugMessageLog")]
         public static 
-        Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.OpenGL.All[] sources, [OutAttribute] OpenTK.Graphics.OpenGL.All[] types, [OutAttribute] Int32[] ids, [OutAttribute] OpenTK.Graphics.OpenGL.All[] severities, [OutAttribute] Int32[] lengths, [OutAttribute] StringBuilder messageLog)
+        Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.OpenGL.DebugSource[] sources, [OutAttribute] OpenTK.Graphics.OpenGL.DebugType[] types, [OutAttribute] Int32[] ids, [OutAttribute] OpenTK.Graphics.OpenGL.DebugSeverity[] severities, [OutAttribute] Int32[] lengths, [OutAttribute] StringBuilder messageLog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -70077,13 +70077,13 @@ namespace OpenTK.Graphics.OpenGL
             #endif
             unsafe
             {
-                fixed (OpenTK.Graphics.OpenGL.All* sources_ptr = sources)
-                fixed (OpenTK.Graphics.OpenGL.All* types_ptr = types)
+                fixed (OpenTK.Graphics.OpenGL.DebugSource* sources_ptr = sources)
+                fixed (OpenTK.Graphics.OpenGL.DebugType* types_ptr = types)
                 fixed (Int32* ids_ptr = ids)
-                fixed (OpenTK.Graphics.OpenGL.All* severities_ptr = severities)
+                fixed (OpenTK.Graphics.OpenGL.DebugSeverity* severities_ptr = severities)
                 fixed (Int32* lengths_ptr = lengths)
                 {
-                    return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.OpenGL.All*)sources_ptr, (OpenTK.Graphics.OpenGL.All*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.OpenGL.All*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
+                    return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.OpenGL.DebugSource*)sources_ptr, (OpenTK.Graphics.OpenGL.DebugType*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.OpenGL.DebugSeverity*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
                 }
             }
             #if DEBUG
@@ -70137,7 +70137,7 @@ namespace OpenTK.Graphics.OpenGL
                 /// </param>
         [AutoGenerated(Category = "KHR_debug|VERSION_4_3", Version = "4.3", EntryPoint = "glGetDebugMessageLog")]
         public static 
-        Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] out OpenTK.Graphics.OpenGL.All sources, [OutAttribute] out OpenTK.Graphics.OpenGL.All types, [OutAttribute] out Int32 ids, [OutAttribute] out OpenTK.Graphics.OpenGL.All severities, [OutAttribute] out Int32 lengths, [OutAttribute] StringBuilder messageLog)
+        Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] out OpenTK.Graphics.OpenGL.DebugSource sources, [OutAttribute] out OpenTK.Graphics.OpenGL.DebugType types, [OutAttribute] out Int32 ids, [OutAttribute] out OpenTK.Graphics.OpenGL.DebugSeverity severities, [OutAttribute] out Int32 lengths, [OutAttribute] StringBuilder messageLog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -70145,13 +70145,13 @@ namespace OpenTK.Graphics.OpenGL
             #endif
             unsafe
             {
-                fixed (OpenTK.Graphics.OpenGL.All* sources_ptr = &sources)
-                fixed (OpenTK.Graphics.OpenGL.All* types_ptr = &types)
+                fixed (OpenTK.Graphics.OpenGL.DebugSource* sources_ptr = &sources)
+                fixed (OpenTK.Graphics.OpenGL.DebugType* types_ptr = &types)
                 fixed (Int32* ids_ptr = &ids)
-                fixed (OpenTK.Graphics.OpenGL.All* severities_ptr = &severities)
+                fixed (OpenTK.Graphics.OpenGL.DebugSeverity* severities_ptr = &severities)
                 fixed (Int32* lengths_ptr = &lengths)
                 {
-                    Int32 retval = Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.OpenGL.All*)sources_ptr, (OpenTK.Graphics.OpenGL.All*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.OpenGL.All*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
+                    Int32 retval = Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.OpenGL.DebugSource*)sources_ptr, (OpenTK.Graphics.OpenGL.DebugType*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.OpenGL.DebugSeverity*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
                     sources = *sources_ptr;
                     types = *types_ptr;
                     ids = *ids_ptr;
@@ -70212,13 +70212,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug|VERSION_4_3", Version = "4.3", EntryPoint = "glGetDebugMessageLog")]
         public static 
-        unsafe Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.OpenGL.All* sources, [OutAttribute] OpenTK.Graphics.OpenGL.All* types, [OutAttribute] Int32* ids, [OutAttribute] OpenTK.Graphics.OpenGL.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog)
+        unsafe Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.OpenGL.DebugSource* sources, [OutAttribute] OpenTK.Graphics.OpenGL.DebugType* types, [OutAttribute] Int32* ids, [OutAttribute] OpenTK.Graphics.OpenGL.DebugSeverity* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.OpenGL.All*)sources, (OpenTK.Graphics.OpenGL.All*)types, (UInt32*)ids, (OpenTK.Graphics.OpenGL.All*)severities, (Int32*)lengths, (StringBuilder)messageLog);
+            return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.OpenGL.DebugSource*)sources, (OpenTK.Graphics.OpenGL.DebugType*)types, (UInt32*)ids, (OpenTK.Graphics.OpenGL.DebugSeverity*)severities, (Int32*)lengths, (StringBuilder)messageLog);
             #if DEBUG
             }
             #endif
@@ -70271,7 +70271,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug|VERSION_4_3", Version = "4.3", EntryPoint = "glGetDebugMessageLog")]
         public static 
-        Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.OpenGL.All[] sources, [OutAttribute] OpenTK.Graphics.OpenGL.All[] types, [OutAttribute] UInt32[] ids, [OutAttribute] OpenTK.Graphics.OpenGL.All[] severities, [OutAttribute] Int32[] lengths, [OutAttribute] StringBuilder messageLog)
+        Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.OpenGL.DebugSource[] sources, [OutAttribute] OpenTK.Graphics.OpenGL.DebugType[] types, [OutAttribute] UInt32[] ids, [OutAttribute] OpenTK.Graphics.OpenGL.DebugSeverity[] severities, [OutAttribute] Int32[] lengths, [OutAttribute] StringBuilder messageLog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -70279,13 +70279,13 @@ namespace OpenTK.Graphics.OpenGL
             #endif
             unsafe
             {
-                fixed (OpenTK.Graphics.OpenGL.All* sources_ptr = sources)
-                fixed (OpenTK.Graphics.OpenGL.All* types_ptr = types)
+                fixed (OpenTK.Graphics.OpenGL.DebugSource* sources_ptr = sources)
+                fixed (OpenTK.Graphics.OpenGL.DebugType* types_ptr = types)
                 fixed (UInt32* ids_ptr = ids)
-                fixed (OpenTK.Graphics.OpenGL.All* severities_ptr = severities)
+                fixed (OpenTK.Graphics.OpenGL.DebugSeverity* severities_ptr = severities)
                 fixed (Int32* lengths_ptr = lengths)
                 {
-                    return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.OpenGL.All*)sources_ptr, (OpenTK.Graphics.OpenGL.All*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.OpenGL.All*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
+                    return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.OpenGL.DebugSource*)sources_ptr, (OpenTK.Graphics.OpenGL.DebugType*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.OpenGL.DebugSeverity*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
                 }
             }
             #if DEBUG
@@ -70340,7 +70340,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug|VERSION_4_3", Version = "4.3", EntryPoint = "glGetDebugMessageLog")]
         public static 
-        Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] out OpenTK.Graphics.OpenGL.All sources, [OutAttribute] out OpenTK.Graphics.OpenGL.All types, [OutAttribute] out UInt32 ids, [OutAttribute] out OpenTK.Graphics.OpenGL.All severities, [OutAttribute] out Int32 lengths, [OutAttribute] StringBuilder messageLog)
+        Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] out OpenTK.Graphics.OpenGL.DebugSource sources, [OutAttribute] out OpenTK.Graphics.OpenGL.DebugType types, [OutAttribute] out UInt32 ids, [OutAttribute] out OpenTK.Graphics.OpenGL.DebugSeverity severities, [OutAttribute] out Int32 lengths, [OutAttribute] StringBuilder messageLog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -70348,13 +70348,13 @@ namespace OpenTK.Graphics.OpenGL
             #endif
             unsafe
             {
-                fixed (OpenTK.Graphics.OpenGL.All* sources_ptr = &sources)
-                fixed (OpenTK.Graphics.OpenGL.All* types_ptr = &types)
+                fixed (OpenTK.Graphics.OpenGL.DebugSource* sources_ptr = &sources)
+                fixed (OpenTK.Graphics.OpenGL.DebugType* types_ptr = &types)
                 fixed (UInt32* ids_ptr = &ids)
-                fixed (OpenTK.Graphics.OpenGL.All* severities_ptr = &severities)
+                fixed (OpenTK.Graphics.OpenGL.DebugSeverity* severities_ptr = &severities)
                 fixed (Int32* lengths_ptr = &lengths)
                 {
-                    Int32 retval = Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.OpenGL.All*)sources_ptr, (OpenTK.Graphics.OpenGL.All*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.OpenGL.All*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
+                    Int32 retval = Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.OpenGL.DebugSource*)sources_ptr, (OpenTK.Graphics.OpenGL.DebugType*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.OpenGL.DebugSeverity*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
                     sources = *sources_ptr;
                     types = *types_ptr;
                     ids = *ids_ptr;
@@ -70415,13 +70415,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug|VERSION_4_3", Version = "4.3", EntryPoint = "glGetDebugMessageLog")]
         public static 
-        unsafe Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.OpenGL.All* sources, [OutAttribute] OpenTK.Graphics.OpenGL.All* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.OpenGL.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog)
+        unsafe Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.OpenGL.DebugSource* sources, [OutAttribute] OpenTK.Graphics.OpenGL.DebugType* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.OpenGL.DebugSeverity* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.OpenGL.All*)sources, (OpenTK.Graphics.OpenGL.All*)types, (UInt32*)ids, (OpenTK.Graphics.OpenGL.All*)severities, (Int32*)lengths, (StringBuilder)messageLog);
+            return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.OpenGL.DebugSource*)sources, (OpenTK.Graphics.OpenGL.DebugType*)types, (UInt32*)ids, (OpenTK.Graphics.OpenGL.DebugSeverity*)severities, (Int32*)lengths, (StringBuilder)messageLog);
             #if DEBUG
             }
             #endif
diff --git a/Source/OpenTK/Graphics/OpenGL/GLCore.cs b/Source/OpenTK/Graphics/OpenGL/GLCore.cs
index d55317e2..4dab511c 100644
--- a/Source/OpenTK/Graphics/OpenGL/GLCore.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GLCore.cs
@@ -2129,7 +2129,7 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static unsafe void GetConvolutionParameterxvOES(OpenTK.Graphics.OpenGL.OesFixedPoint target, OpenTK.Graphics.OpenGL.OesFixedPoint pname, [OutAttribute] int* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetDebugMessageLog", ExactSpelling = true)]
-            internal extern static unsafe Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.OpenGL.All* sources, [OutAttribute] OpenTK.Graphics.OpenGL.All* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.OpenGL.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog);
+            internal extern static unsafe Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.OpenGL.DebugSource* sources, [OutAttribute] OpenTK.Graphics.OpenGL.DebugType* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.OpenGL.DebugSeverity* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetDebugMessageLogAMD", ExactSpelling = true)]
             internal extern static unsafe Int32 GetDebugMessageLogAMD(UInt32 count, Int32 bufsize, [OutAttribute] OpenTK.Graphics.OpenGL.AmdDebugOutput* categories, [OutAttribute] UInt32* severities, [OutAttribute] UInt32* ids, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder message);
diff --git a/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs b/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs
index 3ba4385e..f732a711 100644
--- a/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs
@@ -2127,7 +2127,7 @@ namespace OpenTK.Graphics.OpenGL
             internal unsafe delegate void GetConvolutionParameterxvOES(OpenTK.Graphics.OpenGL.OesFixedPoint target, OpenTK.Graphics.OpenGL.OesFixedPoint pname, [OutAttribute] int* @params);
             internal unsafe static GetConvolutionParameterxvOES glGetConvolutionParameterxvOES;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.OpenGL.All* sources, [OutAttribute] OpenTK.Graphics.OpenGL.All* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.OpenGL.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog);
+            internal unsafe delegate Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.OpenGL.DebugSource* sources, [OutAttribute] OpenTK.Graphics.OpenGL.DebugType* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.OpenGL.DebugSeverity* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog);
             internal unsafe static GetDebugMessageLog glGetDebugMessageLog;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate Int32 GetDebugMessageLogAMD(UInt32 count, Int32 bufsize, [OutAttribute] OpenTK.Graphics.OpenGL.AmdDebugOutput* categories, [OutAttribute] UInt32* severities, [OutAttribute] UInt32* ids, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder message);
diff --git a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs
index ff10aef7..9c2790e2 100644
--- a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs
@@ -736,7 +736,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.Arb.GetProgramEnvParameter, GL.Arb.GetProgramLocalParameter and 11 other functions
+    /// Used in GL.Arb.GetProgramEnvParameter, GL.Arb.GetProgramLocalParameter and 10 other functions
     /// </summary>
     public enum All : int
     {
@@ -29355,7 +29355,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.DebugMessageInsert
+    /// Used in GL.DebugMessageInsert, GL.GetDebugMessageLog
     /// </summary>
     public enum DebugSeverity : int
     {
@@ -29405,7 +29405,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Not used directly.
+    /// Used in GL.GetDebugMessageLog
     /// </summary>
     public enum DebugSource : int
     {
@@ -29486,7 +29486,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.DebugMessageInsert
+    /// Used in GL.DebugMessageInsert, GL.GetDebugMessageLog
     /// </summary>
     public enum DebugType : int
     {
diff --git a/Source/OpenTK/Graphics/OpenGL4/GL4.cs b/Source/OpenTK/Graphics/OpenGL4/GL4.cs
index e8fc9621..53fdb6b0 100644
--- a/Source/OpenTK/Graphics/OpenGL4/GL4.cs
+++ b/Source/OpenTK/Graphics/OpenGL4/GL4.cs
@@ -30318,7 +30318,7 @@ namespace OpenTK.Graphics.OpenGL4
                 /// </param>
         [AutoGenerated(Category = "KHR_debug|VERSION_4_3", Version = "4.3", EntryPoint = "glGetDebugMessageLog")]
         public static 
-        Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.OpenGL4.All[] sources, [OutAttribute] OpenTK.Graphics.OpenGL4.All[] types, [OutAttribute] Int32[] ids, [OutAttribute] OpenTK.Graphics.OpenGL4.All[] severities, [OutAttribute] Int32[] lengths, [OutAttribute] StringBuilder messageLog)
+        Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.OpenGL4.DebugSource[] sources, [OutAttribute] OpenTK.Graphics.OpenGL4.DebugType[] types, [OutAttribute] Int32[] ids, [OutAttribute] OpenTK.Graphics.OpenGL4.DebugSeverity[] severities, [OutAttribute] Int32[] lengths, [OutAttribute] StringBuilder messageLog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -30326,13 +30326,13 @@ namespace OpenTK.Graphics.OpenGL4
             #endif
             unsafe
             {
-                fixed (OpenTK.Graphics.OpenGL4.All* sources_ptr = sources)
-                fixed (OpenTK.Graphics.OpenGL4.All* types_ptr = types)
+                fixed (OpenTK.Graphics.OpenGL4.DebugSource* sources_ptr = sources)
+                fixed (OpenTK.Graphics.OpenGL4.DebugType* types_ptr = types)
                 fixed (Int32* ids_ptr = ids)
-                fixed (OpenTK.Graphics.OpenGL4.All* severities_ptr = severities)
+                fixed (OpenTK.Graphics.OpenGL4.DebugSeverity* severities_ptr = severities)
                 fixed (Int32* lengths_ptr = lengths)
                 {
-                    return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.OpenGL4.All*)sources_ptr, (OpenTK.Graphics.OpenGL4.All*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.OpenGL4.All*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
+                    return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.OpenGL4.DebugSource*)sources_ptr, (OpenTK.Graphics.OpenGL4.DebugType*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.OpenGL4.DebugSeverity*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
                 }
             }
             #if DEBUG
@@ -30386,7 +30386,7 @@ namespace OpenTK.Graphics.OpenGL4
                 /// </param>
         [AutoGenerated(Category = "KHR_debug|VERSION_4_3", Version = "4.3", EntryPoint = "glGetDebugMessageLog")]
         public static 
-        Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] out OpenTK.Graphics.OpenGL4.All sources, [OutAttribute] out OpenTK.Graphics.OpenGL4.All types, [OutAttribute] out Int32 ids, [OutAttribute] out OpenTK.Graphics.OpenGL4.All severities, [OutAttribute] out Int32 lengths, [OutAttribute] StringBuilder messageLog)
+        Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] out OpenTK.Graphics.OpenGL4.DebugSource sources, [OutAttribute] out OpenTK.Graphics.OpenGL4.DebugType types, [OutAttribute] out Int32 ids, [OutAttribute] out OpenTK.Graphics.OpenGL4.DebugSeverity severities, [OutAttribute] out Int32 lengths, [OutAttribute] StringBuilder messageLog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -30394,13 +30394,13 @@ namespace OpenTK.Graphics.OpenGL4
             #endif
             unsafe
             {
-                fixed (OpenTK.Graphics.OpenGL4.All* sources_ptr = &sources)
-                fixed (OpenTK.Graphics.OpenGL4.All* types_ptr = &types)
+                fixed (OpenTK.Graphics.OpenGL4.DebugSource* sources_ptr = &sources)
+                fixed (OpenTK.Graphics.OpenGL4.DebugType* types_ptr = &types)
                 fixed (Int32* ids_ptr = &ids)
-                fixed (OpenTK.Graphics.OpenGL4.All* severities_ptr = &severities)
+                fixed (OpenTK.Graphics.OpenGL4.DebugSeverity* severities_ptr = &severities)
                 fixed (Int32* lengths_ptr = &lengths)
                 {
-                    Int32 retval = Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.OpenGL4.All*)sources_ptr, (OpenTK.Graphics.OpenGL4.All*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.OpenGL4.All*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
+                    Int32 retval = Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.OpenGL4.DebugSource*)sources_ptr, (OpenTK.Graphics.OpenGL4.DebugType*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.OpenGL4.DebugSeverity*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
                     sources = *sources_ptr;
                     types = *types_ptr;
                     ids = *ids_ptr;
@@ -30461,13 +30461,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug|VERSION_4_3", Version = "4.3", EntryPoint = "glGetDebugMessageLog")]
         public static 
-        unsafe Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.OpenGL4.All* sources, [OutAttribute] OpenTK.Graphics.OpenGL4.All* types, [OutAttribute] Int32* ids, [OutAttribute] OpenTK.Graphics.OpenGL4.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog)
+        unsafe Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.OpenGL4.DebugSource* sources, [OutAttribute] OpenTK.Graphics.OpenGL4.DebugType* types, [OutAttribute] Int32* ids, [OutAttribute] OpenTK.Graphics.OpenGL4.DebugSeverity* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.OpenGL4.All*)sources, (OpenTK.Graphics.OpenGL4.All*)types, (UInt32*)ids, (OpenTK.Graphics.OpenGL4.All*)severities, (Int32*)lengths, (StringBuilder)messageLog);
+            return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.OpenGL4.DebugSource*)sources, (OpenTK.Graphics.OpenGL4.DebugType*)types, (UInt32*)ids, (OpenTK.Graphics.OpenGL4.DebugSeverity*)severities, (Int32*)lengths, (StringBuilder)messageLog);
             #if DEBUG
             }
             #endif
@@ -30520,7 +30520,7 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug|VERSION_4_3", Version = "4.3", EntryPoint = "glGetDebugMessageLog")]
         public static 
-        Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.OpenGL4.All[] sources, [OutAttribute] OpenTK.Graphics.OpenGL4.All[] types, [OutAttribute] UInt32[] ids, [OutAttribute] OpenTK.Graphics.OpenGL4.All[] severities, [OutAttribute] Int32[] lengths, [OutAttribute] StringBuilder messageLog)
+        Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.OpenGL4.DebugSource[] sources, [OutAttribute] OpenTK.Graphics.OpenGL4.DebugType[] types, [OutAttribute] UInt32[] ids, [OutAttribute] OpenTK.Graphics.OpenGL4.DebugSeverity[] severities, [OutAttribute] Int32[] lengths, [OutAttribute] StringBuilder messageLog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -30528,13 +30528,13 @@ namespace OpenTK.Graphics.OpenGL4
             #endif
             unsafe
             {
-                fixed (OpenTK.Graphics.OpenGL4.All* sources_ptr = sources)
-                fixed (OpenTK.Graphics.OpenGL4.All* types_ptr = types)
+                fixed (OpenTK.Graphics.OpenGL4.DebugSource* sources_ptr = sources)
+                fixed (OpenTK.Graphics.OpenGL4.DebugType* types_ptr = types)
                 fixed (UInt32* ids_ptr = ids)
-                fixed (OpenTK.Graphics.OpenGL4.All* severities_ptr = severities)
+                fixed (OpenTK.Graphics.OpenGL4.DebugSeverity* severities_ptr = severities)
                 fixed (Int32* lengths_ptr = lengths)
                 {
-                    return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.OpenGL4.All*)sources_ptr, (OpenTK.Graphics.OpenGL4.All*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.OpenGL4.All*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
+                    return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.OpenGL4.DebugSource*)sources_ptr, (OpenTK.Graphics.OpenGL4.DebugType*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.OpenGL4.DebugSeverity*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
                 }
             }
             #if DEBUG
@@ -30589,7 +30589,7 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug|VERSION_4_3", Version = "4.3", EntryPoint = "glGetDebugMessageLog")]
         public static 
-        Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] out OpenTK.Graphics.OpenGL4.All sources, [OutAttribute] out OpenTK.Graphics.OpenGL4.All types, [OutAttribute] out UInt32 ids, [OutAttribute] out OpenTK.Graphics.OpenGL4.All severities, [OutAttribute] out Int32 lengths, [OutAttribute] StringBuilder messageLog)
+        Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] out OpenTK.Graphics.OpenGL4.DebugSource sources, [OutAttribute] out OpenTK.Graphics.OpenGL4.DebugType types, [OutAttribute] out UInt32 ids, [OutAttribute] out OpenTK.Graphics.OpenGL4.DebugSeverity severities, [OutAttribute] out Int32 lengths, [OutAttribute] StringBuilder messageLog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -30597,13 +30597,13 @@ namespace OpenTK.Graphics.OpenGL4
             #endif
             unsafe
             {
-                fixed (OpenTK.Graphics.OpenGL4.All* sources_ptr = &sources)
-                fixed (OpenTK.Graphics.OpenGL4.All* types_ptr = &types)
+                fixed (OpenTK.Graphics.OpenGL4.DebugSource* sources_ptr = &sources)
+                fixed (OpenTK.Graphics.OpenGL4.DebugType* types_ptr = &types)
                 fixed (UInt32* ids_ptr = &ids)
-                fixed (OpenTK.Graphics.OpenGL4.All* severities_ptr = &severities)
+                fixed (OpenTK.Graphics.OpenGL4.DebugSeverity* severities_ptr = &severities)
                 fixed (Int32* lengths_ptr = &lengths)
                 {
-                    Int32 retval = Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.OpenGL4.All*)sources_ptr, (OpenTK.Graphics.OpenGL4.All*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.OpenGL4.All*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
+                    Int32 retval = Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.OpenGL4.DebugSource*)sources_ptr, (OpenTK.Graphics.OpenGL4.DebugType*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.OpenGL4.DebugSeverity*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
                     sources = *sources_ptr;
                     types = *types_ptr;
                     ids = *ids_ptr;
@@ -30664,13 +30664,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug|VERSION_4_3", Version = "4.3", EntryPoint = "glGetDebugMessageLog")]
         public static 
-        unsafe Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.OpenGL4.All* sources, [OutAttribute] OpenTK.Graphics.OpenGL4.All* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.OpenGL4.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog)
+        unsafe Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.OpenGL4.DebugSource* sources, [OutAttribute] OpenTK.Graphics.OpenGL4.DebugType* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.OpenGL4.DebugSeverity* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.OpenGL4.All*)sources, (OpenTK.Graphics.OpenGL4.All*)types, (UInt32*)ids, (OpenTK.Graphics.OpenGL4.All*)severities, (Int32*)lengths, (StringBuilder)messageLog);
+            return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.OpenGL4.DebugSource*)sources, (OpenTK.Graphics.OpenGL4.DebugType*)types, (UInt32*)ids, (OpenTK.Graphics.OpenGL4.DebugSeverity*)severities, (Int32*)lengths, (StringBuilder)messageLog);
             #if DEBUG
             }
             #endif
diff --git a/Source/OpenTK/Graphics/OpenGL4/GL4Core.cs b/Source/OpenTK/Graphics/OpenGL4/GL4Core.cs
index 2b3f75bf..abc80df7 100644
--- a/Source/OpenTK/Graphics/OpenGL4/GL4Core.cs
+++ b/Source/OpenTK/Graphics/OpenGL4/GL4Core.cs
@@ -668,7 +668,7 @@ namespace OpenTK.Graphics.OpenGL4
             internal extern static unsafe void GetConvolutionParameteriv(OpenTK.Graphics.OpenGL4.ConvolutionTarget target, OpenTK.Graphics.OpenGL4.GetConvolutionParameterPName pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetDebugMessageLog", ExactSpelling = true)]
-            internal extern static unsafe Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.OpenGL4.All* sources, [OutAttribute] OpenTK.Graphics.OpenGL4.All* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.OpenGL4.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog);
+            internal extern static unsafe Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.OpenGL4.DebugSource* sources, [OutAttribute] OpenTK.Graphics.OpenGL4.DebugType* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.OpenGL4.DebugSeverity* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetDebugMessageLogARB", ExactSpelling = true)]
             internal extern static unsafe Int32 GetDebugMessageLogARB(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.OpenGL4.All* sources, [OutAttribute] OpenTK.Graphics.OpenGL4.All* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.OpenGL4.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog);
diff --git a/Source/OpenTK/Graphics/OpenGL4/GL4Delegates.cs b/Source/OpenTK/Graphics/OpenGL4/GL4Delegates.cs
index 862ee701..1d61c8fd 100644
--- a/Source/OpenTK/Graphics/OpenGL4/GL4Delegates.cs
+++ b/Source/OpenTK/Graphics/OpenGL4/GL4Delegates.cs
@@ -666,7 +666,7 @@ namespace OpenTK.Graphics.OpenGL4
             internal unsafe delegate void GetConvolutionParameteriv(OpenTK.Graphics.OpenGL4.ConvolutionTarget target, OpenTK.Graphics.OpenGL4.GetConvolutionParameterPName pname, [OutAttribute] Int32* @params);
             internal unsafe static GetConvolutionParameteriv glGetConvolutionParameteriv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.OpenGL4.All* sources, [OutAttribute] OpenTK.Graphics.OpenGL4.All* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.OpenGL4.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog);
+            internal unsafe delegate Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.OpenGL4.DebugSource* sources, [OutAttribute] OpenTK.Graphics.OpenGL4.DebugType* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.OpenGL4.DebugSeverity* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog);
             internal unsafe static GetDebugMessageLog glGetDebugMessageLog;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate Int32 GetDebugMessageLogARB(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.OpenGL4.All* sources, [OutAttribute] OpenTK.Graphics.OpenGL4.All* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.OpenGL4.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog);
diff --git a/Source/OpenTK/Graphics/OpenGL4/GL4Enums.cs b/Source/OpenTK/Graphics/OpenGL4/GL4Enums.cs
index 6dfd0817..70b5d01b 100644
--- a/Source/OpenTK/Graphics/OpenGL4/GL4Enums.cs
+++ b/Source/OpenTK/Graphics/OpenGL4/GL4Enums.cs
@@ -716,7 +716,7 @@ namespace OpenTK.Graphics.OpenGL4
     }
 
     /// <summary>
-    /// Used in GL.Arb.BlendEquation, GL.Arb.BlendEquationSeparate and 41 other functions
+    /// Used in GL.Arb.BlendEquation, GL.Arb.BlendEquationSeparate and 40 other functions
     /// </summary>
     public enum All : int
     {
@@ -15771,7 +15771,7 @@ namespace OpenTK.Graphics.OpenGL4
     }
 
     /// <summary>
-    /// Used in GL.DebugMessageInsert
+    /// Used in GL.DebugMessageInsert, GL.GetDebugMessageLog
     /// </summary>
     public enum DebugSeverity : int
     {
@@ -15821,7 +15821,7 @@ namespace OpenTK.Graphics.OpenGL4
     }
 
     /// <summary>
-    /// Not used directly.
+    /// Used in GL.GetDebugMessageLog
     /// </summary>
     public enum DebugSource : int
     {
@@ -15902,7 +15902,7 @@ namespace OpenTK.Graphics.OpenGL4
     }
 
     /// <summary>
-    /// Used in GL.DebugMessageInsert
+    /// Used in GL.DebugMessageInsert, GL.GetDebugMessageLog
     /// </summary>
     public enum DebugType : int
     {