diff --git a/glib/gspawn.c b/glib/gspawn.c
index 80ef669f8..c37ac7c84 100644
--- a/glib/gspawn.c
+++ b/glib/gspawn.c
@@ -2244,7 +2244,7 @@ script_execute (const gchar *file,
                 gchar      **envp)
 {
   /* Count the arguments.  */
-  int argc = 0;
+  gsize argc = 0;
   while (argv[argc])
     ++argc;
 
diff --git a/glib/gutils.c b/glib/gutils.c
index c5aef47fa..aff3ed442 100644
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -995,7 +995,7 @@ g_get_host_name (void)
 
 #ifdef _SC_HOST_NAME_MAX
       max = sysconf (_SC_HOST_NAME_MAX);
-      if (max > 0 && max <= G_MAXSIZE - 1)
+      if (max > 0 && (gsize) max <= G_MAXSIZE - 1)
         size = (gsize) max + 1;
       else
 #ifdef HOST_NAME_MAX
diff --git a/glib/tests/collate.c b/glib/tests/collate.c
index 017f247b1..bd9ea234f 100644
--- a/glib/tests/collate.c
+++ b/glib/tests/collate.c
@@ -271,7 +271,7 @@ int
 main (int argc, char *argv[])
 {
   gchar *path;
-  gint i;
+  guint i;
   const gchar *locale;
   CollateTest test[3];
 
diff --git a/glib/tests/date.c b/glib/tests/date.c
index 92f0a7f6e..e49ec3419 100644
--- a/glib/tests/date.c
+++ b/glib/tests/date.c
@@ -737,7 +737,7 @@ int
 main (int argc, char** argv)
 {
   gchar *path;
-  gint i;
+  gsize i;
 
   /* Try to get all the leap year cases. */
   int check_years[] = {