compatibility fix for new GST_DEBUG stuff.

Original commit message from CVS:
compatibility fix for new GST_DEBUG stuff.
Includes fixes for missing includes for config.h and unistd.h

I only ensured for plugins I can build that they work, so if some of them are still broken, you gotta fix them yourselves unfortunately.

30 files changed, 203 insertions, 122 deletions

diff --git a/ext/arts/gst_arts.c b/ext/arts/gst_arts.c
index 8e65656a..482c91b4 100644
--- a/ext/arts/gst_arts.c
+++ b/ext/arts/gst_arts.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string.h>
 #include <math.h>
 #include <sys/soundcard.h>
diff --git a/ext/artsd/gstartsdsink.c b/ext/artsd/gstartsdsink.c
index a7d1f7f3..2847d8af 100644
--- a/ext/artsd/gstartsdsink.c
+++ b/ext/artsd/gstartsdsink.c
@@ -20,6 +20,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "gstartsdsink.h"
 
 /* elementfactory information */
@@ -233,7 +236,7 @@ gst_artsdsink_chain (GstPad *pad, GstBuffer *buf)
       int bytes;
       void * bufptr = GST_BUFFER_DATA (buf);
       int bufsize = GST_BUFFER_SIZE (buf);
-      GST_DEBUG (0, "artsdsink: stream=%p data=%p size=%d",
+      GST_DEBUG ("artsdsink: stream=%p data=%p size=%d",
 		 artsdsink->stream, GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf));
 
       do {
@@ -360,11 +363,11 @@ gst_artsdsink_open_audio (GstArtsdsink *sink)
       return FALSE;
   }
 
-  GST_DEBUG (0, "artsdsink: attempting to open connection to aRtsd server");
+  GST_DEBUG ("artsdsink: attempting to open connection to aRtsd server");
   sink->stream = arts_play_stream(sink->frequency, sink->depth,
 				  sink->channels, connname);
   /* FIXME: check connection */
-  /*   GST_DEBUG (0, "artsdsink: can't open connection to aRtsd server"); */
+  /*   GST_DEBUG ("artsdsink: can't open connection to aRtsd server"); */
 
   GST_FLAG_SET (sink, GST_ARTSDSINK_OPEN);
   sink->connected = TRUE;
diff --git a/ext/audiofile/gstafparse.c b/ext/audiofile/gstafparse.c
index d8840ea5..2ceb4ee7 100644
--- a/ext/audiofile/gstafparse.c
+++ b/ext/audiofile/gstafparse.c
@@ -21,6 +21,9 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <gst/gst.h>
 #include <gst/audio/audio.h>
 #include <string.h>
@@ -375,11 +378,11 @@ gst_afparse_open_file (GstAFParse *afparse)
         break;
       case AF_SAMPFMT_FLOAT:
       case AF_SAMPFMT_DOUBLE:
-        GST_DEBUG (GST_CAT_PLUGIN_INFO, "ERROR: float data not supported yet !\n");
+        GST_DEBUG ("ERROR: float data not supported yet !\n");
     }
     afparse->rate = (guint) afGetRate (afparse->file, AF_DEFAULT_TRACK);
     afparse->width = sampleWidth;
-    GST_DEBUG (GST_CAT_PLUGIN_INFO, 
+    GST_DEBUG (
        "input file: %d channels, %d width, %d rate, signed %s\n",
         afparse->channels, afparse->width, afparse->rate,
         afparse->is_signed ? "yes" : "no");
diff --git a/ext/audiofile/gstafsink.c b/ext/audiofile/gstafsink.c
index 43ebabfc..e9783ac2 100644
--- a/ext/audiofile/gstafsink.c
+++ b/ext/audiofile/gstafsink.c
@@ -21,6 +21,9 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <gst/gst.h>
 #include "gstafsink.h"
 
@@ -316,10 +319,10 @@ gst_afsink_open_file (GstAFSink *sink)
     gst_caps_get_boolean (caps, "signed",     &sink->is_signed);
     gst_caps_get_int	 (caps, "endianness", &sink->endianness_data);
   }
