diff --git a/gtk/gtkspinner.c b/gtk/gtkspinner.c
index f3fbfffbe8..a4ab26a49a 100644
--- a/gtk/gtkspinner.c
+++ b/gtk/gtkspinner.c
@@ -53,8 +53,6 @@
  */
 
 
-#define GTK_SPINNER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_SPINNER, GtkSpinnerPrivate))
-
 G_DEFINE_TYPE (GtkSpinner, gtk_spinner, GTK_TYPE_DRAWING_AREA);
 
 enum {
@@ -204,7 +202,9 @@ gtk_spinner_init (GtkSpinner *spinner)
 {
   GtkSpinnerPrivate *priv;
 
-  priv = GTK_SPINNER_GET_PRIVATE (spinner);
+  priv = G_TYPE_INSTANCE_GET_PRIVATE (spinner,
+                                      GTK_TYPE_SPINNER,
+                                      GtkSpinnerPrivate);
   priv->current = 0;
   priv->timeout = 0;
 
diff --git a/gtk/gtkspinner.h b/gtk/gtkspinner.h
index 6f9aa72809..5e8fb37482 100644
--- a/gtk/gtkspinner.h
+++ b/gtk/gtkspinner.h
@@ -47,6 +47,8 @@ typedef struct _GtkSpinnerPrivate  GtkSpinnerPrivate;
 struct _GtkSpinner
 {
   GtkDrawingArea parent;
+
+  /* <private> */
   GtkSpinnerPrivate *priv;
 };