diff --git a/app/libraries/llvm b/app/libraries/llvm
index 08e3a5cc..abffdd88 160000
--- a/app/libraries/llvm
+++ b/app/libraries/llvm
@@ -1 +1 @@
-Subproject commit 08e3a5ccd952edee36b3c002e3a29c6b1b5153de
+Subproject commit abffdd88767791ef6da4d2df7ec7ab158eb8b775
diff --git a/app/libraries/oboe b/app/libraries/oboe
index 855ea841..9053f015 160000
--- a/app/libraries/oboe
+++ b/app/libraries/oboe
@@ -1 +1 @@
-Subproject commit 855ea841a93bf304065e5152909983b1b85ffabb
+Subproject commit 9053f015ce1317d3c8bac0111c516b377c2e287e
diff --git a/app/src/main/cpp/skyline/audio/track.h b/app/src/main/cpp/skyline/audio/track.h
index 791a3c84..6d50112d 100644
--- a/app/src/main/cpp/skyline/audio/track.h
+++ b/app/src/main/cpp/skyline/audio/track.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <deque>
 #include <kernel/types/KEvent.h>
 #include <common/circular_buffer.h>
 #include "common.h"
diff --git a/app/src/main/cpp/skyline/common/utils.h b/app/src/main/cpp/skyline/common/utils.h
index a7ac282f..ddd04576 100644
--- a/app/src/main/cpp/skyline/common/utils.h
+++ b/app/src/main/cpp/skyline/common/utils.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <algorithm>
 #include <random>
 #include <span>
 #include <frozen/unordered_map.h>
diff --git a/app/src/main/cpp/skyline/services/am/controller/ICommonStateGetter.h b/app/src/main/cpp/skyline/services/am/controller/ICommonStateGetter.h
index 6220610d..f82db486 100644
--- a/app/src/main/cpp/skyline/services/am/controller/ICommonStateGetter.h
+++ b/app/src/main/cpp/skyline/services/am/controller/ICommonStateGetter.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <deque>
 #include <kernel/types/KEvent.h>
 #include <services/serviceman.h>
 #include <common/macros.h>