diff --git a/gst/gobject2gtk.h b/gst/gobject2gtk.h
index 3cd9d89440..ba9ce3fcd8 100644
--- a/gst/gobject2gtk.h
+++ b/gst/gobject2gtk.h
@@ -15,13 +15,13 @@
 #define G_PI_4  0.78539816339744830962E0
 #define G_SQRT2 1.4142135623730950488E0
 
-// lists functions not in glib 1.2
+/* lists functions not in glib 1.2 */
 GList *g_list_delete_link (GList *list, GList *llink);
 GSList *g_slist_delete_link (GSList *list, GSList *llink);
 
 #define g_string_append_printf g_string_printfa
 
-// string helper functions not in glib 1.2
+/* string helper functions not in glib 1.2 */
 #define G_CSET_A_2_Z       "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
 #define G_CSET_a_2_z       "abcdefghijklmnopqrstuvwxyz"
 #define G_CSET_DIGITS      "0123456789"
@@ -30,7 +30,7 @@ gchar* g_strcanon (gchar *string, const gchar *valid_chars,
                    gchar substitutor);
 
 
-// GObject
+/* GObject */
 typedef struct _GObject GObject;
 typedef struct _GObjectClass GObjectClass;
 
@@ -40,7 +40,7 @@ typedef struct _GObjectClass GObjectClass;
 #define g_object_ref(obj)			gtk_object_ref((GtkObject *)(obj))
 #define g_object_unref(obj)			gtk_object_unref((GtkObject *)(obj))
 
-// the helper macros for type checking
+/* the helper macros for type checking */
 #define G_TYPE_CHECK_INSTANCE_CAST		GTK_CHECK_CAST
 #define G_TYPE_CHECK_INSTANCE_TYPE		GTK_CHECK_TYPE
 #define G_TYPE_INSTANCE_GET_CLASS(o,t,c)        (((c*)(GTK_OBJECT(o)->klass)))
@@ -51,7 +51,7 @@ typedef struct _GObjectClass GObjectClass;
 #define G_OBJECT_TYPE				GTK_OBJECT_TYPE
 #define G_OBJECT_CLASS_TYPE(gclass)		(gclass->type)
 
-// types
+/* types */
 #define G_TYPE_NONE				GTK_TYPE_NONE
 #define G_TYPE_CHAR				GTK_TYPE_CHAR
 #define G_TYPE_UCHAR				GTK_TYPE_UCHAR
@@ -70,7 +70,7 @@ typedef struct _GObjectClass GObjectClass;
 #define G_TYPE_BOXED				GTK_TYPE_BOXED
 #define G_TYPE_PARAM				GTK_TYPE_PARAM
 
-// marshallers
+/* marshallers */
 #define g_cclosure_marshal_VOID__VOID			gtk_marshal_NONE__NONE
 #define g_cclosure_marshal_VOID__BOOLEAN		gtk_marshal_NONE__BOOL
 #define g_cclosure_marshal_VOID__CHAR			gtk_marshal_NONE__CHAR
@@ -110,9 +110,9 @@ typedef struct _GObjectClass GObjectClass;
 # define G_END_DECLS
 #endif
 
