diff --git a/ChangeLog b/ChangeLog
index 5b5cb767f3..08bd4294c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2004-10-23  Michael Natterer  <mitch@gimp.org>
+
+	* libgimp/gimpaspectpreview.h
+	* libgimp/gimpdrawablepreview.h
+	* libgimp/gimpprogressbar.h
+	* libgimpwidgets/gimpcellrenderercolor.h
+	* libgimpwidgets/gimpcellrenderertoggle.h
+	* libgimpwidgets/gimpframe.h
+	* libgimpwidgets/gimpintcombobox.h
+	* libgimpwidgets/gimpintstore.h
+	* libgimpwidgets/gimppreview.h
+	* libgimpwidgets/gimppreviewarea.h
+	* libgimpwidgets/gimpscrolledpreview.h: added padding to all class
+	structs which have been added since 2.0.
+
 2004-10-23  Michael Natterer  <mitch@gimp.org>
 
 	* app/actions/file-commands.c (file_save_cmd_callback): don't
diff --git a/libgimp/gimpaspectpreview.h b/libgimp/gimpaspectpreview.h
index 9f84ffa38d..541ef02384 100644
--- a/libgimp/gimpaspectpreview.h
+++ b/libgimp/gimpaspectpreview.h
@@ -51,6 +51,12 @@ struct _GimpAspectPreview
 struct _GimpAspectPreviewClass
 {
   GimpPreviewClass  parent_class;
+
+  /* Padding for future expansion */
+  void (* _gimp_reserved1) (void);
+  void (* _gimp_reserved2) (void);
+  void (* _gimp_reserved3) (void);
+  void (* _gimp_reserved4) (void);
 };
 
 
diff --git a/libgimp/gimpdrawablepreview.h b/libgimp/gimpdrawablepreview.h
index 379e0cfaca..7006c08845 100644
--- a/libgimp/gimpdrawablepreview.h
+++ b/libgimp/gimpdrawablepreview.h
@@ -50,6 +50,12 @@ struct _GimpDrawablePreview
 struct _GimpDrawablePreviewClass
 {
   GimpScrolledPreviewClass parent_class;
+
+  /* Padding for future expansion */
+  void (* _gimp_reserved1) (void);
+  void (* _gimp_reserved2) (void);
+  void (* _gimp_reserved3) (void);
+  void (* _gimp_reserved4) (void);
 };
 
 
diff --git a/libgimp/gimpprogressbar.h b/libgimp/gimpprogressbar.h
index 3e5ee4571a..d8d1cdd869 100644
--- a/libgimp/gimpprogressbar.h
+++ b/libgimp/gimpprogressbar.h
@@ -49,6 +49,12 @@ struct _GimpProgressBar
 struct _GimpProgressBarClass
 {
   GtkProgressBarClass  parent_class;
+
+  /* Padding for future expansion */
+  void (* _gimp_reserved1) (void);
+  void (* _gimp_reserved2) (void);
+  void (* _gimp_reserved3) (void);
+  void (* _gimp_reserved4) (void);
 };
 
 
diff --git a/libgimpwidgets/gimpcellrenderercolor.h b/libgimpwidgets/gimpcellrenderercolor.h
index d4fae8b235..5ed19ddead 100644
--- a/libgimpwidgets/gimpcellrenderercolor.h
+++ b/libgimpwidgets/gimpcellrenderercolor.h
@@ -49,6 +49,12 @@ struct _GimpCellRendererColor
 struct _GimpCellRendererColorClass
 {
   GtkCellRendererClass  parent_class;
+
+  /* Padding for future expansion */
+  void (* _gimp_reserved1) (void);
+  void (* _gimp_reserved2) (void);
+  void (* _gimp_reserved3) (void);
+  void (* _gimp_reserved4) (void);
 };
 
 
diff --git a/libgimpwidgets/gimpcellrenderertoggle.h b/libgimpwidgets/gimpcellrenderertoggle.h
index 5ccfecf319..566de7eea5 100644
--- a/libgimpwidgets/gimpcellrenderertoggle.h
+++ b/libgimpwidgets/gimpcellrenderertoggle.h
@@ -52,6 +52,12 @@ struct _GimpCellRendererToggleClass
   void (* clicked) (GimpCellRendererToggle *cell,
                     const gchar            *path,
                     GdkModifierType         state);
+
+  /* Padding for future expansion */
+  void (* _gimp_reserved1) (void);
+  void (* _gimp_reserved2) (void);
+  void (* _gimp_reserved3) (void);
+  void (* _gimp_reserved4) (void);
 };
 
 
