diff --git a/i3bar/src/config.c b/i3bar/src/config.c
index 1cff085e..14d54ed6 100644
--- a/i3bar/src/config.c
+++ b/i3bar/src/config.c
@@ -13,7 +13,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <X11/Xlib.h>
 #include <yajl/yajl_parse.h>
 
 config_t config;
@@ -126,31 +125,31 @@ static int config_string_cb(void *params_, const unsigned char *val, size_t _len
         }
 
         if (len == strlen("shift") && !strncmp((const char *)val, "shift", strlen("shift"))) {
-            config.modifier = ShiftMask;
+            config.modifier = XCB_MOD_MASK_SHIFT;
             return 1;
         }
         if (len == strlen("ctrl") && !strncmp((const char *)val, "ctrl", strlen("ctrl"))) {
-            config.modifier = ControlMask;
+            config.modifier = XCB_MOD_MASK_CONTROL;
             return 1;
         }
         if (len == strlen("Mod") + 1 && !strncmp((const char *)val, "Mod", strlen("Mod"))) {
             switch (val[3]) {
                 case '1':
-                    config.modifier = Mod1Mask;
+                    config.modifier = XCB_MOD_MASK_1;
                     return 1;
                 case '2':
-                    config.modifier = Mod2Mask;
+                    config.modifier = XCB_MOD_MASK_2;
                     return 1;
                 case '3':
-                    config.modifier = Mod3Mask;
+                    config.modifier = XCB_MOD_MASK_3;
                     return 1;
                 case '5':
-                    config.modifier = Mod5Mask;
+                    config.modifier = XCB_MOD_MASK_5;
                     return 1;
             }
         }
 
-        config.modifier = Mod4Mask;
+        config.modifier = XCB_MOD_MASK_4;
         return 1;
     }
 
diff --git a/include/i3.h b/include/i3.h
index 15ca1d46..4e2eb5c0 100644
--- a/include/i3.h
+++ b/include/i3.h
@@ -56,7 +56,6 @@ extern xcb_timestamp_t last_timestamp;
 extern SnDisplay *sndisplay;
 extern xcb_key_symbols_t *keysyms;
 extern char **start_argv;
-extern Display *xlibdpy, *xkbdpy;
 extern int xkb_current_group;
 extern TAILQ_HEAD(bindings_head, Binding) *bindings;
 extern const char *current_binding_mode;