-// args
-//#define set_property set_arg
-//#define get_property get_arg
+/* args */
+/*#define set_property set_arg*/
+/*#define get_property get_arg*/
 
 #define g_object_get_property(obj,argname,pspec)\
 G_STMT_START{ \
@@ -123,7 +123,7 @@ G_STMT_START{ \
 #define g_object_set(o,args...)		        gtk_object_set ((GtkObject *) (o), ## args)
 
 
-// type system
+/* type system */
 #define GType					GtkType
 #define GTypeFlags				guint
 #define GClassInitFunc				GtkClassInitFunc
@@ -148,7 +148,7 @@ GType g2g_object_get_type (void);
  ***********************************/
 
 
-// type registration
+/* type registration */
 typedef struct _GTypeInfo               GTypeInfo;
 struct _GTypeInfo
 {
@@ -180,11 +180,11 @@ guint g2g_type_register_static (GtkType parent_type, gchar *type_name,
 
 
 
-// object creation
+/* object creation */
 #define g_object_new					g2g_object_new
 gpointer g2g_object_new(GtkType type,gpointer blah_varargs_stuff);
 
-// disposal
+/* disposal */
 #define g_object_run_dispose				g2g_object_run_dispose
 void g2g_object_run_dispose (GObject *object);
 
@@ -195,7 +195,7 @@ void g2g_object_run_dispose (GObject *object);
 #define G_SIGNAL_NO_RECURSE				GTK_RUN_NO_RECURSE
 #define G_SIGNAL_NO_HOOKS				GTK_RUN_NO_HOOKS
 
-#define GCallback					gpointer	// FIXME?
+#define GCallback					gpointer	/* FIXME?*/
 #define G_CALLBACK(f)					((gpointer)(f))
 
 #define g_signal_new					g2g_signal_new
@@ -206,7 +206,7 @@ g2g_signal_new (const gchar       *signal_name,
 		GtkType            object_type,
 		GtkSignalRunType   signal_flags,
 		guint              function_offset,
-		gpointer           accumulator,  // GSignalAccumulator   
+		gpointer           accumulator,  /* GSignalAccumulator */ 
 		gpointer           accu_data,
 		GtkSignalMarshaller  marshaller,
 		GType              return_type,
@@ -243,13 +243,13 @@ gtk_signal_handler_pending ((GtkObject *)object,name,may_block)
 
 gint* g_signal_list_ids (GType type, guint *n_ids);
 
-// lists
+/* lists */
 GSList*		g_slist_delete_link	(GSList *list, GSList *link) __attribute__ ((no_instrument_function));
 
 
-// arguments/parameters
+/* arguments/parameters */
 
-// first define GValue and GParamSpec
+/* first define GValue and GParamSpec */
 #define GValue			GtkArg
 #define GParamFlags		gint
 #define G_VALUE_TYPE(v)		((v)->type)
@@ -340,18 +340,18 @@ GParamSpec *g2g_param_spec_string(gchar *name,gchar *nick,gchar *blurb,gchar *de
 #define G_VALUE_HOLDS_STRING(value) (((value)->type)==GTK_TYPE_STRING)
 #define G_VALUE_HOLDS_POINTER(value) (((value)->type)==GTK_TYPE_POINTER)
 
-// the object itself
-//#define GObject				GtkObject
-//#define GObjectClass				GtkObjectClass
+/* the object itself */
+/*#define GObject				GtkObject */
+/*#define GObjectClass				GtkObjectClass */
 #define G_OBJECT(obj)				((GObject *)(obj))
 #define G_OBJECT_CLASS(c)			((GObjectClass *)(c))
 
 #define G_TYPE_OBJECT \
   (g2g_object_get_type())
-//#define G_OBJECT(obj) 
-//  (GTK_CHECK_CAST((obj),G_TYPE_OBJECT,GObject))
-//#define G_OBJECT_CLASS(klass) 
-//  (GTK_CHECK_CLASS_CAST((klass),G_TYPE_OBJECT,GObjectClass)) 
+/*#define G_OBJECT(obj)  */
+/*  (GTK_CHECK_CAST((obj),G_TYPE_OBJECT,GObject)) */
+/*#define G_OBJECT_CLASS(klass)  */
+/*  (GTK_CHECK_CLASS_CAST((klass),G_TYPE_OBJECT,GObjectClass)) */
 #define G_IS_OBJECT(obj) \
   (GTK_CHECK_TYPE((obj),G_TYPE_OBJECT))
 #define G_IS_OBJECT_CLASS(obj) \
diff --git a/gst/gst_private.h b/gst/gst_private.h
index c30ad77cfd..6dc4f5573a 100644
--- a/gst/gst_private.h
+++ b/gst/gst_private.h
@@ -33,10 +33,10 @@
 #define _(String) dgettext(PACKAGE,String)
 #ifdef gettext_noop
 #define N_(String) gettext_noop(String)
-#else // gettext_noop
+#else /* gettext_noop */
 #define N_(String) (String)
-#endif // gettext_noop
-#else // ENABLE_NLS
+#endif /* gettext_noop */
+#else /* ENABLE_NLS */
 #define _(String) (String)
 #define N_(String) (String)
 #define textdomain(String) (String)
@@ -44,7 +44,7 @@
 #define dgettext(Domain,String) (String)
 #define dcgettext(Domain,String,Type) (String)
 #define bindtextdomain(Domain,Directory) (Domain)
-#endif // ENABLE_NLS
+#endif /* ENABLE_NLS */
 *****/
 
 #endif /* HAVE_CONFIG_H */
diff --git a/gst/gstarch.h b/gst/gstarch.h
index 8b1c2d8dd0..1e2f1ba1bf 100644
--- a/gst/gstarch.h
+++ b/gst/gstarch.h
@@ -37,7 +37,7 @@
 #define GST_ARCH_CALL(target) \
     __asm__("call *%0" : : "r"(target) );
 
-// assuming the stackframe is 16 bytes
+/* assuming the stackframe is 16 bytes */
 #define GST_ARCH_SETUP_STACK(sp) sp -= 4
 
 
@@ -45,7 +45,7 @@
 /***** PowerPC *****/
 #elif defined (HAVE_CPU_PPC)
 
-// should bring this in line with others and use an "r"
+/* should bring this in line with others and use an "r" */
 #define GST_ARCH_SET_SP(stackpointer) \
     __asm__("lwz 1,%0" : : "m"(stackpointer))
   
@@ -77,8 +77,9 @@ struct minimal_ppc_stackframe {
     __asm__( "bis $31,%0,$27\n\t" \
              "jsr $26,($27),0" : : "r"(target) );
 
-// Need to get more information about the stackframe format
-// and get the fields more correct.  Check GDB sources maybe?
+/* Need to get more information about the stackframe format
+ * and get the fields more correct.  Check GDB sources maybe?
+ */
 struct minimal_stackframe {
     unsigned long back_chain;
     unsigned long LR_save;
@@ -101,9 +102,9 @@ struct minimal_stackframe {
 #define GST_ARCH_CALL(target) \
     __asm__( "mov pc, %0" : : "r"(target) );
 
-// Need to get more information about the stackframe format
-// and get the fields more correct.  Check GDB sources maybe?
-
+/* Need to get more information about the stackframe format 
+ * and get the fields more correct.  Check GDB sources maybe?
+ */
 #define GST_ARCH_SETUP_STACK(sp) sp -= 4
 
 
@@ -122,9 +123,9 @@ struct minimal_stackframe {
 #define GST_ARCH_PRESETJMP() \
     __asm__( "ta 3" );
 
-// Need to get more information about the stackframe format
-// and get the fields more correct.  Check GDB sources maybe?
-
+/* Need to get more information about the stackframe format 
+ * and get the fields more correct.  Check GDB sources maybe?
+ */
 #define GST_ARCH_SETUP_STACK(sp) sp -= 4
 
 
@@ -139,7 +140,7 @@ struct minimal_stackframe {
     __asm__("move $25,%1\n\t"	/* call via $25 */ \
             "jal  $25\n\t" : : "r"(target));
 
-// assuming the stackframe is 16 bytes
+/* assuming the stackframe is 16 bytes */
 #define GST_ARCH_SETUP_STACK(sp) sp -= 4
     
 
@@ -155,7 +156,7 @@ struct minimal_stackframe {
             ".CALL\n\t"			/* call pseudo insn (why?) */ \
             "bl $$dyncall,%%r31\n\t" : : "r"(target));
 
-// assume stackframe is 16 bytes
+/* assume stackframe is 16 bytes */
 #define GST_ARCH_SETUP_STACK(sp) sp -= 4
 
 
diff --git a/gst/gstautoplug.h b/gst/gstautoplug.h
index 6432cd3130..ec37e8ae88 100644
--- a/gst/gstautoplug.h
+++ b/gst/gstautoplug.h
@@ -123,7 +123,7 @@ GstAutoplug*		gst_autoplugfactory_make		(const gchar *name);
 }
 #endif /* __cplusplus */
 
-#else // GST_DISABLE_AUTOPLUG
+#else /* GST_DISABLE_AUTOPLUG */
 
 #pragma GCC poison	gst_autoplug_get_type	
 #pragma GCC poison	gst_autoplug_signal_new_object	
@@ -140,7 +140,7 @@ GstAutoplug*		gst_autoplugfactory_make		(const gchar *name);
 #pragma GCC poison	gst_autoplugfactory_create
 #pragma GCC poison	gst_autoplugfactory_make
 
-#endif // GST_DISABLE_AUTOPLUG
+#endif /* GST_DISABLE_AUTOPLUG */
 
 #endif /* __GST_AUTOPLUG_H__ */
 
diff --git a/gst/gstbin.h b/gst/gstbin.h
index b62248f370..10ea7f2288 100644
--- a/gst/gstbin.h
+++ b/gst/gstbin.h
@@ -62,8 +62,8 @@ typedef enum {
   GST_BIN_FLAG_LAST		= GST_ELEMENT_FLAG_LAST + 4,
 } GstBinFlags;
 
-//typedef struct _GstBin GstBin;
-//typedef struct _GstBinClass GstBinClass;
+/*typedef struct _GstBin GstBin; */
+/*typedef struct _GstBinClass GstBinClass; */
 
 struct _GstBin {
   GstElement element;
diff --git a/gst/gstbuffer.h b/gst/gstbuffer.h
index 77ff766df2..17edbd8f8e 100644
--- a/gst/gstbuffer.h
+++ b/gst/gstbuffer.h
@@ -24,16 +24,16 @@
 #ifndef __GST_BUFFER_H__
 #define __GST_BUFFER_H__
 
-//
-// Define this to add file:line info to each GstBuffer showing
-// the location in the source code where the buffer was created.
-// 
-// #define GST_BUFFER_WHERE
-//
-// Then in gdb, you can `call gst_buffer_print_live()' to get a list
-// of allocated GstBuffers and also the file:line where they were
-// allocated.
-//
+/*
+ * Define this to add file:line info to each GstBuffer showing
+ * the location in the source code where the buffer was created.
+ * 
+ * #define GST_BUFFER_WHERE
+ *
+ * Then in gdb, you can `call gst_buffer_print_live()' to get a list
+ * of allocated GstBuffers and also the file:line where they were
+ * allocated.
+ */
 
 #include <gst/gstdata.h>
 
diff --git a/gst/gstconfig.h b/gst/gstconfig.h
index e48d428dc2..b775efb682 100644
--- a/gst/gstconfig.h
+++ b/gst/gstconfig.h
@@ -22,8 +22,8 @@
   #include <parser.h>
 #endif
  
-  // Include compatability defines: if libxml hasn't already defined these,
-  // we have an old version 1.x
+  /* Include compatability defines: if libxml hasn't already defined these, */
+  /* we have an old version 1.x */
   #ifndef xmlChildrenNode
     #define xmlChildrenNode childs
     #define xmlRootNode root
diff --git a/gst/gstelement.h b/gst/gstelement.h
index b45be70dd0..4f48140628 100644
--- a/gst/gstelement.h
+++ b/gst/gstelement.h
@@ -52,12 +52,13 @@ typedef enum {
 } GstElementStateReturn;
 
 
-// NOTE: this probably should be done with an #ifdef to decide whether to safe-cast
-// or to just do the non-checking cast.
+/* NOTE: this probably should be done with an #ifdef to decide 
+ * whether to safe-cast or to just do the non-checking cast.
+ */
 #define GST_STATE(obj)			(GST_ELEMENT(obj)->current_state)
 #define GST_STATE_PENDING(obj)		(GST_ELEMENT(obj)->pending_state)
 
-// Note: using 8 bit shift mostly "just because", it leaves us enough room to grow <g>
+/* Note: using 8 bit shift mostly "just because", it leaves us enough room to grow <g> */
 #define GST_STATE_TRANSITION(obj)	((GST_STATE(obj)<<8) | GST_STATE_PENDING(obj))
 #define GST_STATE_NULL_TO_READY		((GST_STATE_NULL<<8) | GST_STATE_READY)
 #define GST_STATE_READY_TO_PAUSED	((GST_STATE_READY<<8) | GST_STATE_PAUSED)
@@ -125,8 +126,8 @@ typedef enum {
 #define GST_ELEMENT_SCHED(obj)			(((GstElement*)(obj))->sched)
 #define GST_ELEMENT_PADS(obj)			((obj)->pads)
 
-//typedef struct _GstElement GstElement;
-//typedef struct _GstElementClass GstElementClass;
+/*typedef struct _GstElement GstElement;*/
+/*typedef struct _GstElementClass GstElementClass;*/
 typedef struct _GstElementFactory GstElementFactory;
 typedef struct _GstElementFactoryClass GstElementFactoryClass;
 
diff --git a/gst/gstinfo.h b/gst/gstinfo.h
index 4f3f605d7c..86e04b47e7 100644
--- a/gst/gstinfo.h
+++ b/gst/gstinfo.h
@@ -62,36 +62,36 @@ gint _gst_debug_stringhash_color(gchar *file);
 const gchar *	gst_get_category_name	(gint category);
 
 enum {
-  GST_CAT_GST_INIT = 0,		// Library initialization
-  GST_CAT_COTHREADS,		// Cothread creation, etc.
-  GST_CAT_COTHREAD_SWITCH,	// Cothread switching
-  GST_CAT_AUTOPLUG,		// Successful autoplug results
-  GST_CAT_AUTOPLUG_ATTEMPT,	// Attempted autoplug operations
-  GST_CAT_PARENTAGE,		// GstBin parentage issues
-  GST_CAT_STATES,		// State changes and such
-  GST_CAT_PLANNING,		// Plan generation
-  GST_CAT_SCHEDULING,		// Schedule construction
-  GST_CAT_DATAFLOW,		// Events during actual data movement
-  GST_CAT_BUFFER,		// Buffer creation/destruction
-  GST_CAT_CAPS,			// Capabilities matching
-  GST_CAT_CLOCK,		// Clocking
-  GST_CAT_ELEMENT_PADS,		// Element pad management
-  GST_CAT_ELEMENTFACTORY,	// Elementfactory stuff
-  GST_CAT_PADS,			// Pad creation/connection
-  GST_CAT_PIPELINE,		// Pipeline stuff
-  GST_CAT_PLUGIN_LOADING,	// Plugin loading
-  GST_CAT_PLUGIN_ERRORS,	// Errors during plugin loading
-  GST_CAT_PLUGIN_INFO,		// Plugin state information
-  GST_CAT_PROPERTIES,		// Properties
-  GST_CAT_THREAD,		// Thread creation/management
-  GST_CAT_TYPES,		// Typing
-  GST_CAT_XML,			// XML load/save of everything
-  GST_CAT_NEGOTIATION,		// Caps Negotiation stuff
-  GST_CAT_REFCOUNTING,		// Ref Counting stuff
-  GST_CAT_EVENT,		// Event system
-  GST_CAT_PARAMS,		// Dynamic parameters
+  GST_CAT_GST_INIT = 0,		/* Library initialization */
+  GST_CAT_COTHREADS,		/* Cothread creation, etc. */
+  GST_CAT_COTHREAD_SWITCH,	/* Cothread switching */
+  GST_CAT_AUTOPLUG,		/* Successful autoplug results */
+  GST_CAT_AUTOPLUG_ATTEMPT,	/* Attempted autoplug operations */
+  GST_CAT_PARENTAGE,		/* GstBin parentage issues */
+  GST_CAT_STATES,		/* State changes and such */
+  GST_CAT_PLANNING,		/* Plan generation */
+  GST_CAT_SCHEDULING,		/* Schedule construction */
+  GST_CAT_DATAFLOW,		/* Events during actual data movement */
+  GST_CAT_BUFFER,		/* Buffer creation/destruction */
+  GST_CAT_CAPS,			/* Capabilities matching */
+  GST_CAT_CLOCK,		/* Clocking */
+  GST_CAT_ELEMENT_PADS,		/* Element pad management */
+  GST_CAT_ELEMENTFACTORY,	/* Elementfactory stuff */
+  GST_CAT_PADS,			/* Pad creation/connection */
+  GST_CAT_PIPELINE,		/* Pipeline stuff */
+  GST_CAT_PLUGIN_LOADING,	/* Plugin loading */
+  GST_CAT_PLUGIN_ERRORS,	/* Errors during plugin loading */
+  GST_CAT_PLUGIN_INFO,		/* Plugin state information */
+  GST_CAT_PROPERTIES,		/* Properties */
+  GST_CAT_THREAD,		/* Thread creation/management */
+  GST_CAT_TYPES,		/* Typing */
+  GST_CAT_XML,			/* XML load/save of everything */
+  GST_CAT_NEGOTIATION,		/* Caps Negotiation stuff */
+  GST_CAT_REFCOUNTING,		/* Ref Counting stuff */
+  GST_CAT_EVENT,		/* Event system */
+  GST_CAT_PARAMS,		/* Dynamic parameters */
 
-  GST_CAT_CALL_TRACE = 30,	// Call tracing
+  GST_CAT_CALL_TRACE = 30,	/* Call tracing */
 
   GST_CAT_MAX_CATEGORY = 31
 };
@@ -113,11 +113,11 @@ extern const gchar *_gst_category_colors[32];
 #define GST_DEBUG_ENABLED
 #endif
 
-//#ifdef GST_DEBUG_ENABLED
+/*#ifdef GST_DEBUG_ENABLED */
 #define GST_DEBUG_ENABLE_CATEGORIES 0xffffffff
-//#else
-//#define GST_DEBUG_ENABLE_CATEGORIES 0x00000000
-//#endif
+/*#else */
+/*#define GST_DEBUG_ENABLE_CATEGORIES 0x00000000 */
+/*#endif */
 
 
 typedef void (*GstDebugHandler) (gint category,gboolean core,
diff --git a/gst/gstobject.h b/gst/gstobject.h
index 681dcadde4..d889dfba6c 100644
--- a/gst/gstobject.h
+++ b/gst/gstobject.h
@@ -27,7 +27,7 @@
 #include <gst/gstconfig.h>
 
 #ifdef USE_GLIB2
-#include <glib-object.h>	// note that this gets wrapped in __GST_OBJECT_H__ 
+#include <glib-object.h>	/* note that this gets wrapped in __GST_OBJECT_H__ */
 #include <gst/gstmarshal.h>
 #else
 #include <gst/gobject2gtk.h>
@@ -40,7 +40,7 @@
 #include <gst/gsttrace.h>
 #include <gst/gsttypes.h>
 
-// FIXME
+/* FIXME */
 #include "gstlog.h"
 
 #ifdef __cplusplus
@@ -64,9 +64,9 @@ extern GType _gst_object_type;
 # define GST_OBJECT_CLASS               GST_OBJECT_CLASS_FAST
 #endif
 
-//typedef struct _GstObject GstObject;
-//typedef struct _GstObjectClass GstObjectClass;
-//
+/*typedef struct _GstObject GstObject; */ 
+/*typedef struct _GstObjectClass GstObjectClass; */
+
 typedef enum
 {
   GST_DESTROYED   = 0,
diff --git a/gst/gstpad.h b/gst/gstpad.h
index c73ecf740b..d2f66535e6 100644
--- a/gst/gstpad.h
+++ b/gst/gstpad.h
@@ -41,7 +41,7 @@ extern GType _gst_pad_type;
 extern GType _gst_real_pad_type;
 extern GType _gst_ghost_pad_type;
 
-//#define GST_TYPE_PARANOID
+/*#define GST_TYPE_PARANOID */
 
 /* 
  * Pad base class
@@ -102,14 +102,14 @@ extern GType _gst_ghost_pad_type;
 #endif
 
 
-//typedef struct _GstPad GstPad;
-//typedef struct _GstPadClass GstPadClass;
+/*typedef struct _GstPad GstPad; */
+/*typedef struct _GstPadClass GstPadClass;*/
 typedef struct _GstRealPad GstRealPad;
 typedef struct _GstRealPadClass GstRealPadClass;
 typedef struct _GstGhostPad GstGhostPad;
 typedef struct _GstGhostPadClass GstGhostPadClass;
-//typedef struct _GstPadTemplate GstPadTemplate;
-//typedef struct _GstPadTemplateClass GstPadTemplateClass;
+/*typedef struct _GstPadTemplate GstPadTemplate;*/
+/*typedef struct _GstPadTemplateClass GstPadTemplateClass;*/
 
 
 typedef enum {
diff --git a/gst/gstparse.h b/gst/gstparse.h
index 374e456f80..bbff4834de 100644
--- a/gst/gstparse.h
+++ b/gst/gstparse.h
@@ -39,11 +39,11 @@ typedef enum {
   
 gint	gst_parse_launch	(const gchar *cmdline, GstBin *parent);
 
-#else // GST_DISABLE_PARSE
+#else /* GST_DISABLE_PARSE */
 
 #pragma GCC poison gst_parse_launch
 
-#endif // GST_DISABLE_PARSE
+#endif /* GST_DISABLE_PARSE */
 
 #ifdef __cplusplus
 }
diff --git a/gst/gstscheduler.h b/gst/gstscheduler.h
index 042664d7b9..955ee58190 100644
--- a/gst/gstscheduler.h
+++ b/gst/gstscheduler.h
@@ -47,8 +47,8 @@ extern "C" {
 
 #define GST_SCHED_PARENT(sched)		((sched)->parent)
 
-//typedef struct _GstScheduler GstScheduler;
-//typedef struct _GstSchedulerClass GstSchedulerClass;
+/*typedef struct _GstScheduler GstScheduler; */
+/*typedef struct _GstSchedulerClass GstSchedulerClass; */
 
 struct _GstScheduler {
   GstObject object;
diff --git a/gst/gsttrace.h b/gst/gsttrace.h
index 6e91c1e272..22963841bb 100644
--- a/gst/gsttrace.h
+++ b/gst/gsttrace.h
@@ -77,7 +77,7 @@ extern gint _gst_trace_on;
 #define gst_trace_add_entry(trace,seq,data,msg)
 #endif
 
-#else // GST_DISABLE_TRACE
+#else /* GST_DISABLE_TRACE */
 
 #pragma GCC poison 	gst_trace_new	
 #pragma GCC poison	gst_trace_destroy
@@ -91,6 +91,6 @@ extern gint _gst_trace_on;
 #pragma GCC poison 	gst_trace_read_tsc
 #pragma GCC poison 	gst_trace_add_entry
 
-#endif // GST_DISABLE_TRACE
+#endif /* GST_DISABLE_TRACE */
 
 #endif /* __GST_TRACE_H__ */
diff --git a/gst/gsttypefind.h b/gst/gsttypefind.h
index 2f1f62d1ab..19ee83bb96 100644
--- a/gst/gsttypefind.h
+++ b/gst/gsttypefind.h
@@ -71,6 +71,6 @@ GType gst_typefind_get_type (void);
 }
 #endif /* __cplusplus */
 
-#endif // GST_DISABLE_TYPEFIND
+#endif /* GST_DISABLE_TYPEFIND */
 
 #endif /* __GST_TYPEFIND_H__ */
diff --git a/gst/gstutils.h b/gst/gstutils.h
index 0e854124d4..2a445bfdfe 100644
--- a/gst/gstutils.h
+++ b/gst/gstutils.h
@@ -41,7 +41,7 @@ gfloat 		gst_util_get_float_arg		(GObject *object, const gchar *argname);
 gdouble 	gst_util_get_double_arg		(GObject *object, const gchar *argname);
 const gchar*	gst_util_get_string_arg		(GObject *object, const gchar *argname);
 gpointer 	gst_util_get_pointer_arg	(GObject *object, const gchar *argname);
-//GtkWidget*	gst_util_get_widget_property	(GObject *object, const gchar *argname);
+/*GtkWidget*	gst_util_get_widget_property	(GObject *object, const gchar *argname);*/
 
 void 		gst_util_set_object_arg 	(GObject *object, const gchar *name, const gchar *value);
 	
diff --git a/gst/gstxml.h b/gst/gstxml.h
index b66aba2608..da0566e5be 100644
--- a/gst/gstxml.h
+++ b/gst/gstxml.h
@@ -83,7 +83,7 @@ GList*		gst_xml_get_topelements (GstXML *xml);
 }
 #endif /* __cplusplus */
 
-#else // GST_DISABLE_LOADSAVE
+#else /* GST_DISABLE_LOADSAVE */
 
 #pragma GCC poison gst_xml_write
 #pragma GCC poison gst_xml_new
@@ -93,6 +93,6 @@ GList*		gst_xml_get_topelements (GstXML *xml);
 #pragma GCC poison gst_xml_get_element
 #pragma GCC poison gst_xml_get_topelements
 
-#endif // GST_DISABLE_LOADSAVE
+#endif /* GST_DISABLE_LOADSAVE */
 
 #endif /* __GST_XML_H__ */