diff --git a/driver.h b/driver.h
index 764c1e4ab5..2472946c62 100644
--- a/driver.h
+++ b/driver.h
@@ -363,7 +363,7 @@ typedef struct video_poke_interface
    void (*set_aspect_ratio)(void *data, unsigned aspectratio_index);
    void (*apply_state_changes)(void *data);
 
-#if defined(HAVE_RGUI) || defined(HAVE_RMENU)
+#if defined(HAVE_RGUI) || defined(HAVE_RMENU) || defined(HAVE_RMENU_XUI)
    void (*set_texture_frame)(void *data, const void *frame, bool rgb32, unsigned width, unsigned height, float alpha); // Update texture.
    void (*set_texture_enable)(void *data, bool enable, bool full_screen); // Enable/disable rendering.
 #endif
@@ -387,7 +387,7 @@ typedef struct video_driver
    void (*free)(void *data);
    const char *ident;
 
-#if defined(HAVE_RMENU) || defined(HAVE_RGUI)
+#if defined(HAVE_RMENU) || defined(HAVE_RGUI) || defined(HAVE_RMENU_XUI)
    void (*start)(void);
    void (*restart)(void);
 #endif
diff --git a/frontend/menu/rmenu_xui.cpp b/frontend/menu/rmenu_xui.cpp
index c700bacdd2..5be2ee4335 100644
--- a/frontend/menu/rmenu_xui.cpp
+++ b/frontend/menu/rmenu_xui.cpp
@@ -463,7 +463,7 @@ static void init_menulist(unsigned menu_id)
    }
 }
 
-unsigned xui_input_to_rgui_action(unsigned input)
+static unsigned xui_input_to_rgui_action(unsigned input)
 {
    switch (input)
    {
diff --git a/general.h b/general.h
index 654aa6ba12..2cb5417253 100644
--- a/general.h
+++ b/general.h
@@ -284,7 +284,7 @@ struct settings
    uint16_t network_cmd_port;
    bool stdin_cmd_enable;
 
-#if defined(HAVE_RGUI) || defined(HAVE_RMENU)
+#if defined(HAVE_RGUI) || defined(HAVE_RMENU) || defined(HAVE_RMENU_XUI)
    char rgui_browser_directory[PATH_MAX];
    char rgui_config_directory[PATH_MAX];
 #endif
diff --git a/gfx/gl_common.h b/gfx/gl_common.h
index 1d5f308d92..e590aaed36 100644
--- a/gfx/gl_common.h
+++ b/gfx/gl_common.h
@@ -237,7 +237,7 @@ typedef struct gl
    struct scaler_ctx pbo_readback_scaler;
 #endif
 
-#if defined(HAVE_RGUI) || defined(HAVE_RMENU)
+#if defined(HAVE_RGUI) || defined(HAVE_RMENU) || defined(HAVE_RMENU_XUI)
    GLuint rgui_texture;
    bool rgui_texture_enable;
    bool rgui_texture_full_screen;
diff --git a/xdk/xdk_d3d.cpp b/xdk/xdk_d3d.cpp
index bc013c60fc..59aede0b58 100644
--- a/xdk/xdk_d3d.cpp
+++ b/xdk/xdk_d3d.cpp
@@ -1066,7 +1066,7 @@ static void xdk_d3d_apply_state_changes(void *data)
    d3d->should_resize = true;
 }
 
-#if defined(HAVE_RGUI) || defined(HAVE_RMENU)
+#if defined(HAVE_RGUI) || defined(HAVE_RMENU) || defined(HAVE_RMENU_XUI)
 static void xdk_d3d_set_texture_frame(void *data,
    const void *frame, bool rgb32, unsigned width, unsigned height,
    float alpha)
@@ -1103,7 +1103,7 @@ static const video_poke_interface_t d3d_poke_interface = {
 #endif
    xdk_d3d_set_aspect_ratio,
    xdk_d3d_apply_state_changes,
-#if defined(HAVE_RGUI) || defined(HAVE_RMENU)
+#if defined(HAVE_RGUI) || defined(HAVE_RMENU) || defined(HAVE_RMENU_XUI)
    xdk_d3d_set_texture_frame,
    xdk_d3d_set_texture_enable,
 #endif
diff --git a/xdk/xdk_d3d.h b/xdk/xdk_d3d.h
index 022d95b9ce..cff7c1074e 100644
--- a/xdk/xdk_d3d.h
+++ b/xdk/xdk_d3d.h
@@ -67,7 +67,7 @@ typedef struct xdk_d3d_video
    LPDIRECT3DTEXTURE lpTexture_ot;
    IDirect3DVertexDeclaration9* v_decl;
 #endif
-#if defined(HAVE_RGUI) || defined(HAVE_RMENU)
+#if defined(HAVE_RGUI) || defined(HAVE_RMENU) || defined(HAVE_RMENU_XUI)
    bool rgui_texture_enable;
    bool rgui_texture_full_screen;
 #endif