diff --git a/include/GL/glfw3.h b/include/GL/glfw3.h
index d37ee178..ecc8c28f 100644
--- a/include/GL/glfw3.h
+++ b/include/GL/glfw3.h
@@ -526,7 +526,7 @@ extern "C" {
 /*! @brief The @link clients client API @endlink to create a context for.
  */
 #define GLFW_CLIENT_API           0x00022000
-#define GLFW_OPENGL_VERSION_MAJOR 0x00022001
+#define GLFW_CLIENT_VERSION_MAJOR 0x00022001
 #define GLFW_OPENGL_VERSION_MINOR 0x00022002
 #define GLFW_OPENGL_FORWARD_COMPAT 0x00022003
 #define GLFW_OPENGL_DEBUG_CONTEXT 0x00022004
diff --git a/src/cocoa_platform.h b/src/cocoa_platform.h
index 06055a25..46957e53 100644
--- a/src/cocoa_platform.h
+++ b/src/cocoa_platform.h
@@ -41,9 +41,10 @@
 typedef void* id;
 #endif
 
-#define _GLFW_PLATFORM_WINDOW_STATE  _GLFWwindowNS NS
-#define _GLFW_PLATFORM_CONTEXT_STATE _GLFWcontextNSGL NSGL
+#define _GLFW_PLATFORM_WINDOW_STATE         _GLFWwindowNS  NS
 #define _GLFW_PLATFORM_LIBRARY_WINDOW_STATE _GLFWlibraryNS NS
+
+#define _GLFW_PLATFORM_CONTEXT_STATE        _GLFWcontextNSGL NSGL
 #define _GLFW_PLATFORM_LIBRARY_OPENGL_STATE _GLFWlibraryNSGL NSGL
 
 
diff --git a/src/egl_platform.h b/src/egl_platform.h
index fcc4420a..cb9114dd 100644
--- a/src/egl_platform.h
+++ b/src/egl_platform.h
@@ -54,7 +54,7 @@
  #error "No OpenGL entry point retrieval mechanism was enabled"
 #endif
 
-#define _GLFW_PLATFORM_CONTEXT_STATE _GLFWcontextEGL EGL
+#define _GLFW_PLATFORM_CONTEXT_STATE        _GLFWcontextEGL EGL
 #define _GLFW_PLATFORM_LIBRARY_OPENGL_STATE _GLFWlibraryEGL EGL
 
 
diff --git a/src/glx_platform.h b/src/glx_platform.h
index a04d6f2e..92a5ec65 100644
--- a/src/glx_platform.h
+++ b/src/glx_platform.h
@@ -60,7 +60,7 @@
  #error "No OpenGL entry point retrieval mechanism was enabled"
 #endif
 
-#define _GLFW_PLATFORM_CONTEXT_STATE _GLFWcontextGLX GLX
+#define _GLFW_PLATFORM_CONTEXT_STATE        _GLFWcontextGLX GLX
 #define _GLFW_PLATFORM_LIBRARY_OPENGL_STATE _GLFWlibraryGLX GLX
 
 #ifndef GLX_MESA_swap_control
diff --git a/src/wgl_platform.h b/src/wgl_platform.h
index 1bbd8e23..346176a3 100644
--- a/src/wgl_platform.h
+++ b/src/wgl_platform.h
@@ -37,7 +37,7 @@
 #include "../support/GL/wglext.h"
 
 
-#define _GLFW_PLATFORM_CONTEXT_STATE _GLFWcontextWGL WGL
+#define _GLFW_PLATFORM_CONTEXT_STATE        _GLFWcontextWGL WGL
 #define _GLFW_PLATFORM_LIBRARY_OPENGL_STATE _GLFWlibraryWGL WGL
 
 
diff --git a/src/win32_platform.h b/src/win32_platform.h
index 142a7eae..20126177 100644
--- a/src/win32_platform.h
+++ b/src/win32_platform.h
@@ -113,7 +113,7 @@ typedef DWORD (WINAPI * TIMEGETTIME_T) (void);
  #include "egl_platform.h"
 #endif
 
-#define _GLFW_PLATFORM_WINDOW_STATE  _GLFWwindowWin32 Win32
+#define _GLFW_PLATFORM_WINDOW_STATE         _GLFWwindowWin32  Win32
 #define _GLFW_PLATFORM_LIBRARY_WINDOW_STATE _GLFWlibraryWin32 Win32
 
 
diff --git a/src/x11_platform.h b/src/x11_platform.h
index e2acc6e6..7c4ad4ce 100644
--- a/src/x11_platform.h
+++ b/src/x11_platform.h
@@ -63,7 +63,7 @@
  #include "egl_platform.h"
 #endif
 
-#define _GLFW_PLATFORM_WINDOW_STATE  _GLFWwindowX11 X11
+#define _GLFW_PLATFORM_WINDOW_STATE         _GLFWwindowX11  X11
 #define _GLFW_PLATFORM_LIBRARY_WINDOW_STATE _GLFWlibraryX11 X11
 
 // Clipboard format atom indices