diff --git a/Userland/Libraries/LibCore/DeprecatedFile.cpp b/Userland/Libraries/LibCore/DeprecatedFile.cpp
index 15a5856a4a2..f4e18665d96 100644
--- a/Userland/Libraries/LibCore/DeprecatedFile.cpp
+++ b/Userland/Libraries/LibCore/DeprecatedFile.cpp
@@ -10,6 +10,7 @@
 #include <LibCore/DeprecatedFile.h>
 #include <LibCore/DirIterator.h>
 #include <LibCore/System.h>
+#include <LibFileSystem/FileSystem.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <libgen.h>
diff --git a/Userland/Libraries/LibCore/DeprecatedFile.h b/Userland/Libraries/LibCore/DeprecatedFile.h
index cd871b7822f..eddf3813155 100644
--- a/Userland/Libraries/LibCore/DeprecatedFile.h
+++ b/Userland/Libraries/LibCore/DeprecatedFile.h
@@ -11,10 +11,6 @@
 #include <LibCore/IODevice.h>
 #include <sys/stat.h>
 
-// FIXME: Make this a bit prettier.
-#define DEFAULT_PATH "/usr/local/sbin:/usr/local/bin:/usr/bin:/bin"
-#define DEFAULT_PATH_SV "/usr/local/sbin:/usr/local/bin:/usr/bin:/bin"sv
-
 namespace Core {
 
 ///
diff --git a/Userland/Services/ChessEngine/ChessEngine.cpp b/Userland/Services/ChessEngine/ChessEngine.cpp
index e68e45e67b4..e415e1b55e9 100644
--- a/Userland/Services/ChessEngine/ChessEngine.cpp
+++ b/Userland/Services/ChessEngine/ChessEngine.cpp
@@ -7,7 +7,6 @@
 #include "ChessEngine.h"
 #include "MCTSTree.h"
 #include <AK/Random.h>
-#include <LibCore/DeprecatedFile.h>
 #include <LibCore/ElapsedTimer.h>
 
 using namespace Chess::UCI;
diff --git a/Userland/Services/TelnetServer/main.cpp b/Userland/Services/TelnetServer/main.cpp
index 1481f028590..d2b8620f5e6 100644
--- a/Userland/Services/TelnetServer/main.cpp
+++ b/Userland/Services/TelnetServer/main.cpp
@@ -9,10 +9,10 @@
 #include <AK/HashMap.h>
 #include <AK/Types.h>
 #include <LibCore/ArgsParser.h>
-#include <LibCore/DeprecatedFile.h>
 #include <LibCore/EventLoop.h>
 #include <LibCore/Socket.h>
 #include <LibCore/TCPServer.h>
+#include <LibFileSystem/FileSystem.h>
 #include <LibMain/Main.h>
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/Userland/Shell/Builtin.cpp b/Userland/Shell/Builtin.cpp
index 47f56dbf514..e7ebcc099c7 100644
--- a/Userland/Shell/Builtin.cpp
+++ b/Userland/Shell/Builtin.cpp
@@ -16,6 +16,7 @@
 #include <LibCore/DeprecatedFile.h>
 #include <LibCore/EventLoop.h>
 #include <LibCore/File.h>
+#include <LibFileSystem/FileSystem.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <limits.h>
diff --git a/Userland/Shell/Shell.cpp b/Userland/Shell/Shell.cpp
index 32d7280d5d3..7471a8f2489 100644
--- a/Userland/Shell/Shell.cpp
+++ b/Userland/Shell/Shell.cpp
@@ -25,6 +25,7 @@
 #include <LibCore/EventLoop.h>
 #include <LibCore/System.h>
 #include <LibCore/Timer.h>
+#include <LibFileSystem/FileSystem.h>
 #include <LibLine/Editor.h>
 #include <Shell/PosixParser.h>
 #include <errno.h>