diff --git a/libweston/gl-renderer.c b/libweston/gl-renderer.c
index bff74ef4..64ef628e 100644
--- a/libweston/gl-renderer.c
+++ b/libweston/gl-renderer.c
@@ -2749,10 +2749,8 @@ gl_renderer_setup_egl_extensions(struct weston_compositor *ec)
 		weston_log("warning: EGL_EXT_swap_buffers_with_damage not "
 			   "supported. Performance could be affected.\n");
 
-#ifdef EGL_MESA_configless_context
 	if (check_extension(extensions, "EGL_MESA_configless_context"))
 		gr->has_configless_context = 1;
-#endif
 
 	if (check_extension(extensions, "EGL_KHR_surfaceless_context"))
 		gr->has_surfaceless_context = 1;
@@ -3114,10 +3112,8 @@ gl_renderer_setup(struct weston_compositor *ec, EGLSurface egl_surface)
 
 	context_config = gr->egl_config;
 
-#ifdef EGL_MESA_configless_context
 	if (gr->has_configless_context)
 		context_config = EGL_NO_CONFIG_MESA;
-#endif
 
 	gr->egl_context = eglCreateContext(gr->egl_display, context_config,
 					   EGL_NO_CONTEXT, context_attribs);
diff --git a/libweston/weston-egl-ext.h b/libweston/weston-egl-ext.h
index f5420ba0..6bb401da 100644
--- a/libweston/weston-egl-ext.h
+++ b/libweston/weston-egl-ext.h
@@ -121,5 +121,10 @@ typedef struct wl_buffer * (EGLAPIENTRYP PFNEGLCREATEWAYLANDBUFFERFROMIMAGEWL) (
 typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC) (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects);
 #endif /* EGL_EXT_swap_buffers_with_damage */
 
+#ifndef EGL_MESA_configless_context
+#define EGL_MESA_configless_context 1
+#define EGL_NO_CONFIG_MESA                      ((EGLConfig)0)
+#endif
+
 
 #endif