diff --git a/gtk/gtkhandlebox.h b/gtk/gtkhandlebox.h
index 48176963fc..1f6ec3e292 100644
--- a/gtk/gtkhandlebox.h
+++ b/gtk/gtkhandlebox.h
@@ -67,7 +67,7 @@ struct _GtkHandleBox
   guint		  in_drag : 1;
   guint		  shrink_on_detach : 1;
 
-  gint            snap_edge : 3; /* -1 == unset */
+  signed int      snap_edge : 3; /* -1 == unset */
   
   /* Variables used during a drag
    */
diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c
index 7f270e19a8..42194fbc2d 100644
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@@ -100,7 +100,7 @@ struct _NodeData {
 
   /* Height and width of this node */
   gint height;
-  gint width : 24;
+  signed int width : 24;
 
   /* boolean indicating whether the lines below this node are in need of validation.
    * However, width/height should always represent the current total width and
@@ -108,7 +108,7 @@ struct _NodeData {
    * width/height on the lines needs recomputing, not whether the totals
    * need recomputing.
    */
-  gint valid : 8;
+  guint valid : 8;		/* Actually a boolean */
 };
 
 
diff --git a/gtk/gtktextbtree.h b/gtk/gtktextbtree.h
index dea958ec37..d3553624eb 100644
--- a/gtk/gtktextbtree.h
+++ b/gtk/gtktextbtree.h
@@ -192,8 +192,8 @@ struct _GtkTextLineData {
   gpointer view_id;
   GtkTextLineData *next;
   gint height;
-  gint width : 24;
-  gint valid : 8;
+  signed int width : 24;
+  guint valid : 8;		/* Actually a boolean */
 };
 
 /*
diff --git a/gtk/gtktextlayout.h b/gtk/gtktextlayout.h
index c794e3b9b7..42126ed73d 100644
--- a/gtk/gtktextlayout.h
+++ b/gtk/gtktextlayout.h
@@ -163,7 +163,7 @@ struct _GtkTextLayout
   /* For what GtkTextDirection to draw cursor GTK_TEXT_DIR_NONE -
    * means draw both cursors.
    */
-  gint cursor_direction : 2;
+  guint cursor_direction : 2;
 
   /* The preedit string and attributes, if any */