diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index bc526a33e8..4dce680fa1 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -115,7 +115,7 @@ _gdk_windowing_init_check (int argc, char **argv)
 {
   XKeyboardState keyboard_state;
   XClassHint *class_hint;
-  guint pid;
+  gulong pid;
 
   _gdk_x11_initialize_locale ();
   
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 5b2df95ecf..a4563ba171 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -337,7 +337,7 @@ gdk_window_new (GdkWindow     *parent,
   unsigned int class;
   char *title;
   int i;
-  int pid;
+  long pid;
   
   g_return_val_if_fail (attributes != NULL, NULL);
   
@@ -2763,9 +2763,9 @@ void
 gdk_window_set_icon_list (GdkWindow *window,
 			  GList     *pixbufs)
 {
-  guint *data;
+  gulong *data;
   guchar *pixels;
-  guint *p;
+  gulong *p;
   gint size;
   GList *l;
   GdkPixbuf *pixbuf;
@@ -2794,7 +2794,7 @@ gdk_window_set_icon_list (GdkWindow *window,
       l = g_list_next (l);
     }
 
-  data = g_malloc (size*4);
+  data = g_malloc (size * sizeof (gulong));
 
   l = pixbufs;
   p = data;