diff --git a/gst/Makefile.am b/gst/Makefile.am
index 607ab9e805..94a1334467 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -32,10 +32,12 @@ libgst_la_SOURCES =		\
 	gstpipeline.c		\
 	gstplugin.c		\
 	gstprops.c		\
+	gstqueue.c		\
 	gstscheduler.c		\
 	gstthread.c		\
 	gsttrace.c		\
 	gsttype.c		\
+	gsttypefind.c		\
 	gstutils.c		\
 	gstxml.c		\
 	gstparse.c		\
@@ -86,10 +88,12 @@ libgstinclude_HEADERS =		\
 	gstpipeline.h		\
 	gstplugin.h		\
 	gstprops.h		\
+	gstqueue.h		\
 	gstscheduler.h		\
 	gstthread.h		\
 	gsttrace.h		\
 	gsttype.h		\
+	gsttypefind.h		\
 	gstutils.h		\
 	gstparse.h		\
 	gstxml.h
diff --git a/gst/elements/Makefile.am b/gst/elements/Makefile.am
index 3a140270c3..a6292d3044 100644
--- a/gst/elements/Makefile.am
+++ b/gst/elements/Makefile.am
@@ -21,9 +21,7 @@ libgstelements_la_SOURCES =	\
 	gstaudiosrc.c		\
 	gstfdsink.c		\
 	gstpipefilter.c		\
-	gstqueue.c		\
 	gsttee.c		\
-	gsttypefind.c		\
 	gstsinesrc.c		\
 	$(GSTHTTPSRC)
 
@@ -39,9 +37,7 @@ noinst_HEADERS =		\
 	gstaudiosrc.h		\
 	gstfdsink.h		\
 	gstpipefilter.h		\
-	gstqueue.h		\
 	gsttee.h		\
-	gsttypefind.h		\
 	gstsinesrc.h
 
 CFLAGS += -O2 -Wall
diff --git a/gst/elements/gstelements.c b/gst/elements/gstelements.c
index da7c0f6f6f..c91a010845 100644
--- a/gst/elements/gstelements.c
+++ b/gst/elements/gstelements.c
@@ -33,10 +33,8 @@
 #include "gstfdsink.h"
 #include "gstfdsrc.h"
 #include "gstpipefilter.h"
-#include "gstqueue.h"
 #include "gstsinesrc.h"
 #include "gsttee.h"
-#include "gsttypefind.h"
 
 #if HAVE_LIBGHTTP
 #include <gsthttpsrc.h>
@@ -61,10 +59,8 @@ static struct _elements_entry _elements[] = {
   { "fdsink",       gst_fdsink_get_type, 	&gst_fdsink_details,       NULL },
   { "fdsrc", 	    gst_fdsrc_get_type, 	&gst_fdsrc_details,        NULL },
   { "pipefilter",   gst_pipefilter_get_type, 	&gst_pipefilter_details,   NULL },
-  { "queue", 	    gst_queue_get_type, 	&gst_queue_details,        NULL },
   { "sinesrc", 	    gst_sinesrc_get_type, 	&gst_sinesrc_details,      NULL },
   { "tee",     	    gst_tee_get_type, 		&gst_tee_details,     	   gst_tee_factory_init },
-  { "typefind",     gst_typefind_get_type, 	&gst_typefind_details,     NULL },
 
 #if HAVE_LIBGHTTP
   { "httpsrc", 	    gst_httpsrc_get_type, 	&gst_httpsrc_details,      NULL },
diff --git a/gst/gst.c b/gst/gst.c
index 1b98c5dbe9..a8aa7958fd 100644
--- a/gst/gst.c
+++ b/gst/gst.c
@@ -31,6 +31,8 @@
 #include "gstbin.h"
 #include "gstpipeline.h"
 #include "gstthread.h"
+#include "gstqueue.h"
+#include "gsttypefind.h"
 
 
 
@@ -76,6 +78,8 @@ gst_init (int *argc, char **argv[])
   gst_elementfactory_new ("bin", gst_bin_get_type (), &gst_bin_details);
   gst_elementfactory_new ("pipeline", gst_pipeline_get_type (), &gst_pipeline_details);
   gst_elementfactory_new ("thread", gst_thread_get_type (), &gst_thread_details);
+  gst_elementfactory_new ("queue", gst_queue_get_type (), &gst_queue_details);
+  gst_elementfactory_new ("typefind", gst_typefind_get_type (), &gst_typefind_details);
 
   _gst_trace_on = 0;
   if (_gst_trace_on) {
diff --git a/gst/gstbin.c b/gst/gstbin.c
index aa63cae670..4bf7348d56 100644
--- a/gst/gstbin.c
+++ b/gst/gstbin.c
@@ -29,6 +29,7 @@
 #include "gstscheduler.h"
 
 
+
 GstElementDetails gst_bin_details = { 
   "Generic bin",
   "Bin",
diff --git a/plugins/elements/Makefile.am b/plugins/elements/Makefile.am
index 3a140270c3..a6292d3044 100644
--- a/plugins/elements/Makefile.am
+++ b/plugins/elements/Makefile.am
@@ -21,9 +21,7 @@ libgstelements_la_SOURCES =	\
 	gstaudiosrc.c		\
 	gstfdsink.c		\
 	gstpipefilter.c		\
-	gstqueue.c		\
 	gsttee.c		\
-	gsttypefind.c		\
 	gstsinesrc.c		\
 	$(GSTHTTPSRC)
 
@@ -39,9 +37,7 @@ noinst_HEADERS =		\
 	gstaudiosrc.h		\
 	gstfdsink.h		\
 	gstpipefilter.h		\
-	gstqueue.h		\
 	gsttee.h		\
-	gsttypefind.h		\
 	gstsinesrc.h
 
 CFLAGS += -O2 -Wall
diff --git a/plugins/elements/gstelements.c b/plugins/elements/gstelements.c
index da7c0f6f6f..c91a010845 100644
--- a/plugins/elements/gstelements.c
+++ b/plugins/elements/gstelements.c
@@ -33,10 +33,8 @@
 #include "gstfdsink.h"
 #include "gstfdsrc.h"
 #include "gstpipefilter.h"
-#include "gstqueue.h"
 #include "gstsinesrc.h"
 #include "gsttee.h"
-#include "gsttypefind.h"
 
 #if HAVE_LIBGHTTP
 #include <gsthttpsrc.h>
@@ -61,10 +59,8 @@ static struct _elements_entry _elements[] = {
   { "fdsink",       gst_fdsink_get_type, 	&gst_fdsink_details,       NULL },
   { "fdsrc", 	    gst_fdsrc_get_type, 	&gst_fdsrc_details,        NULL },
   { "pipefilter",   gst_pipefilter_get_type, 	&gst_pipefilter_details,   NULL },
-  { "queue", 	    gst_queue_get_type, 	&gst_queue_details,        NULL },
   { "sinesrc", 	    gst_sinesrc_get_type, 	&gst_sinesrc_details,      NULL },
   { "tee",     	    gst_tee_get_type, 		&gst_tee_details,     	   gst_tee_factory_init },
-  { "typefind",     gst_typefind_get_type, 	&gst_typefind_details,     NULL },
 
 #if HAVE_LIBGHTTP
   { "httpsrc", 	    gst_httpsrc_get_type, 	&gst_httpsrc_details,      NULL },