diff --git a/ext/eglgles/gstegladaptation.h b/ext/eglgles/gstegladaptation.h
index e30b570427..b4eef2ba06 100644
--- a/ext/eglgles/gstegladaptation.h
+++ b/ext/eglgles/gstegladaptation.h
@@ -51,16 +51,26 @@
 #  include <config.h>
 #endif
 
+#include <gst/gst.h>
+#include <gst/video/gstvideopool.h>
+
+#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
+
 #define EGL_EGLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 
-#include <gst/gst.h>
 #include <gst/egl/egl.h>
-#include <gst/video/gstvideopool.h>
 
 #ifdef HAVE_IOS
 #include <OpenGLES/ES2/gl.h>
-
 #else
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
@@ -68,6 +78,11 @@
 #include <GLES2/gl2ext.h>
 #endif
 
+#if defined (USE_EGL_RPI) && defined(__GNUC__)
+#pragma GCC reset_options
+#pragma GCC diagnostic pop
+#endif
+
 #define GST_EGLGLESSINK_EGL_MIN_VERSION 1
 
 static const EGLint eglglessink_RGBA8888_attribs[] = {
diff --git a/ext/eglgles/gsteglglessink.c b/ext/eglgles/gsteglglessink.c
index a202f90b32..0c4ac17ee0 100644
--- a/ext/eglgles/gsteglglessink.c
+++ b/ext/eglgles/gsteglglessink.c
@@ -123,18 +123,13 @@
 #include <gst/video/gstvideometa.h>
 #include <gst/video/gstvideopool.h>
 #include <gst/video/videooverlay.h>
-#include <gst/egl/egl.h>
 
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
+#include "gstegladaptation.h"
 
 #ifdef USE_EGL_RPI
 #include <bcm_host.h>
 #endif
 
-#include "gstegladaptation.h"
 #include "gsteglglessink.h"
 
 GST_DEBUG_CATEGORY_STATIC (gst_eglglessink_debug);
diff --git a/ext/eglgles/video_platform_wrapper.c b/ext/eglgles/video_platform_wrapper.c
index 0cc1eb499b..0482a8fd7e 100644
--- a/ext/eglgles/video_platform_wrapper.c
+++ b/ext/eglgles/video_platform_wrapper.c
@@ -46,6 +46,16 @@
 #  include <config.h>
 #endif
 
+#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
+
 #define EGL_EGLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 #include <EGL/egl.h>
@@ -53,6 +63,11 @@
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 
+#if defined (USE_EGL_RPI) && defined(__GNUC__)
+#pragma GCC reset_options
+#pragma GCC diagnostic pop
+#endif
+
 #include <string.h>
 
 #include <gst/gst.h>