diff --git a/configure b/configure
index 4f0ffbd83..e4f8e924e 100755
--- a/configure
+++ b/configure
@@ -21775,6 +21775,7 @@ $as_echo_n "checking for EGL support... " >&6; }
 
           #define LINUX
           #define EGL_API_FB
+          #define MESA_EGL_NO_X11_HEADERS
           #include <EGL/egl.h>
           #include <EGL/eglext.h>
 
diff --git a/configure.in b/configure.in
index fbe0583d4..95bef6269 100644
--- a/configure.in
+++ b/configure.in
@@ -2340,6 +2340,7 @@ CheckOpenGLESX11()
         AC_TRY_COMPILE([
           #define LINUX
           #define EGL_API_FB
+          #define MESA_EGL_NO_X11_HEADERS
           #include <EGL/egl.h>
           #include <EGL/eglext.h>
         ],[
diff --git a/src/video/wayland/SDL_waylandvideo.h b/src/video/wayland/SDL_waylandvideo.h
index d173b28e5..0a7c31087 100644
--- a/src/video/wayland/SDL_waylandvideo.h
+++ b/src/video/wayland/SDL_waylandvideo.h
@@ -33,7 +33,7 @@
 !!! FIXME:  in Ubuntu 18.04 (and other distros).
 */
 
-
+#define MESA_EGL_NO_X11_HEADERS
 #include <EGL/egl.h>
 #include "wayland-util.h"