diff --git a/ChangeLog b/ChangeLog
index 4db65ac5a6..1bae2252ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2006-06-23  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* ext/directfb/dfbvideosink.c:
+	* ext/gsm/gstgsmdec.c:
+	* ext/gsm/gstgsmenc.c:
+	* ext/libmms/gstmms.c:
+	* ext/neon/gstneonhttpsrc.c:
+	* ext/theora/theoradec.c:
+	* gst/freeze/gstfreeze.c:
+	* gst/gdp/gstgdpdepay.c:
+	* gst/gdp/gstgdppay.c:
+	* sys/glsink/glimagesink.c:
+	  Use GST_DEBUG_CATEGORY_STATIC where possible (#342503)
+	  and fix one GObject boilerplate macro.
+
 2006-06-20  Wim Taymans  <wim@fluendo.com>
 
 	* gst/modplug/libmodplug/stdafx.h:
diff --git a/common b/common
index bbfa014696..123195d3bb 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit bbfa0146961f4ca61ddbca7b42360b5741a6354b
+Subproject commit 123195d3bbcc0b6e1cf867d3a180685f8766a0be
diff --git a/ext/directfb/dfbvideosink.c b/ext/directfb/dfbvideosink.c
index 9c970598b3..db51f7e9d1 100644
--- a/ext/directfb/dfbvideosink.c
+++ b/ext/directfb/dfbvideosink.c
@@ -98,7 +98,7 @@
 #include <string.h>
 
 /* Debugging category */
-GST_DEBUG_CATEGORY (dfbvideosink_debug);
+GST_DEBUG_CATEGORY_STATIC (dfbvideosink_debug);
 #define GST_CAT_DEFAULT dfbvideosink_debug
 
 /* ElementFactory information */
diff --git a/ext/gsm/gstgsmdec.c b/ext/gsm/gstgsmdec.c
index ef2c3ea135..e312255cb6 100644
--- a/ext/gsm/gstgsmdec.c
+++ b/ext/gsm/gstgsmdec.c
@@ -27,7 +27,7 @@
 
 #include "gstgsmdec.h"
 
-GST_DEBUG_CATEGORY (gsmdec_debug);
+GST_DEBUG_CATEGORY_STATIC (gsmdec_debug);
 #define GST_CAT_DEFAULT (gsmdec_debug)
 
 /* elementfactory information */
diff --git a/ext/gsm/gstgsmenc.c b/ext/gsm/gstgsmenc.c
index 5e422ebd2b..209e5c586c 100644
--- a/ext/gsm/gstgsmenc.c
+++ b/ext/gsm/gstgsmenc.c
@@ -27,7 +27,7 @@
 
 #include "gstgsmenc.h"
 
-GST_DEBUG_CATEGORY (gsmenc_debug);
+GST_DEBUG_CATEGORY_STATIC (gsmenc_debug);
 #define GST_CAT_DEFAULT (gsmenc_debug)
 
 /* elementfactory information */
diff --git a/ext/libmms/gstmms.c b/ext/libmms/gstmms.c
index df5555c43c..b89070e5d3 100644
--- a/ext/libmms/gstmms.c
+++ b/ext/libmms/gstmms.c
@@ -34,7 +34,7 @@ enum
 };
 
 
-GST_DEBUG_CATEGORY (mmssrc_debug);
+GST_DEBUG_CATEGORY_STATIC (mmssrc_debug);
 #define GST_CAT_DEFAULT mmssrc_debug
 
 static const GstElementDetails plugin_details =
diff --git a/ext/neon/gstneonhttpsrc.c b/ext/neon/gstneonhttpsrc.c
index 98da82343b..ab353b88b6 100644
--- a/ext/neon/gstneonhttpsrc.c
+++ b/ext/neon/gstneonhttpsrc.c
@@ -28,7 +28,7 @@
 #define HTTP_DEFAULT_PORT        80
 #define HTTPS_DEFAULT_PORT       443
 
