diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index 00dacbc8b9..d190405ce0 100644
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -112,6 +112,21 @@ static void       row_changed_cb                               (GtkTreeModel
 								GtkTreeIter          *iter,
 								GtkCellView          *view);
 
+typedef struct _GtkCellViewClass        GtkCellViewClass;
+typedef struct _GtkCellViewPrivate      GtkCellViewPrivate;
+
+struct _GtkCellView
+{
+  GtkWidget parent_instance;
+
+  GtkCellViewPrivate *priv;
+};
+
+struct _GtkCellViewClass
+{
+  GtkWidgetClass parent_class;
+};
+
 struct _GtkCellViewPrivate
 {
   GtkTreeModel        *model;
diff --git a/gtk/gtkcellview.h b/gtk/gtkcellview.h
index 2514c77f96..ebfef56a3c 100644
--- a/gtk/gtkcellview.h
+++ b/gtk/gtkcellview.h
@@ -32,39 +32,9 @@ G_BEGIN_DECLS
 
 #define GTK_TYPE_CELL_VIEW                (gtk_cell_view_get_type ())
 #define GTK_CELL_VIEW(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_VIEW, GtkCellView))
-#define GTK_CELL_VIEW_CLASS(vtable)       (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_TYPE_CELL_VIEW, GtkCellViewClass))
 #define GTK_IS_CELL_VIEW(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_VIEW))
-#define GTK_IS_CELL_VIEW_CLASS(vtable)    (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_CELL_VIEW))
-#define GTK_CELL_VIEW_GET_CLASS(inst)     (G_TYPE_INSTANCE_GET_CLASS ((inst), GTK_TYPE_CELL_VIEW, GtkCellViewClass))
 
 typedef struct _GtkCellView             GtkCellView;
-typedef struct _GtkCellViewClass        GtkCellViewClass;
-typedef struct _GtkCellViewPrivate      GtkCellViewPrivate;
-
-struct _GtkCellView
-{
-  GtkWidget parent_instance;
-
-  /*< private >*/
-  GtkCellViewPrivate *priv;
-};
-
-/**
- * GtkCellViewClass:
- * @parent_class: The parent class.
- */
-struct _GtkCellViewClass
-{
-  GtkWidgetClass parent_class;
-
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
 
 GDK_AVAILABLE_IN_ALL
 GType             gtk_cell_view_get_type                (void) G_GNUC_CONST;