6 files changed, 9 insertions, 0 deletions
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 0be9235835d..bce9ecb274f 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -58,6 +58,7 @@
 #include "X11/Xlibint.h"
 #endif
 
+#include "egldefines.h"
 #include "egl_dri2.h"
 #include "GL/mesa_glinterop.h"
 #include "loader/loader.h"
diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index 3afdfd40e4a..bfd79a5952d 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -90,6 +90,8 @@
 #include "c11/threads.h"
 #include "util/macros.h"
 
+#include "eglapi.h"
+#include "egldefines.h"
 #include "eglglobals.h"
 #include "eglcontext.h"
 #include "egldisplay.h"
diff --git a/src/egl/main/eglapi.h b/src/egl/main/eglapi.h
index 3f70377cd74..07ddf34a032 100644
--- a/src/egl/main/eglapi.h
+++ b/src/egl/main/eglapi.h
@@ -31,6 +31,7 @@
 #ifndef EGLAPI_INCLUDED
 #define EGLAPI_INCLUDED
 
+#include "egltypedefs.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/egl/main/eglcontext.c b/src/egl/main/eglcontext.c
index ecc546e1132..6b241a524ec 100644
--- a/src/egl/main/eglcontext.c
+++ b/src/egl/main/eglcontext.c
@@ -37,6 +37,7 @@
 #include "eglcurrent.h"
 #include "eglsurface.h"
 #include "egllog.h"
+#include "util/macros.h"
 
 
 /**
diff --git a/src/egl/main/eglglobals.c b/src/egl/main/eglglobals.c
index 33d92533d15..2fc64bc52c3 100644
--- a/src/egl/main/eglglobals.c
+++ b/src/egl/main/eglglobals.c
@@ -40,6 +40,8 @@
 #include "egldriver.h"
 #include "egllog.h"
 
+#include "util/macros.h"
+
 #ifdef HAVE_MINCORE
 #include <unistd.h>
 #include <sys/mman.h>
diff --git a/src/egl/main/eglsurface.c b/src/egl/main/eglsurface.c
index 95677105e58..cd1c7ea4c56 100644
--- a/src/egl/main/eglsurface.c
+++ b/src/egl/main/eglsurface.c
@@ -36,6 +36,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+#include "egldefines.h"
 #include "egldisplay.h"
 #include "egldriver.h"
 #include "eglcontext.h"
@@ -44,6 +45,7 @@
 #include "egllog.h"
 #include "eglsurface.h"
 
+#include "util/macros.h"
 
 /**
  * Parse the list of surface attributes and return the proper error code.