diff --git a/ChangeLog b/ChangeLog
index dabcc8e15e..debadefc19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserbutton.c:
+	* gtk/gtktoolbar.c: Don't use guint8 for bitfields, since
+	some compilers choke on that.  (#467722)
+
 2007-11-26  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkaboutdialog.c (gtk_about_dialog_set_website): Add a note
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index d8817625d7..927eca6da8 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -162,18 +162,18 @@ struct _GtkFileChooserButtonPrivate
   guint8 n_volumes;
   guint8 n_shortcuts;
   guint8 n_bookmarks;
-  guint8 has_bookmark_separator       : 1;
-  guint8 has_current_folder_separator : 1;
-  guint8 has_current_folder           : 1;
-  guint8 has_other_separator          : 1;
+  guint  has_bookmark_separator       : 1;
+  guint  has_current_folder_separator : 1;
+  guint  has_current_folder           : 1;
+  guint  has_other_separator          : 1;
 
   /* Used for hiding/showing the dialog when the button is hidden */
-  guint8 active                       : 1;
+  guint  active                       : 1;
 
   /* Used to track whether we need to set a default current folder on ::map() */
-  guint8 folder_has_been_set          : 1;
+  guint  folder_has_been_set          : 1;
 
-  guint8 focus_on_click               : 1;
+  guint  focus_on_click               : 1;
 };
 
 
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 6ed46b9aca..8b5141129b 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -3877,7 +3877,7 @@ struct _ToolbarContent
       GtkAllocation	goal_allocation;
       guint		is_placeholder : 1;
       guint		disappearing : 1;
-      TriState		has_menu : 2;
+      guint		has_menu : 2;
     } tool_item;
     
     struct