4 files changed, 15 insertions, 13 deletions
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index fefbc854..fba6e109 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -79,7 +79,7 @@ noinst_HEADERS =
 
 TESTS = $(check_PROGRAMS)
 
-AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS)
+AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS)  $(GST_OPTION_CFLAGS)
 LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS)
 
 elements_timidity_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS)
diff --git a/tests/check/elements/multifile.c b/tests/check/elements/multifile.c
index 4b5a28f9..26ba0af1 100644
--- a/tests/check/elements/multifile.c
+++ b/tests/check/elements/multifile.c
@@ -18,6 +18,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include <glib/gstdio.h>
 #include <gst/check/gstcheck.h>
 
 static void
diff --git a/tests/check/elements/rganalysis.c b/tests/check/elements/rganalysis.c
index c5168fd2..96ea6dad 100644
--- a/tests/check/elements/rganalysis.c
+++ b/tests/check/elements/rganalysis.c
@@ -94,15 +94,15 @@ struct rate_test
 };
 
 static const struct rate_test supported_rates[] = {
-  8000, -0.91,
-  11025, -2.80,
-  12000, -3.13,
-  16000, -4.26,
-  22050, -5.64,
-  24000, -5.87,
-  32000, -6.03,
-  44100, -6.20,
-  48000, -6.14
+  {8000, -0.91},
+  {11025, -2.80},
+  {12000, -3.13},
+  {16000, -4.26},
+  {22050, -5.64},
+  {24000, -5.87},
+  {32000, -6.03},
+  {44100, -6.20},
+  {48000, -6.14}
 };
 
 /* Lookup the correct gain adjustment result in above array. */
@@ -1057,7 +1057,6 @@ GST_START_TEST (test_peak_track_album)
 {
   GstElement *element = setup_rganalysis ();
   GstTagList *tag_list;
-  guint num;
 
   set_playing_state (element);
 
@@ -1091,7 +1090,6 @@ GST_START_TEST (test_peak_album_abort_to_track)
 {
   GstElement *element = setup_rganalysis ();
   GstTagList *tag_list;
-  guint num;
 
   g_object_set (element, "num-tracks", 2, NULL);
   set_playing_state (element);
diff --git a/tests/check/elements/rglimiter.c b/tests/check/elements/rglimiter.c
index 2b7cc741..33b478d0 100644
--- a/tests/check/elements/rglimiter.c
+++ b/tests/check/elements/rglimiter.c
@@ -53,7 +53,6 @@ GstElement *
 setup_rglimiter ()
 {
   GstElement *element;
-  GstBus *bus;
 
   GST_DEBUG ("setup_rglimiter");
   element = gst_check_setup_element ("rglimiter");