-GST_DEBUG_CATEGORY (neonhttpsrc_debug);
+GST_DEBUG_CATEGORY_STATIC (neonhttpsrc_debug);
 #define GST_CAT_DEFAULT neonhttpsrc_debug
 
 #define MAX_READ_SIZE                   (4 * 1024)
diff --git a/ext/theora/theoradec.c b/ext/theora/theoradec.c
index c68ba41a2e..ccb286417e 100644
--- a/ext/theora/theoradec.c
+++ b/ext/theora/theoradec.c
@@ -48,7 +48,7 @@
 #include "theoradec.h"
 #include <gst/tag/tag.h>
 
-GST_DEBUG_CATEGORY (theoradecexp_debug);
+GST_DEBUG_CATEGORY_STATIC (theoradecexp_debug);
 #define GST_CAT_DEFAULT theoradecexp_debug
 
 static const GstElementDetails theora_dec_details =
diff --git a/gst/freeze/gstfreeze.c b/gst/freeze/gstfreeze.c
index 205e8c8362..4061724533 100644
--- a/gst/freeze/gstfreeze.c
+++ b/gst/freeze/gstfreeze.c
@@ -23,8 +23,8 @@
 
 #include "gstfreeze.h"
 
+GST_DEBUG_CATEGORY_STATIC (freeze_debug);
 #define GST_CAT_DEFAULT freeze_debug
-GST_DEBUG_CATEGORY (freeze_debug);
 
 enum
 {
diff --git a/gst/gdp/gstgdpdepay.c b/gst/gdp/gstgdpdepay.c
index 9ffddfe2b4..3f973b8bd8 100644
--- a/gst/gdp/gstgdpdepay.c
+++ b/gst/gdp/gstgdpdepay.c
@@ -64,7 +64,7 @@ GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS_ANY);
 
-GST_DEBUG_CATEGORY (gst_gdp_depay_debug);
+GST_DEBUG_CATEGORY_STATIC (gst_gdp_depay_debug);
 #define GST_CAT_DEFAULT gst_gdp_depay_debug
 
 #define _do_init(x) \
diff --git a/gst/gdp/gstgdppay.c b/gst/gdp/gstgdppay.c
index e44a6fe8e1..e80476e51f 100644
--- a/gst/gdp/gstgdppay.c
+++ b/gst/gdp/gstgdppay.c
@@ -56,7 +56,7 @@ GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("application/x-gdp"));
 
-GST_DEBUG_CATEGORY (gst_gdp_pay_debug);
+GST_DEBUG_CATEGORY_STATIC (gst_gdp_pay_debug);
 #define GST_CAT_DEFAULT gst_gdp_pay_debug
 
 #define DEFAULT_CRC_HEADER TRUE
diff --git a/sys/glsink/glimagesink.c b/sys/glsink/glimagesink.c
index f6ff4c2782..bfd0b6b3f2 100644
--- a/sys/glsink/glimagesink.c
+++ b/sys/glsink/glimagesink.c
@@ -33,7 +33,7 @@
 #include <GL/glx.h>
 #include <GL/gl.h>
 
-GST_DEBUG_CATEGORY (gst_debug_glimage_sink);
+GST_DEBUG_CATEGORY_STATIC (gst_debug_glimage_sink);
 #define GST_CAT_DEFAULT gst_debug_glimage_sink
 
 #define GST_TYPE_GLIMAGE_SINK \
@@ -44,7 +44,7 @@ GST_DEBUG_CATEGORY (gst_debug_glimage_sink);
     (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GLIMAGE_SINK,GstGLImageSinkClass))
 #define GST_IS_GLIMAGE_SINK(obj) \
     (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GLIMAGE_SINK))
-#define GST_IS_GLIMAGE_SINK_CLASS(obj) \
+#define GST_IS_GLIMAGE_SINK_CLASS(klass) \
     (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GLIMAGE_SINK))
 
 typedef struct _GstGLImageSink GstGLImageSink;