diff --git a/ChangeLog b/ChangeLog
index edcc8a2fc7..be99c0ec6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-29  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtkwidget.h: move the gtk_widget_get_parent() and
+	gtk_widget_get_parent_window() prototypes together with their
+	respective setters.
+
+	* gtk/gtkwidget.c: move gtk_widget_get_parent_window() together
+	with its setter.
+
 2008-08-29  Michael Natterer  <mitch@imendio.com>
 
 	* gtk/gtkscrolledwindow.c: events return gboolean not gint,
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 9f3ce5b5ce..6307698f50 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -6564,6 +6564,26 @@ gtk_widget_set_parent_window   (GtkWidget           *widget,
     }
 }
 
+/**
+ * gtk_widget_get_parent_window:
+ * @widget: a #GtkWidget.
+ * @returns: the parent window of @widget.
+ *
+ * Gets @widget's parent window.
+ **/
+GdkWindow *
+gtk_widget_get_parent_window (GtkWidget *widget)
+{
+  GdkWindow *parent_window;
+
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+
+  parent_window = g_object_get_qdata (G_OBJECT (widget), quark_parent_window);
+
+  return (parent_window != NULL) ? parent_window :
+	 (widget->parent != NULL) ? widget->parent->window : NULL;
+}
+
 
 /**
  * gtk_widget_set_child_visible:
@@ -6774,26 +6794,6 @@ gtk_widget_get_root_window (GtkWidget *widget)
   return gdk_screen_get_root_window (gtk_widget_get_screen (widget));
 }
 
-/**
- * gtk_widget_get_parent_window:
- * @widget: a #GtkWidget.
- * @returns: the parent window of @widget.
- * 
- * Gets @widget's parent window.
- **/
-GdkWindow *
-gtk_widget_get_parent_window   (GtkWidget           *widget)
-{
-  GdkWindow *parent_window;
-
-  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
-  
-  parent_window = g_object_get_qdata (G_OBJECT (widget), quark_parent_window);
-
-  return (parent_window != NULL) ? parent_window : 
-	 (widget->parent != NULL) ? widget->parent->window : NULL;
-}
-
 /**
  * gtk_widget_child_focus:
  * @widget: a #GtkWidget
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index a4feb4e2fe..1545f15888 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -567,17 +567,16 @@ void                  gtk_widget_set_redraw_on_allocate (GtkWidget    *widget,
 							 gboolean      redraw_on_allocate);
 void                  gtk_widget_set_parent             (GtkWidget    *widget,
 							 GtkWidget    *parent);
+GtkWidget           * gtk_widget_get_parent             (GtkWidget    *widget);
 void                  gtk_widget_set_parent_window      (GtkWidget    *widget,
 							 GdkWindow    *parent_window);
+GdkWindow           * gtk_widget_get_parent_window      (GtkWidget    *widget);
 void                  gtk_widget_set_child_visible      (GtkWidget    *widget,
 							 gboolean      is_visible);
 gboolean              gtk_widget_get_child_visible      (GtkWidget    *widget);
 GtkAllocation	      gtk_widget_get_allocation         (GtkWidget    *widget);
 GdkWindow*            gtk_widget_get_window             (GtkWidget    *widget);
 
-GtkWidget *gtk_widget_get_parent          (GtkWidget           *widget);
-GdkWindow *gtk_widget_get_parent_window	  (GtkWidget	       *widget);
-
 gboolean   gtk_widget_child_focus         (GtkWidget           *widget,
                                            GtkDirectionType     direction);
 gboolean   gtk_widget_keynav_failed       (GtkWidget           *widget,