diff --git a/src/core/screen.c b/src/core/screen.c
index 6ef5dd01e..b3b9b9df6 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -750,7 +750,7 @@ void
 meta_screen_init_workspaces (MetaScreen *screen)
 {
   MetaWorkspace *current_workspace;
-  gulong current_workspace_index = 0;
+  uint32_t current_workspace_index = 0;
   guint32 timestamp;
 
   g_return_if_fail (META_IS_SCREEN (screen));
diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
index b69fb793f..bac473d8b 100644
--- a/src/x11/window-x11.c
+++ b/src/x11/window-x11.c
@@ -2774,7 +2774,7 @@ maybe_filter_xwindow (MetaDisplay       *display,
        */
       if (!must_be_viewable || attrs->map_state == IsViewable)
         {
-          gulong old_state;
+          uint32_t old_state;
 
           if (!meta_prop_get_cardinal_with_atom_type (display, xwindow,
                                                       display->atom_WM_STATE,
@@ -2910,7 +2910,7 @@ meta_window_x11_new (MetaDisplay       *display,
   if (must_be_viewable && attrs.map_state != IsViewable)
     {
       /* Only manage if WM_STATE is IconicState or NormalState */
-      gulong state;
+      uint32_t state;
 
       /* WM_STATE isn't a cardinal, it's type WM_STATE, but is an int */
       if (!(meta_prop_get_cardinal_with_atom_type (display, xwindow,
diff --git a/src/x11/xprops.c b/src/x11/xprops.c
index 56b607bde..b9ad50da1 100644
--- a/src/x11/xprops.c
+++ b/src/x11/xprops.c
@@ -703,7 +703,7 @@ gboolean
 meta_prop_get_cardinal (MetaDisplay   *display,
                         Window         xwindow,
                         Atom           xatom,
-                        gulong        *cardinal_p)
+                        uint32_t      *cardinal_p)
 {
   return meta_prop_get_cardinal_with_atom_type (display, xwindow, xatom,
                                                 XA_CARDINAL, cardinal_p);
@@ -712,7 +712,7 @@ meta_prop_get_cardinal (MetaDisplay   *display,
 static gboolean
 cardinal_with_atom_type_from_results (GetPropertyResults *results,
                                       Atom                prop_type,
-                                      gulong             *cardinal_p)
+                                      uint32_t           *cardinal_p)
 {
   if (!validate_or_free_results (results, 32, prop_type, TRUE))
     return FALSE;
@@ -729,7 +729,7 @@ meta_prop_get_cardinal_with_atom_type (MetaDisplay   *display,
                                        Window         xwindow,
                                        Atom           xatom,
                                        Atom           prop_type,
-                                       gulong        *cardinal_p)
+                                       uint32_t      *cardinal_p)
 {
   GetPropertyResults results;
 
diff --git a/src/x11/xprops.h b/src/x11/xprops.h
index d30af7c74..80ad73d2c 100644
--- a/src/x11/xprops.h
+++ b/src/x11/xprops.h
@@ -115,12 +115,12 @@ gboolean meta_prop_get_window        (MetaDisplay   *display,
 gboolean meta_prop_get_cardinal      (MetaDisplay   *display,
                                       Window         xwindow,
                                       Atom           xatom,
-                                      gulong        *cardinal_p);
+                                      uint32_t      *cardinal_p);
 gboolean meta_prop_get_cardinal_with_atom_type (MetaDisplay   *display,
                                                 Window         xwindow,
                                                 Atom           xatom,
                                                 Atom           prop_type,
-                                                gulong        *cardinal_p);
+                                                uint32_t      *cardinal_p);
 gboolean meta_prop_get_text_property (MetaDisplay   *display,
                                       Window         xwindow,
                                       Atom           xatom,
@@ -174,7 +174,7 @@ typedef struct
     char *str;
     MotifWmHints *motif_hints;
     Window xwindow;
-    gulong cardinal;
+    uint32_t cardinal;
     XWMHints *wm_hints;
     XClassHint class_hint;
     XSyncCounter xcounter;