diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c
index 54ca14c5ba..32f96dbd1f 100644
--- a/gtk/gtkcolorbutton.c
+++ b/gtk/gtkcolorbutton.c
@@ -62,6 +62,17 @@
  * it from a plain #GtkButton, it gets the .color style class.
  */
 
+typedef struct _GtkColorButtonClass     GtkColorButtonClass;
+
+struct _GtkColorButton {
+  GtkWidget parent_instance;
+};
+
+struct _GtkColorButtonClass {
+  GtkWidgetClass parent_class;
+
+  void (* color_set) (GtkColorButton *cp);
+};
 
 typedef struct
 {
diff --git a/gtk/gtkcolorbutton.h b/gtk/gtkcolorbutton.h
index 4151c240ba..554238701e 100644
--- a/gtk/gtkcolorbutton.h
+++ b/gtk/gtkcolorbutton.h
@@ -42,30 +42,9 @@ G_BEGIN_DECLS
 
 #define GTK_TYPE_COLOR_BUTTON             (gtk_color_button_get_type ())
 #define GTK_COLOR_BUTTON(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_BUTTON, GtkColorButton))
-#define GTK_COLOR_BUTTON_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COLOR_BUTTON, GtkColorButtonClass))
 #define GTK_IS_COLOR_BUTTON(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COLOR_BUTTON))
-#define GTK_IS_COLOR_BUTTON_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COLOR_BUTTON))
-#define GTK_COLOR_BUTTON_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_COLOR_BUTTON, GtkColorButtonClass))
-
-typedef struct _GtkColorButton          GtkColorButton;
-typedef struct _GtkColorButtonClass     GtkColorButtonClass;
-
-struct _GtkColorButton {
-  GtkWidget parent_instance;
-};
-
-struct _GtkColorButtonClass {
-  GtkWidgetClass parent_class;
-
-  void (* color_set) (GtkColorButton *cp);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
 
+typedef struct _GtkColorButton GtkColorButton;
 
 GDK_AVAILABLE_IN_ALL
 GType        gtk_color_button_get_type      (void) G_GNUC_CONST;