diff --git a/glib/glib.h b/glib/glib.h
index b07ea1137..f641762c4 100644
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -715,6 +715,12 @@ GArray* g_rarray_truncate (GArray   *array,
 
 /* Hash Functions
  */
+gint  g_str_equal (const gpointer v,
+		   const gpointer v2);
+guint g_str_hash  (const gpointer v);
+
+/* Deprecated, use g_string_*
+ */
 gint  g_string_equal (gpointer v,
 		      gpointer v2);
 guint g_string_hash  (gpointer v);
diff --git a/gtk/gtkviewport.h b/gtk/gtkviewport.h
index 9af4e8720..fd3bac5fd 100644
--- a/gtk/gtkviewport.h
+++ b/gtk/gtkviewport.h
@@ -42,8 +42,8 @@ struct _GtkViewport
   GtkBin bin;
 
   gint shadow_type;
-  GdkWindow *main_window;
   GdkWindow *view_window;
+  GdkWindow *bin_window;
   GtkAdjustment *hadjustment;
   GtkAdjustment *vadjustment;
 };