diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index 31f8f92e1f..f09764ec74 100644
--- a/gtk/gtkaccelgroup.c
+++ b/gtk/gtkaccelgroup.c
@@ -28,7 +28,7 @@
 
 #include "gtkaccelgroup.h"
 #include "gtkaccelgroupprivate.h"
-#include "gtkaccellabel.h"
+#include "gtkaccellabelprivate.h"
 #include "gtkaccelmapprivate.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
index b833e43d9c..2b12fcc779 100644
--- a/gtk/gtkaccellabel.c
+++ b/gtk/gtkaccellabel.c
@@ -30,6 +30,7 @@
 
 #include "gtklabel.h"
 #include "gtkaccellabel.h"
+#include "gtkaccellabelprivate.h"
 #include "gtkaccelmap.h"
 #include "gtkintl.h"
 #include "gtkmain.h"
@@ -118,6 +119,21 @@ enum {
   LAST_PROP
 };
 
+struct _GtkAccelLabel
+{
+  GtkWidget parent_instance;
+};
+
+struct _GtkAccelLabelClass
+{
+  GtkWidgetClass parent_class;
+
+  char *mod_name_shift;
+  char *mod_name_control;
+  char *mod_name_alt;
+  char *mod_separator;
+};
+
 typedef struct _GtkAccelLabelPrivate GtkAccelLabelPrivate;
 struct _GtkAccelLabelPrivate
 {
diff --git a/gtk/gtkaccellabel.h b/gtk/gtkaccellabel.h
index 4c5a2cbf3c..3c5c67e90f 100644
--- a/gtk/gtkaccellabel.h
+++ b/gtk/gtkaccellabel.h
@@ -37,42 +37,9 @@ G_BEGIN_DECLS
 
 #define GTK_TYPE_ACCEL_LABEL		(gtk_accel_label_get_type ())
 #define GTK_ACCEL_LABEL(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ACCEL_LABEL, GtkAccelLabel))
-#define GTK_ACCEL_LABEL_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ACCEL_LABEL, GtkAccelLabelClass))
 #define GTK_IS_ACCEL_LABEL(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ACCEL_LABEL))
-#define GTK_IS_ACCEL_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ACCEL_LABEL))
-#define GTK_ACCEL_LABEL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ACCEL_LABEL, GtkAccelLabelClass))
-
 
 typedef struct _GtkAccelLabel	     GtkAccelLabel;
-typedef struct _GtkAccelLabelClass   GtkAccelLabelClass;
-
-/**
- * GtkAccelLabel:
- *
- * The #GtkAccelLabel-struct contains private data only, and
- * should be accessed using the functions below.
- */
-struct _GtkAccelLabel
-{
-  GtkWidget parent_instance;
-};
-
-struct _GtkAccelLabelClass
-{
-  GtkWidgetClass parent_class;
-
-  gchar		*mod_name_shift;
-  gchar		*mod_name_control;
-  gchar		*mod_name_alt;
-  gchar		*mod_separator;
-
-  /* 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_accel_label_get_type	     (void) G_GNUC_CONST;
@@ -113,12 +80,6 @@ void      gtk_accel_label_set_use_underline  (GtkAccelLabel   *accel_label,
 GDK_AVAILABLE_IN_ALL
 gboolean  gtk_accel_label_get_use_underline  (GtkAccelLabel   *accel_label);
 
-
-/* private */
-gchar *    _gtk_accel_label_class_get_accelerator_label (GtkAccelLabelClass *klass,
-							 guint               accelerator_key,
-							 GdkModifierType     accelerator_mods);
-
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAccelLabel, g_object_unref)
 
 G_END_DECLS
diff --git a/gtk/gtkaccellabelprivate.h b/gtk/gtkaccellabelprivate.h
new file mode 100644
index 0000000000..248b2e3800
--- /dev/null
+++ b/gtk/gtkaccellabelprivate.h
@@ -0,0 +1,39 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1998, 2001 Tim Janik
+ * Copyright (C) Javier Jardón <jjardon@gnome.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GTK_ACCEL_LABEL_PRIVATE_H__
+#define __GTK_ACCEL_LABEL_PRIVATE_H__
+
+
+#include <gtk/gtkaccellabel.h>
+
+G_BEGIN_DECLS
+
+#define GTK_ACCEL_LABEL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ACCEL_LABEL, GtkAccelLabelClass))
+
+typedef struct _GtkAccelLabelClass   GtkAccelLabelClass;
+
+char *    _gtk_accel_label_class_get_accelerator_label (GtkAccelLabelClass *klass,
+                                                        guint               accelerator_key,
+                                                        GdkModifierType     accelerator_mods);
+
+
+G_END_DECLS
+
+#endif /* __GTK_ACCEL_LABEL_PRIVATE_H__ */