diff --git a/include/Nazara/Platform/WindowHandle.hpp b/include/Nazara/Platform/WindowHandle.hpp
index 90815b021..9dfb10bde 100644
--- a/include/Nazara/Platform/WindowHandle.hpp
+++ b/include/Nazara/Platform/WindowHandle.hpp
@@ -14,7 +14,7 @@ namespace Nz
 {
 	enum class WindowManager
 	{
-		None,
+		Invalid,
 
 		X11,
 		Wayland,
@@ -23,7 +23,7 @@ namespace Nz
 
 	struct WindowHandle
 	{
-		WindowManager type = WindowManager::None;
+		WindowManager type = WindowManager::Invalid;
 
 		union
 		{
diff --git a/include/Nazara/Renderer/OpenGL.hpp b/include/Nazara/Renderer/OpenGL.hpp
index 77fe10ad3..f2dcd21ec 100644
--- a/include/Nazara/Renderer/OpenGL.hpp
+++ b/include/Nazara/Renderer/OpenGL.hpp
@@ -27,8 +27,9 @@
 namespace GLX
 {
 	#include <GL/glx.h> // Defined in a namespace to avoid conflict
-}
 	#include <GL/glxext.h>
+}
+
 #endif
 
 namespace Nz
diff --git a/src/Nazara/Renderer/GLX/ContextImpl.cpp b/src/Nazara/Renderer/GLX/ContextImpl.cpp
index d7a4fa425..572c6eace 100644
--- a/src/Nazara/Renderer/GLX/ContextImpl.cpp
+++ b/src/Nazara/Renderer/GLX/ContextImpl.cpp
@@ -141,7 +141,7 @@ namespace Nz
 		}
 
 		// If context is shared by multiple windows
-		if (parameters.window)
+		if (parameters.window.type != WindowManager::Invalid)
 		{
 			NazaraAssert(parameters.window.type == WindowManager::X11, "Cannot create a context for a non-x11 window");
 
diff --git a/src/Nazara/Renderer/Win32/ContextImpl.cpp b/src/Nazara/Renderer/Win32/ContextImpl.cpp
index 71aa5f1e1..1eec82fa6 100644
--- a/src/Nazara/Renderer/Win32/ContextImpl.cpp
+++ b/src/Nazara/Renderer/Win32/ContextImpl.cpp
@@ -25,7 +25,7 @@ namespace Nz
 
 	bool ContextImpl::Create(ContextParameters& parameters)
 	{
-		if (parameters.window.type != WindowManager::None)
+		if (parameters.window.type != WindowManager::Invalid)
 		{
 			NazaraAssert(parameters.window.type == WindowManager::Windows, "Cannot create a context for a non-win32 window");