diff --git a/gfx/common/d3dcompiler_common.c b/gfx/common/d3dcompiler_common.c
index 9cf9e3aa96..a408ac7b4f 100644
--- a/gfx/common/d3dcompiler_common.c
+++ b/gfx/common/d3dcompiler_common.c
@@ -27,6 +27,7 @@
 #if defined(HAVE_DYNAMIC) && !defined(__WINRT__)
 #include <dynamic/dylib.h>
 
+/* TODO/FIXME - static globals */
 static dylib_t     d3dcompiler_dll;
 static const char* d3dcompiler_dll_list[] = {
    "D3DCompiler_47.dll", "D3DCompiler_46.dll", "D3DCompiler_45.dll", "D3DCompiler_44.dll",
diff --git a/gfx/common/dbus_common.c b/gfx/common/dbus_common.c
index 68c4838187..abbce177c7 100644
--- a/gfx/common/dbus_common.c
+++ b/gfx/common/dbus_common.c
@@ -19,6 +19,7 @@
 
 #ifdef HAVE_DBUS
 #include <dbus/dbus.h>
+/* TODO/FIXME - static globals */
 static DBusConnection* dbus_connection      = NULL;
 static unsigned int dbus_screensaver_cookie = 0;
 #endif
diff --git a/gfx/common/drm_common.c b/gfx/common/drm_common.c
index a1bede5eac..15af377eb2 100644
--- a/gfx/common/drm_common.c
+++ b/gfx/common/drm_common.c
@@ -21,6 +21,7 @@
 
 #include "drm_common.h"
 
+/* TODO/FIXME - globals */
 struct pollfd g_drm_fds;
 
 uint32_t g_connector_id               = 0;
diff --git a/gfx/common/egl_common.c b/gfx/common/egl_common.c
index 791f1b86e2..cf20ada661 100644
--- a/gfx/common/egl_common.c
+++ b/gfx/common/egl_common.c
@@ -33,6 +33,7 @@
 #include "../../verbosity.h"
 #include "../../frontend/frontend_driver.h"
 
+/* TODO/FIXME - globals */
 bool g_egl_inited    = false;
 
 unsigned g_egl_major = 0;
diff --git a/gfx/common/vulkan_common.c b/gfx/common/vulkan_common.c
index 1c5780c190..a1ebcd872a 100644
--- a/gfx/common/vulkan_common.c
+++ b/gfx/common/vulkan_common.c
@@ -46,6 +46,7 @@
 #define VULKAN_EMULATE_MAILBOX
 #endif
 
+/* TODO/FIXME - static globals */
 static dylib_t                       vulkan_library;
 static VkInstance                    cached_instance_vk;
 static VkDevice                      cached_device_vk;
diff --git a/gfx/common/win32_common.c b/gfx/common/win32_common.c
index 8c3c8927bf..f1abece965 100644
--- a/gfx/common/win32_common.c
+++ b/gfx/common/win32_common.c
@@ -230,10 +230,19 @@ typedef struct DISPLAYCONFIG_PATH_INFO_CUSTOM
 typedef LONG (WINAPI *QUERYDISPLAYCONFIG)(UINT32, UINT32*, DISPLAYCONFIG_PATH_INFO_CUSTOM*, UINT32*, DISPLAYCONFIG_MODE_INFO_CUSTOM*, UINT32*);
 typedef LONG (WINAPI *GETDISPLAYCONFIGBUFFERSIZES)(UINT32, UINT32*, UINT32*);
 
+/* TODO/FIXME - globals */
 bool g_win32_restore_desktop        = false;
 static bool taskbar_is_created      = false;
 bool g_win32_inited                 = false;
 
+unsigned g_win32_resize_width       = 0;
+unsigned g_win32_resize_height      = 0;
+
+ui_window_win32_t main_window;
+
+static HMONITOR win32_monitor_last;
+static HMONITOR win32_monitor_all[MAX_MONITORS];
+
 typedef struct win32_common_state
 {
    int pos_x;
@@ -258,11 +267,6 @@ static win32_common_state_t win32_st =
    false                /* resized */
 };
 
-unsigned g_win32_resize_width       = 0;
-unsigned g_win32_resize_height      = 0;
-
-ui_window_win32_t main_window;
-
 /* Power Request APIs */
 
 #if !defined(_XBOX) && (_MSC_VER == 1310)
@@ -310,9 +314,6 @@ typedef REASON_CONTEXT POWER_REQUEST_CONTEXT, *PPOWER_REQUEST_CONTEXT, *LPPOWER_
 #define INT_PTR_COMPAT INT_PTR
 #endif
 
-static HMONITOR win32_monitor_last;
-static HMONITOR win32_monitor_all[MAX_MONITORS];
-
 bool win32_taskbar_is_created(void)
 {
    return taskbar_is_created;
diff --git a/gfx/common/x11_common.c b/gfx/common/x11_common.c
index 5f5b302e6f..93c6e60c9a 100644
--- a/gfx/common/x11_common.c
+++ b/gfx/common/x11_common.c
@@ -59,6 +59,7 @@
 
 #define V_DBLSCAN 0x20
 
+/* TODO/FIXME - globals */
 static XF86VidModeModeInfo desktop_mode;
 static bool xdg_screensaver_available       = true;
 bool g_x11_entered                          = false;
@@ -81,11 +82,11 @@ static XIC g_x11_xic;
 
 static void x11_hide_mouse(Display *dpy, Window win)
 {
-   static char bm_no_data[] = {0, 0, 0, 0, 0, 0, 0, 0};
    Cursor no_ptr;
    Pixmap bm_no;
    XColor black, dummy;
-   Colormap colormap = DefaultColormap(dpy, DefaultScreen(dpy));
+   static char bm_no_data[] = {0, 0, 0, 0, 0, 0, 0, 0};
+   Colormap colormap        = DefaultColormap(dpy, DefaultScreen(dpy));
 
    if (!XAllocNamedColor(dpy, colormap, "black", &black, &dummy))
       return;
diff --git a/gfx/common/xinerama_common.c b/gfx/common/xinerama_common.c
index 34879e8275..3db4d765de 100644
--- a/gfx/common/xinerama_common.c
+++ b/gfx/common/xinerama_common.c
@@ -30,7 +30,8 @@
 
 #include "../../verbosity.h"
 
-static XineramaScreenInfo *xinerama_query_screens(Display *dpy, int *num_screens)
+static XineramaScreenInfo *xinerama_query_screens(
+      Display *dpy, int *num_screens)
 {
    int major, minor;