diff --git a/test/a.c b/test/a.c
index 6e7aa47d00..6efa57dae4 100644
--- a/test/a.c
+++ b/test/a.c
@@ -1,6 +1,6 @@
 #include <gst/gst.h>
 
-void eof(GstSrc *src) {
+void eof(GstElement *src) {
   g_print("have eof, quitting\n");
   exit(0);
 }
diff --git a/test/avi2mpg.c b/test/avi2mpg.c
index be4f4d1f69..4b2b2a8896 100644
--- a/test/avi2mpg.c
+++ b/test/avi2mpg.c
@@ -13,7 +13,7 @@ int fd;
 char *outfile;
 GstElement *mux;
 
-void eof(GstSrc *src) {
+void eof(GstElement *src) {
   g_print("have eos, quitting\n");
   exit(0);
 }
@@ -123,8 +123,7 @@ void new_pad_created(GstElement *parse,GstPad *pad,GstElement *pipeline) {
 }
 
 int main(int argc,char *argv[]) {
-  GstPipeline *pipeline;
-  GstElement *src, *parse, *fdsink;
+  GstElement *pipeline, *src, *parse, *fdsink;
   GstElementFactory *fdsinkfactory;
 
   g_print("have %d args\n",argc);
diff --git a/test/aviparse.c b/test/aviparse.c
index 2fb8c2499b..a8187d9533 100644
--- a/test/aviparse.c
+++ b/test/aviparse.c
@@ -9,7 +9,7 @@ GstElement *show, *play;
 GstElement *audio_thread, *video_thread;
 GstElement *audio_queue, *video_queue;
 
-void eof(GstSrc *src) {
+void eof(GstElement *src) {
   g_print("have eos, quitting\n");
   exit(0);
 }
@@ -59,8 +59,7 @@ void new_pad_created(GstElement *parse,GstPad *pad,GstElement *pipeline) {
 }
 
 int main(int argc,char *argv[]) {
-  GstPipeline *pipeline;
-  GstElement *src, *parse;
+  GstElement *pipeline, *src, *parse;
 
   g_print("have %d args\n",argc);
 
diff --git a/test/mp1parse.c b/test/mp1parse.c
index dba55950e2..d8697d715e 100644
--- a/test/mp1parse.c
+++ b/test/mp1parse.c
@@ -8,7 +8,7 @@
 extern gboolean _gst_plugin_spew;
 gboolean idle_func(gpointer data);
 
-void eof(GstSrc *src) {
+void eof(GstElement *src) {
   g_print("have eos, quitting\n");
   exit(0);
 }
@@ -129,8 +129,7 @@ void new_pad_created(GstElement *parse,GstPad *pad,GstElement *pipeline) {
 }
 
 int main(int argc,char *argv[]) {
-  GstPipeline *pipeline;
-  GstElement *src, *parse;
+  GstElement *pipeline, *src, *parse;
 
   g_print("have %d args\n",argc);
 
diff --git a/test/mp1tomp1.c b/test/mp1tomp1.c
index 0d63f34a63..7ae452cd07 100644
--- a/test/mp1tomp1.c
+++ b/test/mp1tomp1.c
@@ -8,7 +8,7 @@
 int fd;
 char *outfile;
 
-void eof(GstSrc *src) {
+void eof(GstElement *src) {
   g_print("have eos, quitting\n");
   exit(0);
 }
@@ -170,8 +170,7 @@ void mp2tomp1(GstElement *parser,GstPad *pad, GstElement *pipeline) {
 }
 
 int main(int argc,char *argv[]) {
-  GstPipeline *pipeline;
-  GstElement *src, *parse, *out;
+  GstElement *pipeline, *src, *parse, *out;
   GstPad *infopad;
   int i,c;
 
diff --git a/test/mp2toavi.c b/test/mp2toavi.c
index 32b94dee98..77a627dc2e 100644
--- a/test/mp2toavi.c
+++ b/test/mp2toavi.c
@@ -9,7 +9,7 @@
 GstElement *mux;
 GstElement *merge_subtitles;
 
-void eof(GstSrc *src) {
+void eof(GstElement *src) {
   g_print("have eos, quitting\n");
   exit(0);
 }
@@ -229,8 +229,7 @@ void mp2tomp1(GstElement *parser,GstPad *pad, GstElement *pipeline) {
 }
 
 int main(int argc,char *argv[]) {
-  GstPipeline *pipeline;
-  GstElement *src, *parse;
+  GstElement *pipeline, *src, *parse;
   GstElement *fdsink;
   GstElementFactory *fdsinkfactory;
   int fd;
diff --git a/test/mp2tomp1.c b/test/mp2tomp1.c
index cca6b42a7d..78ce6057b2 100644
--- a/test/mp2tomp1.c
+++ b/test/mp2tomp1.c
@@ -9,7 +9,7 @@
 GstElement *mux;
 GstElement *merge_subtitles;
 
-void eof(GstSrc *src) {
+void eof(GstElement *src) {
   g_print("have eos, quitting\n");
   exit(0);
 }
@@ -215,8 +215,7 @@ void mp2tomp1(GstElement *parser,GstPad *pad, GstElement *pipeline) {
 }
 
 int main(int argc,char *argv[]) {
-  GstPipeline *pipeline;
-  GstElement *src, *parse;
+  GstElement *pipeline, *src, *parse;
   GstElement *fdsink;
   GstElementFactory *fdsinkfactory;
   int fd;
diff --git a/test/mp3.c b/test/mp3.c
index 2b7c696816..744bf51fad 100644
--- a/test/mp3.c
+++ b/test/mp3.c
@@ -5,7 +5,7 @@ extern gboolean _gst_plugin_spew;
 
 static gboolean playing = TRUE;
 
-void eof(GstSrc *src) {
+void eof(GstElement *src) {
   DEBUG("have EOF\n");
   playing = FALSE;
 }
diff --git a/test/mp3parse.c b/test/mp3parse.c
index d7dddc50f8..7d3b3f1a89 100644
--- a/test/mp3parse.c
+++ b/test/mp3parse.c
@@ -2,7 +2,7 @@
 
 extern gboolean _gst_plugin_spew;
 
-void eof(GstSrc *src) {
+void eof(GstElement *src) {
     g_print("have eof, quitting\n");
    exit(0);
 }
@@ -25,7 +25,7 @@ int main(int argc,char *argv[]) {
 // gst_plugin_load("mp3parse");
   gst_plugin_load_all();
 
-  pipeline = gst_pipeline_new("pipeline");
+  pipeline = GST_PIPELINE(gst_pipeline_new("pipeline"));
   g_return_val_if_fail(pipeline != NULL, -1);
 
   srcfactory = gst_elementfactory_find("disksrc");
diff --git a/test/mp3play.c b/test/mp3play.c
index fec0983702..803da00af9 100644
--- a/test/mp3play.c
+++ b/test/mp3play.c
@@ -1,15 +1,14 @@
 #include <gst/gst.h>
 
 
-void eof(GstSrc *src) {
+void eof(GstElement *src) {
    g_print("have eof, quitting\n");
    exit(0);
 }
 
 int main(int argc,char *argv[]) {
-  GstPipeline *pipeline;
   GstElementFactory *srcfactory, *parsefactory, *decodefactory, *playfactory;
-  GstElement *src, *parse, *decode, *play;
+  GstElement *pipeline, *src, *parse, *decode, *play;
   GstPad *infopad;
 
   g_print("have %d args\n",argc);
diff --git a/test/mp3tovorbis.c b/test/mp3tovorbis.c
index a87692f18d..f18f6b58f5 100644
--- a/test/mp3tovorbis.c
+++ b/test/mp3tovorbis.c
@@ -4,7 +4,7 @@
 #include <fcntl.h>
 
 
-void eof(GstSrc *src) {
+void eof(GstElement *src) {
    g_print("have eof, quitting\n");
    exit(0);
 }
diff --git a/test/mpeg2parse.c b/test/mpeg2parse.c
index d0fed19751..fdbd0af54b 100644
--- a/test/mpeg2parse.c
+++ b/test/mpeg2parse.c
@@ -2,7 +2,7 @@
 #include <gnome.h>
 #include <gst/gst.h>
 
-void eof(GstSrc *src) {
+void eof(GstElement *src) {
   g_print("have eos, quitting\n");
   exit(0);
 }
@@ -185,7 +185,7 @@ int main(int argc,char *argv[]) {
   gst_plugin_load("mpeg2parse");
   //gst_plugin_load("mpeg1parse");
 
-  pipeline = gst_pipeline_new("pipeline");
+  pipeline = GST_PIPELINE(gst_pipeline_new("pipeline"));
   g_return_val_if_fail(pipeline != NULL, -1);
 
   if (strstr(argv[1],"video_ts")) {
diff --git a/test/pipetest.c b/test/pipetest.c
index 50fd223e8a..5c77c04efb 100644
--- a/test/pipetest.c
+++ b/test/pipetest.c
@@ -5,15 +5,14 @@
 #include <gst/gst.h>
 
 
-void eof(GstSrc *src) {
+void eof(GstElement *src) {
    g_print("have eof, quitting\n");
    exit(0);
 }
 
 int main(int argc,char *argv[]) {
-  GstPipeline *pipeline;
   GstElementFactory *srcfactory, *pipefactory, *sinkfactory;
-  GstElement *src, *pipe, *sink;
+  GstElement *pipeline, *src, *pipe, *sink;
   int fd;
 
   g_print("have %d args\n",argc);
diff --git a/test/qtest.c b/test/qtest.c
index 6695830c4c..fb69f5a2ee 100644
--- a/test/qtest.c
+++ b/test/qtest.c
@@ -9,7 +9,7 @@ extern gboolean _gst_plugin_spew;
    don't screw around with state unexpectedly */
 static gboolean playing = TRUE;
 
-void eof(GstSrc *src) {
+void eof(GstElement *src) {
   DEBUG("have EOF\n");
   playing = FALSE;
 }