diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
index 7789a79558..e762c199b6 100644
--- a/gst-libs/gst/gl/Makefile.am
+++ b/gst-libs/gst/gl/Makefile.am
@@ -13,11 +13,11 @@ libgstgl_@GST_MAJORMINOR@include_HEADERS = \
 	gstgldisplay.h
 
 libgstgl_@GST_MAJORMINOR@_la_LIBADD = \
-	$(GSTPB_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) \
+	$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) \
 	$(X_LIBS) $(GL_LIBS)
 
 libgstgl_@GST_MAJORMINOR@_la_CFLAGS = \
-	$(GSTPB_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
+	$(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 
 libgstgl_@GST_MAJORMINOR@_la_LDFLAGS = \
 	$(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
diff --git a/gst/gl/Makefile.am b/gst/gl/Makefile.am
index 3dc0d72a93..d5563e39f5 100644
--- a/gst/gl/Makefile.am
+++ b/gst/gl/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstopengl.la
 
 noinst_PROGRAMS = color_matrix
 
-AM_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS)
+AM_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 AM_LIBS = $(GST_BASE_LIBS)
 
 libgstopengl_la_SOURCES = \
@@ -17,12 +17,14 @@ libgstopengl_la_SOURCES = \
 	gltestsrc.h \
 	gstglfilterexample.c \
 	gstglconvert.c
+# check order of CFLAGS and LIBS, shouldn't the order be the other way around
+# (like in AM_CFLAGS)?
 libgstopengl_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \
-	$(GSTPB_CFLAGS) $(GL_CFLAGS) \
+	$(GST_PLUGINS_BASE_CFLAGS) $(GL_CFLAGS) \
 	-I$(top_srcdir)/gst-libs \
 	-I$(top_srcdir)/gst-libs/gst/gl
 libgstopengl_la_LIBADD = $(GL_LIBS) \
-	$(GST_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
-	$(GSTPB_LIBS) -lgstinterfaces-$(GST_MAJORMINOR)
+	$(GST_BASE_LIBS) \
+	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR)
 libgstopengl_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)