diff --git a/gfx/common/x11_common.c b/gfx/common/x11_common.c
index 5f8a6e3bcf..b713929203 100644
--- a/gfx/common/x11_common.c
+++ b/gfx/common/x11_common.c
@@ -46,6 +46,8 @@ static bool g_x11_has_focus                 = false;
 static bool g_x11_true_full                 = false;
 Display *g_x11_dpy                          = NULL;
 
+unsigned g_x11_screen                       = 0;
+
 Colormap g_x11_cmap;
 Window   g_x11_win;
 
@@ -57,8 +59,6 @@ static Atom g_x11_quit_atom;
 static XIM g_x11_xim;
 static XIC g_x11_xic;
 
-unsigned g_x11_screen;
-
 #define XA_INIT(x) XA##x = XInternAtom(dpy, #x, False)
 #define _NET_WM_STATE_ADD 1
 #define MOVERESIZE_GRAVITY_CENTER 5
diff --git a/gfx/drivers_context/x_ctx.c b/gfx/drivers_context/x_ctx.c
index 535fc94fa6..644c0cc38d 100644
--- a/gfx/drivers_context/x_ctx.c
+++ b/gfx/drivers_context/x_ctx.c
@@ -332,7 +332,9 @@ static bool gfx_ctx_x_set_resize(void *data,
 
 static void *gfx_ctx_x_init(void *data)
 {
-   int nelements, major, minor;
+   int nelements           = 0;
+   int major               = 0;
+   int minor               = 0;
 #ifdef HAVE_OPENGL
    static const int visual_attribs[] = {
       GLX_X_RENDERABLE     , True,