diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c
index 0a4dae7588e..e6d50984727 100644
--- a/src/egl/main/egldriver.c
+++ b/src/egl/main/egldriver.c
@@ -61,7 +61,7 @@ _eglMatchAndInitialize(_EGLDisplay *disp)
  * Match a display to a driver.  The matching is done by finding the first
  * driver that can initialize the display.
  */
-_EGLDriver *
+bool
 _eglMatchDriver(_EGLDisplay *disp)
 {
    _EGLDriver *best_drv;
@@ -85,7 +85,7 @@ _eglMatchDriver(_EGLDisplay *disp)
       disp->Initialized = EGL_TRUE;
    }
 
-   return best_drv;
+   return best_drv != NULL;
 }
 
 __eglMustCastToProperFunctionPointerType
diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h
index 51390332157..0d0f50726b1 100644
--- a/src/egl/main/egldriver.h
+++ b/src/egl/main/egldriver.h
@@ -35,6 +35,7 @@
 #include "c99_compat.h"
 
 #include "egltypedefs.h"
+#include <stdbool.h>
 #include <stddef.h>
 
 
@@ -223,7 +224,7 @@ struct _egl_driver
 };
 
 
-extern _EGLDriver *
+extern bool
 _eglMatchDriver(_EGLDisplay *disp);