diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index 97f5b6ab447..decf1182067 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -93,7 +93,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "c99_compat.h"
 #include "c11/threads.h"
 #include "util/debug.h"
 #include "util/macros.h"
diff --git a/src/egl/main/eglarray.h b/src/egl/main/eglarray.h
index 29b7128b68d..af728088034 100644
--- a/src/egl/main/eglarray.h
+++ b/src/egl/main/eglarray.h
@@ -29,8 +29,6 @@
 #ifndef EGLARRAY_INCLUDED
 #define EGLARRAY_INCLUDED
 
-#include "c99_compat.h"
-
 #include "egltypedefs.h"
 
 
diff --git a/src/egl/main/eglconfig.c b/src/egl/main/eglconfig.c
index eff7733c071..1c8b01bca8f 100644
--- a/src/egl/main/eglconfig.c
+++ b/src/egl/main/eglconfig.c
@@ -36,7 +36,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include "c99_compat.h"
 #include "util/macros.h"
 
 #include "eglconfig.h"
diff --git a/src/egl/main/eglconfig.h b/src/egl/main/eglconfig.h
index 1f2a4008f12..dcfb11b69a0 100644
--- a/src/egl/main/eglconfig.h
+++ b/src/egl/main/eglconfig.h
@@ -34,7 +34,6 @@
 
 #include <assert.h>
 #include <stddef.h>
-#include "c99_compat.h"
 
 #include "egltypedefs.h"
 
diff --git a/src/egl/main/eglcontext.h b/src/egl/main/eglcontext.h
index 06029e81251..cbdefa3432f 100644
--- a/src/egl/main/eglcontext.h
+++ b/src/egl/main/eglcontext.h
@@ -31,8 +31,6 @@
 #ifndef EGLCONTEXT_INCLUDED
 #define EGLCONTEXT_INCLUDED
 
-#include "c99_compat.h"
-
 #include "egltypedefs.h"
 #include "egldisplay.h"
 
diff --git a/src/egl/main/eglcurrent.c b/src/egl/main/eglcurrent.c
index 3a82a2d0d77..6fdfd9469e1 100644
--- a/src/egl/main/eglcurrent.c
+++ b/src/egl/main/eglcurrent.c
@@ -30,7 +30,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
-#include "c99_compat.h"
 #include "c11/threads.h"
 #include "util/u_thread.h"
 #include "util/u_string.h"
diff --git a/src/egl/main/eglcurrent.h b/src/egl/main/eglcurrent.h
index d9a4a90174e..9bf76c806ae 100644
--- a/src/egl/main/eglcurrent.h
+++ b/src/egl/main/eglcurrent.h
@@ -29,8 +29,6 @@
 #ifndef EGLCURRENT_INCLUDED
 #define EGLCURRENT_INCLUDED
 
-#include "c99_compat.h"
-
 #include "egltypedefs.h"
 
 
diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h
index 25b4ea79541..aee9f86a699 100644
--- a/src/egl/main/egldisplay.h
+++ b/src/egl/main/egldisplay.h
@@ -31,7 +31,6 @@
 #ifndef EGLDISPLAY_INCLUDED
 #define EGLDISPLAY_INCLUDED
 
-#include "c99_compat.h"
 #include "c11/threads.h"
 
 #include "egltypedefs.h"
diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h
index 12f9a0aab86..7af0f3ce0cf 100644
--- a/src/egl/main/egldriver.h
+++ b/src/egl/main/egldriver.h
@@ -32,8 +32,6 @@
 #define EGLDRIVER_INCLUDED
 
 
-#include "c99_compat.h"
-
 #include "egltypedefs.h"
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/src/egl/main/eglimage.h b/src/egl/main/eglimage.h
index 9837f05dad1..3da3d68027c 100644
--- a/src/egl/main/eglimage.h
+++ b/src/egl/main/eglimage.h
@@ -30,8 +30,6 @@
 #ifndef EGLIMAGE_INCLUDED
 #define EGLIMAGE_INCLUDED
 
-#include "c99_compat.h"
-
 #include "egltypedefs.h"
 #include "egldisplay.h"
 
diff --git a/src/egl/main/eglsurface.h b/src/egl/main/eglsurface.h
index b26768363d9..752b1b41e23 100644
--- a/src/egl/main/eglsurface.h
+++ b/src/egl/main/eglsurface.h
@@ -31,8 +31,6 @@
 #ifndef EGLSURFACE_INCLUDED
 #define EGLSURFACE_INCLUDED
 
-#include "c99_compat.h"
-
 #include "egltypedefs.h"
 #include "egldisplay.h"
 
diff --git a/src/egl/main/eglsync.h b/src/egl/main/eglsync.h
index 4fdf15f231e..b2f1ee5f3f5 100644
--- a/src/egl/main/eglsync.h
+++ b/src/egl/main/eglsync.h
@@ -30,8 +30,6 @@
 #define EGLSYNC_INCLUDED
 
 
-#include "c99_compat.h"
-
 #include "egltypedefs.h"
 #include "egldisplay.h"