diff --git a/Makefile.am b/Makefile.am
index d3b6040e2a..d05c1752dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,11 +19,11 @@ else
 SUBDIRS_EXAMPLES =
 endif
 
-SUBDIRS = include gst libs tools \
+SUBDIRS = include libs gst tools \
 	$(SUBDIRS_TESTS) $(SUBDIRS_EXAMPLES) $(SUBDIRS_DOCS)
 
 # These are all the possible subdirs
-DIST_SUBDIRS = include gst libs tools tests testsuite examples docs
+DIST_SUBDIRS = include libs gst tools tests testsuite examples docs
 
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/gst/schedulers/Makefile.am b/gst/schedulers/Makefile.am
index f2617696b0..b92ba761a3 100644
--- a/gst/schedulers/Makefile.am
+++ b/gst/schedulers/Makefile.am
@@ -7,10 +7,6 @@ libgstbasicscheduler_la_CFLAGS = $(GST_CFLAGS)
 libgstbasicscheduler_la_LIBADD = $(GST_LIBS) ../libcothreads.la
 libgstbasicscheduler_la_LDFLAGS = @GST_LT_LDFLAGS@
 
-## this is a REALLY evil hack which we need to get rid of as soon as possible !
-$(top_builddir)/libs/ext/cothreads/cothreads/libcothreads-gthreads.la:
-	cd $(top_builddir)/libs/ext/cothreads/cothreads && make
-
 libgststandardscheduler_la_SOURCES = gststandardscheduler.c 
 libgststandardscheduler_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/libs/ext/cothreads
 libgststandardscheduler_la_LIBADD = $(GST_LIBS) $(top_builddir)/libs/ext/cothreads/cothreads/libcothreads-gthreads.la
diff --git a/libs/gst/bytestream/Makefile.am b/libs/gst/bytestream/Makefile.am
index 4a0c24e3e2..a514755815 100644
--- a/libs/gst/bytestream/Makefile.am
+++ b/libs/gst/bytestream/Makefile.am
@@ -8,9 +8,7 @@ libgstbytestreaminclude_HEADERS = bytestream.h
 
 libgstbytestream_la_SOURCES = bytestream.c 
 libgstbytestream_la_CFLAGS = $(GST_CFLAGS)
-libgstbytestream_la_LIBADD = $(GST_LIBS)
 libgstbytestream_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@
 
 libgstbstest_la_SOURCES = bstest.c
 libgstbstest_la_CFLAGS = $(GST_CFLAGS)
-libgstbstest_la_LIBADD = $(GST_LIBS)
diff --git a/libs/gst/control/Makefile.am b/libs/gst/control/Makefile.am
index f92aafabfe..8984ef0b96 100644
--- a/libs/gst/control/Makefile.am
+++ b/libs/gst/control/Makefile.am
@@ -17,5 +17,4 @@ libgstcontrol_la_SOURCES = \
     dplinearinterp.c
 
 libgstcontrol_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math
-libgstcontrol_la_LIBADD = $(GST_LIBS)
 libgstcontrol_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@
diff --git a/libs/gst/getbits/Makefile.am b/libs/gst/getbits/Makefile.am
index 8a8b5c1f28..222e679854 100644
--- a/libs/gst/getbits/Makefile.am
+++ b/libs/gst/getbits/Makefile.am
@@ -15,7 +15,6 @@ libgstgetbits_la_SOURCES = getbits.c gstgetbits_inl.h gstgetbits_generic.c $(GST
 EXTRA_libgstgetbits_la_SOURCES = gstgetbits_i386.s
 
 libgstgetbits_la_CFLAGS = $(GST_CFLAGS) -funroll-all-loops -finline-functions -ffast-math
-libgstgetbits_la_LIBADD = $(GST_LIBS)
 libgstgetbits_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@
 
 noinst_HEADERS = getbits.h gstgetbits_inl.h
diff --git a/libs/gst/putbits/Makefile.am b/libs/gst/putbits/Makefile.am
index adc87e171b..16254de8db 100644
--- a/libs/gst/putbits/Makefile.am
+++ b/libs/gst/putbits/Makefile.am
@@ -7,7 +7,6 @@ libgstputbitsinclude_HEADERS = putbits.h
 
 libgstputbits_la_SOURCES = putbits.c 
 libgstputbits_la_CFLAGS = $(GST_CFLAGS) -funroll-all-loops -finline-functions -ffast-math
-libgstputbits_la_LIBADD = $(GST_LIBS)
 libgstputbits_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@
 
 noinst_HEADERS = putbits.h