diff -Nurd gst-plugins-base-0.10.30/docs/plugins/Makefile.am gst-plugins-base-0.10.30-new/docs/plugins/Makefile.am
--- gst-plugins-base-0.10.30/docs/plugins/Makefile.am	2010-04-01 21:14:28.000000000 -0400
+++ gst-plugins-base-0.10.30-new/docs/plugins/Makefile.am	2010-12-05 15:14:34.000000000 -0500
@@ -136,7 +136,7 @@
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib
 # contains GtkObjects/GObjects and you want to document signals and properties.
-GTKDOC_CFLAGS = $(GST_BASE_CFLAGS) -I$(top_builddir) -I$(top_builddir)/gst-libs
+GTKDOC_CFLAGS = -I$(top_builddir) -I$(top_builddir)/gst-libs $(GST_BASE_CFLAGS)
 GTKDOC_LIBS = $(SCANOBJ_DEPS) $(GST_BASE_LIBS)
 
 GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC)
diff -Nurd gst-plugins-base-0.10.30/ext/cdparanoia/gstcdparanoiasrc.c gst-plugins-base-0.10.30-new/ext/cdparanoia/gstcdparanoiasrc.c
--- gst-plugins-base-0.10.30/ext/cdparanoia/gstcdparanoiasrc.c	2010-06-25 13:03:59.000000000 -0400
+++ gst-plugins-base-0.10.30-new/ext/cdparanoia/gstcdparanoiasrc.c	2010-12-05 13:25:50.000000000 -0500
@@ -24,6 +24,9 @@
 #include "config.h"
 #endif
 
+#define GSTVERSION "@GSTVERSION@"
+#undef VERSION
+
 #include <string.h>
 #include <errno.h>
 
@@ -538,4 +541,4 @@
     GST_VERSION_MINOR,
     "cdparanoia",
     "Read audio from CD in paranoid mode",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
+    plugin_init, GSTVERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff -Nurd gst-plugins-base-0.10.30/gst/app/Makefile.am gst-plugins-base-0.10.30-new/gst/app/Makefile.am
--- gst-plugins-base-0.10.30/gst/app/Makefile.am	2010-12-05 15:13:50.000000000 -0500
+++ gst-plugins-base-0.10.30-new/gst/app/Makefile.am	2010-12-05 15:13:40.000000000 -0500
@@ -1,7 +1,7 @@
 plugin_LTLIBRARIES = libgstapp.la
 
 libgstapp_la_SOURCES = gstapp.c
-libgstapp_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
+libgstapp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(GST_BASE_CFLAGS)
 libgstapp_la_LIBADD = $(GST_BASE_LIBS) $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la
 libgstapp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstapp_la_LIBTOOLFLAGS = --tag=disable-static