diff --git a/gst-libs/gst/audio/audioclock.h b/gst-libs/gst/audio/audioclock.h
index 8ac984b7b5..8d0e2a3d69 100644
--- a/gst-libs/gst/audio/audioclock.h
+++ b/gst-libs/gst/audio/audioclock.h
@@ -62,10 +62,14 @@ struct _GstAudioClock {
   GSList *async_entries;
 
   gboolean active;
+
+  GST_OBJECT_PADDING
 };
 
 struct _GstAudioClockClass {
   GstSystemClockClass parent_class;
+
+  GST_CLASS_PADDING
 };
 
 GType           gst_audio_clock_get_type 	(void);
diff --git a/gst-libs/gst/media-info/media-info.h b/gst-libs/gst/media-info/media-info.h
index 942fbf6384..8df0c2d927 100644
--- a/gst-libs/gst/media-info/media-info.h
+++ b/gst-libs/gst/media-info/media-info.h
@@ -24,22 +24,27 @@
 #include <gst/gst.h>
 
 typedef struct GstMediaInfoPriv		GstMediaInfoPriv;
+typedef struct _GstMediaInfo            GstMediaInfo;
+typedef struct _GstMediaInfoClass       GstMediaInfoClass;
 
-typedef struct
+struct _GstMediaInfo
 {
   GObject parent;
 
   GstMediaInfoPriv *priv;
-} GstMediaInfo;
 
-typedef struct
+  GST_OBJECT_PADDING
+};
+
+struct _GstMediaInfoClass
 {
   GObjectClass parent_class;
 
   /* signals */
   void (*media_info_signal) 		(GstMediaInfo *gst_media_info);
 
-} GstMediaInfoClass;
+  GST_CLASS_PADDING
+};
 
 /* structure for "physical" stream,
  * which can contain multiple sequential ones */
diff --git a/gst-libs/gst/mixer/mixer.h b/gst-libs/gst/mixer/mixer.h
index 49351aec4d..565ba8db71 100644
--- a/gst-libs/gst/mixer/mixer.h
+++ b/gst-libs/gst/mixer/mixer.h
@@ -82,6 +82,8 @@ typedef struct _GstMixerClass {
   void           (* set_record)    (GstMixer        *mixer,
 				    GstMixerChannel *channel,
 				    gboolean         record);
+
+  GST_CLASS_PADDING
 } GstMixerClass;
 
 GType		gst_mixer_get_type	(void);
diff --git a/gst-libs/gst/navigation/navigation.h b/gst-libs/gst/navigation/navigation.h
index a70583938e..e5e02a9821 100644
--- a/gst-libs/gst/navigation/navigation.h
+++ b/gst-libs/gst/navigation/navigation.h
@@ -48,6 +48,7 @@ typedef struct _GstNavigationClass {
   /* virtual functions */
   void (*send_event) (GstNavigation *navigation, GstCaps *caps);
   
+  GST_CLASS_PADDING
 } GstNavigationClass;
 
 GType		gst_navigation_get_type	(void);
diff --git a/gst-libs/gst/play/play.old.h b/gst-libs/gst/play/play.old.h
index 1eabd3fd42..fec75173ba 100644
--- a/gst-libs/gst/play/play.old.h
+++ b/gst-libs/gst/play/play.old.h
@@ -132,6 +132,8 @@ struct _GstPlay
 
   GstPlayTimeoutAdd timeout_add_func;
   GstPlayIdleAdd idle_add_func;
+
+  GST_OBJECT_PADDING
 };
 
 struct _GstPlayClass
@@ -152,6 +154,8 @@ struct _GstPlayClass
   void (*have_vis_video_out) (GstPlay * play, gpointer video_out);
   void (*have_video_size) (GstPlay * play, gint width, gint height);
   void (*have_vis_size) (GstPlay * play, gint width, gint height);
+
+  GST_CLASS_PADDING
 };
 
 struct _GstPlayIdleData
diff --git a/gst-libs/gst/video/gstvideosink.h b/gst-libs/gst/video/gstvideosink.h
index 9f82bb1f81..2a460fdaab 100644
--- a/gst-libs/gst/video/gstvideosink.h
+++ b/gst-libs/gst/video/gstvideosink.h
@@ -61,6 +61,8 @@ struct _GstVideoSink {
   GstClock *clock;
   
   GstCaps *formats;
+
+  GST_OBJECT_PADDING
 };
 
 struct _GstVideoSinkClass {
@@ -75,6 +77,8 @@ struct _GstVideoSinkClass {
   void (*have_video_out)  (GstVideoSink *element, gpointer video_out);
   void (*have_size)       (GstVideoSink *element, gint width, gint height);
   void (*frame_displayed) (GstVideoSink *element);
+
+  GST_CLASS_PADDING
 };
 
 GType gst_videosink_get_type (void);
diff --git a/gst-libs/gst/video/videosink.h b/gst-libs/gst/video/videosink.h
index 9f82bb1f81..2a460fdaab 100644
--- a/gst-libs/gst/video/videosink.h
+++ b/gst-libs/gst/video/videosink.h
@@ -61,6 +61,8 @@ struct _GstVideoSink {
   GstClock *clock;
   
   GstCaps *formats;
+
+  GST_OBJECT_PADDING
 };
 
 struct _GstVideoSinkClass {
@@ -75,6 +77,8 @@ struct _GstVideoSinkClass {
   void (*have_video_out)  (GstVideoSink *element, gpointer video_out);
   void (*have_size)       (GstVideoSink *element, gint width, gint height);
   void (*frame_displayed) (GstVideoSink *element);
+
+  GST_CLASS_PADDING
 };
 
 GType gst_videosink_get_type (void);