diff --git a/include/EGL/eglext.h b/include/EGL/eglext.h
index 02dd7719161..04facdfbce6 100644
--- a/include/EGL/eglext.h
+++ b/include/EGL/eglext.h
@@ -1373,9 +1373,6 @@ EGLAPI EGLBoolean EGLAPIENTRY eglImageInvalidateExternalEXT (EGLDisplay dpy, EGL
 #endif
 #endif /* EGL_EXT_image_flush_external */
 
-#include <EGL/eglmesaext.h>
-#include <EGL/eglextchromium.h>
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/egl/generate/gen_egl_dispatch.py b/src/egl/generate/gen_egl_dispatch.py
index 12342b28a54..2063e9d0993 100644
--- a/src/egl/generate/gen_egl_dispatch.py
+++ b/src/egl/generate/gen_egl_dispatch.py
@@ -100,6 +100,8 @@ def generateHeader(functions):
 
     #include <EGL/egl.h>
     #include <EGL/eglext.h>
+    #include <EGL/eglmesaext.h>
+    #include <EGL/eglextchromium.h>
     #include "glvnd/libeglabi.h"
 
     """.lstrip("\n"))
diff --git a/src/egl/main/egltypedefs.h b/src/egl/main/egltypedefs.h
index 642f473c4eb..4809cf5d7d5 100644
--- a/src/egl/main/egltypedefs.h
+++ b/src/egl/main/egltypedefs.h
@@ -33,6 +33,8 @@
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
+#include <EGL/eglmesaext.h>
+#include <EGL/eglextchromium.h>
 
 #ifdef __cplusplus
 extern "C" {