diff --git a/ChangeLog b/ChangeLog
index 72c34908d5c..8e8969a58ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-02-08  Jan Schmidt  <jan.schmidt@sun.com>
+
+	* gst/equalizer/Makefile.am:
+	* gst/spectrum/Makefile.am:
+	Fix includes order
+
+	* tests/check/Makefile.am:
+	Exclude v4l2src from the states test - it takes too long to start.
+
+	* tests/check/elements/spectrum.c:
+	Make the test run properly with CK_FORK=no
+
 2008-02-08 Christian Schaller <christian.schaller@collabora.co.uk>
 
 	* gst/audiofix/Makefile.am: add missing header files 
diff --git a/common b/common
index df7f73bd454..961bb6bd997 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit df7f73bd454e0b0ee7870d8c85874aba9329fd2e
+Subproject commit 961bb6bd997d7c8da6058534e86b4a1361c0fcea
diff --git a/gst/equalizer/Makefile.am b/gst/equalizer/Makefile.am
index a5f132e5ae5..664b655b31d 100644
--- a/gst/equalizer/Makefile.am
+++ b/gst/equalizer/Makefile.am
@@ -6,8 +6,11 @@ libgstequalizer_la_SOURCES = \
         gstiirequalizer3bands.c gstiirequalizer3bands.h \
         gstiirequalizer10bands.c gstiirequalizer10bands.h
 
-libgstequalizer_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS)
-libgstequalizer_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(LIBM)
+libgstequalizer_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
+	$(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS)
+libgstequalizer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
+	-lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) \
+	$(GST_LIBS) $(LIBM)
 libgstequalizer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = gstiirequalizer.h
diff --git a/gst/spectrum/Makefile.am b/gst/spectrum/Makefile.am
index 451d36d3099..13848c97b9e 100644
--- a/gst/spectrum/Makefile.am
+++ b/gst/spectrum/Makefile.am
@@ -4,7 +4,9 @@ plugin_LTLIBRARIES = libgstspectrum.la
 libgstspectrum_la_SOURCES = gstspectrum.c
 libgstspectrum_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
 	$(GST_CFLAGS)
-libgstspectrum_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -lgstaudio-$(GST_MAJORMINOR) -lgstfft-$(GST_MAJORMINOR) $(LIBM)
+libgstspectrum_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
+	-lgstfft-$(GST_MAJORMINOR) -lgstaudio-$(GST_MAJORMINOR) \
+	$(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
 libgstspectrum_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = gstspectrum.h
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index ea2fcaa5a77..77e20a8d2bd 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -11,7 +11,7 @@ TESTS_ENVIRONMENT = \
 	GST_PLUGIN_SYSTEM_PATH=					\
 	GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/ext:$(top_builddir)/sys:$(GSTPB_PLUGINS_DIR):$(GST_PLUGINS_DIR)			\
 	GST_TEST_FILES_PATH=$(TEST_FILES_DIRECTORY) \
-	STATE_IGNORE_ELEMENTS="aasink autovideosink cacasink cairotextoverlay gconfvideosrc"
+	STATE_IGNORE_ELEMENTS="aasink autovideosink cacasink cairotextoverlay gconfvideosrc v4l2src"
 
 # ths core dumps of some machines have PIDs appended
 CLEANFILES = core.* test-registry.*
diff --git a/tests/check/elements/spectrum.c b/tests/check/elements/spectrum.c
index 245b37bc89e..98e0074d8ec 100644
--- a/tests/check/elements/spectrum.c
+++ b/tests/check/elements/spectrum.c
@@ -124,6 +124,10 @@ cleanup_spectrum (GstElement * spectrum)
   gst_check_teardown_src_pad (spectrum);
   gst_check_teardown_sink_pad (spectrum);
   gst_check_teardown_element (spectrum);
+
+  g_list_foreach (buffers, (GFunc) gst_mini_object_unref, NULL);
+  g_list_free (buffers);
+  buffers = NULL;
 }
 
 
@@ -222,7 +226,6 @@ GST_START_TEST (test_int16)
   gst_element_set_bus (spectrum, NULL);
   ASSERT_OBJECT_REFCOUNT (bus, "bus", 1);
   gst_object_unref (bus);
-  gst_buffer_unref (outbuffer);
   fail_unless (gst_element_set_state (spectrum,
           GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS, "could not set to null");
   ASSERT_OBJECT_REFCOUNT (spectrum, "spectrum", 1);
@@ -324,7 +327,6 @@ GST_START_TEST (test_int32)
   gst_element_set_bus (spectrum, NULL);
   ASSERT_OBJECT_REFCOUNT (bus, "bus", 1);
   gst_object_unref (bus);
-  gst_buffer_unref (outbuffer);
   fail_unless (gst_element_set_state (spectrum,
           GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS, "could not set to null");
   ASSERT_OBJECT_REFCOUNT (spectrum, "spectrum", 1);
@@ -426,7 +428,6 @@ GST_START_TEST (test_float32)
   gst_element_set_bus (spectrum, NULL);
   ASSERT_OBJECT_REFCOUNT (bus, "bus", 1);
   gst_object_unref (bus);
-  gst_buffer_unref (outbuffer);
   fail_unless (gst_element_set_state (spectrum,
           GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS, "could not set to null");
   ASSERT_OBJECT_REFCOUNT (spectrum, "spectrum", 1);
@@ -528,7 +529,6 @@ GST_START_TEST (test_float64)
   gst_element_set_bus (spectrum, NULL);
   ASSERT_OBJECT_REFCOUNT (bus, "bus", 1);
   gst_object_unref (bus);
-  gst_buffer_unref (outbuffer);
   fail_unless (gst_element_set_state (spectrum,
           GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS, "could not set to null");
   ASSERT_OBJECT_REFCOUNT (spectrum, "spectrum", 1);