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.

37 files changed, 300 insertions, 190 deletions

diff --git a/gst/audiofx/audiowsincband.c b/gst/audiofx/audiowsincband.c
index 7ee8680b..0e57a747 100644
--- a/gst/audiofx/audiowsincband.c
+++ b/gst/audiofx/audiowsincband.c
@@ -30,6 +30,9 @@
  * - this might be improved upon with bytestream
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <gst/gst.h>
 #include "gstfilter.h"
 #include <math.h>		/* M_PI */
@@ -197,7 +200,7 @@ gst_bpwsinc_sink_connect (GstPad * pad, GstCaps * caps)
   {
     len = filter->wing_size;
     /* fill the lp kernel */
-    GST_DEBUG (GST_CAT_PLUGIN_INFO, 
+    GST_DEBUG (
 	       "bpwsinc: initializing LP kernel of length %d with cut-off %f", 
 	       len * 2 + 1, filter->lower_frequency);
     kernel_lp = (double *) g_malloc (sizeof (double) * (2 * len + 1));
@@ -220,7 +223,7 @@ gst_bpwsinc_sink_connect (GstPad * pad, GstCaps * caps)
     for (i = 0; i <= len * 2; ++i) kernel_lp[i] /= sum;
 
     /* fill the hp kernel */
-    GST_DEBUG (GST_CAT_PLUGIN_INFO, 
+    GST_DEBUG (
 	       "bpwsinc: initializing HP kernel of length %d with cut-off %f", 
 	       len * 2 + 1, filter->upper_frequency);
     kernel_hp = (double *) g_malloc (sizeof (double) * (2 * len + 1));
diff --git a/gst/audiofx/audiowsinclimit.c b/gst/audiofx/audiowsinclimit.c
index 74cea70e..64e104d6 100644
--- a/gst/audiofx/audiowsinclimit.c
+++ b/gst/audiofx/audiowsinclimit.c
@@ -30,6 +30,9 @@
  * - this might be improved upon with bytestream
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <gst/gst.h>
 #include "gstfilter.h"
 #include <math.h>		/* M_PI */
@@ -189,7 +192,7 @@ gst_lpwsinc_sink_connect (GstPad * pad, GstCaps * caps)
     /* fill the kernel */
     g_print ("DEBUG: initing filter kernel\n");
     len = filter->wing_size;
-    GST_DEBUG (GST_CAT_PLUGIN_INFO, 
+    GST_DEBUG (
 	       "lpwsinc: initializing filter kernel of length %d", len * 2 + 1);
     filter->kernel = (double *) g_malloc (sizeof (double) * (2 * len + 1));
 
diff --git a/gst/auparse/gstauparse.c b/gst/auparse/gstauparse.c
index 269766a2..d9eeb8e0 100644
--- a/gst/auparse/gstauparse.c
+++ b/gst/auparse/gstauparse.c
@@ -21,6 +21,9 @@
  *              Zaheer Merali <zaheer@grid9.net
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <stdlib.h>
 #include <string.h>
 
@@ -182,7 +185,7 @@ gst_auparse_chain (GstPad *pad, GstBuffer *buf)
 
   auparse = GST_AUPARSE (gst_pad_get_parent (pad));
   
-  GST_DEBUG (0, "gst_auparse_chain: got buffer in '%s'",
+  GST_DEBUG ("gst_auparse_chain: got buffer in '%s'",
           gst_element_get_name (GST_ELEMENT (auparse)));
 
   data = GST_BUFFER_DATA (buf);
@@ -234,7 +237,7 @@ gst_auparse_chain (GstPad *pad, GstBuffer *buf)
     g_print ("offset %ld, size %ld, encoding %ld, frequency %ld, channels %ld\n",
              auparse->offset,auparse->size,auparse->encoding,
              auparse->frequency,auparse->channels);
-    GST_DEBUG (0, "offset %ld, size %ld, encoding %ld, frequency %ld, channels %ld",
+    GST_DEBUG ("offset %ld, size %ld, encoding %ld, frequency %ld, channels %ld",
              auparse->offset,auparse->size,auparse->encoding,
              auparse->frequency,auparse->channels);
     
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index 7c9bd462..77ff97f6 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -19,6 +19,9 @@
 
 
 /* #define GST_DEBUG_ENABLED */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string.h>
 
 #include "gstavidemux.h"
@@ -268,7 +271,7 @@ avi_type_find (GstBuffer *buf,
   gchar *data = GST_BUFFER_DATA (buf);
   GstCaps *new;
 
-  GST_DEBUG (0,"avi_demux: typefind");
+  GST_DEBUG ("avi_demux: typefind");
 
   if (GUINT32_FROM_LE (((guint32 *)data)[0]) != GST_RIFF_TAG_RIFF)
     return NULL;
@@ -308,21 +311,21 @@ gst_avi_demux_avih (GstAviDemux *avi_demux)
     avi_demux->avih.start 	= GUINT32_FROM_LE (avih->start);
     avi_demux->avih.length 	= GUINT32_FROM_LE (avih->length);
 
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: avih tag found");
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  us_frame    %d", avi_demux->avih.us_frame);
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  max_bps     %d", avi_demux->avih.max_bps);
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  pad_gran    %d", avi_demux->avih.pad_gran);
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  flags       0x%08x", avi_demux->avih.flags);
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  tot_frames  %d", avi_demux->avih.tot_frames);
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  init_frames %d", avi_demux->avih.init_frames);
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  streams     %d", avi_demux->avih.streams);
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  bufsize     %d", avi_demux->avih.bufsize);
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  width       %d", avi_demux->avih.width);
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  height      %d", avi_demux->avih.height);
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  scale       %d", avi_demux->avih.scale);
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  rate        %d", avi_demux->avih.rate);
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  start       %d", avi_demux->avih.start);
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  length      %d", avi_demux->avih.length);
+    GST_INFO ( "gst_avi_demux: avih tag found");
+    GST_INFO ( "gst_avi_demux:  us_frame    %d", avi_demux->avih.us_frame);
+    GST_INFO ( "gst_avi_demux:  max_bps     %d", avi_demux->avih.max_bps);
+    GST_INFO ( "gst_avi_demux:  pad_gran    %d", avi_demux->avih.pad_gran);
+    GST_INFO ( "gst_avi_demux:  flags       0x%08x", avi_demux->avih.flags);
+    GST_INFO ( "gst_avi_demux:  tot_frames  %d", avi_demux->avih.tot_frames);
+    GST_INFO ( "gst_avi_demux:  init_frames %d", avi_demux->avih.init_frames);
+    GST_INFO ( "gst_avi_demux:  streams     %d", avi_demux->avih.streams);
+    GST_INFO ( "gst_avi_demux:  bufsize     %d", avi_demux->avih.bufsize);
+    GST_INFO ( "gst_avi_demux:  width       %d", avi_demux->avih.width);
+    GST_INFO ( "gst_avi_demux:  height      %d", avi_demux->avih.height);
+    GST_INFO ( "gst_avi_demux:  scale       %d", avi_demux->avih.scale);
+    GST_INFO ( "gst_avi_demux:  rate        %d", avi_demux->avih.rate);
+    GST_INFO ( "gst_avi_demux:  start       %d", avi_demux->avih.start);
+    GST_INFO ( "gst_avi_demux:  length      %d", avi_demux->avih.length);
 
     return TRUE;
   }
@@ -367,21 +370,21 @@ gst_avi_demux_strh (GstAviDemux *avi_demux)
     if (!target->strh.rate)
       target->strh.rate = 1; /* avoid division by zero */
 
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: strh tag found");
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  type        0x%08x (%s)", 
+    GST_INFO ( "gst_avi_demux: strh tag found");
+    GST_INFO ( "gst_avi_demux:  type        0x%08x (%s)", 
   		  target->strh.type, gst_riff_id_to_fourcc (strh->type));
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  fcc_handler 0x%08x (%s)", 
+    GST_INFO ( "gst_avi_demux:  fcc_handler 0x%08x (%s)", 
 		  target->strh.fcc_handler, gst_riff_id_to_fourcc (strh->fcc_handler));
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  flags       0x%08x", strh->flags);
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  priority    %d", target->strh.priority);
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  init_frames %d", target->strh.init_frames);
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  scale       %d", target->strh.scale);
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  rate        %d", target->strh.rate);
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  start       %d", target->strh.start);
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  length      %d", target->strh.length);
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  bufsize     %d", target->strh.bufsize);
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  quality     %d", target->strh.quality);
-    GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  samplesize  %d", target->strh.samplesize);
+    GST_INFO ( "gst_avi_demux:  flags       0x%08x", strh->flags);
+    GST_INFO ( "gst_avi_demux:  priority    %d", target->strh.priority);
+    GST_INFO ( "gst_avi_demux:  init_frames %d", target->strh.init_frames);
+    GST_INFO ( "gst_avi_demux:  scale       %d", target->strh.scale);
+    GST_INFO ( "gst_avi_demux:  rate        %d", target->strh.rate);
+    GST_INFO ( "gst_avi_demux:  start       %d", target->strh.start);
+    GST_INFO ( "gst_avi_demux:  length      %d", target->strh.length);
+    GST_INFO ( "gst_avi_demux:  bufsize     %d", target->strh.bufsize);
+    GST_INFO ( "gst_avi_demux:  quality     %d", target->strh.quality);
+    GST_INFO ( "gst_avi_demux:  samplesize  %d", target->strh.samplesize);
 
     target->delay = 0LL;
     target->total_bytes = 0LL;
@@ -424,7 +427,7 @@ gst_avi_demux_strn (GstAviDemux *avi_demux, gint len)
   if (got_bytes != len)
     return;
 
-  GST_DEBUG (0, "Stream name: \"%s\"", name);
+  GST_DEBUG ("Stream name: \"%s\"", name);
 }
 
 static void
@@ -592,19 +595,19 @@ gst_avi_demux_strf_vids (GstAviDemux *avi_demux)
   if (got_bytes != sizeof (gst_riff_strf_vids))
     return;
 
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: strf tag found in context vids");
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  size        %d", GUINT32_FROM_LE (strf->size));
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  width       %d", GUINT32_FROM_LE (strf->width));
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  height      %d", GUINT32_FROM_LE (strf->height));
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  planes      %d", GUINT16_FROM_LE (strf->planes));
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  bit_cnt     %d", GUINT16_FROM_LE (strf->bit_cnt));
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  compression 0x%08x (%s)", 
+  GST_INFO ( "gst_avi_demux: strf tag found in context vids");
+  GST_INFO ( "gst_avi_demux:  size        %d", GUINT32_FROM_LE (strf->size));
+  GST_INFO ( "gst_avi_demux:  width       %d", GUINT32_FROM_LE (strf->width));
+  GST_INFO ( "gst_avi_demux:  height      %d", GUINT32_FROM_LE (strf->height));
+  GST_INFO ( "gst_avi_demux:  planes      %d", GUINT16_FROM_LE (strf->planes));
+  GST_INFO ( "gst_avi_demux:  bit_cnt     %d", GUINT16_FROM_LE (strf->bit_cnt));
+  GST_INFO ( "gst_avi_demux:  compression 0x%08x (%s)", 
 		  GUINT32_FROM_LE (strf->compression), gst_riff_id_to_fourcc (strf->compression));
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  image_size  %d", GUINT32_FROM_LE (strf->image_size));
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  xpels_meter %d", GUINT32_FROM_LE (strf->xpels_meter));
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  ypels_meter %d", GUINT32_FROM_LE (strf->ypels_meter));
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  num_colors  %d", GUINT32_FROM_LE (strf->num_colors));
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  imp_colors  %d", GUINT32_FROM_LE (strf->imp_colors));
+  GST_INFO ( "gst_avi_demux:  image_size  %d", GUINT32_FROM_LE (strf->image_size));
+  GST_INFO ( "gst_avi_demux:  xpels_meter %d", GUINT32_FROM_LE (strf->xpels_meter));
+  GST_INFO ( "gst_avi_demux:  ypels_meter %d", GUINT32_FROM_LE (strf->ypels_meter));
+  GST_INFO ( "gst_avi_demux:  num_colors  %d", GUINT32_FROM_LE (strf->num_colors));
+  GST_INFO ( "gst_avi_demux:  imp_colors  %d", GUINT32_FROM_LE (strf->imp_colors));
 
   srcpad =  gst_pad_new_from_template (
 		  GST_PAD_TEMPLATE_GET (src_video_templ), g_strdup_printf ("video_%02d", 
@@ -772,13 +775,13 @@ gst_avi_demux_strf_auds (GstAviDemux *avi_demux)
   if (got_bytes != sizeof (gst_riff_strf_auds))
     return;
 
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: strf tag found in context auds");
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  format      %d", GUINT16_FROM_LE (strf->format));
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  channels    %d", GUINT16_FROM_LE (strf->channels));
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  rate        %d", GUINT32_FROM_LE (strf->rate));
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  av_bps      %d", GUINT32_FROM_LE (strf->av_bps));
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  blockalign  %d", GUINT16_FROM_LE (strf->blockalign));
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  size        %d", GUINT16_FROM_LE (strf->size));
+  GST_INFO ( "gst_avi_demux: strf tag found in context auds");
+  GST_INFO ( "gst_avi_demux:  format      %d", GUINT16_FROM_LE (strf->format));
+  GST_INFO ( "gst_avi_demux:  channels    %d", GUINT16_FROM_LE (strf->channels));
+  GST_INFO ( "gst_avi_demux:  rate        %d", GUINT32_FROM_LE (strf->rate));
+  GST_INFO ( "gst_avi_demux:  av_bps      %d", GUINT32_FROM_LE (strf->av_bps));
+  GST_INFO ( "gst_avi_demux:  blockalign  %d", GUINT16_FROM_LE (strf->blockalign));
+  GST_INFO ( "gst_avi_demux:  size        %d", GUINT16_FROM_LE (strf->size));
 
   srcpad =  gst_pad_new_from_template (
 		  GST_PAD_TEMPLATE_GET (src_audio_templ), g_strdup_printf ("audio_%02d", 
@@ -910,15 +913,15 @@ gst_avi_demux_strf_iavs (GstAviDemux *avi_demux)
   if (got_bytes != sizeof (gst_riff_strf_iavs))
     return;
 
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: strf tag found in context iavs");
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  DVAAuxSrc   %08x", GUINT32_FROM_LE (strf->DVAAuxSrc));
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  DVAAuxCtl   %08x", GUINT32_FROM_LE (strf->DVAAuxCtl));
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  DVAAuxSrc1  %08x", GUINT32_FROM_LE (strf->DVAAuxSrc1));
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  DVAAuxCtl1  %08x", GUINT32_FROM_LE (strf->DVAAuxCtl1));
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  DVVAuxSrc   %08x", GUINT32_FROM_LE (strf->DVVAuxSrc));
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  DVVAuxCtl   %08x", GUINT32_FROM_LE (strf->DVVAuxCtl));
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  DVReserved1 %08x", GUINT32_FROM_LE (strf->DVReserved1));
-  GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux:  DVReserved2 %08x", GUINT32_FROM_LE (strf->DVReserved2));
+  GST_INFO ( "gst_avi_demux: strf tag found in context iavs");
+  GST_INFO ( "gst_avi_demux:  DVAAuxSrc   %08x", GUINT32_FROM_LE (strf->DVAAuxSrc));
+  GST_INFO ( "gst_avi_demux:  DVAAuxCtl   %08x", GUINT32_FROM_LE (strf->DVAAuxCtl));
+  GST_INFO ( "gst_avi_demux:  DVAAuxSrc1  %08x", GUINT32_FROM_LE (strf->DVAAuxSrc1));
+  GST_INFO ( "gst_avi_demux:  DVAAuxCtl1  %08x", GUINT32_FROM_LE (strf->DVAAuxCtl1));
+  GST_INFO ( "gst_avi_demux:  DVVAuxSrc   %08x", GUINT32_FROM_LE (strf->DVVAuxSrc));
+  GST_INFO ( "gst_avi_demux:  DVVAuxCtl   %08x", GUINT32_FROM_LE (strf->DVVAuxCtl));
+  GST_INFO ( "gst_avi_demux:  DVReserved1 %08x", GUINT32_FROM_LE (strf->DVReserved1));
+  GST_INFO ( "gst_avi_demux:  DVReserved2 %08x", GUINT32_FROM_LE (strf->DVReserved2));
 
   srcpad =  gst_pad_new_from_template (
 		  GST_PAD_TEMPLATE_GET (src_video_templ), g_strdup_printf ("video_%02d", 
@@ -966,7 +969,7 @@ gst_avi_demux_strf_iavs (GstAviDemux *avi_demux)
 static void
 gst_avi_debug_entry (const gchar *prefix, gst_avi_index_entry *entry)
 {
-  GST_DEBUG (0, "%s: %05d %d %08llx %05d %14" G_GINT64_FORMAT " %08x %08x (%d) %08x", 
+  GST_DEBUG ("%s: %05d %d %08llx %05d %14" G_GINT64_FORMAT " %08x %08x (%d) %08x", 
 		  prefix, entry->index_nr, entry->stream_nr, 
 		  (unsigned long long)entry->bytes_before, 
 		  entry->frames_before, entry->ts, entry->flags, entry->offset, 
@@ -985,7 +988,7 @@ gst_avi_demux_parse_index (GstAviDemux *avi_demux,
   guint32 id;
 
   if (!gst_bytestream_seek (avi_demux->bs, filepos + offset, GST_SEEK_METHOD_SET)) {
-    GST_INFO (GST_CAT_PLUGIN_INFO, "avidemux: could not seek to index");
+    GST_INFO ( "avidemux: could not seek to index");
     return;
   }
   do {
@@ -1001,7 +1004,7 @@ gst_avi_demux_parse_index (GstAviDemux *avi_demux,
   } while (TRUE);
 
   if (GST_BUFFER_OFFSET (buf) != filepos + offset || GST_BUFFER_SIZE (buf) != 8) {
-    GST_INFO (GST_CAT_PLUGIN_INFO, "avidemux: could not get index, got %" G_GINT64_FORMAT " %d, expected %ld", 
+    GST_INFO ( "avidemux: could not get index, got %" G_GINT64_FORMAT " %d, expected %ld", 
 		    GST_BUFFER_OFFSET (buf), GST_BUFFER_SIZE (buf), filepos + offset);
     goto end;
   }
@@ -1009,7 +1012,7 @@ gst_avi_demux_parse_index (GstAviDemux *avi_demux,
   id = GUINT32_FROM_LE (*(guint32 *)GST_BUFFER_DATA (buf));
 
   if (id != GST_RIFF_TAG_idx1) {
-    GST_INFO (GST_CAT_PLUGIN_INFO, "avidemux: no index found");
+    GST_INFO ( "avidemux: no index found");
     goto end;
   }
 
@@ -1020,12 +1023,12 @@ gst_avi_demux_parse_index (GstAviDemux *avi_demux,
 
   got_bytes = gst_bytestream_read (avi_demux->bs, &buf, index_size);
   if (got_bytes < index_size) {
-    GST_INFO (GST_CAT_PLUGIN_INFO, "avidemux: error reading index");
+    GST_INFO ( "avidemux: error reading index");
     goto end;
   }
 
   avi_demux->index_size = index_size/sizeof(gst_riff_index_entry);
-  GST_INFO (GST_CAT_PLUGIN_INFO, "avidemux: index size %lu", avi_demux->index_size);
+  GST_INFO ( "avidemux: index size %lu", avi_demux->index_size);
 
   avi_demux->index_entries = g_malloc (avi_demux->index_size * sizeof (gst_avi_index_entry));
 
@@ -1089,16 +1092,16 @@ gst_avi_demux_parse_index (GstAviDemux *avi_demux,
     avi_stream_context *stream;
 
     stream = &avi_demux->stream[i];
-    GST_DEBUG (GST_CAT_PLUGIN_INFO, "stream %i: %d frames, %" G_GINT64_FORMAT " bytes", 
+    GST_DEBUG ("stream %i: %d frames, %" G_GINT64_FORMAT " bytes", 
 	       i, stream->total_frames, stream->total_bytes);
   }
   gst_buffer_unref (buf);
 
 end:
-  GST_DEBUG (GST_CAT_PLUGIN_INFO, "index offset at %08lx", filepos);
+  GST_DEBUG ("index offset at %08lx", filepos);
 
   if (!gst_bytestream_seek (avi_demux->bs, filepos, GST_SEEK_METHOD_SET)) {
-    GST_INFO (GST_CAT_PLUGIN_INFO, "avidemux: could not seek back to movi");
+    GST_INFO ( "avidemux: could not seek back to movi");
     return;
   }
 }
@@ -1305,7 +1308,7 @@ gst_avi_demux_sync_streams (GstAviDemux *avi_demux, guint64 time)
   for (i = 0; i < avi_demux->num_streams; i++) {
     stream = &avi_demux->stream[i];
 
-    GST_DEBUG (0, "finding %d for time %" G_GINT64_FORMAT, i, time);
+    GST_DEBUG ("finding %d for time %" G_GINT64_FORMAT, i, time);
 
     entry = gst_avi_demux_index_entry_for_time (avi_demux, stream->num, time, GST_RIFF_IF_KEYFRAME);
     if (entry) {
@@ -1314,7 +1317,7 @@ gst_avi_demux_sync_streams (GstAviDemux *avi_demux, guint64 time)
       min_index = MIN (entry->index_nr, min_index);
     }
   }
-  GST_DEBUG (0, "first index at %d", min_index);
+  GST_DEBUG ("first index at %d", min_index);
   
   /* now we know the entry we need to sync on. calculate number of frames to
    * skip fro there on and the stream stats */
@@ -1332,9 +1335,9 @@ gst_avi_demux_sync_streams (GstAviDemux *avi_demux, guint64 time)
     stream->current_frame = next_entry->frames_before;
     stream->skip = entry->frames_before - next_entry->frames_before;
 
-    GST_DEBUG (0, "%d skip %d", stream->num, stream->skip);
+    GST_DEBUG ("%d skip %d", stream->num, stream->skip);
   }
-  GST_DEBUG (0, "final index at %d", min_index);
+  GST_DEBUG ("final index at %d", min_index);
 
   return min_index;
 }
@@ -1391,7 +1394,7 @@ gst_avi_demux_handle_src_event (GstPad *pad, GstEvent *event)
     case GST_EVENT_SEEK_SEGMENT:
       stream->end_pos = GST_EVENT_SEEK_ENDOFFSET (event);
     case GST_EVENT_SEEK:
-      GST_DEBUG (0, "seek format %d, %08x", GST_EVENT_SEEK_FORMAT (event), stream->strh.type);
+      GST_DEBUG ("seek format %d, %08x", GST_EVENT_SEEK_FORMAT (event), stream->strh.type);
       switch (GST_EVENT_SEEK_FORMAT (event)) {
 	case GST_FORMAT_BYTES:
 	case GST_FORMAT_DEFAULT:
@@ -1409,7 +1412,7 @@ gst_avi_demux_handle_src_event (GstPad *pad, GstEvent *event)
 	    res = FALSE;
 	    goto done;
 	  }
-          GST_DEBUG (0, "seeking to %" G_GINT64_FORMAT, desired_offset);
+          GST_DEBUG ("seeking to %" G_GINT64_FORMAT, desired_offset);
 
           flags = GST_RIFF_IF_KEYFRAME;
 
@@ -1426,7 +1429,7 @@ gst_avi_demux_handle_src_event (GstPad *pad, GstEvent *event)
 	    avi_demux->last_seek = seek_entry->ts;
 	  }
 	  else {
-            GST_DEBUG (0, "no index entry found for time %" G_GINT64_FORMAT, desired_offset);
+            GST_DEBUG ("no index entry found for time %" G_GINT64_FORMAT, desired_offset);
 	    res = FALSE;
 	  }
 	  break;
@@ -1458,7 +1461,7 @@ gst_avi_demux_handle_sink_event (GstAviDemux *avi_demux)
   gst_bytestream_get_status (avi_demux->bs, &remaining, &event);
 
   type = event? GST_EVENT_TYPE (event) : GST_EVENT_UNKNOWN;
-  GST_DEBUG (0, "avidemux: event %p %d", event, type); 
+  GST_DEBUG ("avidemux: event %p %d", event, type); 
 
   switch (type) {
     case GST_EVENT_EOS:
@@ -1478,7 +1481,7 @@ gst_avi_demux_handle_sink_event (GstAviDemux *avi_demux)
         avi_stream_context *stream = &avi_demux->stream[i];
 
 	if (GST_PAD_IS_USABLE (stream->pad)) {
-	  GST_DEBUG (GST_CAT_EVENT, "sending discont on %d %" G_GINT64_FORMAT " + %" G_GINT64_FORMAT " = %" G_GINT64_FORMAT, 
+	  GST_DEBUG ("sending discont on %d %" G_GINT64_FORMAT " + %" G_GINT64_FORMAT " = %" G_GINT64_FORMAT, 
 			i, avi_demux->last_seek, stream->delay, avi_demux->last_seek + stream->delay);
 
           discont = gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME, 
@@ -1517,14 +1520,14 @@ gst_avi_demux_loop (GstElement *element)
   bs = avi_demux->bs;
 
   if (avi_demux->seek_pending) {
-    GST_DEBUG (0, "avidemux: seek pending to %" G_GINT64_FORMAT " %08llx", 
+    GST_DEBUG ("avidemux: seek pending to %" G_GINT64_FORMAT " %08llx", 
 		  avi_demux->seek_offset, (unsigned long long)avi_demux->seek_offset);
 
     if (!gst_bytestream_seek (avi_demux->bs, 
 			      avi_demux->seek_offset, 
 			      GST_SEEK_METHOD_SET)) 
     {
-      GST_INFO (GST_CAT_PLUGIN_INFO, "avidemux: could not seek");
+      GST_INFO ( "avidemux: could not seek");
     }
     avi_demux->seek_pending = FALSE;
   }
@@ -1588,10 +1591,10 @@ gst_avi_demux_loop (GstElement *element)
       flush = 0;
       break;
     case GST_AVI_DEMUX_HEADER:
-      GST_DEBUG (0, "riff tag: %4.4s %08x", (gchar *)&chunk.id, chunk.size);
+      GST_DEBUG ("riff tag: %4.4s %08x", (gchar *)&chunk.id, chunk.size);
       switch (chunk.id) {
 	case GST_RIFF_TAG_LIST:
-          GST_DEBUG (0, "list type: %4.4s", (gchar *)&chunk.type);
+          GST_DEBUG ("list type: %4.4s", (gchar *)&chunk.type);
           switch (chunk.type) {
             case GST_RIFF_LIST_movi:
 	    {
@@ -1639,7 +1642,7 @@ gst_avi_demux_loop (GstElement *element)
 	    case GST_RIFF_FCC_pads:
 	    case GST_RIFF_FCC_txts:
 	    default:
-              GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux_chain: strh type %s not supported", 
+              GST_INFO ( "gst_avi_demux_chain: strh type %s not supported", 
 			  gst_riff_id_to_fourcc (avi_demux->fcc_type));
 	      break;
           }
@@ -1654,7 +1657,7 @@ gst_avi_demux_loop (GstElement *element)
         case GST_RIFF_ISFT:
           break;
 	default:
-          GST_DEBUG (0, "  *****  unknown chunkid %08x", chunk.id);
+          GST_DEBUG ("  *****  unknown chunkid %08x", chunk.id);
 	  break;
       }
       break;
@@ -1674,7 +1677,7 @@ gst_avi_demux_loop (GstElement *element)
 		   
           stream = &avi_demux->stream[stream_id];
 
-          GST_DEBUG (0,"gst_avi_demux_chain: tag found %08x size %08x stream_id %d",
+          GST_DEBUG ("gst_avi_demux_chain: tag found %08x size %08x stream_id %d",
 		    chunk.id, chunk.size, stream_id);
 
           format = GST_FORMAT_TIME;
@@ -1693,7 +1696,7 @@ gst_avi_demux_loop (GstElement *element)
             if (GST_PAD_IS_USABLE (stream->pad)) {
               if (next_ts >= stream->end_pos) {
                 gst_pad_push (stream->pad, GST_BUFFER (gst_event_new (GST_EVENT_EOS)));
-	        GST_DEBUG (0, "end stream %d: %" G_GINT64_FORMAT " %d %" G_GINT64_FORMAT, 
+	        GST_DEBUG ("end stream %d: %" G_GINT64_FORMAT " %d %" G_GINT64_FORMAT, 
 		           stream_id, next_ts, stream->current_frame - 1,
 			   stream->end_pos);
 	      }
@@ -1714,7 +1717,7 @@ gst_avi_demux_loop (GstElement *element)
                     /* FIXME, do some flush event here */
                     stream->need_flush = FALSE;
                   }
-	          GST_DEBUG (0, "send stream %d: %" G_GINT64_FORMAT " %d %" G_GINT64_FORMAT " %08x", 
+	          GST_DEBUG ("send stream %d: %" G_GINT64_FORMAT " %d %" G_GINT64_FORMAT " %08x", 
 			     stream_id, next_ts, stream->current_frame - 1,
 			     stream->delay, chunk.size);
 
@@ -1726,7 +1729,7 @@ gst_avi_demux_loop (GstElement *element)
           break;
 	}
 	default:
-          GST_DEBUG (0, "  *****  unknown chunkid %08x", chunk.id);
+          GST_DEBUG ("  *****  unknown chunkid %08x", chunk.id);
           break;
       }
       break;
diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index c54700b4..8dfa50fa 100644
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@@ -25,6 +25,9 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <config.h>
 
 #include <stdlib.h>
@@ -308,7 +311,7 @@ gst_avimux_sinkconnect (GstPad *pad, GstCaps *vscaps)
   if (!GST_CAPS_IS_FIXED (vscaps))
     return GST_PAD_LINK_DELAYED;
 
-  GST_DEBUG (0, "avimux: sinkconnect triggered on %s", gst_pad_get_name (pad));
+  GST_DEBUG ("avimux: sinkconnect triggered on %s", gst_pad_get_name (pad));
 
   for (caps = vscaps; caps != NULL; caps = vscaps = vscaps->next)
   {
@@ -438,7 +441,7 @@ gst_avimux_sinkconnect (GstPad *pad, GstCaps *vscaps)
 	  gst_caps_has_property(caps, "layer"))
         gst_caps_get_int(caps, "layer", &layer);
       else
-        GST_DEBUG(GST_CAT_PLUGIN_INFO,
+        GST_DEBUG (
                   "No layer specified, assuming layer 3");
 
       /* we don't need to do anything here, compressed mp3 contains it all */
@@ -497,7 +500,7 @@ gst_avimux_pad_link (GstPad   *pad,
     return;
   }
 
-  GST_DEBUG(GST_CAT_PLUGIN_INFO, "pad '%s' connected", padname);
+  GST_DEBUG ("pad '%s' connected", padname);
 }
 
 static void
@@ -524,7 +527,7 @@ gst_avimux_pad_unlink (GstPad   *pad,
     return;
   }
 
-  GST_DEBUG(GST_CAT_PLUGIN_INFO, "pad '%s' unlinked", padname);
+  GST_DEBUG ("pad '%s' unlinked", padname);
 }
 
 static GstPad*
diff --git a/gst/cutter/gstcutter.c b/gst/cutter/gstcutter.c
index f256bda7..e902894c 100644
--- a/gst/cutter/gstcutter.c
+++ b/gst/cutter/gstcutter.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <gst/gst.h>
 #include <gst/audio/audio.h>
 #include "gstcutter.h"
@@ -222,7 +225,7 @@ gst_cutter_chain (GstPad *pad, GstBuffer *buf)
   if (!filter->have_caps) gst_cutter_get_caps (pad, filter);
 
   in_data = (gint16 *) GST_BUFFER_DATA (buf);
-  GST_DEBUG (GST_CAT_PLUGIN_INFO,
+  GST_DEBUG (
              "length of prerec buffer: %.3f sec",
              filter->pre_run_length);
 
@@ -248,7 +251,7 @@ gst_cutter_chain (GstPad *pad, GstBuffer *buf)
   /* if RMS below threshold, add buffer length to silent run length count
    * if not, reset
    */
-  GST_DEBUG (GST_CAT_PLUGIN_INFO,
+  GST_DEBUG (
              "buffer stats: ms %f, RMS %f, audio length %f",
 	     ms, RMS, gst_audio_length (filter->srcpad, buf));
   if (RMS < filter->threshold_level)
@@ -279,7 +282,7 @@ gst_cutter_chain (GstPad *pad, GstBuffer *buf)
 /*      g_print ("DEBUG: cutter: start from here, turning on out\n"); */
       /* first of all, flush current buffer */
       g_signal_emit (G_OBJECT (filter), gst_cutter_signals[CUT_START], 0);
-      GST_DEBUG (GST_CAT_PLUGIN_INFO,
+      GST_DEBUG (
 		 "flushing buffer of length %.3f",
 		 filter->pre_run_length);
       while (filter->pre_buffer)
@@ -289,7 +292,7 @@ gst_cutter_chain (GstPad *pad, GstBuffer *buf)
         gst_pad_push (filter->srcpad, prebuf);
 	++count;
       }
-      GST_DEBUG (GST_CAT_PLUGIN_INFO, "flushed %d buffers", count);
+      GST_DEBUG ("flushed %d buffers", count);
       filter->pre_run_length = 0.0;
     }
   }
@@ -345,7 +348,7 @@ gst_cutter_set_property (GObject *object, guint prop_id,
     case ARG_THRESHOLD:
 	/* set the level */
       filter->threshold_level = g_value_get_double (value);
-      GST_DEBUG (GST_CAT_PLUGIN_INFO,
+      GST_DEBUG (
 		 "DEBUG: set threshold level to %f",
 		 filter->threshold_level);
       break;
@@ -355,7 +358,7 @@ gst_cutter_set_property (GObject *object, guint prop_id,
        * values in dB < 0 result in values between 0 and 1
        */
       filter->threshold_level = pow (10, g_value_get_double (value) / 20);
-      GST_DEBUG (GST_CAT_PLUGIN_INFO,
+      GST_DEBUG (
                  "DEBUG: set threshold level to %f",
 		 filter->threshold_level);
       break;
diff --git a/gst/debug/efence.c b/gst/debug/efence.c
index 09acc5d5..3178d16e 100644
--- a/gst/debug/efence.c
+++ b/gst/debug/efence.c
@@ -19,6 +19,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <gst/gst.h>
 
 #include <string.h>
@@ -200,7 +203,7 @@ gst_efence_chain (GstPad *pad, GstBuffer *buffer)
   GstBuffer *copy;
   void *ptr;
 
-  GST_DEBUG(0, "gst_efence_chain");
+  GST_DEBUG ("gst_efence_chain");
 
   g_return_if_fail (GST_IS_PAD (pad));
   g_return_if_fail (buffer != NULL);
@@ -322,7 +325,7 @@ GstBuffer *gst_fenced_buffer_new(void)
   GST_BUFFER_BUFFERPOOL (newbuf)   = NULL;
   GST_BUFFER_POOL_PRIVATE (newbuf) = NULL;
 
-  GST_DEBUG(0, "new buffer=%p", newbuf);
+  GST_DEBUG ("new buffer=%p", newbuf);
 
   return newbuf;
 }
@@ -331,7 +334,7 @@ void gst_fenced_buffer_default_free (GstBuffer *buffer)
 {
   GstFencedBuffer *fenced_buffer;
 
-  GST_DEBUG(0, "free buffer=%p", buffer);
+  GST_DEBUG ("free buffer=%p", buffer);
 
   g_return_if_fail (buffer != NULL);
 
@@ -340,11 +343,11 @@ void gst_fenced_buffer_default_free (GstBuffer *buffer)
   /* free our data */
   if (!GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_DONTFREE) &&
       GST_BUFFER_DATA (buffer)) {
-    GST_DEBUG(0, "free region %p %d", fenced_buffer->region,
+    GST_DEBUG ("free region %p %d", fenced_buffer->region,
 	fenced_buffer->length);
     munmap(fenced_buffer->region, fenced_buffer->length);
   }else{
-    GST_DEBUG(0, "not freeing region %p %d %p", fenced_buffer->region,
+    GST_DEBUG ("not freeing region %p %d %p", fenced_buffer->region,
 	GST_BUFFER_FLAGS(buffer), GST_BUFFER_DATA(buffer));
   }
 
@@ -392,7 +395,7 @@ void *gst_fenced_buffer_alloc(GstBuffer *buffer, unsigned int length,
   GstFencedBuffer *fenced_buffer = (GstFencedBuffer *) buffer;
   int page_size;
 
-  GST_DEBUG(0, "buffer=%p length=%d fence_top=%d", buffer, length, fence_top);
+  GST_DEBUG ("buffer=%p length=%d fence_top=%d", buffer, length, fence_top);
 
   if(length==0)return NULL;
 
@@ -418,7 +421,7 @@ void *gst_fenced_buffer_alloc(GstBuffer *buffer, unsigned int length,
   fenced_buffer->region = region;
   fenced_buffer->length = alloc_size;
 
-  GST_DEBUG(0, "new region %p %d", fenced_buffer->region,
+  GST_DEBUG ("new region %p %d", fenced_buffer->region,
       fenced_buffer->length);
   
   if(fence_top){
diff --git a/gst/effectv/gstaging.c b/gst/effectv/gstaging.c
index e60b49ec..d427a1e3 100644
--- a/gst/effectv/gstaging.c
+++ b/gst/effectv/gstaging.c
@@ -21,6 +21,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string.h>
 #include "gsteffectv.h"
 
diff --git a/gst/effectv/gstdice.c b/gst/effectv/gstdice.c
index 4286f07e..a9fabd26 100644
--- a/gst/effectv/gstdice.c
+++ b/gst/effectv/gstdice.c
@@ -10,6 +10,9 @@
  * 270 degrees.  The amount of rotation for each square is chosen at random.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string.h>
 #include <gst/gst.h>
 #include "gsteffectv.h"
diff --git a/gst/effectv/gstedge.c b/gst/effectv/gstedge.c
index 4d25fddd..f169c249 100644
--- a/gst/effectv/gstedge.c
+++ b/gst/effectv/gstedge.c
@@ -21,6 +21,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string.h>
 #include <gst/gst.h>
 #include "gsteffectv.h"
diff --git a/gst/effectv/gstquark.c b/gst/effectv/gstquark.c
index c48cddad..12aacb52 100644
--- a/gst/effectv/gstquark.c
+++ b/gst/effectv/gstquark.c
@@ -21,6 +21,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <math.h>
 #include <string.h>
 #include <gst/gst.h>
diff --git a/gst/effectv/gstrev.c b/gst/effectv/gstrev.c
index 870e47a9..88b3a8b8 100644
--- a/gst/effectv/gstrev.c
+++ b/gst/effectv/gstrev.c
@@ -40,6 +40,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <math.h>
 #include <string.h>
 #include <gst/gst.h>
diff --git a/gst/effectv/gstshagadelic.c b/gst/effectv/gstshagadelic.c
index 38fbb7a3..f97fdae6 100644
--- a/gst/effectv/gstshagadelic.c
+++ b/gst/effectv/gstshagadelic.c
@@ -22,6 +22,9 @@
  * Boston, MA 02111-1307, USA.
  */ 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <math.h>
 #include <string.h>
 #include <gst/gst.h>
diff --git a/gst/effectv/gstvertigo.c b/gst/effectv/gstvertigo.c
index 0c5d507f..0216690b 100644
--- a/gst/effectv/gstvertigo.c
+++ b/gst/effectv/gstvertigo.c
@@ -22,6 +22,9 @@
  */ 
  
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <math.h>
 #include <string.h>
 #include <gst/gst.h>
diff --git a/gst/effectv/gstwarp.c b/gst/effectv/gstwarp.c
index e82dcaad..d08c2656 100644
--- a/gst/effectv/gstwarp.c
+++ b/gst/effectv/gstwarp.c
@@ -27,6 +27,9 @@
  *      by sam lantinga slouken@devolution.com
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string.h>
 #include <math.h>
 #include <gst/gst.h>
diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c
index 337d920f..0f4fac18 100644
--- a/gst/flx/gstflxdec.c
+++ b/gst/flx/gstflxdec.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string.h>
 
 #include "flx_fmt.h"
@@ -471,7 +474,7 @@ gst_flxdec_loop (GstElement *element)
   g_return_if_fail (element != NULL);
   g_return_if_fail (GST_IS_FLXDEC(element));
 
-  GST_DEBUG (0, "entering loop function");
+  GST_DEBUG ("entering loop function");
   
   flxdec = GST_FLXDEC(element);
 
diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c
index 36929f03..72757990 100644
--- a/gst/goom/gstgoom.c
+++ b/gst/goom/gstgoom.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <config.h>
 #include <gst/gst.h>
 
@@ -297,7 +300,7 @@ gst_goom_chain (GstPad *pad, GstBuffer *bufin)
 
   goom = GST_GOOM (gst_pad_get_parent (pad));
 
-  GST_DEBUG (0, "GOOM: chainfunc called");
+  GST_DEBUG ("GOOM: chainfunc called");
 
   if (GST_IS_EVENT (bufin)) {
     GstEvent *event = GST_EVENT (bufin);
@@ -335,7 +338,7 @@ gst_goom_chain (GstPad *pad, GstBuffer *bufin)
 
   samples_in = GST_BUFFER_SIZE (bufin) / (sizeof (gint16) * goom->channels);
 
-  GST_DEBUG (0, "input buffer has %d samples", samples_in);
+  GST_DEBUG ("input buffer has %d samples", samples_in);
 
   if (GST_BUFFER_TIMESTAMP (bufin) < goom->next_time || samples_in < 512) {
     goto done;
@@ -368,7 +371,7 @@ gst_goom_chain (GstPad *pad, GstBuffer *bufin)
 done:
   gst_buffer_unref (bufin);
 
-  GST_DEBUG (0, "GOOM: exiting chainfunc");
+  GST_DEBUG ("GOOM: exiting chainfunc");
 }
 
 static GstElementStateReturn
diff --git a/gst/law/alaw.c b/gst/law/alaw.c
index 7f6e7de1..1e0c5b8b 100644
--- a/gst/law/alaw.c
+++ b/gst/law/alaw.c
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "alaw-encode.h"
 #include "alaw-decode.h"
 
diff --git a/gst/law/mulaw.c b/gst/law/mulaw.c
index 5a6ce244..d0c8bbdb 100644
--- a/gst/law/mulaw.c
+++ b/gst/law/mulaw.c
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "mulaw-encode.h"
 #include "mulaw-decode.h"
 
diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c
index c762d8e1..ba246bea 100644
--- a/gst/level/gstlevel.c
+++ b/gst/level/gstlevel.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <gst/gst.h>
 #include "gstlevel.h"
 #include "math.h"
diff --git a/gst/median/gstmedian.c b/gst/median/gstmedian.c
index 4260b72b..e1e84b25 100644
--- a/gst/median/gstmedian.c
+++ b/gst/median/gstmedian.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string.h>
 #include <gstmedian.h>
 
@@ -282,7 +285,7 @@ gst_median_chain (GstPad *pad, GstBuffer *buf)
   data = GST_BUFFER_DATA(buf);
   size = GST_BUFFER_SIZE(buf);
 
-  GST_DEBUG (0,"median: have buffer of %d", GST_BUFFER_SIZE(buf));
+  GST_DEBUG ("median: have buffer of %d", GST_BUFFER_SIZE(buf));
 
   outbuf = gst_buffer_new();
   GST_BUFFER_DATA(outbuf) = g_malloc(GST_BUFFER_SIZE(buf));
diff --git a/gst/monoscope/gstmonoscope.c b/gst/monoscope/gstmonoscope.c
index 384dfa04..f6ff75a1 100644
--- a/gst/monoscope/gstmonoscope.c
+++ b/gst/monoscope/gstmonoscope.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <config.h>
 #include <gst/gst.h>
 
@@ -234,15 +237,15 @@ gst_monoscope_chain (GstPad *pad, GstBuffer *bufin)
 
   monoscope = GST_MONOSCOPE (gst_pad_get_parent (pad));
 
-  GST_DEBUG (0, "Monoscope: chainfunc called");
+  GST_DEBUG ("Monoscope: chainfunc called");
 
   samples_in = GST_BUFFER_SIZE (bufin) / sizeof (gint16);
 
-  GST_DEBUG (0, "input buffer has %d samples", samples_in);
+  GST_DEBUG ("input buffer has %d samples", samples_in);
 
   /* FIXME: should really select the first 1024 samples after the timestamp. */
   if (GST_BUFFER_TIMESTAMP (bufin) < monoscope->next_time || samples_in < 1024) {
-    GST_DEBUG (0, "timestamp is %" G_GUINT64_FORMAT ": want >= %" G_GUINT64_FORMAT, GST_BUFFER_TIMESTAMP (bufin), monoscope->next_time);
+    GST_DEBUG ("timestamp is %" G_GUINT64_FORMAT ": want >= %" G_GUINT64_FORMAT, GST_BUFFER_TIMESTAMP (bufin), monoscope->next_time);
     gst_buffer_unref (bufin);
     return;
   }
@@ -258,7 +261,7 @@ gst_monoscope_chain (GstPad *pad, GstBuffer *bufin)
 
     monoscope->visstate = monoscope_init (monoscope->width, monoscope->height);
     g_assert(monoscope->visstate != 0);
-    GST_DEBUG (0, "making new pad");
+    GST_DEBUG ("making new pad");
 
     caps = GST_CAPS_NEW (
 		     "monoscopesrc",
@@ -293,7 +296,7 @@ gst_monoscope_chain (GstPad *pad, GstBuffer *bufin)
 
   gst_buffer_unref (bufin);
 
-  GST_DEBUG (0, "Monoscope: exiting chainfunc");
+  GST_DEBUG ("Monoscope: exiting chainfunc");
 
 }
 
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index 16b415b9..be187752 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -18,6 +18,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "qtdemux.h"
 
 #include <string.h>
@@ -257,7 +260,7 @@ static gboolean gst_qtdemux_handle_sink_event (GstQTDemux *qtdemux)
   gst_bytestream_get_status(qtdemux->bs, &remaining, &event);
 
   type = event ? GST_EVENT_TYPE(event) : GST_EVENT_UNKNOWN;
-  GST_DEBUG(0,"qtdemux: event %p %d", event, type);
+  GST_DEBUG ("qtdemux: event %p %d", event, type);
 
   switch(type){
     case GST_EVENT_EOS:
@@ -268,7 +271,7 @@ static gboolean gst_qtdemux_handle_sink_event (GstQTDemux *qtdemux)
       g_warning("flush event");
       break;
     case GST_EVENT_DISCONTINUOUS:
-      GST_DEBUG(0,"discontinuous event\n");
+      GST_DEBUG ("discontinuous event\n");
       //gst_bytestream_flush_fast(qtdemux->bs, remaining);
       break;
     default:
@@ -324,7 +327,7 @@ static void gst_qtdemux_loop_header (GstElement *element)
   //cur_offset = gst_bytestream_tell(qtdemux->bs);
   
   cur_offset = qtdemux->offset;
-  GST_DEBUG(0,"loop at position %d",cur_offset);
+  GST_DEBUG ("loop at position %d",cur_offset);
 
   switch(qtdemux->state){
   case QTDEMUX_STATE_HEADER:
@@ -341,9 +344,9 @@ static void gst_qtdemux_loop_header (GstElement *element)
     }while(1);
 
     length = GUINT32_FROM_BE(*(guint32 *)data);
-    GST_DEBUG(0,"length %08x",length);
+    GST_DEBUG ("length %08x",length);
     fourcc = GUINT32_FROM_LE(*(guint32 *)(data+4));
-    GST_DEBUG(0,"fourcc " GST_FOURCC_FORMAT, GST_FOURCC_ARGS(fourcc));
+    GST_DEBUG ("fourcc " GST_FOURCC_FORMAT, GST_FOURCC_ARGS(fourcc));
     if(length==0){
       length = gst_bytestream_length(qtdemux->bs) - cur_offset;
     }
@@ -351,9 +354,9 @@ static void gst_qtdemux_loop_header (GstElement *element)
       guint32 length1, length2;
   
       length1 = GUINT32_FROM_BE(*(guint32 *)(data+8));
-      GST_DEBUG(0,"length1 %08x",length1);
+      GST_DEBUG ("length1 %08x",length1);
       length2 = GUINT32_FROM_BE(*(guint32 *)(data+12));
-      GST_DEBUG(0,"length2 %08x",length2);
+      GST_DEBUG ("length2 %08x",length2);
   
       length=length2;
     }
@@ -370,7 +373,7 @@ static void gst_qtdemux_loop_header (GstElement *element)
 	do{
           ret = gst_bytestream_read(qtdemux->bs, &moov, length);
           if(ret < length){
-            GST_DEBUG(0,"read failed (%d < %d)",ret,length);
+            GST_DEBUG ("read failed (%d < %d)",ret,length);
             if(!gst_qtdemux_handle_sink_event(qtdemux)){
 	      return;
 	    }
@@ -395,7 +398,7 @@ static void gst_qtdemux_loop_header (GstElement *element)
     ret = gst_bytestream_seek(qtdemux->bs, cur_offset + length,
         GST_SEEK_METHOD_SET);
     qtdemux->offset = cur_offset + length;
-    GST_DEBUG(0,"seek returned %d\n",ret);
+    GST_DEBUG ("seek returned %d\n",ret);
     break;
   }
   case QTDEMUX_STATE_SEEKING_EOS:
@@ -444,7 +447,7 @@ static void gst_qtdemux_loop_header (GstElement *element)
 	    GST_BUFFER(gst_event_new (GST_EVENT_EOS)));
       }
       ret = gst_bytestream_seek(qtdemux->bs, 0, GST_SEEK_METHOD_END);
-      GST_DEBUG(0,"seek returned %d",ret);
+      GST_DEBUG ("seek returned %d",ret);
 
       qtdemux->state = QTDEMUX_STATE_SEEKING_EOS;
       return;
@@ -455,23 +458,23 @@ static void gst_qtdemux_loop_header (GstElement *element)
     offset = stream->samples[stream->sample_index].offset;
     size = stream->samples[stream->sample_index].size;
 
-    GST_DEBUG(0,"pushing from stream %d, sample_index=%d offset=%d size=%d",
+    GST_DEBUG ("pushing from stream %d, sample_index=%d offset=%d size=%d",
 	index, stream->sample_index, offset, size);
 
     cur_offset = gst_bytestream_tell(qtdemux->bs);
     if(offset != cur_offset){
-      GST_DEBUG(0,"seeking to offset %d",offset);
+      GST_DEBUG ("seeking to offset %d",offset);
       ret = gst_bytestream_seek(qtdemux->bs, offset, GST_SEEK_METHOD_SET);
-      GST_DEBUG(0,"seek returned %d",ret);
+      GST_DEBUG ("seek returned %d",ret);
       return;
     }
 
-    GST_DEBUG(0,"reading %d bytes\n",size);
+    GST_DEBUG ("reading %d bytes\n",size);
     buf = NULL;
     do{
       ret = gst_bytestream_read(qtdemux->bs, &buf, size);
       if(ret < size){
-        GST_DEBUG(0,"read failed (%d < %d)",ret,size);
+        GST_DEBUG ("read failed (%d < %d)",ret,size);
         if(!gst_qtdemux_handle_sink_event(qtdemux)){
 	  return;
 	}
@@ -500,14 +503,14 @@ static GstCaps *gst_qtdemux_src_getcaps(GstPad *pad, GstCaps *caps)
   QtDemuxStream *stream;
   int i;
 
-  GST_DEBUG(0,"gst_qtdemux_src_getcaps");
+  GST_DEBUG ("gst_qtdemux_src_getcaps");
 
   qtdemux = GST_QTDEMUX(gst_pad_get_parent(pad));
 
   g_return_val_if_fail(GST_IS_QTDEMUX(qtdemux), NULL);
 
-  GST_DEBUG(0, "looking for pad %p in qtdemux %p", pad, qtdemux);
-  GST_DEBUG(0, "n_streams is %d", qtdemux->n_streams);
+  GST_DEBUG ("looking for pad %p in qtdemux %p", pad, qtdemux);
+  GST_DEBUG ("n_streams is %d", qtdemux->n_streams);
   for(i=0;i<qtdemux->n_streams;i++){
     stream = qtdemux->streams[i];
     if(stream->pad == pad){
@@ -515,7 +518,7 @@ static GstCaps *gst_qtdemux_src_getcaps(GstPad *pad, GstCaps *caps)
     }
   }
 
-  GST_DEBUG(0,"Couldn't find stream cooresponding to pad\n");
+  GST_DEBUG ("Couldn't find stream cooresponding to pad\n");
 
   return NULL;
 }
@@ -527,23 +530,23 @@ gst_qtdemux_src_link(GstPad *pad, GstCaps *caps)
   QtDemuxStream *stream;
   int i;
 
-  GST_DEBUG(0,"gst_qtdemux_src_link");
+  GST_DEBUG ("gst_qtdemux_src_link");
 
   qtdemux = GST_QTDEMUX(gst_pad_get_parent(pad));
 
-  GST_DEBUG(0, "looking for pad %p in qtdemux %p", pad, qtdemux);
+  GST_DEBUG ("looking for pad %p in qtdemux %p", pad, qtdemux);
   g_return_val_if_fail(GST_IS_QTDEMUX(qtdemux), GST_PAD_LINK_REFUSED);
 
-  GST_DEBUG(0, "n_streams is %d", qtdemux->n_streams);
+  GST_DEBUG ("n_streams is %d", qtdemux->n_streams);
   for(i=0;i<qtdemux->n_streams;i++){
     stream = qtdemux->streams[i];
-    GST_DEBUG(0, "pad[%d] is %p", i, stream->pad);
+    GST_DEBUG ("pad[%d] is %p", i, stream->pad);
     if(stream->pad == pad){
       return GST_PAD_LINK_OK;
     }
   }
 
-  GST_DEBUG(0,"Couldn't find stream cooresponding to pad\n");
+  GST_DEBUG ("Couldn't find stream cooresponding to pad\n");
 
   return GST_PAD_LINK_REFUSED;
 }
@@ -581,9 +584,9 @@ void gst_qtdemux_add_stream(GstQTDemux *qtdemux, QtDemuxStream *stream)
 
   qtdemux->streams[qtdemux->n_streams] = stream;
   qtdemux->n_streams++;
-  GST_DEBUG(0, "n_streams is now %d", qtdemux->n_streams);
+  GST_DEBUG ("n_streams is now %d", qtdemux->n_streams);
 
-  GST_DEBUG(0, "adding pad %p to qtdemux %p", stream->pad, qtdemux);
+  GST_DEBUG ("adding pad %p to qtdemux %p", stream->pad, qtdemux);
   gst_element_add_pad(GST_ELEMENT (qtdemux), stream->pad);
 
   /* Note: we need to have everything set up before calling try_set_caps */
diff --git a/gst/rtp/gstrtpL16depay.c b/gst/rtp/gstrtpL16depay.c
index 63d3e0bd..484b7a30 100644
--- a/gst/rtp/gstrtpL16depay.c
+++ b/gst/rtp/gstrtpL16depay.c
@@ -12,6 +12,9 @@
  * Library General Public License for more 
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string.h>
 #include "gstrtpL16parse.h"
 #include "gstrtp-common.h"
@@ -238,7 +241,7 @@ gst_rtpL16parse_chain (GstPad * pad, GstBuffer * buf)
 
   memcpy (GST_BUFFER_DATA (outbuf), rtp_packet_get_payload (packet), GST_BUFFER_SIZE (outbuf));
         
-  GST_DEBUG (0,"gst_rtpL16parse_chain: pushing buffer of size %d", GST_BUFFER_SIZE(outbuf));
+  GST_DEBUG ("gst_rtpL16parse_chain: pushing buffer of size %d", GST_BUFFER_SIZE(outbuf));
 
   /* FIXME: According to RFC 1890, this is required, right? */
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
@@ -303,7 +306,7 @@ gst_rtpL16parse_change_state (GstElement * element)
 
   rtpL16parse = GST_RTP_L16_PARSE (element);
 
-  GST_DEBUG (0, "state pending %d\n", GST_STATE_PENDING (element));
+  GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element));
 
   switch (GST_STATE_TRANSITION (element)) {
     case GST_STATE_NULL_TO_READY:
diff --git a/gst/rtp/gstrtpL16enc.c b/gst/rtp/gstrtpL16enc.c
index 9dec5cc7..c5a60a68 100644
--- a/gst/rtp/gstrtpL16enc.c
+++ b/gst/rtp/gstrtpL16enc.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string.h>
 #include "gstrtpL16enc.h"
 
@@ -195,7 +198,7 @@ gst_rtpL16enc_chain (GstPad * pad, GstBuffer * buf)
 
     switch (GST_EVENT_TYPE (event)) {
       case GST_EVENT_DISCONTINUOUS:
-	GST_DEBUG (GST_CAT_EVENT, "discont"); 
+	GST_DEBUG ("discont"); 
         rtpL16enc->next_time = 0;
         gst_pad_event_default (pad, event);
 	return;
@@ -238,7 +241,7 @@ gst_rtpL16enc_chain (GstPad * pad, GstBuffer * buf)
   memcpy (GST_BUFFER_DATA (outbuf), packet->data, rtp_packet_get_packet_len (packet));
   memcpy (GST_BUFFER_DATA (outbuf) + rtp_packet_get_packet_len(packet), GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf));
 
-  GST_DEBUG (0,"gst_rtpL16enc_chain: pushing buffer of size %d", GST_BUFFER_SIZE(outbuf));
+  GST_DEBUG ("gst_rtpL16enc_chain: pushing buffer of size %d", GST_BUFFER_SIZE(outbuf));
   gst_pad_push (rtpL16enc->srcpad, outbuf);
 
   ++rtpL16enc->seq;
@@ -288,7 +291,7 @@ gst_rtpL16enc_change_state (GstElement * element)
 
   rtpL16enc = GST_RTP_L16_ENC (element);
 
-  GST_DEBUG (0, "state pending %d\n", GST_STATE_PENDING (element));
+  GST_DEBUG ("state pending %d\n", 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/gst/rtp/gstrtpL16parse.c b/gst/rtp/gstrtpL16parse.c
index 63d3e0bd..484b7a30 100644
--- a/gst/rtp/gstrtpL16parse.c
+++ b/gst/rtp/gstrtpL16parse.c
@@ -12,6 +12,9 @@
  * Library General Public License for more 
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string.h>
 #include "gstrtpL16parse.h"
 #include "gstrtp-common.h"
@@ -238,7 +241,7 @@ gst_rtpL16parse_chain (GstPad * pad, GstBuffer * buf)
 
   memcpy (GST_BUFFER_DATA (outbuf), rtp_packet_get_payload (packet), GST_BUFFER_SIZE (outbuf));
         
-  GST_DEBUG (0,"gst_rtpL16parse_chain: pushing buffer of size %d", GST_BUFFER_SIZE(outbuf));
+  GST_DEBUG ("gst_rtpL16parse_chain: pushing buffer of size %d", GST_BUFFER_SIZE(outbuf));
 
   /* FIXME: According to RFC 1890, this is required, right? */
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
@@ -303,7 +306,7 @@ gst_rtpL16parse_change_state (GstElement * element)
 
   rtpL16parse = GST_RTP_L16_PARSE (element);
 
-  GST_DEBUG (0, "state pending %d\n", GST_STATE_PENDING (element));
+  GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element));
 
   switch (GST_STATE_TRANSITION (element)) {
     case GST_STATE_NULL_TO_READY:
diff --git a/gst/rtp/gstrtpL16pay.c b/gst/rtp/gstrtpL16pay.c
index 9dec5cc7..c5a60a68 100644
--- a/gst/rtp/gstrtpL16pay.c
+++ b/gst/rtp/gstrtpL16pay.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string.h>
 #include "gstrtpL16enc.h"
 
@@ -195,7 +198,7 @@ gst_rtpL16enc_chain (GstPad * pad, GstBuffer * buf)
 
     switch (GST_EVENT_TYPE (event)) {
       case GST_EVENT_DISCONTINUOUS:
-	GST_DEBUG (GST_CAT_EVENT, "discont"); 
+	GST_DEBUG ("discont"); 
         rtpL16enc->next_time = 0;
         gst_pad_event_default (pad, event);
 	return;
@@ -238,7 +241,7 @@ gst_rtpL16enc_chain (GstPad * pad, GstBuffer * buf)
   memcpy (GST_BUFFER_DATA (outbuf), packet->data, rtp_packet_get_packet_len (packet));
   memcpy (GST_BUFFER_DATA (outbuf) + rtp_packet_get_packet_len(packet), GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf));
 
-  GST_DEBUG (0,"gst_rtpL16enc_chain: pushing buffer of size %d", GST_BUFFER_SIZE(outbuf));
+  GST_DEBUG ("gst_rtpL16enc_chain: pushing buffer of size %d", GST_BUFFER_SIZE(outbuf));
   gst_pad_push (rtpL16enc->srcpad, outbuf);
 
   ++rtpL16enc->seq;
@@ -288,7 +291,7 @@ gst_rtpL16enc_change_state (GstElement * element)
 
   rtpL16enc = GST_RTP_L16_ENC (element);
 
-  GST_DEBUG (0, "state pending %d\n", GST_STATE_PENDING (element));
+  GST_DEBUG ("state pending %d\n", 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/gst/smoothwave/gstsmoothwave.c b/gst/smoothwave/gstsmoothwave.c
index 7e2917b4..e6a55fcd 100644
--- a/gst/smoothwave/gstsmoothwave.c
+++ b/gst/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/gst/smpte/gstsmpte.c b/gst/smpte/gstsmpte.c
index 3a7d2f4e..b6761427 100644
--- a/gst/smpte/gstsmpte.c
+++ b/gst/smpte/gstsmpte.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string.h>
 #include <gstsmpte.h>
 #include "paint.h"
diff --git a/gst/spectrum/gstspectrum.c b/gst/spectrum/gstspectrum.c
index cb78bdd0..16786e33 100644
--- a/gst/spectrum/gstspectrum.c
+++ b/gst/spectrum/gstspectrum.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string.h>
 
 #include "gstspectrum.h"
diff --git a/gst/udp/gstudpsink.c b/gst/udp/gstudpsink.c
index 3d2580c3..a251eede 100644
--- a/gst/udp/gstudpsink.c
+++ b/gst/udp/gstudpsink.c
@@ -18,6 +18,9 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "gstudpsink.h"
 
 #define UDP_DEFAULT_HOST	"localhost"
@@ -271,7 +274,7 @@ gst_udpsink_chain (GstPad *pad, GstBuffer *buf)
   if (udpsink->clock) {
     GstClockID id = gst_clock_new_single_shot_id (udpsink->clock, GST_BUFFER_TIMESTAMP (buf));
 
-    GST_DEBUG (0, "udpsink: clock wait: %" G_GUINT64_FORMAT "\n", GST_BUFFER_TIMESTAMP (buf));
+    GST_DEBUG ("udpsink: clock wait: %" G_GUINT64_FORMAT "\n", GST_BUFFER_TIMESTAMP (buf));
     gst_element_clock_wait (GST_ELEMENT (udpsink), id, NULL);
     gst_clock_id_free (id);
   }
diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c
index f400b0fb..b3101e00 100644
--- a/gst/udp/gstudpsrc.c
+++ b/gst/udp/gstudpsrc.c
@@ -18,7 +18,12 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "gstudpsrc.h"
+#include <unistd.h>
 
 #define UDP_DEFAULT_PORT		4951
 #define UDP_DEFAULT_MULTICAST_GROUP	"0.0.0.0"
diff --git a/gst/videocrop/gstvideocrop.c b/gst/videocrop/gstvideocrop.c
index ea807420..53628471 100644
--- a/gst/videocrop/gstvideocrop.c
+++ b/gst/videocrop/gstvideocrop.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <gst/gst.h>
 
 #include <string.h>
diff --git a/gst/videoflip/gstvideoflip.c b/gst/videoflip/gstvideoflip.c
index 6f51d705..6dd26247 100644
--- a/gst/videoflip/gstvideoflip.c
+++ b/gst/videoflip/gstvideoflip.c
@@ -19,6 +19,9 @@
 
 
 /*#define DEBUG_ENABLED */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <gstvideoflip.h>
 #include <videoflip.h>
 
@@ -188,7 +191,7 @@ gst_videoflip_sink_getcaps (GstPad *pad, GstCaps *caps)
   GstCaps *sizecaps;
   int i;
 
-  GST_DEBUG(0,"gst_videoflip_src_link");
+  GST_DEBUG ("gst_videoflip_src_link");
   videoflip = GST_VIDEOFLIP (gst_pad_get_parent (pad));
   
   /* get list of peer's caps */
@@ -229,7 +232,7 @@ gst_videoflip_src_link (GstPad *pad, GstCaps *caps)
   GstPadLinkReturn ret;
   GstCaps *peercaps;
 
-  GST_DEBUG(0,"gst_videoflip_src_link");
+  GST_DEBUG ("gst_videoflip_src_link");
   videoflip = GST_VIDEOFLIP (gst_pad_get_parent (pad));
 
   if (!GST_CAPS_IS_FIXED (caps)) {
@@ -244,7 +247,7 @@ gst_videoflip_src_link (GstPad *pad, GstCaps *caps)
   gst_caps_get_int (caps, "width", &videoflip->to_width);
   gst_caps_get_int (caps, "height", &videoflip->to_height);
 
-  GST_DEBUG(0,"width %d height %d",videoflip->to_width,videoflip->to_height);
+  GST_DEBUG ("width %d height %d",videoflip->to_width,videoflip->to_height);
 
   peercaps = gst_caps_copy(caps);
 
@@ -273,7 +276,7 @@ gst_videoflip_sink_link (GstPad *pad, GstCaps *caps)
   GstPadLinkReturn ret;
   GstCaps *peercaps;
 
-  GST_DEBUG(0,"gst_videoflip_src_link");
+  GST_DEBUG ("gst_videoflip_src_link");
   videoflip = GST_VIDEOFLIP (gst_pad_get_parent (pad));
 
   if (!GST_CAPS_IS_FIXED (caps)) {
@@ -312,7 +315,7 @@ gst_videoflip_sink_link (GstPad *pad, GstCaps *caps)
 static void
 gst_videoflip_init (GstVideoflip *videoflip)
 {
-  GST_DEBUG(0,"gst_videoflip_init");
+  GST_DEBUG ("gst_videoflip_init");
   videoflip->sinkpad = gst_pad_new_from_template (
 		  GST_PAD_TEMPLATE_GET (gst_videoflip_sink_template_factory),
 		  "sink");
@@ -341,7 +344,7 @@ gst_videoflip_chain (GstPad *pad, GstBuffer *buf)
   gulong size;
   GstBuffer *outbuf;
 
-  GST_DEBUG (0,"gst_videoflip_chain");
+  GST_DEBUG ("gst_videoflip_chain");
 
   g_return_if_fail (pad != NULL);
   g_return_if_fail (GST_IS_PAD (pad));
@@ -358,10 +361,10 @@ gst_videoflip_chain (GstPad *pad, GstBuffer *buf)
     return;
   }
 
-  GST_DEBUG (0,"gst_videoflip_chain: got buffer of %ld bytes in '%s'",size,
+  GST_DEBUG ("gst_videoflip_chain: got buffer of %ld bytes in '%s'",size,
 		              GST_OBJECT_NAME (videoflip));
  
-  GST_DEBUG(0,"size=%ld from=%dx%d to=%dx%d fromsize=%ld (should be %d) tosize=%d",
+  GST_DEBUG ("size=%ld from=%dx%d to=%dx%d fromsize=%ld (should be %d) tosize=%d",
 	size,
 	videoflip->from_width, videoflip->from_height,
 	videoflip->to_width, videoflip->to_height,
@@ -377,12 +380,12 @@ gst_videoflip_chain (GstPad *pad, GstBuffer *buf)
   GST_BUFFER_TIMESTAMP(outbuf) = GST_BUFFER_TIMESTAMP(buf);
 
   g_return_if_fail(videoflip->format);
-  GST_DEBUG (0,"format %s",videoflip->format->fourcc);
+  GST_DEBUG ("format %s",videoflip->format->fourcc);
   g_return_if_fail(videoflip->format->scale);
 
   videoflip->format->scale(videoflip, GST_BUFFER_DATA(outbuf), data);
 
-  GST_DEBUG (0,"gst_videoflip_chain: pushing buffer of %d bytes in '%s'",GST_BUFFER_SIZE(outbuf),
+  GST_DEBUG ("gst_videoflip_chain: pushing buffer of %d bytes in '%s'",GST_BUFFER_SIZE(outbuf),
 	              GST_OBJECT_NAME (videoflip));
 
   gst_pad_push(videoflip->srcpad, outbuf);
@@ -399,7 +402,7 @@ gst_videoflip_set_property (GObject *object, guint prop_id, const GValue *value,
   g_return_if_fail(GST_IS_VIDEOFLIP(object));
   src = GST_VIDEOFLIP(object);
 
-  GST_DEBUG(0,"gst_videoflip_set_property");
+  GST_DEBUG ("gst_videoflip_set_property");
   switch (prop_id) {
     case ARG_METHOD:
       src->method = g_value_get_enum (value);
diff --git a/gst/videoflip/videoflip.c b/gst/videoflip/videoflip.c
index ea93a7c6..14764019 100644
--- a/gst/videoflip/videoflip.c
+++ b/gst/videoflip/videoflip.c
@@ -74,7 +74,7 @@ videoflip_find_by_caps(GstCaps *caps)
 {
   int i;
 
-  GST_DEBUG (0,"finding %p",caps);
+  GST_DEBUG ("finding %p",caps);
 
   g_return_val_if_fail(caps != NULL, NULL);
 
@@ -121,13 +121,13 @@ gst_videoflip_setup (GstVideoflip *videoflip)
       break;
   }
 
-  GST_DEBUG (0,"format=%p \"%s\" from %dx%d to %dx%d",
+  GST_DEBUG ("format=%p \"%s\" from %dx%d to %dx%d",
 		videoflip->format, videoflip->format->fourcc,
 		videoflip->from_width, videoflip->from_height,
 		videoflip->to_width, videoflip->to_height);
 
   if(videoflip->method == GST_VIDEOFLIP_METHOD_IDENTITY){
-    GST_DEBUG (0,"videoflip: using passthru");
+    GST_DEBUG ("videoflip: using passthru");
     videoflip->passthru = TRUE;
     videoflip->inited = TRUE;
     return;
@@ -149,7 +149,7 @@ gst_videoflip_planar411 (GstVideoflip *scale, unsigned char *dest, unsigned char
   int dw = scale->to_width;
   int dh = scale->to_height;
 
-  GST_DEBUG (0,"videoflip: scaling planar 4:1:1 %dx%d to %dx%d", sw, sh, dw, dh);
+  GST_DEBUG ("videoflip: scaling planar 4:1:1 %dx%d to %dx%d", sw, sh, dw, dh);
 
   gst_videoflip_flip(scale, dest, src, sw, sh, dw, dh);
 
diff --git a/gst/wavenc/gstwavenc.c b/gst/wavenc/gstwavenc.c
index 21736cb9..81487867 100644
--- a/gst/wavenc/gstwavenc.c
+++ b/gst/wavenc/gstwavenc.c
@@ -18,6 +18,9 @@
  * 
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string.h>
 #include <gstwavenc.h>
 
diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c
index 3385fed3..f8966fc1 100644
--- a/gst/wavparse/gstwavparse.c
+++ b/gst/wavparse/gstwavparse.c
@@ -18,6 +18,9 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string.h>
 
 #include <gstwavparse.h>
@@ -233,7 +236,7 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf)
   g_return_if_fail (GST_BUFFER_DATA (buf) != NULL);
 
   wavparse = GST_WAVPARSE (gst_pad_get_parent (pad));
-  GST_DEBUG (0, "gst_wavparse_chain: got buffer in '%s'",
+  GST_DEBUG ("gst_wavparse_chain: got buffer in '%s'",
           gst_object_get_name (GST_OBJECT (wavparse)));
 
   size = GST_BUFFER_SIZE (buf);
@@ -298,7 +301,7 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf)
   }
 
   if (wavparse->state == GST_WAVPARSE_OTHER) {
-    GST_DEBUG (0, "we're in unknown territory here, not passing on");
+    GST_DEBUG ("we're in unknown territory here, not passing on");
     return;
   }
 
@@ -311,7 +314,7 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf)
   if (wavparse->state == GST_WAVPARSE_UNKNOWN) {
     gint retval;
 
-    GST_DEBUG (0, "GstWavParse: checking for RIFF format");
+    GST_DEBUG ("GstWavParse: checking for RIFF format");
 
     /* create a new RIFF parser */
     wavparse->riff = gst_riff_new ();
@@ -320,13 +323,13 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf)
     retval = gst_riff_next_buffer (wavparse->riff, buf, 0);
     buffer_riffed = TRUE;
     if (retval < 0) {
-      GST_DEBUG (0, "sorry, isn't RIFF");
+      GST_DEBUG ("sorry, isn't RIFF");
       return;
     }
 
     /* this has to be a file of form WAVE for us to deal with it */
     if (wavparse->riff->form != gst_riff_fourcc_to_id ("WAVE")) {
-      GST_DEBUG (0, "sorry, isn't WAVE");
+      GST_DEBUG ("sorry, isn't WAVE");
       return;
     }
 
@@ -339,7 +342,7 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf)
     GstRiffChunk *fmt;
     GstWavParseFormat *format;
 
-    GST_DEBUG (0, "GstWavParse: looking for fmt chunk");
+    GST_DEBUG ("GstWavParse: looking for fmt chunk");
 
     /* there's a good possibility we may not have parsed this buffer */
     if (buffer_riffed == FALSE) {
@@ -417,7 +420,7 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf)
         return;
       }
 
-      GST_DEBUG (0, "frequency %d, channels %d",
+      GST_DEBUG ("frequency %d, channels %d",
 		 wavparse->rate, wavparse->channels);
 
       /* we're now looking for the data chunk */
@@ -434,7 +437,7 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf)
     GstBuffer *newbuf;
     GstRiffChunk *datachunk;
 
-    GST_DEBUG (0, "GstWavParse: looking for data chunk");
+    GST_DEBUG ("GstWavParse: looking for data chunk");
 
     /* again, we might need to parse the buffer */
     if (buffer_riffed == FALSE) {
@@ -447,7 +450,7 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf)
     if (datachunk != NULL) {
       gulong subsize;
 
-      GST_DEBUG (0, "data begins at %ld", datachunk->offset);
+      GST_DEBUG ("data begins at %ld", datachunk->offset);
 
       wavparse->datastart = datachunk->offset;
 
@@ -456,7 +459,7 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf)
 
       /* now we construct a new buffer for the remainder */
       subsize = size - datachunk->offset;
-      GST_DEBUG (0, "sending last %ld bytes along as audio", subsize);
+      GST_DEBUG ("sending last %ld bytes along as audio", subsize);
 
       newbuf = gst_buffer_create_sub (buf, datachunk->offset, subsize);
       gst_buffer_unref (buf);
@@ -510,7 +513,7 @@ gst_wavparse_pad_convert (GstPad *pad,
   
   bytes_per_sample = wavparse->channels * wavparse->width / 8;
   if (bytes_per_sample == 0) {
-    GST_DEBUG (0, "bytes_per_sample is 0, probably an mp3 - channels %d,  width %d\n",
+    GST_DEBUG ("bytes_per_sample is 0, probably an mp3 - channels %d,  width %d\n",
 	          wavparse->channels, wavparse->width);
     return FALSE;
   }
@@ -519,7 +522,7 @@ gst_wavparse_pad_convert (GstPad *pad,
     g_warning ("byterate is 0, internal error\n");
     return FALSE;
   }
-  GST_DEBUG (0, "bytes per sample: %d\n", bytes_per_sample);
+  GST_DEBUG ("bytes per sample: %d\n", bytes_per_sample);
 
   switch (src_format) {
     case GST_FORMAT_BYTES:
@@ -589,7 +592,7 @@ gst_wavparse_pad_query (GstPad *pad, GstQueryType type,
     g_warning ("Could not query sink pad's peer\n");
     return FALSE;
   }
-  GST_DEBUG (0, "pad_query done, value %" G_GINT64_FORMAT "\n", *value);
+  GST_DEBUG ("pad_query done, value %" G_GINT64_FORMAT "\n", *value);
   return TRUE;
 }
 
@@ -610,7 +613,7 @@ gst_wavparse_srcpad_event (GstPad *pad, GstEvent *event)
   GstWavParse *wavparse = GST_WAVPARSE (GST_PAD_PARENT (pad));
   gboolean res = FALSE;
 
-  GST_DEBUG(0, "event %d", GST_EVENT_TYPE (event));
+  GST_DEBUG ("event %d", GST_EVENT_TYPE (event));
 
   switch (GST_EVENT_TYPE (event)) {
     case GST_EVENT_SEEK: