diff --git a/gfx/common/x11_common.c b/gfx/common/x11_common.c
index 09e9cbe4e3..5f8a6e3bcf 100644
--- a/gfx/common/x11_common.c
+++ b/gfx/common/x11_common.c
@@ -40,22 +40,22 @@ static DBusConnection* dbus_connection      = NULL;
 static unsigned int dbus_screensaver_cookie = 0;
 #endif
 
-static bool xdg_screensaver_available = true;
+static bool xdg_screensaver_available       = true;
+bool g_x11_entered                          = false;
+static bool g_x11_has_focus                 = false;
+static bool g_x11_true_full                 = false;
+Display *g_x11_dpy                          = NULL;
 
 Colormap g_x11_cmap;
 Window   g_x11_win;
-Display *g_x11_dpy;
 
 static Atom XA_NET_WM_STATE;
 static Atom XA_NET_WM_STATE_FULLSCREEN;
 static Atom XA_NET_MOVERESIZE_WINDOW;
 
 static Atom g_x11_quit_atom;
-static bool g_x11_has_focus;
 static XIM g_x11_xim;
 static XIC g_x11_xic;
-static bool g_x11_true_full;
-bool g_x11_entered            = false;
 
 unsigned g_x11_screen;
 
@@ -563,7 +563,7 @@ bool x11_alive(void *data)
 
    while (XPending(g_x11_dpy))
    {
-      bool filter;
+      bool filter = false;
 
       /* Can get events from older windows. Check this. */
       XNextEvent(g_x11_dpy, &event);