diff --git a/include/eepp/config.hpp b/include/eepp/config.hpp
index d9aab37d3..183b2be13 100644
--- a/include/eepp/config.hpp
+++ b/include/eepp/config.hpp
@@ -64,7 +64,8 @@
 	defined( __OpenBSD__ ) || defined( __NetBSD__ ) || defined( __DragonFly__ ) || \
 	defined( __SVR4 ) || defined( __sun )
 
-#if !defined( EE_GLES1 ) && !defined( EE_GLES2 )
+#if !defined( EE_GLES1 ) && !defined( EE_GLES2 ) && defined( __has_include ) && \
+	__has_include( <X11/Xlib.h> )
 #define EE_X11_PLATFORM
 #endif
 
diff --git a/src/eepp/window/backend/SDL2/wminfo.cpp b/src/eepp/window/backend/SDL2/wminfo.cpp
index 3ee17f291..0ca0c66bc 100644
--- a/src/eepp/window/backend/SDL2/wminfo.cpp
+++ b/src/eepp/window/backend/SDL2/wminfo.cpp
@@ -3,8 +3,8 @@
 #ifdef EE_BACKEND_SDL2
 
 #if EE_PLATFORM == EE_PLATFORM_WIN || EE_PLATFORM == EE_PLATFORM_MACOS || \
-	defined( EE_X11_PLATFORM ) || EE_PLATFORM == EE_PLATFORM_IOS ||        \
-	EE_PLATFORM_ANDROID == EE_PLATFORM
+	( defined( SDL_VIDEO_DRIVER_X11 ) && defined( EE_X11_PLATFORM ) ) ||  \
+	EE_PLATFORM == EE_PLATFORM_IOS || EE_PLATFORM_ANDROID == EE_PLATFORM
 #define EE_WMINFO
 
 #if !defined( EE_COMPILER_MSVC ) && EE_PLATFORM != EE_PLATFORM_ANDROID && \
@@ -33,7 +33,7 @@ WMInfo::~WMInfo() {
 #endif
 }
 
-#if defined( EE_X11_PLATFORM )
+#if defined( SDL_VIDEO_DRIVER_X11 ) && defined( EE_X11_PLATFORM )
 X11Window WMInfo::getWindow() const {
 	SDL_SysWMinfo* info = static_cast<SDL_SysWMinfo*>( mWMInfo );
 	return info->info.x11.window;
@@ -41,14 +41,13 @@ X11Window WMInfo::getWindow() const {
 #endif
 
 eeWindowHandle WMInfo::getWindowHandler() const {
-#if EE_PLATFORM == EE_PLATFORM_WIN || defined( EE_X11_PLATFORM ) || \
-	EE_PLATFORM == EE_PLATFORM_MACOS
+#if EE_PLATFORM == EE_PLATFORM_WIN || defined( EE_X11_PLATFORM ) || EE_PLATFORM == EE_PLATFORM_MACOS
 	SDL_SysWMinfo* info = static_cast<SDL_SysWMinfo*>( mWMInfo );
 #endif
 
 #if EE_PLATFORM == EE_PLATFORM_WIN
 	return info->info.win.window;
-#elif defined( EE_X11_PLATFORM )
+#elif defined( SDL_VIDEO_DRIVER_X11 ) && defined( EE_X11_PLATFORM )
 	return info->info.x11.display;
 #elif EE_PLATFORM == EE_PLATFORM_MACOS
 	return info->info.cocoa.window;
diff --git a/src/eepp/window/backend/SDL2/wminfo.hpp b/src/eepp/window/backend/SDL2/wminfo.hpp
index 62e0c04c0..b051db150 100644
--- a/src/eepp/window/backend/SDL2/wminfo.hpp
+++ b/src/eepp/window/backend/SDL2/wminfo.hpp
@@ -12,7 +12,7 @@ class EE_API WMInfo {
 
 	~WMInfo();
 
-#if defined( EE_X11_PLATFORM )
+#if defined( SDL_VIDEO_DRIVER_X11 ) && defined( EE_X11_PLATFORM )
 	X11Window getWindow() const;
 #endif