-  GST_DEBUG (GST_CAT_PLUGIN_INFO, "channels %d, width %d, rate %d, signed %s",
+  GST_DEBUG ("channels %d, width %d, rate %d, signed %s",
   	   		sink->channels, sink->width, sink->rate,
   	   		sink->is_signed ? "yes" : "no");
-  GST_DEBUG (GST_CAT_PLUGIN_INFO, "endianness: data %d, output %d", 
+  GST_DEBUG ("endianness: data %d, output %d", 
 	   sink->endianness_data, sink->endianness_output);
   /* setup the output file */
   if (sink->is_signed)
@@ -485,7 +488,7 @@ gst_afsink_handle_event (GstPad *pad, GstEvent *event)
   GstAFSink *afsink;
 
   afsink = GST_AFSINK (gst_pad_get_parent (pad));
-  GST_DEBUG (0, "DEBUG: afsink: got event");
+  GST_DEBUG ("DEBUG: afsink: got event");
   gst_afsink_close_file (afsink);
 
   return TRUE;
diff --git a/ext/audiofile/gstafsrc.c b/ext/audiofile/gstafsrc.c
index ddc059ce..cf2ebb56 100644
--- a/ext/audiofile/gstafsrc.c
+++ b/ext/audiofile/gstafsrc.c
@@ -21,6 +21,9 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <gst/gst.h>
 #include <gst/audio/audio.h>
 #include "gstafsrc.h"
@@ -326,12 +329,12 @@ gst_afsrc_open_file (GstAFSrc *src)
 	    break;
 	  case AF_SAMPFMT_FLOAT:
 	  case AF_SAMPFMT_DOUBLE:
-	    GST_DEBUG (GST_CAT_PLUGIN_INFO,
+	    GST_DEBUG (
 	    		   "ERROR: float data not supported yet !\n");
 	}
 	src->rate = (guint) afGetRate (src->file, AF_DEFAULT_TRACK);		
     src->width = sampleWidth;
-    GST_DEBUG (GST_CAT_PLUGIN_INFO, 
+    GST_DEBUG (
     		   "input file: %d channels, %d width, %d rate, signed %s\n",
 	  			src->channels, src->width, src->rate,
 	  			src->is_signed ? "yes" : "no");
diff --git a/ext/cdaudio/gstcdaudio.c b/ext/cdaudio/gstcdaudio.c
index 66577b40..ac24854c 100644
--- a/ext/cdaudio/gstcdaudio.c
+++ b/ext/cdaudio/gstcdaudio.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <cdaudio.h>
 
 #include <gst/gst.h>
diff --git a/ext/divx/gstdivxdec.c b/ext/divx/gstdivxdec.c
index 7f715546..0ee308b8 100644
--- a/ext/divx/gstdivxdec.c
+++ b/ext/divx/gstdivxdec.c
@@ -18,6 +18,9 @@
  */
 
 #ifdef HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "config.h"
 #endif
 
diff --git a/ext/divx/gstdivxenc.c b/ext/divx/gstdivxenc.c
index bdc32786..24a26684 100644
--- a/ext/divx/gstdivxenc.c
+++ b/ext/divx/gstdivxenc.c
@@ -18,6 +18,9 @@
  */
 
 #ifdef HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "config.h"
 #endif
 
diff --git a/ext/gsm/gstgsmdec.c b/ext/gsm/gstgsmdec.c
index bf5cf68f..957b832d 100644
--- a/ext/gsm/gstgsmdec.c
+++ b/ext/gsm/gstgsmdec.c
@@ -18,6 +18,9 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string.h>
 
 #include "gstgsmdec.h"
@@ -88,7 +91,7 @@ gst_gsmdec_class_init (GstGSMDec *klass)
 static void
 gst_gsmdec_init (GstGSMDec *gsmdec)
 {
-  GST_DEBUG (0,"gst_gsmdec_init: initializing");
+  GST_DEBUG ("gst_gsmdec_init: initializing");
 
   /* create the sink and src pads */
   gsmdec->sinkpad = gst_pad_new_from_template (gsmdec_sink_template, "sink");
diff --git a/ext/gsm/gstgsmenc.c b/ext/gsm/gstgsmenc.c
index 9084257b..2b25042f 100644
--- a/ext/gsm/gstgsmenc.c
+++ b/ext/gsm/gstgsmenc.c
@@ -18,6 +18,9 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string.h>
 
 #include "gstgsmenc.h"
diff --git a/ext/hermes/gstcolorspace.c b/ext/hermes/gstcolorspace.c
index aeb66450..7e99a749 100644
--- a/ext/hermes/gstcolorspace.c
+++ b/ext/hermes/gstcolorspace.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <gst/gst.h>
 
 #include "gstcolorspace.h"
@@ -134,7 +137,7 @@ colorspace_setup_converter (GstColorspace *space, GstCaps *from_caps, GstCaps *t
   gst_caps_get_fourcc_int (from_caps, "format", &from_space);
   gst_caps_get_fourcc_int (to_caps,   "format", &to_space);
 
-  GST_INFO (GST_CAT_NEGOTIATION, "set up converter for %08x to %08x", from_space, to_space);
+  GST_INFO ( "set up converter for %08x to %08x", from_space, to_space);
 
   switch (from_space) {
     case GST_MAKE_FOURCC ('R','G','B',' '):
@@ -159,10 +162,10 @@ colorspace_setup_converter (GstColorspace *space, GstCaps *from_caps, GstCaps *t
 	  space->source.indexed = 0;
 	  space->source.has_colorkey = 0;
 
-	  GST_INFO (GST_CAT_PLUGIN_INFO, "source red mask   %08x", space->source.r);
-	  GST_INFO (GST_CAT_PLUGIN_INFO, "source green mask %08x", space->source.g);
-	  GST_INFO (GST_CAT_PLUGIN_INFO, "source blue mask  %08x", space->source.b);
-	  GST_INFO (GST_CAT_PLUGIN_INFO, "source bpp        %08x", space->srcbpp);
+	  GST_INFO ( "source red mask   %08x", space->source.r);
+	  GST_INFO ( "source green mask %08x", space->source.g);
+	  GST_INFO ( "source blue mask  %08x", space->source.b);
+	  GST_INFO ( "source bpp        %08x", space->srcbpp);
 
 	  gst_caps_get_int (to_caps, "red_mask",   &space->dest.r);
 	  gst_caps_get_int (to_caps, "green_mask", &space->dest.g);
@@ -172,16 +175,16 @@ colorspace_setup_converter (GstColorspace *space, GstCaps *from_caps, GstCaps *t
 	  space->dest.indexed = 0;
 	  space->dest.has_colorkey = 0;
 
-	  GST_INFO (GST_CAT_PLUGIN_INFO, "dest red mask   %08x", space->dest.r);
-	  GST_INFO (GST_CAT_PLUGIN_INFO, "dest green mask %08x", space->dest.g);
-	  GST_INFO (GST_CAT_PLUGIN_INFO, "dest blue mask  %08x", space->dest.b);
-	  GST_INFO (GST_CAT_PLUGIN_INFO, "dest bpp        %08x", space->destbpp);
+	  GST_INFO ( "dest red mask   %08x", space->dest.r);
+	  GST_INFO ( "dest green mask %08x", space->dest.g);
+	  GST_INFO ( "dest blue mask  %08x", space->dest.b);
+	  GST_INFO ( "dest bpp        %08x", space->destbpp);
 
 	  if (!Hermes_ConverterRequest (space->h_handle, &space->source, &space->dest)) {
 	    g_warning ("Hermes: could not get converter\n");
 	    return FALSE;
 	  }
-	  GST_INFO (GST_CAT_PLUGIN_INFO, "converter set up");
+	  GST_INFO ( "converter set up");
           space->type = GST_COLORSPACE_HERMES;
 	  return TRUE;
 	}
@@ -202,7 +205,7 @@ colorspace_setup_converter (GstColorspace *space, GstCaps *from_caps, GstCaps *t
 	    return TRUE;
 	  }
         case GST_MAKE_FOURCC ('Y','U','Y','2'):
-          GST_INFO (GST_CAT_NEGOTIATION, "colorspace: RGB to YUV with bpp %d not implemented!!", from_bpp);
+          GST_INFO ( "colorspace: RGB to YUV with bpp %d not implemented!!", from_bpp);
 	  return FALSE;
       }
       break;
@@ -210,7 +213,7 @@ colorspace_setup_converter (GstColorspace *space, GstCaps *from_caps, GstCaps *t
     case GST_MAKE_FOURCC ('I','4','2','0'):
       switch (to_space) {
         case GST_MAKE_FOURCC ('R','G','B',' '):
-          GST_INFO (GST_CAT_NEGOTIATION, "colorspace: YUV to RGB");
+          GST_INFO ( "colorspace: YUV to RGB");
 
 	  gst_caps_get_int (to_caps, "bpp", &space->destbpp);
 	  space->converter = gst_colorspace_yuv2rgb_get_converter (from_caps, to_caps);
@@ -238,14 +241,14 @@ colorspace_setup_converter (GstColorspace *space, GstCaps *from_caps, GstCaps *t
 	  space->destbpp = 16;
 	  return TRUE;
         case GST_MAKE_FOURCC ('R','G','B',' '):
-          GST_INFO (GST_CAT_NEGOTIATION, "colorspace: YUY2 to RGB not implemented!!");
+          GST_INFO ( "colorspace: YUY2 to RGB not implemented!!");
 	  return FALSE;
       }
       break;
     case GST_MAKE_FOURCC ('Y','V','1','2'):
       switch (to_space) {
         case GST_MAKE_FOURCC ('R','G','B',' '):
-          GST_INFO (GST_CAT_NEGOTIATION, "colorspace: YV12 to RGB");
+          GST_INFO ( "colorspace: YV12 to RGB");
 
 	  gst_caps_get_int (to_caps, "bpp", &space->destbpp);
 	  space->converter = gst_colorspace_yuv2rgb_get_converter (from_caps, to_caps);
@@ -306,7 +309,7 @@ gst_colorspace_sinkconnect (GstPad *pad, GstCaps *caps)
   gst_caps_get_int (caps, "width", &space->width);
   gst_caps_get_int (caps, "height", &space->height);
 
-  GST_INFO (GST_CAT_PROPERTIES, "size: %dx%d", space->width, space->height);
+  GST_INFO ( "size: %dx%d", space->width, space->height);
 
   gst_caps_replace_sink (&space->sinkcaps, caps);
 
diff --git a/ext/hermes/yuv2rgb.c b/ext/hermes/yuv2rgb.c
index 4e98642c..62121ff5 100644
--- a/ext/hermes/yuv2rgb.c
+++ b/ext/hermes/yuv2rgb.c
@@ -111,7 +111,7 @@ gst_colorspace_yuv2rgb_get_converter (GstCaps *from, GstCaps *to)
   GstColorSpaceConverter *new;
   gint to_bpp;
   
-  GST_DEBUG (0,"gst_colorspace_yuv2rgb_get_converter");
+  GST_DEBUG ("gst_colorspace_yuv2rgb_get_converter");
 
   new = g_malloc (sizeof (GstColorSpaceConverter));
 
@@ -138,9 +138,9 @@ gst_colorspace_yuv2rgb_get_converter (GstCaps *from, GstCaps *to)
       gst_caps_get_int (to, "green_mask", &green_mask);
       gst_caps_get_int (to, "blue_mask",  &blue_mask);
 
-      GST_INFO (GST_CAT_PLUGIN_INFO, "red_mask    %08x", red_mask);
-      GST_INFO (GST_CAT_PLUGIN_INFO, "green_mask  %08x", green_mask);
-      GST_INFO (GST_CAT_PLUGIN_INFO, "blue_mask   %08x", blue_mask);
+      GST_INFO ( "red_mask    %08x", red_mask);
+      GST_INFO ( "green_mask  %08x", green_mask);
+      GST_INFO ( "blue_mask   %08x", blue_mask);
 
       new->insize 	   = new->width * new->height + new->width * new->height/2;
       new->color_tables    = gst_colorspace_init_yuv (to_bpp, red_mask, green_mask, blue_mask);
@@ -211,7 +211,7 @@ gst_colorspace_converter_destroy (GstColorSpaceConverter *conv)
 static void gst_colorspace_I420_to_rgb32(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) 
 {
   int size;
-  GST_DEBUG (0,"gst_colorspace_I420_to_rgb32");
+  GST_DEBUG ("gst_colorspace_I420_to_rgb32");
 
   size = space->width * space->height;
 
@@ -227,7 +227,7 @@ static void gst_colorspace_I420_to_rgb32(GstColorSpaceConverter *space, unsigned
 
 static void gst_colorspace_I420_to_rgb24(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) {
   int size;
-  GST_DEBUG (0,"gst_colorspace_I420_to_rgb24");
+  GST_DEBUG ("gst_colorspace_I420_to_rgb24");
 
   size = space->width * space->height;
 
@@ -243,7 +243,7 @@ static void gst_colorspace_I420_to_rgb24(GstColorSpaceConverter *space, unsigned
 
 static void gst_colorspace_I420_to_rgb16(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) {
   int size;
-  GST_DEBUG (0,"gst_colorspace_I420_to_rgb16");
+  GST_DEBUG ("gst_colorspace_I420_to_rgb16");
 
   size = space->width * space->height;
 
@@ -260,7 +260,7 @@ static void gst_colorspace_I420_to_rgb16(GstColorSpaceConverter *space, unsigned
 #ifdef HAVE_LIBMMX
 static void gst_colorspace_I420_to_bgr32_mmx(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) {
   int size;
-  GST_DEBUG (0,"gst_colorspace_I420_to_rgb32_mmx");
+  GST_DEBUG ("gst_colorspace_I420_to_rgb32_mmx");
 
   size = space->width * space->height;
 
@@ -275,7 +275,7 @@ static void gst_colorspace_I420_to_bgr32_mmx(GstColorSpaceConverter *space, unsi
 }
 static void gst_colorspace_I420_to_bgr16_mmx(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) {
   int size;
-  GST_DEBUG (0,"gst_colorspace_I420_to_bgr16_mmx ");
+  GST_DEBUG ("gst_colorspace_I420_to_bgr16_mmx ");
 
   size = space->width * space->height;
 
@@ -286,7 +286,7 @@ static void gst_colorspace_I420_to_bgr16_mmx(GstColorSpaceConverter *space, unsi
                         dest,
 			space->height,
 			space->width);
-  GST_DEBUG (0,"gst_colorspace_I420_to_bgr16_mmx done");
+  GST_DEBUG ("gst_colorspace_I420_to_bgr16_mmx done");
 
 }
 #endif
@@ -295,7 +295,7 @@ static void gst_colorspace_I420_to_bgr16_mmx(GstColorSpaceConverter *space, unsi
 static void gst_colorspace_YV12_to_rgb32(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) 
 {
   int size;
-  GST_DEBUG (0,"gst_colorspace_YV12_to_rgb32");
+  GST_DEBUG ("gst_colorspace_YV12_to_rgb32");
 
   size = space->width * space->height;
 
@@ -311,7 +311,7 @@ static void gst_colorspace_YV12_to_rgb32(GstColorSpaceConverter *space, unsigned
 
 static void gst_colorspace_YV12_to_rgb24(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) {
   int size;
-  GST_DEBUG (0,"gst_colorspace_YV12_to_rgb24");
+  GST_DEBUG ("gst_colorspace_YV12_to_rgb24");
 
   size = space->width * space->height;
 
@@ -327,7 +327,7 @@ static void gst_colorspace_YV12_to_rgb24(GstColorSpaceConverter *space, unsigned
 
 static void gst_colorspace_YV12_to_rgb16(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) {
   int size;
-  GST_DEBUG (0,"gst_colorspace_YV12_to_rgb16");
+  GST_DEBUG ("gst_colorspace_YV12_to_rgb16");
 
   size = space->width * space->height;
 
@@ -344,7 +344,7 @@ static void gst_colorspace_YV12_to_rgb16(GstColorSpaceConverter *space, unsigned
 #ifdef HAVE_LIBMMX
 static void gst_colorspace_YV12_to_bgr32_mmx(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) {
   int size;
-  GST_DEBUG (0,"gst_colorspace_YV12_to_rgb32_mmx");
+  GST_DEBUG ("gst_colorspace_YV12_to_rgb32_mmx");
 
   size = space->width * space->height;
 
@@ -359,7 +359,7 @@ static void gst_colorspace_YV12_to_bgr32_mmx(GstColorSpaceConverter *space, unsi
 }
 static void gst_colorspace_YV12_to_bgr16_mmx(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) {
   int size;
-  GST_DEBUG (0,"gst_colorspace_YV12_to_bgr16_mmx ");
+  GST_DEBUG ("gst_colorspace_YV12_to_bgr16_mmx ");
 
   size = space->width * space->height;
 
@@ -370,7 +370,7 @@ static void gst_colorspace_YV12_to_bgr16_mmx(GstColorSpaceConverter *space, unsi
                         dest,
 			space->height,
 			space->width);
-  GST_DEBUG (0,"gst_colorspace_YV12_to_bgr16_mmx done");
+  GST_DEBUG ("gst_colorspace_YV12_to_bgr16_mmx done");
 
 }
 #endif
diff --git a/ext/ivorbis/vorbisfile.c b/ext/ivorbis/vorbisfile.c
index 8403d065..76763f22 100644
--- a/ext/ivorbis/vorbisfile.c
+++ b/ext/ivorbis/vorbisfile.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string.h>
 #include <gst/gst.h>
 #include <tremor/ivorbiscodec.h>
@@ -231,7 +234,7 @@ gst_ivorbisfile_read (void *ptr, size_t size, size_t nmemb, void *datasource)
 
   Ivorbisfile *ivorbisfile = GST_IVORBISFILE (datasource);
 
-  GST_DEBUG (0, "read %d", read_size);
+  GST_DEBUG ("read %d", read_size);
 
   /* make sure we don't go to EOS */
   if (!ivorbisfile->may_eos && ivorbisfile->total_bytes && 
@@ -253,7 +256,7 @@ gst_ivorbisfile_read (void *ptr, size_t size, size_t nmemb, void *datasource)
 
       switch (GST_EVENT_TYPE (event)) {
 	case GST_EVENT_EOS:
-	  GST_DEBUG (0, "eos");
+	  GST_DEBUG ("eos");
           ivorbisfile->eos = TRUE;
           if (avail == 0) {
             gst_event_unref (event);
@@ -261,7 +264,7 @@ gst_ivorbisfile_read (void *ptr, size_t size, size_t nmemb, void *datasource)
 	  }
 	  break;
 	case GST_EVENT_DISCONTINUOUS:
-	  GST_DEBUG (0, "discont");
+	  GST_DEBUG ("discont");
 	  ivorbisfile->need_discont = TRUE;
 	default:
           break;
@@ -295,7 +298,7 @@ gst_ivorbisfile_seek (void *datasource, int64_t offset, int whence)
     return -1;
   }
   
-  GST_DEBUG (0, "seek %lld %d", offset, whence);
+  GST_DEBUG ("seek %lld %d", offset, whence);
 
   if (whence == SEEK_SET) {
     method = GST_SEEK_METHOD_SET;
@@ -326,7 +329,7 @@ gst_ivorbisfile_seek (void *datasource, int64_t offset, int whence)
 static int
 gst_ivorbisfile_close (void *datasource)
 {
-  GST_DEBUG (0, "close");
+  GST_DEBUG ("close");
   return 0;
 }
 
@@ -338,7 +341,7 @@ gst_ivorbisfile_tell (void *datasource)
 
   result = gst_bytestream_tell (ivorbisfile->bs);
 
-  GST_DEBUG (0, "tell %ld", result);
+  GST_DEBUG ("tell %ld", result);
 
   return result;
 }
@@ -489,7 +492,7 @@ gst_ivorbisfile_loop (GstElement *element)
     ivorbisfile->may_eos = FALSE;
     ivorbisfile->vf.seekable = gst_bytestream_seek (ivorbisfile->bs, 0, 
 		                                   GST_SEEK_METHOD_SET);
-    GST_DEBUG (GST_CAT_PLUGIN_INFO, "ivorbisfile: seekable: %s\n",
+    GST_DEBUG ("ivorbisfile: seekable: %s\n",
 	       ivorbisfile->vf.seekable ? "yes" : "no");
 
     /* open our custom ivorbisfile data object with the callbacks we provide */
@@ -576,7 +579,7 @@ gst_ivorbisfile_loop (GstElement *element)
 		 &link);
 
   if (ret == 0) {
-    GST_DEBUG (0, "eos");
+    GST_DEBUG ("eos");
     /* send EOS event */
     /*ov_clear (&ivorbisfile->vf);*/
     ivorbisfile->restart = TRUE;
@@ -935,11 +938,11 @@ gst_ivorbisfile_src_event (GstPad *pad, GstEvent *event)
       vorbis_info *vi;
       GstFormat format;
   
-      GST_DEBUG (GST_CAT_EVENT, "ivorbisfile: handling seek event on pad %s:%s",
+      GST_DEBUG ("ivorbisfile: handling seek event on pad %s:%s",
 		 GST_DEBUG_PAD_NAME (pad));
       if (!ivorbisfile->vf.seekable) {
 	gst_event_unref (event);
-	GST_DEBUG (GST_CAT_EVENT, "vorbis stream is not seekable");
+	GST_DEBUG ("vorbis stream is not seekable");
         return FALSE;
       }
 
@@ -957,7 +960,7 @@ gst_ivorbisfile_src_event (GstPad *pad, GstEvent *event)
 	case GST_FORMAT_BYTES:
           vi = ov_info (&ivorbisfile->vf, -1);
 	  if (vi->channels == 0) {
-	    GST_DEBUG (GST_CAT_EVENT, "vorbis stream has 0 channels ?");
+	    GST_DEBUG ("vorbis stream has 0 channels ?");
 	    res = FALSE;
 	    goto done; 
 	  }
@@ -980,7 +983,7 @@ gst_ivorbisfile_src_event (GstPad *pad, GstEvent *event)
 	  }
 	  else
 	  {
-	    GST_DEBUG (GST_CAT_EVENT, "unhandled seek format");
+	    GST_DEBUG ("unhandled seek format");
 	    res = FALSE;
 	  }
 	  break;
diff --git a/ext/jack/gstjack.c b/ext/jack/gstjack.c
index 8a3357dd..68d07753 100644
--- a/ext/jack/gstjack.c
+++ b/ext/jack/gstjack.c
@@ -17,6 +17,9 @@
     Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <stdlib.h>
 #include <string.h>
 #include "gstjack.h"
diff --git a/ext/jack/gstjackbin.c b/ext/jack/gstjackbin.c
index 76c7e075..959f5867 100644
--- a/ext/jack/gstjackbin.c
+++ b/ext/jack/gstjackbin.c
@@ -80,7 +80,7 @@ gst_jack_bin_class_init(GstJackBinClass *klass)
 static void
 gst_jack_bin_init(GstJackBin *this)
 {
-    GST_DEBUG (GST_CAT_THREAD, "initializing jack bin");
+    GST_DEBUG ("initializing jack bin");
     
     /* jack bins are managing bins and iterate themselves */
     GST_FLAG_SET (this, GST_BIN_FLAG_MANAGER);
diff --git a/ext/ladspa/gstladspa.c b/ext/ladspa/gstladspa.c
index ed96e835..55c0186d 100644
--- a/ext/ladspa/gstladspa.c
+++ b/ext/ladspa/gstladspa.c
@@ -170,19 +170,19 @@ gst_ladspa_class_init (GstLADSPAClass *klass)
   for (i=0;i<desc->PortCount;i++) {
     if (LADSPA_IS_PORT_AUDIO(desc->PortDescriptors[i]) && 
         LADSPA_IS_PORT_INPUT(desc->PortDescriptors[i])){
-      GST_DEBUG (0, "input port %d", i);
+      GST_DEBUG ("input port %d", i);
       klass->sinkpad_portnums[sinkcount++] = i;
     }
       
     if (LADSPA_IS_PORT_AUDIO(desc->PortDescriptors[i]) && 
         LADSPA_IS_PORT_OUTPUT(desc->PortDescriptors[i])){
-      GST_DEBUG (0, "output port %d", i);
+      GST_DEBUG ("output port %d", i);
       klass->srcpad_portnums[srccount++] = i;
     }
       
     if (LADSPA_IS_PORT_CONTROL(desc->PortDescriptors[i]) && 
         LADSPA_IS_PORT_INPUT(desc->PortDescriptors[i])){
-      GST_DEBUG (0, "control port %d", i);
+      GST_DEBUG ("control port %d", i);
       klass->control_portnums[controlcount++] = i;
     }
   }
@@ -324,7 +324,7 @@ gst_ladspa_class_init (GstLADSPAClass *klass)
     
     klass->control_info[i].param_name = argname;
     
-    GST_DEBUG (0, "adding arg %s from %s",argname, klass->control_info[i].name);
+    GST_DEBUG ("adding arg %s from %s",argname, klass->control_info[i].name);
     
     if (argtype==G_TYPE_BOOLEAN){
       paramspec = g_param_spec_boolean(argname,argname,argname, FALSE, argperms);
@@ -443,7 +443,7 @@ gst_ladspa_init (GstLADSPA *ladspa)
 
   if (sinkcount==0 && srccount == 1) {
     /* get mode (no sink pads) */
-    GST_DEBUG (0, "mono get mode with 1 src pad");
+    GST_DEBUG ("mono get mode with 1 src pad");
 
     ladspa->newcaps = TRUE;
 
@@ -451,14 +451,14 @@ gst_ladspa_init (GstLADSPA *ladspa)
     gst_pad_set_get_function (ladspa->srcpads[0], gst_ladspa_get);
   } else if (sinkcount==1){
     /* with one sink we can use the chain function */
-    GST_DEBUG (0, "chain mode");
+    GST_DEBUG ("chain mode");
 
     gst_pad_set_link_function (ladspa->sinkpads[0], gst_ladspa_connect);
     gst_pad_set_chain_function (ladspa->sinkpads[0], gst_ladspa_chain);
     gst_pad_set_bufferpool_function (ladspa->sinkpads[0], gst_ladspa_get_bufferpool);
   } else if (sinkcount > 1){
     /* more than one sink pad needs loop mode */
-    GST_DEBUG (0, "loop mode with %d sink pads and %d src pads", sinkcount, srccount);
+    GST_DEBUG ("loop mode with %d sink pads and %d src pads", sinkcount, srccount);
 
     for (i=0;i<sinkcount;i++) {
       gst_pad_set_link_function (ladspa->sinkpads[i], gst_ladspa_connect);
@@ -469,7 +469,7 @@ gst_ladspa_init (GstLADSPA *ladspa)
   else if (sinkcount==0 && srccount == 0){
     /* for some reason these plugins exist - we'll just ignore them */
   } else {
-    GST_DEBUG (0, "%d sink pads, %d src pads not yet supported", sinkcount, srccount);
+    GST_DEBUG ("%d sink pads, %d src pads not yet supported", sinkcount, srccount);
   }
 
   gst_ladspa_instantiate (ladspa);
@@ -539,7 +539,7 @@ gst_ladspa_connect_get (GstPad *pad, GstCaps *caps)
 static void
 gst_ladspa_force_src_caps(GstLADSPA *ladspa, GstPad *pad)
 {
-  GST_DEBUG (0, "forcing caps with rate %d", ladspa->samplerate);
+  GST_DEBUG ("forcing caps with rate %d", ladspa->samplerate);
   gst_pad_try_set_caps (pad, gst_caps_new (
     "ladspa_src_caps",
     "audio/raw",
@@ -605,7 +605,7 @@ gst_ladspa_set_property (GObject *object, guint prop_id, const GValue *value, GP
     ladspa->controls[cid] = val;
   }    
 
-  GST_DEBUG (0, "set arg %s to %f", control_info->name, ladspa->controls[cid]);
+  GST_DEBUG ("set arg %s to %f", control_info->name, ladspa->controls[cid]);
 }
 
 static void
@@ -633,7 +633,7 @@ gst_ladspa_get_property (GObject *object, guint prop_id, GValue *value, GParamSp
   control_info = &(oclass->control_info[cid]);
   if (control_info->name == NULL) return;
 
-  GST_DEBUG (0, "got arg %s as %f", control_info->name, ladspa->controls[cid]);
+  GST_DEBUG ("got arg %s as %f", control_info->name, ladspa->controls[cid]);
 
   /* now see what type it is */
   if (control_info->toggled) {
@@ -666,7 +666,7 @@ gst_ladspa_instantiate (GstLADSPA *ladspa)
   }
         
   /* instantiate the plugin */ 
-  GST_DEBUG (0, "instantiating the plugin");
+  GST_DEBUG ("instantiating the plugin");
   
   ladspa->handle = desc->instantiate(desc,ladspa->samplerate);
   g_return_val_if_fail (ladspa->handle != NULL, FALSE);
@@ -674,7 +674,7 @@ gst_ladspa_instantiate (GstLADSPA *ladspa)
   /* walk through the ports and add all the arguments */
   for (i=0;i<oclass->numcontrols;i++) {
     /* connect the argument to the plugin */
-    GST_DEBUG (0, "added control port %d", oclass->control_portnums[i]);
+    GST_DEBUG ("added control port %d", oclass->control_portnums[i]);
     desc->connect_port(ladspa->handle,
                        oclass->control_portnums[i],
                        &(ladspa->controls[i]));
@@ -694,7 +694,7 @@ gst_ladspa_change_state (GstElement *element)
   GstLADSPA *ladspa = (GstLADSPA*)element;
   desc = ladspa->descriptor;
 
-  GST_DEBUG (0, "changing state");
+  GST_DEBUG ("changing state");
   switch (GST_STATE_TRANSITION (element)) {
     case GST_STATE_NULL_TO_READY:
       gst_ladspa_activate(ladspa);
@@ -722,7 +722,7 @@ gst_ladspa_activate(GstLADSPA *ladspa)
     gst_ladspa_deactivate(ladspa);
   }
   
-  GST_DEBUG (0, "activating");
+  GST_DEBUG ("activating");
 
   /* activate the plugin (function might be null) */
   if (desc->activate != NULL) {
@@ -738,7 +738,7 @@ gst_ladspa_deactivate(GstLADSPA *ladspa)
   LADSPA_Descriptor *desc;
   desc = ladspa->descriptor;
 
-  GST_DEBUG (0, "deactivating");
+  GST_DEBUG ("deactivating");
 
   /* deactivate the plugin (function might be null) */
   if (ladspa->activated && (desc->deactivate != NULL)) {
@@ -776,11 +776,11 @@ gst_ladspa_loop(GstElement *element)
   
   /* find a bufferpool */
   if (numsrcpads > 0 && (bufpool = gst_pad_get_bufferpool (ladspa->srcpads[0]))) {
-    GST_DEBUG (0, "Got bufferpool from first source pad");
+    GST_DEBUG ("Got bufferpool from first source pad");
   } else {
     bufferbytesize = sizeof (LADSPA_Data) * ladspa->buffersize;
     bufpool = gst_buffer_pool_get_default (bufferbytesize, ladspa->numbuffers);
-    GST_DEBUG (0, "Created default bufferpool, %d x %d bytes", ladspa->numbuffers, bufferbytesize);
+    GST_DEBUG ("Created default bufferpool, %d x %d bytes", ladspa->numbuffers, bufferbytesize);
   }
 
   /* get the bytestreams for each pad */
@@ -803,7 +803,7 @@ gst_ladspa_loop(GstElement *element)
     num_empty_pads = 0;
     /* first get all the necessary data from the input ports */
     for (i=0 ; i<numsinkpads ; i++){  
-      GST_DEBUG (0, "pulling %u bytes through channel %d's bytestream", bufferbytesize, i);
+      GST_DEBUG ("pulling %u bytes through channel %d's bytestream", bufferbytesize, i);
       got_bytes = gst_bytestream_read (bytestreams[i], buffers_in + i, bufferbytesize);
 
       if (got_bytes != bufferbytesize) {
@@ -814,7 +814,7 @@ gst_ladspa_loop(GstElement *element)
           /* if we get an EOS event from one of our sink pads, we assume that
              pad's finished handling data. delete the bytestream, free up the
              pad, and free up the memory associated with the input channel. */
-          GST_DEBUG (0, "got an EOS event on sinkpad %d", i);
+          GST_DEBUG ("got an EOS event on sinkpad %d", i);
         }
         /* CHECKME should maybe check for other events and try to pull more data here */
         num_empty_pads++;
@@ -845,7 +845,7 @@ gst_ladspa_loop(GstElement *element)
       else {
         /* all pads have EOS, time to quit */
         /* CHECKME do I have to push EOS events here? */
-        GST_DEBUG (0, "All sink pads have EOS, finishing.");
+        GST_DEBUG ("All sink pads have EOS, finishing.");
         break;
       }
     }
@@ -878,7 +878,7 @@ gst_ladspa_loop(GstElement *element)
     }
     
     for (i=0 ; i<numsrcpads ; i++) {
-      GST_DEBUG (0, "pushing buffer (%p) on src pad %d", buffers_out[i], i);
+      GST_DEBUG ("pushing buffer (%p) on src pad %d", buffers_out[i], i);
       gst_pad_push (ladspa->srcpads[i], buffers_out[i]);
       
       data_out[i] = NULL;
diff --git a/ext/lcs/gstcolorspace.c b/ext/lcs/gstcolorspace.c
index ff9e43b0..c457f9a7 100644
--- a/ext/lcs/gstcolorspace.c
+++ b/ext/lcs/gstcolorspace.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <gst/gst.h>
 #include <lcs/lcs.h>
 
@@ -181,7 +184,7 @@ colorspace_find_lcs_format (GstCaps *caps)
     format = lcs_format_new_simple_rgb_packed (red_bits, green_bits, blue_bits, 0,
 		    red_shift, green_shift, blue_shift, 0, depth, G_BYTE_ORDER);
 
-    GST_DEBUG (GST_CAT_NEGOTIATION, "%lu %lu %lu %lu %lu %lu %u %s\n", red_bits, green_bits, blue_bits, 
+    GST_DEBUG ("%lu %lu %lu %lu %lu %lu %u %s\n", red_bits, green_bits, blue_bits, 
 		    red_shift, green_shift, blue_shift, depth, lcs_format_get_layout (format));
   }
   else {
@@ -210,11 +213,11 @@ colorspace_setup_converter (GstColorspace *space, GstCaps *from_caps, GstCaps *t
   from_format 	= colorspace_find_lcs_format (from_caps);
   to_format 	= colorspace_find_lcs_format (to_caps);
 	  
-  GST_DEBUG (GST_CAT_NEGOTIATION, "trying from %4.4s to %4.4s\n", (gchar*)&from_space, (gchar*)&to_space);
+  GST_DEBUG ("trying from %4.4s to %4.4s\n", (gchar*)&from_space, (gchar*)&to_space);
   space->converter = lcs_get_converter (from_format, to_format, LCS_FLAG_FAST);
 
   if (space->converter) {
-    GST_DEBUG (GST_CAT_NEGOTIATION, "converting from %4.4s to %4.4s\n", (gchar*)&from_space, (gchar*)&to_space);
+    GST_DEBUG ("converting from %4.4s to %4.4s\n", (gchar*)&from_space, (gchar*)&to_space);
     space->type = GST_COLORSPACE_LCS;
     return TRUE;
   }
@@ -258,7 +261,7 @@ gst_colorspace_sinkconnect (GstPad *pad, GstCaps *caps)
   gst_caps_get_int (caps, "width", &space->width);
   gst_caps_get_int (caps, "height", &space->height);
 
-  GST_INFO (GST_CAT_PROPERTIES, "size: %dx%d", space->width, space->height);
+  GST_INFO ( "size: %dx%d", space->width, space->height);
 
   space->sinkcaps = caps;
 
diff --git a/ext/libfame/gstfamedec.c b/ext/libfame/gstfamedec.c
index abab52bc..03805f84 100644
--- a/ext/libfame/gstfamedec.c
+++ b/ext/libfame/gstfamedec.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <fame.h>
 #include <string.h>
 
@@ -309,7 +312,7 @@ gst_famedec_sinkconnect (GstPad *pad, GstCaps *caps)
     return GST_PAD_LINK_DELAYED;
 
   if (famedec->initialized) {
-    GST_DEBUG(0, "error: famedec decoder already initialized !");
+    GST_DEBUG ("error: famedec decoder already initialized !");
     return GST_PAD_LINK_REFUSED;
   }
 
@@ -412,7 +415,7 @@ gst_famedec_chain (GstPad *pad, GstBuffer *buf)
   data = (guchar *) GST_BUFFER_DATA (buf);
   size = GST_BUFFER_SIZE (buf);
 
-  GST_DEBUG (0,"gst_famedec_chain: got buffer of %ld bytes in '%s'", 
+  GST_DEBUG ("gst_famedec_chain: got buffer of %ld bytes in '%s'", 
 	     size, GST_OBJECT_NAME (famedec));
 
   /* the data contains the three planes side by side, with size w * h, w * h /4,
@@ -442,7 +445,7 @@ gst_famedec_chain (GstPad *pad, GstBuffer *buf)
     GST_BUFFER_DATA (outbuf) = g_malloc (length);
     memcpy (GST_BUFFER_DATA(outbuf), famedec->buffer, length);
 
-    GST_DEBUG (0,"gst_famedec_chain: pushing buffer of size %d",
+    GST_DEBUG ("gst_famedec_chain: pushing buffer of size %d",
                GST_BUFFER_SIZE(outbuf));
 
     gst_pad_push (famedec->srcpad, outbuf);
@@ -463,7 +466,7 @@ gst_famedec_set_property (GObject *object, guint prop_id,
   famedec = GST_FAMEENC (object);
 
   if (famedec->initialized) {
-    GST_DEBUG(0, "error: famedec decoder already initialized, cannot set properties !");
+    GST_DEBUG ("error: famedec decoder already initialized, cannot set properties !");
     return;
   }
 
diff --git a/ext/libfame/gstlibfame.c b/ext/libfame/gstlibfame.c
index fdeaaa7f..45ffee4e 100644
--- a/ext/libfame/gstlibfame.c
+++ b/ext/libfame/gstlibfame.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <fame.h>
 #include <string.h>
 
@@ -308,7 +311,7 @@ gst_fameenc_sinkconnect (GstPad *pad, GstCaps *caps)
     return GST_PAD_LINK_DELAYED;
 
   if (fameenc->initialized) {
-    GST_DEBUG(0, "error: fameenc encoder already initialized !");
+    GST_DEBUG ("error: fameenc encoder already initialized !");
     return GST_PAD_LINK_REFUSED;
   }
 
@@ -415,7 +418,7 @@ gst_fameenc_chain (GstPad *pad, GstBuffer *buf)
   data = (guchar *) GST_BUFFER_DATA (buf);
   size = GST_BUFFER_SIZE (buf);
 
-  GST_DEBUG (0,"gst_fameenc_chain: got buffer of %ld bytes in '%s'", 
+  GST_DEBUG ("gst_fameenc_chain: got buffer of %ld bytes in '%s'", 
 	     size, GST_OBJECT_NAME (fameenc));
 
   /* the data contains the three planes side by side, with size w * h, w * h /4,
@@ -453,7 +456,7 @@ gst_fameenc_chain (GstPad *pad, GstBuffer *buf)
     memcpy (GST_BUFFER_DATA(outbuf), fameenc->buffer, length);
     GST_BUFFER_TIMESTAMP (outbuf) = GST_BUFFER_TIMESTAMP (buf);
 
-    GST_DEBUG (0,"gst_fameenc_chain: pushing buffer of size %d",
+    GST_DEBUG ("gst_fameenc_chain: pushing buffer of size %d",
                GST_BUFFER_SIZE(outbuf));
 
     gst_pad_push (fameenc->srcpad, outbuf);
@@ -474,7 +477,7 @@ gst_fameenc_set_property (GObject *object, guint prop_id,
   fameenc = GST_FAMEENC (object);
 
   if (fameenc->initialized) {
-    GST_DEBUG(0, "error: fameenc encoder already initialized, cannot set properties !");
+    GST_DEBUG ("error: fameenc encoder already initialized, cannot set properties !");
     return;
   }
 
diff --git a/ext/mas/massink.c b/ext/mas/massink.c
index 1b965beb..281418d1 100644
--- a/ext/mas/massink.c
+++ b/ext/mas/massink.c
@@ -18,6 +18,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "massink.h"
 
 #define  BUFFER_SIZE           640
@@ -218,14 +221,14 @@ gst_massink_chain (GstPad *pad, GstBuffer *buf)
   if (massink->clock) {
     GstClockID id = gst_clock_new_single_shot_id (massink->clock, GST_BUFFER_TIMESTAMP (buf));
 
-    GST_DEBUG (0, "massink: clock wait: %llu\n", GST_BUFFER_TIMESTAMP (buf));
+    GST_DEBUG ("massink: clock wait: %llu\n", GST_BUFFER_TIMESTAMP (buf));
     gst_element_clock_wait (GST_ELEMENT (massink), id, NULL);
     gst_clock_id_free (id);
   }
 
   if (GST_BUFFER_DATA (buf) != NULL) {
     if (!massink->mute) {
-      GST_DEBUG (0, "massink: data=%p size=%d", GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf));
+      GST_DEBUG ("massink: data=%p size=%d", GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf));
       if (GST_BUFFER_SIZE (buf) > BUFFER_SIZE) {
   	gst_buffer_unref (buf);
 	return;
@@ -357,19 +360,19 @@ gst_massink_open_audio (GstMassink *massink)
   err = mas_init();
     
   if (err < 0) {
-     GST_DEBUG(err, "connection with local MAS server failed.");
+     GST_DEBUG ("connection with local MAS server failed.");
      exit (1);
   }    
     
-  GST_DEBUG (0, "Establishing audio output channel.");
+  GST_DEBUG ("Establishing audio output channel.");
   mas_make_data_channel ("Gstreamer", &massink->audio_channel, &massink->audio_source, &massink->audio_sink);
   mas_asm_get_port_by_name (0, "default_mix_sink", &massink->mix_sink);
 
-  GST_DEBUG (0, "Instantiating endian device.");
+  GST_DEBUG ("Instantiating endian device.");
   err = mas_asm_instantiate_device ("endian", 0, 0, &massink->endian);
     
   if (err < 0) {
-     GST_DEBUG(0, "Failed to instantiate endian converter device");
+     GST_DEBUG ("Failed to instantiate endian converter device");
      exit(1);
   }
   
@@ -379,7 +382,7 @@ gst_massink_open_audio (GstMassink *massink)
   sprintf (bps, "%u", massink->depth);
   sprintf (ratestring, "%u", massink->frequency);
 
-  GST_DEBUG (0, "Connecting net -> endian.");
+  GST_DEBUG ("Connecting net -> endian.");
   masc_make_dc (&dc, 6);
     
   /* wav weirdness: 8 bit data is unsigned, >8 data is signed. */
@@ -391,7 +394,7 @@ gst_massink_open_audio (GstMassink *massink)
   err = mas_asm_connect_source_sink (massink->audio_source, massink->endian_sink, dc);
   
   if ( err < 0 ) {
-     GST_DEBUG(err, "Failed to connect net audio output to endian");
+     GST_DEBUG ("Failed to connect net audio output to endian");
      return -1;
   }
     
@@ -404,17 +407,17 @@ gst_massink_open_audio (GstMassink *massink)
   massink->open_source = massink->endian_source;
     
   if (massink->depth != 16) {
-     GST_DEBUG (0, "Sample resolution is not 16 bit/sample, instantiating squant device.");
+     GST_DEBUG ("Sample resolution is not 16 bit/sample, instantiating squant device.");
      err = mas_asm_instantiate_device ("squant", 0, 0, &massink->squant);
      if (err < 0) {
-	 GST_DEBUG(err, "Failed to instantiate squant device");
+	 GST_DEBUG ("Failed to instantiate squant device");
          return -1;
      }
 	
      mas_asm_get_port_by_name (massink->squant, "squant_sink", &massink->squant_sink);
      mas_asm_get_port_by_name (massink->squant, "squant_source", &massink->squant_source);
 
-     GST_DEBUG (0, "Connecting endian -> squant.");
+     GST_DEBUG ("Connecting endian -> squant.");
 
      masc_make_dc (&dc, 6);
      masc_append_dc_key_value (dc,"format",(massink->depth==8) ? "ulinear":"linear");
@@ -425,7 +428,7 @@ gst_massink_open_audio (GstMassink *massink)
      err = mas_asm_connect_source_sink (massink->endian_source, massink->squant_sink, dc);
         
      if (err < 0) {
-        GST_DEBUG(err, "Failed to connect endian output to squant");
+        GST_DEBUG ("Failed to connect endian output to squant");
         return -1;
     }
 
@@ -436,18 +439,18 @@ gst_massink_open_audio (GstMassink *massink)
     
    /* Another 'if necessary' device, as above */
    if (massink->frequency != 44100) {
-     GST_DEBUG (0, "Sample rate is not 44100, instantiating srate device.");
+     GST_DEBUG ("Sample rate is not 44100, instantiating srate device.");
      err = mas_asm_instantiate_device ("srate", 0, 0, &massink->srate);
 	
      if (err < 0) {
-	GST_DEBUG (err, "Failed to instantiate srate device");
+	GST_DEBUG ("Failed to instantiate srate device");
         return -1;
      }
 	
      mas_asm_get_port_by_name (massink->srate, "sink", &massink->srate_sink);
      mas_asm_get_port_by_name (massink->srate, "source", &massink->srate_source);
 	
-     GST_DEBUG (0, "Connecting to srate.");
+     GST_DEBUG ("Connecting to srate.");
      masc_make_dc (&dc, 6);
      masc_append_dc_key_value (dc, "format", "linear");
      masc_append_dc_key_value (dc, "resolution", "16");
@@ -458,7 +461,7 @@ gst_massink_open_audio (GstMassink *massink)
      err = mas_asm_connect_source_sink (massink->open_source, massink->srate_sink, dc);
 	
      if ( err < 0 ) {
-	GST_DEBUG(err, "Failed to connect to srate");
+	GST_DEBUG ("Failed to connect to srate");
         return -1;
      }
 
@@ -466,7 +469,7 @@ gst_massink_open_audio (GstMassink *massink)
      massink->open_source = massink->srate_source;        
   }
 
-  GST_DEBUG(0, "Connecting to mix.");
+  GST_DEBUG ("Connecting to mix.");
   masc_make_dc(&dc, 6);
   masc_append_dc_key_value (dc, "format", "linear");
   masc_append_dc_key_value (dc, "resolution", "16");
@@ -477,7 +480,7 @@ gst_massink_open_audio (GstMassink *massink)
   err = mas_asm_connect_source_sink (massink->open_source, massink->mix_sink, dc);
     
   if ( err < 0 ) {
-    GST_DEBUG(err, "Failed to connect to mixer");
+    GST_DEBUG ("Failed to connect to mixer");
     return -1;
   }
   
@@ -519,7 +522,7 @@ gst_massink_close_audio (GstMassink *massink)
   
   GST_FLAG_UNSET (massink, GST_MASSINK_OPEN);
 
-  GST_DEBUG (0, "massink: closed sound channel");
+  GST_DEBUG ("massink: closed sound channel");
 }*/
 
 static GstElementStateReturn
diff --git a/ext/sdl/sdlvideosink.c b/ext/sdl/sdlvideosink.c
index ee6da2bb..eb5c2cc4 100644
--- a/ext/sdl/sdlvideosink.c
+++ b/ext/sdl/sdlvideosink.c
@@ -19,6 +19,9 @@
 
 /* let's not forget to mention that all this was based on aasink ;-) */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <config.h>
 #include <signal.h>
 #include <string.h>
@@ -342,7 +345,7 @@ gst_sdlvideosink_create (GstSDLVideoSink *sdlvideosink, gboolean showlogo)
   else
     SDL_DisplayYUVOverlay(sdlvideosink->yuv_overlay, &(sdlvideosink->rect));
 
-  GST_DEBUG (0, "sdlvideosink: setting %08lx (" GST_FOURCC_FORMAT ")", sdlvideosink->format, GST_FOURCC_ARGS(sdlvideosink->format));
+  GST_DEBUG ("sdlvideosink: setting %08lx (" GST_FOURCC_FORMAT ")", sdlvideosink->format, GST_FOURCC_ARGS(sdlvideosink->format));
   
   /* TODO: is this the width of the input image stream or of the widget? */
   g_signal_emit (G_OBJECT (sdlvideosink), gst_sdlvideosink_signals[SIGNAL_HAVE_SIZE], 0,
@@ -440,7 +443,7 @@ gst_sdlvideosink_chain (GstPad *pad, GstBuffer *buf)
     return;
   }
 
-  GST_DEBUG (0,"videosink: clock wait: %" G_GUINT64_FORMAT, GST_BUFFER_TIMESTAMP(buf));
+  GST_DEBUG ("videosink: clock wait: %" G_GUINT64_FORMAT, GST_BUFFER_TIMESTAMP(buf));
   if (sdlvideosink->clock) {
     GstClockID id = gst_clock_new_single_shot_id (sdlvideosink->clock, GST_BUFFER_TIMESTAMP (buf));
 
diff --git a/ext/shout/gstshout.c b/ext/shout/gstshout.c
index 1b8b3697..a17c0c8c 100644
--- a/ext/shout/gstshout.c
+++ b/ext/shout/gstshout.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "gstshout.h"
 
 /* elementfactory information */
@@ -393,7 +396,7 @@ gst_icecastsend_change_state (GstElement *element)
 
   icecastsend = GST_ICECASTSEND(element);
 
-  GST_DEBUG (0,"state pending %d", GST_STATE_PENDING (element));
+  GST_DEBUG ("state pending %d", GST_STATE_PENDING (element));
 
   /* if going down into NULL state, close the file if it's open */
   switch (GST_STATE_TRANSITION (element)) {
diff --git a/ext/smoothwave/gstsmoothwave.c b/ext/smoothwave/gstsmoothwave.c
index 7e2917b4..e6a55fcd 100644
--- a/ext/smoothwave/gstsmoothwave.c
+++ b/ext/smoothwave/gstsmoothwave.c
@@ -18,6 +18,9 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string.h>
 
 #include "gstsmoothwave.h"
@@ -125,12 +128,12 @@ gst_smoothwave_init (GstSmoothWave *smoothwave)
 /*  gtk_widget_set_default_colormap (gdk_rgb_get_cmap()); */
 /*  gtk_widget_set_default_visual (gdk_rgb_get_visual()); */
 
-/*  GST_DEBUG (0,"creating palette"); */
+/*  GST_DEBUG ("creating palette"); */
   for (i=0;i<256;i++)
     palette[i] = (i << 16) || (i << 8);
-/*  GST_DEBUG (0,"creating cmap"); */
+/*  GST_DEBUG ("creating cmap"); */
   smoothwave->cmap = gdk_rgb_cmap_new(palette,256);
-/*  GST_DEBUG (0,"created cmap"); */
+/*  GST_DEBUG ("created cmap"); */
 /*  gtk_widget_set_default_colormap (smoothwave->cmap); */
 
   smoothwave->image = gtk_drawing_area_new();
@@ -176,7 +179,7 @@ gst_smoothwave_chain (GstPad *pad, GstBuffer *buf)
 
   qheight = smoothwave->height/4;
 
-/*  GST_DEBUG (0,"traversing %d",smoothwave->width); */
+/*  GST_DEBUG ("traversing %d",smoothwave->width); */
   for (i=0;i<MAX(smoothwave->width,samplecount);i++) {
     gint16 y1 = (gint32)(samples[i*2] * qheight) / 32768 +
                 qheight;
@@ -195,8 +198,8 @@ gst_smoothwave_chain (GstPad *pad, GstBuffer *buf)
       ptr++;
   }
 
-/*  GST_DEBUG (0,"drawing"); */
-/*  GST_DEBUG (0,"gdk_draw_indexed_image(%p,%p,%d,%d,%d,%d,%s,%p,%d,%p);",
+/*  GST_DEBUG ("drawing"); */
+/*  GST_DEBUG ("gdk_draw_indexed_image(%p,%p,%d,%d,%d,%d,%s,%p,%d,%p);",
         smoothwave->image->window,
 	smoothwave->image->style->fg_gc[GTK_STATE_NORMAL],
 	0,0,smoothwave->width,smoothwave->height,
diff --git a/ext/snapshot/gstsnapshot.c b/ext/snapshot/gstsnapshot.c
index 2a33f1f0..6af87f2c 100644
--- a/ext/snapshot/gstsnapshot.c
+++ b/ext/snapshot/gstsnapshot.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string.h>
 #include <inttypes.h>
 
@@ -263,7 +266,7 @@ gst_snapshot_chain (GstPad *pad, GstBuffer *buf)
   data = GST_BUFFER_DATA(buf);
   size = GST_BUFFER_SIZE(buf);
 
-  GST_DEBUG (0,"snapshot: have buffer of %d\n", GST_BUFFER_SIZE(buf));
+  GST_DEBUG ("snapshot: have buffer of %d\n", GST_BUFFER_SIZE(buf));
 
   outbuf = gst_buffer_new();
   GST_BUFFER_DATA(outbuf) = g_malloc(GST_BUFFER_SIZE(buf));
@@ -278,7 +281,7 @@ gst_snapshot_chain (GstPad *pad, GstBuffer *buf)
 
     if ( snapshot->format == GST_MAKE_FOURCC('Y','U','Y','2') )
     {
-      GST_DEBUG(0, "YUY2 => RGB\n");
+      GST_DEBUG ("YUY2 => RGB\n");
       buffer_i420 = g_malloc ((image_size * (snapshot->to_bpp/8)) );
       gst_colorspace_yuy2_to_i420( data, buffer_i420, snapshot->width, snapshot->height);
       data_to_convert = buffer_i420;
@@ -288,7 +291,7 @@ gst_snapshot_chain (GstPad *pad, GstBuffer *buf)
 
     gst_colorspace_convert (snapshot->converter, data_to_convert, data_converted); 
 
-    GST_INFO (0,"dumpfile : %s\n", snapshot->location );
+    GST_INFO ("dumpfile : %s\n", snapshot->location );
     fp = fopen( snapshot->location, "wb" );
     if ( fp == NULL )
       g_warning(" Can not open %s\n", snapshot->location );
diff --git a/ext/sndfile/gstsf.c b/ext/sndfile/gstsf.c
index 195d1721..2c5245b4 100644
--- a/ext/sndfile/gstsf.c
+++ b/ext/sndfile/gstsf.c
@@ -22,6 +22,9 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <gst/gst.h>
 #include <string.h>
 #include "gstsf.h"
@@ -322,7 +325,7 @@ gst_sf_request_new_pad (GstElement *element, GstPadTemplate *templ,
   this->channels = g_list_append (this->channels, channel);
   this->channelcount++;
   
-  GST_DEBUG (0, "sf added pad %s\n", name);
+  GST_DEBUG ("sf added pad %s\n", name);
 
   g_free (name);
   return channel->pad;
diff --git a/ext/swfdec/gstswfdec.c b/ext/swfdec/gstswfdec.c
index 8b0ec9d3..13920197 100644
--- a/ext/swfdec/gstswfdec.c
+++ b/ext/swfdec/gstswfdec.c
@@ -18,6 +18,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "gstswfdec.h"
 #include <string.h>
 
@@ -568,7 +571,7 @@ gst_swfdec_change_state (GstElement *element)
 #if 0
       swfdec->pool = gst_pad_get_bufferpool (swfdec->videopad);
       if (swfdec->pool)
-        GST_INFO (GST_CAT_PLUGIN_INFO, "got pool %p", swfdec->pool);
+        GST_INFO ( "got pool %p", swfdec->pool);
 #endif
       break;
     case GST_STATE_PLAYING_TO_PAUSED:
diff --git a/ext/tarkin/gsttarkindec.c b/ext/tarkin/gsttarkindec.c
index 11d5f1ad..7d2c42c0 100644
--- a/ext/tarkin/gsttarkindec.c
+++ b/ext/tarkin/gsttarkindec.c
@@ -18,6 +18,9 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/ext/tarkin/gsttarkinenc.c b/ext/tarkin/gsttarkinenc.c
index 327b38fd..ff3d295e 100644
--- a/ext/tarkin/gsttarkinenc.c
+++ b/ext/tarkin/gsttarkinenc.c
@@ -18,6 +18,9 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/ext/xvid/gstxviddec.c b/ext/xvid/gstxviddec.c
index 34f373d7..cd4ce3f5 100644
--- a/ext/xvid/gstxviddec.c
+++ b/ext/xvid/gstxviddec.c
@@ -18,6 +18,9 @@
  */
 
 #ifdef HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "config.h"
 #endif
 
diff --git a/ext/xvid/gstxvidenc.c b/ext/xvid/gstxvidenc.c
index 5b97c69d..7b3d62dd 100644
--- a/ext/xvid/gstxvidenc.c
+++ b/ext/xvid/gstxvidenc.c
@@ -18,6 +18,9 @@
  */
 
 #ifdef HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "config.h"
 #endif