diff --git a/sphaira/include/i18n.hpp b/sphaira/include/i18n.hpp
index d47a1e2..5ed8406 100644
--- a/sphaira/include/i18n.hpp
+++ b/sphaira/include/i18n.hpp
@@ -14,6 +14,6 @@ std::string get(std::string_view str);
 
 inline namespace literals {
 
-std::string operator"" _i18n(const char* str, size_t len);
+std::string operator""_i18n(const char* str, size_t len);
 
 } // namespace literals
diff --git a/sphaira/source/i18n.cpp b/sphaira/source/i18n.cpp
index 7b44f1a..fa23105 100644
--- a/sphaira/source/i18n.cpp
+++ b/sphaira/source/i18n.cpp
@@ -142,7 +142,7 @@ std::string get(std::string_view str) {
 
 namespace literals {
 
-std::string operator"" _i18n(const char* str, size_t len) {
+std::string operator""_i18n(const char* str, size_t len) {
     return sphaira::i18n::get_internal({str, len});
 }
 
diff --git a/sphaira/source/ui/list.cpp b/sphaira/source/ui/list.cpp
index 1eae425..151c8e8 100644
--- a/sphaira/source/ui/list.cpp
+++ b/sphaira/source/ui/list.cpp
@@ -2,6 +2,7 @@
 #include "ui/nvg_util.hpp"
 #include "app.hpp"
 #include "log.hpp"
+#include <algorithm>
 
 namespace sphaira::ui {
 
diff --git a/sphaira/source/ui/menus/ftp_menu.cpp b/sphaira/source/ui/menus/ftp_menu.cpp
index 53745fe..1b3485b 100644
--- a/sphaira/source/ui/menus/ftp_menu.cpp
+++ b/sphaira/source/ui/menus/ftp_menu.cpp
@@ -7,6 +7,7 @@
 #include "i18n.hpp"
 #include "ftpsrv_helper.hpp"
 #include <cstring>
+#include <algorithm>
 
 namespace sphaira::ui::menu::ftp {
 namespace {
diff --git a/sphaira/source/ui/menus/game_menu.cpp b/sphaira/source/ui/menus/game_menu.cpp
index 0f1ea35..18b1295 100644
--- a/sphaira/source/ui/menus/game_menu.cpp
+++ b/sphaira/source/ui/menus/game_menu.cpp
@@ -14,6 +14,7 @@
 
 #include <utility>
 #include <cstring>
+#include <algorithm>
 
 namespace sphaira::ui::menu::game {
 namespace {
diff --git a/sphaira/source/ui/menus/gc_menu.cpp b/sphaira/source/ui/menus/gc_menu.cpp
index 17aa6d2..48aef00 100644
--- a/sphaira/source/ui/menus/gc_menu.cpp
+++ b/sphaira/source/ui/menus/gc_menu.cpp
@@ -7,6 +7,7 @@
 #include "ui/nvg_util.hpp"
 #include "i18n.hpp"
 #include <cstring>
+#include <algorithm>
 
 namespace sphaira::ui::menu::gc {
 namespace {
diff --git a/sphaira/source/ui/menus/homebrew.cpp b/sphaira/source/ui/menus/homebrew.cpp
index cd40c54..216f355 100644
--- a/sphaira/source/ui/menus/homebrew.cpp
+++ b/sphaira/source/ui/menus/homebrew.cpp
@@ -13,6 +13,7 @@
 
 #include <minIni.h>
 #include <utility>
+#include <algorithm>
 
 namespace sphaira::ui::menu::homebrew {
 namespace {
diff --git a/sphaira/source/ui/popup_list.cpp b/sphaira/source/ui/popup_list.cpp
index 68c8f01..690f5af 100644
--- a/sphaira/source/ui/popup_list.cpp
+++ b/sphaira/source/ui/popup_list.cpp
@@ -2,6 +2,7 @@
 #include "ui/nvg_util.hpp"
 #include "app.hpp"
 #include "i18n.hpp"
+#include <algorithm>
 
 namespace sphaira::ui {
 
diff --git a/sphaira/source/ui/sidebar.cpp b/sphaira/source/ui/sidebar.cpp
index 08bd410..8ff05ad 100644
--- a/sphaira/source/ui/sidebar.cpp
+++ b/sphaira/source/ui/sidebar.cpp
@@ -3,6 +3,7 @@
 #include "ui/popup_list.hpp"
 #include "ui/nvg_util.hpp"
 #include "i18n.hpp"
+#include <algorithm>
 
 namespace sphaira::ui {
 namespace {
diff --git a/sphaira/source/yati/yati.cpp b/sphaira/source/yati/yati.cpp
index 3ddb47b..89c73ea 100644
--- a/sphaira/source/yati/yati.cpp
+++ b/sphaira/source/yati/yati.cpp
@@ -20,6 +20,7 @@
 
 #include <zstd.h>
 #include <minIni.h>
+#include <algorithm>
 
 namespace sphaira::yati {
 namespace {