diff --git a/ui/xui/gl-helpers.cc b/ui/xui/gl-helpers.cc
index f204ace313..cdef85861f 100644
--- a/ui/xui/gl-helpers.cc
+++ b/ui/xui/gl-helpers.cc
@@ -350,9 +350,9 @@ void main() {
     return s;
 }
 
-void RenderDecal(DecalShader *s, float x, float y, float w, float h,
-                 float tex_x, float tex_y, float tex_w, float tex_h,
-                 uint32_t primary, uint32_t secondary, uint32_t fill)
+static void RenderDecal(DecalShader *s, float x, float y, float w, float h,
+                        float tex_x, float tex_y, float tex_w, float tex_h,
+                        uint32_t primary, uint32_t secondary, uint32_t fill)
 {
     GLint vp[4];
     glGetIntegerv(GL_VIEWPORT, vp);
@@ -925,7 +925,7 @@ void RenderFramebuffer(GLint tex, int width, int height, bool flip, float scale[
     }
 }
 
-float GetDisplayAspectRatio(int width, int height)
+static float GetDisplayAspectRatio(int width, int height)
 {
     switch (g_config.display.ui.aspect_ratio) {
     case CONFIG_DISPLAY_UI_ASPECT_RATIO_NATIVE:
diff --git a/ui/xui/popup-menu.cc b/ui/xui/popup-menu.cc
index 9ee2b888c2..eee10893c0 100644
--- a/ui/xui/popup-menu.cc
+++ b/ui/xui/popup-menu.cc
@@ -42,7 +42,7 @@ void PopupMenuItemDelegate::PushFocus() {}
 void PopupMenuItemDelegate::PopFocus() {}
 bool PopupMenuItemDelegate::DidPop() { return false; }
 
-bool PopupMenuButton(std::string text, std::string icon = "")
+static bool PopupMenuButton(std::string text, std::string icon = "")
 {
     ImGui::PushFont(g_font_mgr.m_menu_font);
     auto button_text = string_format("%s %s", icon.c_str(), text.c_str());
@@ -51,7 +51,7 @@ bool PopupMenuButton(std::string text, std::string icon = "")
     return status;
 }
 
-bool PopupMenuCheck(std::string text, std::string icon = "", bool v = false)
+static bool PopupMenuCheck(std::string text, std::string icon = "", bool v = false)
 {
     bool status = PopupMenuButton(text, icon);
     if (v) {
@@ -70,7 +70,7 @@ bool PopupMenuCheck(std::string text, std::string icon = "", bool v = false)
     return status;
 }
 
-bool PopupMenuSubmenuButton(std::string text, std::string icon = "")
+static bool PopupMenuSubmenuButton(std::string text, std::string icon = "")
 {
     bool status = PopupMenuButton(text, icon);
 
@@ -88,7 +88,7 @@ bool PopupMenuSubmenuButton(std::string text, std::string icon = "")
     return status;
 }
 
-bool PopupMenuToggle(std::string text, std::string icon = "", bool *v = nullptr)
+static bool PopupMenuToggle(std::string text, std::string icon = "", bool *v = nullptr)
 {
     bool l_v = false;
     if (v == NULL) v = &l_v;
@@ -112,7 +112,7 @@ bool PopupMenuToggle(std::string text, std::string icon = "", bool *v = nullptr)
     return status;
 }
 
-bool PopupMenuSlider(std::string text, std::string icon = "", float *v = NULL)
+static bool PopupMenuSlider(std::string text, std::string icon = "", float *v = NULL)
 {
     bool status = PopupMenuButton(text, icon);
     ImVec2 p_min = ImGui::GetItemRectMin();