diff --git a/gio/gdatainputstream.c b/gio/gdatainputstream.c
index 2e7750cb5..4440eb41f 100644
--- a/gio/gdatainputstream.c
+++ b/gio/gdatainputstream.c
@@ -631,7 +631,7 @@ scan_for_newline (GDataInputStream *stream,
   GDataInputStreamPrivate *priv;
   const char *buffer;
   gsize start, end, peeked;
-  int i;
+  gsize i;
   gssize found_pos;
   int newline_len;
   gsize available, checked;
@@ -861,7 +861,7 @@ scan_for_chars (GDataInputStream *stream,
   GBufferedInputStream *bstream;
   const char *buffer;
   gsize start, end, peeked;
-  int i;
+  gsize i;
   gsize available, checked;
   const char *stop_char;
   const char *stop_end;
diff --git a/gio/gfileinfo.c b/gio/gfileinfo.c
index 1fba1139e..67b261959 100644
--- a/gio/gfileinfo.c
+++ b/gio/gfileinfo.c
@@ -318,7 +318,7 @@ static void
 g_file_info_finalize (GObject *object)
 {
   GFileInfo *info;
-  int i;
+  guint i;
   GFileAttribute *attrs;
 
   info = G_FILE_INFO (object);
diff --git a/gio/gliststore.c b/gio/gliststore.c
index 3c2361e1b..da7d12ce5 100644
--- a/gio/gliststore.c
+++ b/gio/gliststore.c
@@ -269,7 +269,7 @@ g_list_store_insert (GListStore *store,
 
   g_return_if_fail (G_IS_LIST_STORE (store));
   g_return_if_fail (g_type_is_a (G_OBJECT_TYPE (item), store->item_type));
-  g_return_if_fail (position <= g_sequence_get_length (store->items));
+  g_return_if_fail (position <= (guint) g_sequence_get_length (store->items));
 
   it = g_sequence_get_iter_at_pos (store->items, position);
   g_sequence_insert_before (it, g_object_ref (item));
@@ -477,7 +477,7 @@ g_list_store_splice (GListStore *store,
 
   if (n_additions)
     {
-      gint i;
+      guint i;
 
       for (i = 0; i < n_additions; i++)
         {