diff --git a/libgimpwidgets/gimpframe.h b/libgimpwidgets/gimpframe.h
index a07f49f93c..d530b3add1 100644
--- a/libgimpwidgets/gimpframe.h
+++ b/libgimpwidgets/gimpframe.h
@@ -48,6 +48,12 @@ struct _GimpFrame
 struct _GimpFrameClass
 {
   GtkFrameClass  parent_class;
+
+  /* Padding for future expansion */
+  void (* _gimp_reserved1) (void);
+  void (* _gimp_reserved2) (void);
+  void (* _gimp_reserved3) (void);
+  void (* _gimp_reserved4) (void);
 };
 
 
diff --git a/libgimpwidgets/gimpintcombobox.h b/libgimpwidgets/gimpintcombobox.h
index d46acd16de..bbc9a2a364 100644
--- a/libgimpwidgets/gimpintcombobox.h
+++ b/libgimpwidgets/gimpintcombobox.h
@@ -46,6 +46,12 @@ struct _GimpIntComboBoxClass
 struct _GimpIntComboBox
 {
   GtkComboBox       parent_instance;
+
+  /* Padding for future expansion */
+  void (* _gimp_reserved1) (void);
+  void (* _gimp_reserved2) (void);
+  void (* _gimp_reserved3) (void);
+  void (* _gimp_reserved4) (void);
 };
 
 
diff --git a/libgimpwidgets/gimpintstore.h b/libgimpwidgets/gimpintstore.h
index a6b2a809b7..40501c690f 100644
--- a/libgimpwidgets/gimpintstore.h
+++ b/libgimpwidgets/gimpintstore.h
@@ -48,17 +48,23 @@ typedef enum
 
 typedef struct _GimpIntStoreClass  GimpIntStoreClass;
 
+struct _GimpIntStore
+{
+  GtkListStore  parent_instance;
+
+  /*< private >*/
+  GtkTreeIter  *empty_iter;
+};
+
 struct _GimpIntStoreClass
 {
   GtkListStoreClass  parent_instance;
-};
 
-struct _GimpIntStore
-{
-  GtkListStore       parent_instance;
-
-  /*< private >*/
-  GtkTreeIter       *empty_iter;
+  /* Padding for future expansion */
+  void (* _gimp_reserved1) (void);
+  void (* _gimp_reserved2) (void);
+  void (* _gimp_reserved3) (void);
+  void (* _gimp_reserved4) (void);
 };
 
 
diff --git a/libgimpwidgets/gimppreview.h b/libgimpwidgets/gimppreview.h
index fec9192c51..7167cd1a64 100644
--- a/libgimpwidgets/gimppreview.h
+++ b/libgimpwidgets/gimppreview.h
@@ -79,6 +79,12 @@ struct _GimpPreviewClass
 
   /* signal */
   void   (* invalidated) (GimpPreview   *preview);
+
+  /* Padding for future expansion */
+  void (* _gimp_reserved1) (void);
+  void (* _gimp_reserved2) (void);
+  void (* _gimp_reserved3) (void);
+  void (* _gimp_reserved4) (void);
 };
 
 
diff --git a/libgimpwidgets/gimppreviewarea.h b/libgimpwidgets/gimppreviewarea.h
index 120ef3a463..8558203ea8 100644
--- a/libgimpwidgets/gimppreviewarea.h
+++ b/libgimpwidgets/gimppreviewarea.h
@@ -53,6 +53,12 @@ struct _GimpPreviewArea
 struct _GimpPreviewAreaClass
 {
   GtkDrawingAreaClass  parent_class;
+
+  /* Padding for future expansion */
+  void (* _gimp_reserved1) (void);
+  void (* _gimp_reserved2) (void);
+  void (* _gimp_reserved3) (void);
+  void (* _gimp_reserved4) (void);
 };
 
 
diff --git a/libgimpwidgets/gimpscrolledpreview.h b/libgimpwidgets/gimpscrolledpreview.h
index 52f76575c8..1c2f9c83a5 100644
--- a/libgimpwidgets/gimpscrolledpreview.h
+++ b/libgimpwidgets/gimpscrolledpreview.h
@@ -62,6 +62,12 @@ struct _GimpScrolledPreview
 struct _GimpScrolledPreviewClass
 {
   GimpPreviewClass  parent_class;
+
+  /* Padding for future expansion */
+  void (* _gimp_reserved1) (void);
+  void (* _gimp_reserved2) (void);
+  void (* _gimp_reserved3) (void);
+  void (* _gimp_reserved4) (void);
 };