diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c
index 6f2ec49637..d8f9d7b874 100644
--- a/ext/gl/gstopengl.c
+++ b/ext/gl/gstopengl.c
@@ -43,10 +43,6 @@
 #include "config.h"
 #endif
 
-#ifdef USE_EGL_RPI
-#include <bcm_host.h>
-#endif
-
 #include "gstglimagesink.h"
 
 #include "gstglfiltercube.h"
@@ -74,6 +70,10 @@
 #endif /* HAVE_PNG */
 #endif /* GST_GL_HAVE_OPENGL */
 
+#ifdef USE_EGL_RPI
+#include <bcm_host.h>
+#endif
+
 #define GST_CAT_DEFAULT gst_gl_gstgl_debug
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
 
diff --git a/gst-libs/gst/gl/gstglapi.h b/gst-libs/gst/gl/gstglapi.h
index 78951d146b..0d8ae3c327 100644
--- a/gst-libs/gst/gl/gstglapi.h
+++ b/gst-libs/gst/gl/gstglapi.h
@@ -22,11 +22,27 @@
 #define __GST_GL_API_H__
 
 #include <gst/gl/gstglconfig.h>
-
 #include <gst/gl/glprototypes/gstgl_compat.h>
 
 #if GST_GL_HAVE_PLATFORM_EGL
+
+#if defined (USE_EGL_RPI) && defined(__GNUC__)
+#ifndef __VCCOREVER__
+#define __VCCOREVER__ 0x04000000
+#endif
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wredundant-decls"
+#pragma GCC optimize ("gnu89-inline")
+#endif
+
 #include <EGL/egl.h>
+
+#if defined (USE_EGL_RPI) && defined(__GNUC__)
+#pragma GCC reset_options
+#pragma GCC diagnostic pop
+#endif
+
 #endif
 
 /* OpenGL 2.0 for Embedded Systems */