diff --git a/api/fs/common.hpp b/api/fs/common.hpp
index 5954c53a0..2ddb00be5 100644
--- a/api/fs/common.hpp
+++ b/api/fs/common.hpp
@@ -205,10 +205,6 @@ namespace fs {
   {
     error_t    error;
     Dirvec_ptr entries;
-    auto begin() { return entries->begin(); }
-    auto end()   { return entries->end(); }
-    auto cbegin() const { return entries->cbegin(); }
-    auto cend()   const { return entries->cend(); }
   };
 
 } //< fs
diff --git a/api/fs/dirent.hpp b/api/fs/dirent.hpp
index a1549e651..9c5c91d63 100644
--- a/api/fs/dirent.hpp
+++ b/api/fs/dirent.hpp
@@ -194,5 +194,11 @@ namespace fs {
 
 } //< namespace fs
 
+namespace fs {
+    inline auto begin(List& l) { return l.entries->begin(); }
+    inline auto end(List& l)   { return l.entries->end(); }
+    inline auto cbegin(const List& l) { return l.entries->cbegin(); }
+    inline auto cend(const List& l)   { return l.entries->cend(); }
+} //< namespace fs
 
 #endif //< FS_DIRENT_HPP
diff --git a/api/mem/alloc/buddy.hpp b/api/mem/alloc/buddy.hpp
index bc6e291fd..798f4cecc 100644
--- a/api/mem/alloc/buddy.hpp
+++ b/api/mem/alloc/buddy.hpp
@@ -25,6 +25,9 @@
 #include <stdlib.h>
 #include <math.h>
 #include <expects>
+#ifdef INCLUDEOS_SMP_ENABLE
+#include <mutex>
+#endif
 
 #include <util/bitops.hpp>
 #include <util/units.hpp>
diff --git a/overlay.nix b/overlay.nix
index 907f6bbd6..de76d9084 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -6,7 +6,7 @@
 final: prev: {
 
   stdenvIncludeOS = prev.pkgsStatic.lib.makeScope prev.pkgsStatic.newScope (self: {
-    llvmPkgs = prev.pkgsStatic.llvmPackages_19;
+    llvmPkgs = prev.pkgsStatic.llvmPackages_20;
     stdenv = self.llvmPkgs.libcxxStdenv; # Use this as base stdenv
 
     # Import unpatched musl for building libcxx. Libcxx needs some linux headers to be passed through.
diff --git a/unittests.nix b/unittests.nix
index ae22628b7..68feb6f43 100644
--- a/unittests.nix
+++ b/unittests.nix
@@ -1,6 +1,6 @@
 { nixpkgs ? ./pinned.nix,
   pkgs ? import nixpkgs { config = { }; overlays = [ ]; },
-  stdenv ? pkgs.llvmPackages_19.libcxxStdenv,
+  stdenv ? pkgs.llvmPackages_20.libcxxStdenv,
   withCcache ? false,
 }:
 stdenv.mkDerivation rec {