summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AK/BufferedStream.h1
-rw-r--r--Ladybird/AndroidPlatform.cpp1
-rw-r--r--Ladybird/WebContentView.cpp1
-rw-r--r--Ladybird/main.cpp1
-rw-r--r--Meta/Lagom/Fuzzers/FuzzTar.cpp1
-rw-r--r--Meta/Lagom/Fuzzers/FuzzWAVLoader.cpp1
-rw-r--r--Meta/Lagom/Tools/CodeGenerators/IPCCompiler/main.cpp1
-rw-r--r--Meta/Lagom/Tools/CodeGenerators/LibEDID/GeneratePnpIDs.cpp1
-rw-r--r--Meta/Lagom/Tools/CodeGenerators/LibGL/GenerateGLAPIWrapper.cpp1
-rw-r--r--Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp1
-rw-r--r--Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp1
-rw-r--r--Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp1
-rw-r--r--Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp1
-rw-r--r--Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp1
-rw-r--r--Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp1
-rw-r--r--Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateEmojiData.cpp1
-rw-r--r--Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp1
-rw-r--r--Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h2
-rw-r--r--Meta/Lagom/Tools/CodeGenerators/LibWeb/BindingsGenerator/main.cpp1
-rw-r--r--Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateWindowOrWorkerInterfaces.cpp1
-rw-r--r--Meta/Lagom/Tools/CodeGenerators/LibWeb/GeneratorUtil.h1
-rw-r--r--Meta/Lagom/Tools/CodeGenerators/StateMachineGenerator/main.cpp1
-rw-r--r--Meta/Lagom/Wasm/js_repl.cpp1
-rw-r--r--Ports/OpenJDK/patches/0008-java.base-Enable-java.lang.Process-on-serenity.patch3
-rw-r--r--Tests/AK/TestMemoryStream.cpp1
-rw-r--r--Tests/LibAudio/TestFLACSpec.cpp1
-rw-r--r--Tests/LibCompress/TestBrotli.cpp1
-rw-r--r--Tests/LibCore/TestLibCoreStream.cpp1
-rw-r--r--Tests/LibCpp/test-cpp-parser.cpp1
-rw-r--r--Tests/LibCpp/test-cpp-preprocessor.cpp1
-rw-r--r--Tests/LibGL/TestRender.cpp1
-rw-r--r--Tests/LibJS/test-test262.cpp1
-rw-r--r--Tests/LibJS/test262-runner.cpp1
-rw-r--r--Tests/LibMarkdown/TestCommonmark.cpp1
-rw-r--r--Tests/LibWasm/test-wasm.cpp1
-rw-r--r--Tests/LibWeb/TestHTMLTokenizer.cpp1
-rw-r--r--Userland/Applets/Network/main.cpp1
-rw-r--r--Userland/Applets/ResourceGraph/main.cpp1
-rw-r--r--Userland/Applications/Browser/BrowserWindow.cpp1
-rw-r--r--Userland/Applications/Browser/DownloadWidget.cpp1
-rw-r--r--Userland/Applications/Browser/DownloadWidget.h1
-rw-r--r--Userland/Applications/BrowserSettings/ContentFilterSettingsWidget.cpp1
-rw-r--r--Userland/Applications/FileManager/FileOperationProgressWidget.h1
-rw-r--r--Userland/Applications/FileManager/FileUtils.cpp1
-rw-r--r--Userland/Applications/HexEditor/HexDocument.cpp2
-rw-r--r--Userland/Applications/HexEditor/HexEditorWidget.cpp1
-rw-r--r--Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp1
-rw-r--r--Userland/Applications/Presenter/Presentation.cpp1
-rw-r--r--Userland/Applications/Run/RunWindow.cpp1
-rw-r--r--Userland/Applications/SoundPlayer/M3UParser.cpp1
-rw-r--r--Userland/Applications/Spreadsheet/SpreadsheetWidget.h1
-rw-r--r--Userland/Applications/Spreadsheet/Workbook.cpp1
-rw-r--r--Userland/Applications/Spreadsheet/Writers/XSV.h2
-rw-r--r--Userland/Applications/SystemMonitor/ProcessModel.cpp1
-rw-r--r--Userland/Applications/Welcome/WelcomeWidget.cpp1
-rw-r--r--Userland/Demos/CatDog/CatDog.h1
-rw-r--r--Userland/DevTools/HackStudio/Editor.cpp1
-rw-r--r--Userland/DevTools/HackStudio/Git/GitWidget.cpp1
-rw-r--r--Userland/DevTools/HackStudio/LanguageServers/FileDB.h1
-rw-r--r--Userland/DevTools/HackStudio/ProjectBuilder.cpp1
-rw-r--r--Userland/DevTools/HackStudio/ProjectConfig.cpp1
-rw-r--r--Userland/DevTools/HackStudio/ProjectFile.cpp1
-rw-r--r--Userland/DevTools/Profiler/Profile.cpp1
-rw-r--r--Userland/DevTools/Profiler/SourceModel.cpp1
-rw-r--r--Userland/DevTools/SQLStudio/ScriptEditor.cpp1
-rw-r--r--Userland/Games/Chess/ChessWidget.cpp1
-rw-r--r--Userland/Games/MasterWord/WordGame.cpp1
-rw-r--r--Userland/Libraries/LibArchive/TarStream.cpp1
-rw-r--r--Userland/Libraries/LibArchive/TarStream.h2
-rw-r--r--Userland/Libraries/LibArchive/Zip.h3
-rw-r--r--Userland/Libraries/LibAudio/FlacLoader.cpp1
-rw-r--r--Userland/Libraries/LibAudio/FlacLoader.h1
-rw-r--r--Userland/Libraries/LibAudio/Loader.h1
-rw-r--r--Userland/Libraries/LibAudio/MP3Loader.h1
-rw-r--r--Userland/Libraries/LibAudio/WavLoader.h1
-rw-r--r--Userland/Libraries/LibCompress/Brotli.h2
-rw-r--r--Userland/Libraries/LibCompress/Deflate.h3
-rw-r--r--Userland/Libraries/LibCompress/Gzip.h4
-rw-r--r--Userland/Libraries/LibCompress/Zlib.h3
-rw-r--r--Userland/Libraries/LibCore/ConfigFile.h2
-rw-r--r--Userland/Libraries/LibCore/Directory.h1
-rw-r--r--Userland/Libraries/LibCore/LocalServer.cpp1
-rw-r--r--Userland/Libraries/LibCore/LocalServer.h1
-rw-r--r--Userland/Libraries/LibCore/NetworkJob.h2
-rw-r--r--Userland/Libraries/LibCore/ProcessStatisticsReader.h2
-rw-r--r--Userland/Libraries/LibCore/SOCKSProxyClient.h1
-rw-r--r--Userland/Libraries/LibCore/Stream.h27
-rw-r--r--Userland/Libraries/LibCore/SystemServerTakeover.h2
-rw-r--r--Userland/Libraries/LibCore/TCPServer.h1
-rw-r--r--Userland/Libraries/LibDNS/Name.cpp1
-rw-r--r--Userland/Libraries/LibDNS/Name.h1
-rw-r--r--Userland/Libraries/LibDebug/Dwarf/AddressRanges.cpp1
-rw-r--r--Userland/Libraries/LibDebug/Dwarf/AddressRanges.h1
-rw-r--r--Userland/Libraries/LibDebug/Dwarf/DwarfInfo.h1
-rw-r--r--Userland/Libraries/LibDebug/Dwarf/DwarfTypes.h3
-rw-r--r--Userland/Libraries/LibDebug/Dwarf/LineProgram.h1
-rw-r--r--Userland/Libraries/LibGUI/CommonLocationsProvider.cpp1
-rw-r--r--Userland/Libraries/LibGUI/Variant.cpp1
-rw-r--r--Userland/Libraries/LibGemini/Job.cpp1
-rw-r--r--Userland/Libraries/LibGfx/Font/BitmapFont.cpp1
-rw-r--r--Userland/Libraries/LibGfx/QOILoader.h1
-rw-r--r--Userland/Libraries/LibHTTP/HttpsJob.h1
-rw-r--r--Userland/Libraries/LibIDL/IDLParser.cpp1
-rw-r--r--Userland/Libraries/LibIMAP/Client.cpp1
-rw-r--r--Userland/Libraries/LibIMAP/Client.h1
-rw-r--r--Userland/Libraries/LibIPC/Connection.h1
-rw-r--r--Userland/Libraries/LibIPC/ConnectionToServer.h1
-rw-r--r--Userland/Libraries/LibIPC/Decoder.h2
-rw-r--r--Userland/Libraries/LibIPC/File.h1
-rw-r--r--Userland/Libraries/LibJS/Print.cpp1
-rw-r--r--Userland/Libraries/LibJS/Print.h1
-rw-r--r--Userland/Libraries/LibLine/Editor.h1
-rw-r--r--Userland/Libraries/LibLine/VT.h1
-rw-r--r--Userland/Libraries/LibManual/Node.cpp1
-rw-r--r--Userland/Libraries/LibProtocol/Request.h1
-rw-r--r--Userland/Libraries/LibSQL/Heap.h1
-rw-r--r--Userland/Libraries/LibSQL/SQLClient.cpp1
-rw-r--r--Userland/Libraries/LibTLS/TLSv12.h1
-rw-r--r--Userland/Libraries/LibTest/JavaScriptTestRunner.h1
-rw-r--r--Userland/Libraries/LibVirtGPU/Device.h1
-rw-r--r--Userland/Libraries/LibWasm/AbstractMachine/BytecodeInterpreter.cpp1
-rw-r--r--Userland/Libraries/LibWasm/Parser/Parser.cpp1
-rw-r--r--Userland/Libraries/LibWasm/Printer/Printer.h1
-rw-r--r--Userland/Libraries/LibWasm/Types.h1
-rw-r--r--Userland/Libraries/LibWeb/WebDriver/Client.h1
-rw-r--r--Userland/Services/EchoServer/Client.h1
-rw-r--r--Userland/Services/FileOperation/main.cpp1
-rw-r--r--Userland/Services/FileSystemAccessServer/ConnectionFromClient.cpp1
-rw-r--r--Userland/Services/FileSystemAccessServer/FileSystemAccessServer.ipc1
-rw-r--r--Userland/Services/InspectorServer/InspectableProcess.h3
-rw-r--r--Userland/Services/LookupServer/LookupServer.cpp1
-rw-r--r--Userland/Services/TelnetServer/Client.h1
-rw-r--r--Userland/Services/WebContent/main.cpp1
-rw-r--r--Userland/Services/WebDriver/Client.h1
-rw-r--r--Userland/Services/WebDriver/Session.cpp1
-rw-r--r--Userland/Services/WebDriver/WebContentConnection.h1
-rw-r--r--Userland/Services/WebServer/Client.h1
-rw-r--r--Userland/Shell/Shell.cpp1
-rw-r--r--Userland/Utilities/arp.cpp1
-rw-r--r--Userland/Utilities/base64.cpp1
-rw-r--r--Userland/Utilities/cat.cpp1
-rw-r--r--Userland/Utilities/checksum.cpp1
-rw-r--r--Userland/Utilities/cksum.cpp1
-rw-r--r--Userland/Utilities/cmp.cpp1
-rw-r--r--Userland/Utilities/comm.cpp1
-rw-r--r--Userland/Utilities/copy.cpp1
-rw-r--r--Userland/Utilities/cpp-lexer.cpp1
-rw-r--r--Userland/Utilities/cpp-parser.cpp1
-rw-r--r--Userland/Utilities/cpp-preprocessor.cpp1
-rw-r--r--Userland/Utilities/df.cpp1
-rw-r--r--Userland/Utilities/diff.cpp1
-rw-r--r--Userland/Utilities/dmesg.cpp1
-rw-r--r--Userland/Utilities/du.cpp1
-rw-r--r--Userland/Utilities/file.cpp1
-rw-r--r--Userland/Utilities/fortune.cpp1
-rw-r--r--Userland/Utilities/gml-format.cpp1
-rw-r--r--Userland/Utilities/grep.cpp1
-rw-r--r--Userland/Utilities/gron.cpp1
-rw-r--r--Userland/Utilities/headless-browser.cpp1
-rw-r--r--Userland/Utilities/hexdump.cpp1
-rw-r--r--Userland/Utilities/ifconfig.cpp1
-rw-r--r--Userland/Utilities/js.cpp1
-rw-r--r--Userland/Utilities/json.cpp1
-rw-r--r--Userland/Utilities/lsblk.cpp1
-rw-r--r--Userland/Utilities/lscpu.cpp1
-rw-r--r--Userland/Utilities/lsirq.cpp1
-rw-r--r--Userland/Utilities/lsjails.cpp1
-rw-r--r--Userland/Utilities/lsof.cpp1
-rw-r--r--Userland/Utilities/lspci.cpp1
-rw-r--r--Userland/Utilities/lsusb.cpp1
-rw-r--r--Userland/Utilities/man.cpp1
-rw-r--r--Userland/Utilities/markdown-check.cpp1
-rw-r--r--Userland/Utilities/md.cpp1
-rw-r--r--Userland/Utilities/mount.cpp1
-rw-r--r--Userland/Utilities/nc.cpp1
-rw-r--r--Userland/Utilities/netstat.cpp1
-rw-r--r--Userland/Utilities/nologin.cpp1
-rw-r--r--Userland/Utilities/nproc.cpp1
-rw-r--r--Userland/Utilities/pmap.cpp1
-rw-r--r--Userland/Utilities/reboot.cpp2
-rw-r--r--Userland/Utilities/route.cpp1
-rw-r--r--Userland/Utilities/sed.cpp1
-rw-r--r--Userland/Utilities/shot.cpp1
-rw-r--r--Userland/Utilities/shuf.cpp1
-rw-r--r--Userland/Utilities/shutdown.cpp2
-rw-r--r--Userland/Utilities/sort.cpp2
-rw-r--r--Userland/Utilities/sql.cpp1
-rw-r--r--Userland/Utilities/strace.cpp2
-rw-r--r--Userland/Utilities/strings.cpp1
-rw-r--r--Userland/Utilities/sysctl.cpp1
-rw-r--r--Userland/Utilities/tail.cpp1
-rw-r--r--Userland/Utilities/tar.cpp1
-rw-r--r--Userland/Utilities/test-fuzz.cpp1
-rw-r--r--Userland/Utilities/tsort.cpp1
-rw-r--r--Userland/Utilities/uniq.cpp1
-rw-r--r--Userland/Utilities/uptime.cpp1
-rw-r--r--Userland/Utilities/utmpupdate.cpp1
-rw-r--r--Userland/Utilities/w.cpp1
-rw-r--r--Userland/Utilities/xml.cpp1
-rw-r--r--Userland/Utilities/zip.cpp1
200 files changed, 36 insertions, 219 deletions
diff --git a/AK/BufferedStream.h b/AK/BufferedStream.h
index 528bd49a98..7c24828e3f 100644
--- a/AK/BufferedStream.h
+++ b/AK/BufferedStream.h
@@ -8,6 +8,7 @@
#pragma once
#include <AK/CircularBuffer.h>
+#include <AK/OwnPtr.h>
#include <AK/Stream.h>
namespace AK {
diff --git a/Ladybird/AndroidPlatform.cpp b/Ladybird/AndroidPlatform.cpp
index b1f8104314..73815ce2cc 100644
--- a/Ladybird/AndroidPlatform.cpp
+++ b/Ladybird/AndroidPlatform.cpp
@@ -14,7 +14,6 @@
#include <LibArchive/TarStream.h>
#include <LibCore/Directory.h>
#include <LibCore/FileStream.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
diff --git a/Ladybird/WebContentView.cpp b/Ladybird/WebContentView.cpp
index abc3d74763..346ab74100 100644
--- a/Ladybird/WebContentView.cpp
+++ b/Ladybird/WebContentView.cpp
@@ -25,7 +25,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/EventLoop.h>
#include <LibCore/IODevice.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibCore/Timer.h>
#include <LibGfx/Bitmap.h>
diff --git a/Ladybird/main.cpp b/Ladybird/main.cpp
index 497a7b4929..f4b02b2157 100644
--- a/Ladybird/main.cpp
+++ b/Ladybird/main.cpp
@@ -15,7 +15,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/DeprecatedFile.h>
#include <LibCore/EventLoop.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibGfx/Font/FontDatabase.h>
#include <LibMain/Main.h>
diff --git a/Meta/Lagom/Fuzzers/FuzzTar.cpp b/Meta/Lagom/Fuzzers/FuzzTar.cpp
index 88c81139dd..b799de0c8f 100644
--- a/Meta/Lagom/Fuzzers/FuzzTar.cpp
+++ b/Meta/Lagom/Fuzzers/FuzzTar.cpp
@@ -7,7 +7,6 @@
#include <AK/MemoryStream.h>
#include <AK/NonnullOwnPtr.h>
#include <LibArchive/TarStream.h>
-#include <LibCore/Stream.h>
#include <stdio.h>
extern "C" int LLVMFuzzerTestOneInput(uint8_t const* data, size_t size)
diff --git a/Meta/Lagom/Fuzzers/FuzzWAVLoader.cpp b/Meta/Lagom/Fuzzers/FuzzWAVLoader.cpp
index 85b54b051f..db52582eb1 100644
--- a/Meta/Lagom/Fuzzers/FuzzWAVLoader.cpp
+++ b/Meta/Lagom/Fuzzers/FuzzWAVLoader.cpp
@@ -4,6 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
+#include <AK/Stream.h>
#include <LibAudio/WavLoader.h>
#include <stddef.h>
#include <stdint.h>
diff --git a/Meta/Lagom/Tools/CodeGenerators/IPCCompiler/main.cpp b/Meta/Lagom/Tools/CodeGenerators/IPCCompiler/main.cpp
index 6f7b1dfee6..080784ee13 100644
--- a/Meta/Lagom/Tools/CodeGenerators/IPCCompiler/main.cpp
+++ b/Meta/Lagom/Tools/CodeGenerators/IPCCompiler/main.cpp
@@ -11,7 +11,6 @@
#include <AK/SourceGenerator.h>
#include <AK/StringBuilder.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibMain/Main.h>
#include <ctype.h>
#include <stdio.h>
diff --git a/Meta/Lagom/Tools/CodeGenerators/LibEDID/GeneratePnpIDs.cpp b/Meta/Lagom/Tools/CodeGenerators/LibEDID/GeneratePnpIDs.cpp
index fca6c8d1cb..8ddeefa4c4 100644
--- a/Meta/Lagom/Tools/CodeGenerators/LibEDID/GeneratePnpIDs.cpp
+++ b/Meta/Lagom/Tools/CodeGenerators/LibEDID/GeneratePnpIDs.cpp
@@ -7,7 +7,6 @@
#include <AK/SourceGenerator.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
enum class PnpIdColumns {
ManufacturerName,
diff --git a/Meta/Lagom/Tools/CodeGenerators/LibGL/GenerateGLAPIWrapper.cpp b/Meta/Lagom/Tools/CodeGenerators/LibGL/GenerateGLAPIWrapper.cpp
index 99bf32fe44..2a2b346a0f 100644
--- a/Meta/Lagom/Tools/CodeGenerators/LibGL/GenerateGLAPIWrapper.cpp
+++ b/Meta/Lagom/Tools/CodeGenerators/LibGL/GenerateGLAPIWrapper.cpp
@@ -15,7 +15,6 @@
#include <AK/Vector.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibMain/Main.h>
struct ArgumentDefinition {
diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp
index b33a4a17c2..0c9314837e 100644
--- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp
+++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp
@@ -24,7 +24,6 @@
#include <AK/Utf8View.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/DirIterator.h>
-#include <LibCore/Stream.h>
#include <LibLocale/DateTimeFormat.h>
#include <LibTimeZone/TimeZone.h>
diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp
index 3a2cd6ebda..fbe93fbf4d 100644
--- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp
+++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp
@@ -21,7 +21,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/DeprecatedFile.h>
#include <LibCore/DirIterator.h>
-#include <LibCore/Stream.h>
static DeprecatedString format_identifier(StringView owner, DeprecatedString identifier)
{
diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp
index 7609d9e7b7..a364adfaed 100644
--- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp
+++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp
@@ -25,7 +25,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/DeprecatedFile.h>
#include <LibCore/DirIterator.h>
-#include <LibCore/Stream.h>
#include <LibJS/Runtime/Intl/SingleUnitIdentifiers.h>
#include <LibLocale/Locale.h>
#include <LibLocale/NumberFormat.h>
diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp
index 70ce71efe0..35dba37051 100644
--- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp
+++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp
@@ -15,7 +15,6 @@
#include <AK/Variant.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/DeprecatedFile.h>
-#include <LibCore/Stream.h>
#include <LibLocale/PluralRules.h>
static DeprecatedString format_identifier(StringView owner, DeprecatedString identifier)
diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp
index 382c6b8472..5954490130 100644
--- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp
+++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp
@@ -16,7 +16,6 @@
#include <AK/StringBuilder.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/DirIterator.h>
-#include <LibCore/Stream.h>
#include <LibLocale/Locale.h>
#include <LibLocale/RelativeTimeFormat.h>
diff --git a/Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp
index 0290e46a77..61045cd147 100644
--- a/Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp
+++ b/Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp
@@ -14,7 +14,6 @@
#include <AK/StringBuilder.h>
#include <AK/Vector.h>
#include <LibCore/ArgsParser.h>
-#include <LibCore/Stream.h>
#include <LibTimeZone/TimeZone.h>
namespace {
diff --git a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateEmojiData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateEmojiData.cpp
index ca792f4167..a03051551f 100644
--- a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateEmojiData.cpp
+++ b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateEmojiData.cpp
@@ -13,7 +13,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/DeprecatedFile.h>
#include <LibCore/Directory.h>
-#include <LibCore/Stream.h>
#include <LibUnicode/Emoji.h>
struct Emoji {
diff --git a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp
index f3244b3507..f0bb5b2265 100644
--- a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp
+++ b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp
@@ -19,7 +19,6 @@
#include <AK/Types.h>
#include <AK/Vector.h>
#include <LibCore/ArgsParser.h>
-#include <LibCore/Stream.h>
// Some code points are excluded from UnicodeData.txt, and instead are part of a "range" of code
// points, as indicated by the "name" field. For example:
diff --git a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h
index 472d489a61..1918ce2478 100644
--- a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h
+++ b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h
@@ -7,6 +7,7 @@
#pragma once
#include <AK/DeprecatedString.h>
+#include <AK/Function.h>
#include <AK/HashFunctions.h>
#include <AK/HashMap.h>
#include <AK/JsonValue.h>
@@ -21,7 +22,6 @@
#include <AK/Vector.h>
#include <LibCore/DirIterator.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibLocale/Locale.h>
template<class T>
diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/BindingsGenerator/main.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/BindingsGenerator/main.cpp
index 86f8a6031f..9b87d6c502 100644
--- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/BindingsGenerator/main.cpp
+++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/BindingsGenerator/main.cpp
@@ -12,7 +12,6 @@
#include <AK/LexicalPath.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibIDL/IDLParser.h>
#include <LibIDL/Types.h>
diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateWindowOrWorkerInterfaces.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateWindowOrWorkerInterfaces.cpp
index 09806e93a4..b7e760ec6c 100644
--- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateWindowOrWorkerInterfaces.cpp
+++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateWindowOrWorkerInterfaces.cpp
@@ -10,7 +10,6 @@
#include <AK/StringBuilder.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibIDL/IDLParser.h>
#include <LibIDL/Types.h>
#include <LibMain/Main.h>
diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GeneratorUtil.h b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GeneratorUtil.h
index 5fa86d90ae..a4d3ead5a4 100644
--- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GeneratorUtil.h
+++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GeneratorUtil.h
@@ -11,7 +11,6 @@
#include <AK/JsonObject.h>
#include <AK/Vector.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <ctype.h>
DeprecatedString title_casify(DeprecatedString const& dashy_name)
diff --git a/Meta/Lagom/Tools/CodeGenerators/StateMachineGenerator/main.cpp b/Meta/Lagom/Tools/CodeGenerators/StateMachineGenerator/main.cpp
index f3755f68c6..53328f2103 100644
--- a/Meta/Lagom/Tools/CodeGenerators/StateMachineGenerator/main.cpp
+++ b/Meta/Lagom/Tools/CodeGenerators/StateMachineGenerator/main.cpp
@@ -13,7 +13,6 @@
#include <AK/Types.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibMain/Main.h>
#include <ctype.h>
diff --git a/Meta/Lagom/Wasm/js_repl.cpp b/Meta/Lagom/Wasm/js_repl.cpp
index b40a973226..b508b92fa6 100644
--- a/Meta/Lagom/Wasm/js_repl.cpp
+++ b/Meta/Lagom/Wasm/js_repl.cpp
@@ -9,7 +9,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/ConfigFile.h>
#include <LibCore/StandardPaths.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibJS/AST.h>
#include <LibJS/Bytecode/BasicBlock.h>
diff --git a/Ports/OpenJDK/patches/0008-java.base-Enable-java.lang.Process-on-serenity.patch b/Ports/OpenJDK/patches/0008-java.base-Enable-java.lang.Process-on-serenity.patch
index 15fd209e62..ebbc31ddbe 100644
--- a/Ports/OpenJDK/patches/0008-java.base-Enable-java.lang.Process-on-serenity.patch
+++ b/Ports/OpenJDK/patches/0008-java.base-Enable-java.lang.Process-on-serenity.patch
@@ -50,7 +50,7 @@ new file mode 100644
index 0000000000000000000000000000000000000000..cc0c08cb85a682d66a00f6b48ad2871f83b5e719
--- /dev/null
+++ b/src/java.base/serenity/native/libjava/ProcessHandleImpl_serenity.cpp
-@@ -0,0 +1,166 @@
+@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -91,7 +91,6 @@ index 0000000000000000000000000000000000000000..cc0c08cb85a682d66a00f6b48ad2871f
+#include <LibCore/DeprecatedFile.h>
+#include <LibCore/File.h>
+#include <LibCore/ProcessStatisticsReader.h>
-+#include <LibCore/Stream.h>
+#include <stdio.h>
+#include <string.h>
+
diff --git a/Tests/AK/TestMemoryStream.cpp b/Tests/AK/TestMemoryStream.cpp
index 48f74a0848..b335609b86 100644
--- a/Tests/AK/TestMemoryStream.cpp
+++ b/Tests/AK/TestMemoryStream.cpp
@@ -6,7 +6,6 @@
#include <AK/MemoryStream.h>
#include <AK/String.h>
-#include <LibCore/Stream.h>
#include <LibTest/TestCase.h>
TEST_CASE(allocating_memory_stream_empty)
diff --git a/Tests/LibAudio/TestFLACSpec.cpp b/Tests/LibAudio/TestFLACSpec.cpp
index a03460b80c..515c72acb4 100644
--- a/Tests/LibAudio/TestFLACSpec.cpp
+++ b/Tests/LibAudio/TestFLACSpec.cpp
@@ -8,7 +8,6 @@
#include <AK/Types.h>
#include <LibAudio/FlacLoader.h>
#include <LibCore/DirIterator.h>
-#include <LibCore/Stream.h>
#include <LibTest/TestCase.h>
struct FlacTest : Test::TestCase {
diff --git a/Tests/LibCompress/TestBrotli.cpp b/Tests/LibCompress/TestBrotli.cpp
index f4683d322d..d5b99bd4f1 100644
--- a/Tests/LibCompress/TestBrotli.cpp
+++ b/Tests/LibCompress/TestBrotli.cpp
@@ -8,7 +8,6 @@
#include <LibCompress/Brotli.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
static void run_test(StringView const file_name)
{
diff --git a/Tests/LibCore/TestLibCoreStream.cpp b/Tests/LibCore/TestLibCoreStream.cpp
index 861711be86..8e4ac3917e 100644
--- a/Tests/LibCore/TestLibCoreStream.cpp
+++ b/Tests/LibCore/TestLibCoreStream.cpp
@@ -11,7 +11,6 @@
#include <LibCore/File.h>
#include <LibCore/LocalServer.h>
#include <LibCore/Socket.h>
-#include <LibCore/Stream.h>
#include <LibCore/TCPServer.h>
#include <LibCore/Timer.h>
#include <LibCore/UDPServer.h>
diff --git a/Tests/LibCpp/test-cpp-parser.cpp b/Tests/LibCpp/test-cpp-parser.cpp
index e3d0796b90..9e9f094997 100644
--- a/Tests/LibCpp/test-cpp-parser.cpp
+++ b/Tests/LibCpp/test-cpp-parser.cpp
@@ -7,7 +7,6 @@
#include <AK/LexicalPath.h>
#include <LibCore/DirIterator.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCpp/Parser.h>
#include <LibTest/TestCase.h>
#include <unistd.h>
diff --git a/Tests/LibCpp/test-cpp-preprocessor.cpp b/Tests/LibCpp/test-cpp-preprocessor.cpp
index 14b7cfc9b1..03bdf029db 100644
--- a/Tests/LibCpp/test-cpp-preprocessor.cpp
+++ b/Tests/LibCpp/test-cpp-preprocessor.cpp
@@ -7,7 +7,6 @@
#include <AK/LexicalPath.h>
#include <LibCore/DirIterator.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCpp/Parser.h>
#include <LibTest/TestCase.h>
diff --git a/Tests/LibGL/TestRender.cpp b/Tests/LibGL/TestRender.cpp
index 11a1949208..e366c008f2 100644
--- a/Tests/LibGL/TestRender.cpp
+++ b/Tests/LibGL/TestRender.cpp
@@ -8,7 +8,6 @@
#include <AK/DeprecatedString.h>
#include <AK/LexicalPath.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibGL/GL/gl.h>
#include <LibGL/GLContext.h>
#include <LibGfx/Bitmap.h>
diff --git a/Tests/LibJS/test-test262.cpp b/Tests/LibJS/test-test262.cpp
index bc90d888de..9b168d921c 100644
--- a/Tests/LibJS/test-test262.cpp
+++ b/Tests/LibJS/test-test262.cpp
@@ -16,7 +16,6 @@
#include <LibCore/DeprecatedFile.h>
#include <LibCore/File.h>
#include <LibCore/Process.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <LibTest/TestRunnerUtil.h>
diff --git a/Tests/LibJS/test262-runner.cpp b/Tests/LibJS/test262-runner.cpp
index 0e852e7cfb..76ac7167fe 100644
--- a/Tests/LibJS/test262-runner.cpp
+++ b/Tests/LibJS/test262-runner.cpp
@@ -13,7 +13,6 @@
#include <AK/Vector.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibJS/Bytecode/BasicBlock.h>
#include <LibJS/Bytecode/Generator.h>
#include <LibJS/Bytecode/Interpreter.h>
diff --git a/Tests/LibMarkdown/TestCommonmark.cpp b/Tests/LibMarkdown/TestCommonmark.cpp
index 338bc56c11..b3f685c905 100644
--- a/Tests/LibMarkdown/TestCommonmark.cpp
+++ b/Tests/LibMarkdown/TestCommonmark.cpp
@@ -9,7 +9,6 @@
#include <AK/JsonObject.h>
#include <AK/JsonParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibMarkdown/Document.h>
#include <LibTest/TestCase.h>
#include <LibTest/TestSuite.h>
diff --git a/Tests/LibWasm/test-wasm.cpp b/Tests/LibWasm/test-wasm.cpp
index fce9d807e7..29c7c70139 100644
--- a/Tests/LibWasm/test-wasm.cpp
+++ b/Tests/LibWasm/test-wasm.cpp
@@ -5,7 +5,6 @@
*/
#include <AK/MemoryStream.h>
-#include <LibCore/Stream.h>
#include <LibTest/JavaScriptTestRunner.h>
#include <LibWasm/AbstractMachine/BytecodeInterpreter.h>
#include <LibWasm/Types.h>
diff --git a/Tests/LibWeb/TestHTMLTokenizer.cpp b/Tests/LibWeb/TestHTMLTokenizer.cpp
index 1be1b0c6f8..ba2ba76a91 100644
--- a/Tests/LibWeb/TestHTMLTokenizer.cpp
+++ b/Tests/LibWeb/TestHTMLTokenizer.cpp
@@ -7,7 +7,6 @@
#include <LibTest/TestCase.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibWeb/HTML/Parser/HTMLTokenizer.h>
using Tokenizer = Web::HTML::HTMLTokenizer;
diff --git a/Userland/Applets/Network/main.cpp b/Userland/Applets/Network/main.cpp
index 88d6646298..dcc936bfea 100644
--- a/Userland/Applets/Network/main.cpp
+++ b/Userland/Applets/Network/main.cpp
@@ -7,7 +7,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibGUI/Action.h>
#include <LibGUI/Application.h>
diff --git a/Userland/Applets/ResourceGraph/main.cpp b/Userland/Applets/ResourceGraph/main.cpp
index 2716c2ad96..665219db9f 100644
--- a/Userland/Applets/ResourceGraph/main.cpp
+++ b/Userland/Applets/ResourceGraph/main.cpp
@@ -9,7 +9,6 @@
#include <AK/CircularQueue.h>
#include <AK/JsonObject.h>
#include <LibCore/ArgsParser.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibGUI/Application.h>
#include <LibGUI/Frame.h>
diff --git a/Userland/Applications/Browser/BrowserWindow.cpp b/Userland/Applications/Browser/BrowserWindow.cpp
index 1f73a045e9..c19e388edd 100644
--- a/Userland/Applications/Browser/BrowserWindow.cpp
+++ b/Userland/Applications/Browser/BrowserWindow.cpp
@@ -19,7 +19,6 @@
#include <LibConfig/Client.h>
#include <LibCore/DateTime.h>
#include <LibCore/StandardPaths.h>
-#include <LibCore/Stream.h>
#include <LibGUI/Application.h>
#include <LibGUI/Clipboard.h>
#include <LibGUI/Icon.h>
diff --git a/Userland/Applications/Browser/DownloadWidget.cpp b/Userland/Applications/Browser/DownloadWidget.cpp
index ab6023cf71..1f377c2996 100644
--- a/Userland/Applications/Browser/DownloadWidget.cpp
+++ b/Userland/Applications/Browser/DownloadWidget.cpp
@@ -10,7 +10,6 @@
#include <AK/StringBuilder.h>
#include <LibCore/Proxy.h>
#include <LibCore/StandardPaths.h>
-#include <LibCore/Stream.h>
#include <LibDesktop/Launcher.h>
#include <LibGUI/BoxLayout.h>
#include <LibGUI/Button.h>
diff --git a/Userland/Applications/Browser/DownloadWidget.h b/Userland/Applications/Browser/DownloadWidget.h
index f60fc94108..28b4536d58 100644
--- a/Userland/Applications/Browser/DownloadWidget.h
+++ b/Userland/Applications/Browser/DownloadWidget.h
@@ -9,7 +9,6 @@
#include <AK/URL.h>
#include <LibCore/ElapsedTimer.h>
-#include <LibCore/Stream.h>
#include <LibGUI/ImageWidget.h>
#include <LibGUI/Progressbar.h>
#include <LibGUI/Widget.h>
diff --git a/Userland/Applications/BrowserSettings/ContentFilterSettingsWidget.cpp b/Userland/Applications/BrowserSettings/ContentFilterSettingsWidget.cpp
index 17f44bf3a9..e54b9be917 100644
--- a/Userland/Applications/BrowserSettings/ContentFilterSettingsWidget.cpp
+++ b/Userland/Applications/BrowserSettings/ContentFilterSettingsWidget.cpp
@@ -10,7 +10,6 @@
#include <Applications/BrowserSettings/ContentFilterSettingsWidgetGML.h>
#include <LibConfig/Client.h>
#include <LibCore/StandardPaths.h>
-#include <LibCore/Stream.h>
#include <LibGUI/CheckBox.h>
#include <LibGUI/Event.h>
#include <LibGUI/Forward.h>
diff --git a/Userland/Applications/FileManager/FileOperationProgressWidget.h b/Userland/Applications/FileManager/FileOperationProgressWidget.h
index 907edd12f5..d5aca5e42f 100644
--- a/Userland/Applications/FileManager/FileOperationProgressWidget.h
+++ b/Userland/Applications/FileManager/FileOperationProgressWidget.h
@@ -9,7 +9,6 @@
#include "FileUtils.h"
#include <LibCore/ElapsedTimer.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibGUI/Widget.h>
namespace FileManager {
diff --git a/Userland/Applications/FileManager/FileUtils.cpp b/Userland/Applications/FileManager/FileUtils.cpp
index 0f5c3c423f..0388701ed3 100644
--- a/Userland/Applications/FileManager/FileUtils.cpp
+++ b/Userland/Applications/FileManager/FileUtils.cpp
@@ -10,7 +10,6 @@
#include <AK/LexicalPath.h>
#include <LibCore/DeprecatedFile.h>
#include <LibCore/MimeData.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibGUI/Event.h>
#include <LibGUI/MessageBox.h>
diff --git a/Userland/Applications/HexEditor/HexDocument.cpp b/Userland/Applications/HexEditor/HexDocument.cpp
index 064ca93f91..fa9edbec49 100644
--- a/Userland/Applications/HexEditor/HexDocument.cpp
+++ b/Userland/Applications/HexEditor/HexDocument.cpp
@@ -5,8 +5,8 @@
*/
#include "HexDocument.h"
+#include <AK/TypeCasts.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
void HexDocument::set(size_t position, u8 value)
{
diff --git a/Userland/Applications/HexEditor/HexEditorWidget.cpp b/Userland/Applications/HexEditor/HexEditorWidget.cpp
index 9084e049b9..104f8d861d 100644
--- a/Userland/Applications/HexEditor/HexEditorWidget.cpp
+++ b/Userland/Applications/HexEditor/HexEditorWidget.cpp
@@ -17,7 +17,6 @@
#include <AK/StringBuilder.h>
#include <Applications/HexEditor/HexEditorWindowGML.h>
#include <LibConfig/Client.h>
-#include <LibCore/Stream.h>
#include <LibDesktop/Launcher.h>
#include <LibFileSystemAccessClient/Client.h>
#include <LibGUI/Action.h>
diff --git a/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp b/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp
index 678fd1a573..e42d863d2e 100644
--- a/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp
+++ b/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp
@@ -9,7 +9,6 @@
#include "KeyboardMapperWidget.h"
#include "KeyPositions.h"
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibGUI/BoxLayout.h>
#include <LibGUI/InputBox.h>
#include <LibGUI/MessageBox.h>
diff --git a/Userland/Applications/Presenter/Presentation.cpp b/Userland/Applications/Presenter/Presentation.cpp
index a90da1e9db..f8873a7515 100644
--- a/Userland/Applications/Presenter/Presentation.cpp
+++ b/Userland/Applications/Presenter/Presentation.cpp
@@ -8,7 +8,6 @@
#include "Presentation.h"
#include <AK/JsonObject.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibGUI/Window.h>
#include <errno_codes.h>
diff --git a/Userland/Applications/Run/RunWindow.cpp b/Userland/Applications/Run/RunWindow.cpp
index fc82de3cd6..0e864971c3 100644
--- a/Userland/Applications/Run/RunWindow.cpp
+++ b/Userland/Applications/Run/RunWindow.cpp
@@ -11,7 +11,6 @@
#include <Applications/Run/RunGML.h>
#include <LibCore/DeprecatedFile.h>
#include <LibCore/StandardPaths.h>
-#include <LibCore/Stream.h>
#include <LibDesktop/Launcher.h>
#include <LibGUI/Button.h>
#include <LibGUI/Event.h>
diff --git a/Userland/Applications/SoundPlayer/M3UParser.cpp b/Userland/Applications/SoundPlayer/M3UParser.cpp
index 43353b202b..26f7f40618 100644
--- a/Userland/Applications/SoundPlayer/M3UParser.cpp
+++ b/Userland/Applications/SoundPlayer/M3UParser.cpp
@@ -10,7 +10,6 @@
#include <AK/ScopeGuard.h>
#include <AK/Utf8View.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
M3UParser::M3UParser()
{
diff --git a/Userland/Applications/Spreadsheet/SpreadsheetWidget.h b/Userland/Applications/Spreadsheet/SpreadsheetWidget.h
index 31d21c7f5c..d2ad495171 100644
--- a/Userland/Applications/Spreadsheet/SpreadsheetWidget.h
+++ b/Userland/Applications/Spreadsheet/SpreadsheetWidget.h
@@ -9,7 +9,6 @@
#include "SpreadsheetView.h"
#include "Workbook.h"
#include <AK/NonnullRefPtrVector.h>
-#include <LibCore/Stream.h>
#include <LibGUI/Clipboard.h>
#include <LibGUI/TabWidget.h>
#include <LibGUI/Widget.h>
diff --git a/Userland/Applications/Spreadsheet/Workbook.cpp b/Userland/Applications/Spreadsheet/Workbook.cpp
index 3df8daa501..e7add532cc 100644
--- a/Userland/Applications/Spreadsheet/Workbook.cpp
+++ b/Userland/Applications/Spreadsheet/Workbook.cpp
@@ -11,7 +11,6 @@
#include <AK/ByteBuffer.h>
#include <AK/StringView.h>
#include <LibCore/MimeData.h>
-#include <LibCore/Stream.h>
#include <LibFileSystemAccessClient/Client.h>
#include <LibGUI/TextBox.h>
#include <LibGUI/Window.h>
diff --git a/Userland/Applications/Spreadsheet/Writers/XSV.h b/Userland/Applications/Spreadsheet/Writers/XSV.h
index 818e3d3c1c..f003dfadf7 100644
--- a/Userland/Applications/Spreadsheet/Writers/XSV.h
+++ b/Userland/Applications/Spreadsheet/Writers/XSV.h
@@ -9,10 +9,10 @@
#include <AK/DeprecatedString.h>
#include <AK/GenericLexer.h>
#include <AK/OwnPtr.h>
+#include <AK/Stream.h>
#include <AK/StringView.h>
#include <AK/Types.h>
#include <AK/Vector.h>
-#include <LibCore/Stream.h>
namespace Writer {
diff --git a/Userland/Applications/SystemMonitor/ProcessModel.cpp b/Userland/Applications/SystemMonitor/ProcessModel.cpp
index 04d031269c..5f34a89cb4 100644
--- a/Userland/Applications/SystemMonitor/ProcessModel.cpp
+++ b/Userland/Applications/SystemMonitor/ProcessModel.cpp
@@ -12,7 +12,6 @@
#include <AK/NumberFormat.h>
#include <LibCore/DeprecatedFile.h>
#include <LibCore/ProcessStatisticsReader.h>
-#include <LibCore/Stream.h>
#include <LibGUI/FileIconProvider.h>
#include <LibGUI/Icon.h>
#include <LibGUI/ModelIndex.h>
diff --git a/Userland/Applications/Welcome/WelcomeWidget.cpp b/Userland/Applications/Welcome/WelcomeWidget.cpp
index 776c37f84b..3569c1a57f 100644
--- a/Userland/Applications/Welcome/WelcomeWidget.cpp
+++ b/Userland/Applications/Welcome/WelcomeWidget.cpp
@@ -10,7 +10,6 @@
#include <Applications/Welcome/WelcomeWindowGML.h>
#include <LibConfig/Client.h>
#include <LibCore/StandardPaths.h>
-#include <LibCore/Stream.h>
#include <LibGUI/Application.h>
#include <LibGUI/Button.h>
#include <LibGUI/CheckBox.h>
diff --git a/Userland/Demos/CatDog/CatDog.h b/Userland/Demos/CatDog/CatDog.h
index 0a86a013bf..b7e878aca0 100644
--- a/Userland/Demos/CatDog/CatDog.h
+++ b/Userland/Demos/CatDog/CatDog.h
@@ -12,7 +12,6 @@
#include <AK/RefPtr.h>
#include <AK/Types.h>
#include <LibCore/ElapsedTimer.h>
-#include <LibCore/Stream.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MouseTracker.h>
#include <LibGUI/Widget.h>
diff --git a/Userland/DevTools/HackStudio/Editor.cpp b/Userland/DevTools/HackStudio/Editor.cpp
index 83bb54c955..fad9c322a6 100644
--- a/Userland/DevTools/HackStudio/Editor.cpp
+++ b/Userland/DevTools/HackStudio/Editor.cpp
@@ -17,7 +17,6 @@
#include <LibConfig/Client.h>
#include <LibCore/DeprecatedFile.h>
#include <LibCore/DirIterator.h>
-#include <LibCore/Stream.h>
#include <LibCore/Timer.h>
#include <LibCpp/SemanticSyntaxHighlighter.h>
#include <LibCpp/SyntaxHighlighter.h>
diff --git a/Userland/DevTools/HackStudio/Git/GitWidget.cpp b/Userland/DevTools/HackStudio/Git/GitWidget.cpp
index 2afe716263..c72d634269 100644
--- a/Userland/DevTools/HackStudio/Git/GitWidget.cpp
+++ b/Userland/DevTools/HackStudio/Git/GitWidget.cpp
@@ -7,7 +7,6 @@
#include "GitWidget.h"
#include "../Dialogs/Git/GitCommitDialog.h"
#include "GitFilesModel.h"
-#include <LibCore/Stream.h>
#include <LibDiff/Format.h>
#include <LibGUI/Application.h>
#include <LibGUI/BoxLayout.h>
diff --git a/Userland/DevTools/HackStudio/LanguageServers/FileDB.h b/Userland/DevTools/HackStudio/LanguageServers/FileDB.h
index 8cb3302c64..02f25c3ff9 100644
--- a/Userland/DevTools/HackStudio/LanguageServers/FileDB.h
+++ b/Userland/DevTools/HackStudio/LanguageServers/FileDB.h
@@ -10,7 +10,6 @@
#include <AK/HashMap.h>
#include <AK/NonnullRefPtr.h>
#include <LibCodeComprehension/FileDB.h>
-#include <LibCore/Stream.h>
#include <LibGUI/TextDocument.h>
namespace LanguageServers {
diff --git a/Userland/DevTools/HackStudio/ProjectBuilder.cpp b/Userland/DevTools/HackStudio/ProjectBuilder.cpp
index 5c714c9753..5ec9544cc3 100644
--- a/Userland/DevTools/HackStudio/ProjectBuilder.cpp
+++ b/Userland/DevTools/HackStudio/ProjectBuilder.cpp
@@ -8,7 +8,6 @@
#include <AK/LexicalPath.h>
#include <LibCore/Command.h>
#include <LibCore/DeprecatedFile.h>
-#include <LibCore/Stream.h>
#include <LibRegex/Regex.h>
#include <fcntl.h>
#include <sys/stat.h>
diff --git a/Userland/DevTools/HackStudio/ProjectConfig.cpp b/Userland/DevTools/HackStudio/ProjectConfig.cpp
index 5eacf415ae..9687e36daf 100644
--- a/Userland/DevTools/HackStudio/ProjectConfig.cpp
+++ b/Userland/DevTools/HackStudio/ProjectConfig.cpp
@@ -7,7 +7,6 @@
#include "ProjectConfig.h"
#include <AK/NonnullOwnPtr.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
namespace HackStudio {
diff --git a/Userland/DevTools/HackStudio/ProjectFile.cpp b/Userland/DevTools/HackStudio/ProjectFile.cpp
index 768085b08c..35fba436b0 100644
--- a/Userland/DevTools/HackStudio/ProjectFile.cpp
+++ b/Userland/DevTools/HackStudio/ProjectFile.cpp
@@ -6,7 +6,6 @@
#include "ProjectFile.h"
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
namespace HackStudio {
diff --git a/Userland/DevTools/Profiler/Profile.cpp b/Userland/DevTools/Profiler/Profile.cpp
index 9d512f029c..5a9c1d412c 100644
--- a/Userland/DevTools/Profiler/Profile.cpp
+++ b/Userland/DevTools/Profiler/Profile.cpp
@@ -16,7 +16,6 @@
#include <AK/RefPtr.h>
#include <AK/Try.h>
#include <LibCore/MappedFile.h>
-#include <LibCore/Stream.h>
#include <LibELF/Image.h>
#include <LibSymbolication/Symbolication.h>
#include <sys/stat.h>
diff --git a/Userland/DevTools/Profiler/SourceModel.cpp b/Userland/DevTools/Profiler/SourceModel.cpp
index 87d60dc373..d23691a1e3 100644
--- a/Userland/DevTools/Profiler/SourceModel.cpp
+++ b/Userland/DevTools/Profiler/SourceModel.cpp
@@ -7,7 +7,6 @@
#include "SourceModel.h"
#include "Gradient.h"
#include "Profile.h"
-#include <LibCore/Stream.h>
#include <LibDebug/DebugInfo.h>
#include <LibGfx/Font/FontDatabase.h>
#include <LibSymbolication/Symbolication.h>
diff --git a/Userland/DevTools/SQLStudio/ScriptEditor.cpp b/Userland/DevTools/SQLStudio/ScriptEditor.cpp
index 3c8261b901..331ff35a59 100644
--- a/Userland/DevTools/SQLStudio/ScriptEditor.cpp
+++ b/Userland/DevTools/SQLStudio/ScriptEditor.cpp
@@ -5,7 +5,6 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
-#include <LibCore/Stream.h>
#include <LibGUI/Dialog.h>
#include <LibGUI/FilePicker.h>
#include <LibGUI/MessageBox.h>
diff --git a/Userland/Games/Chess/ChessWidget.cpp b/Userland/Games/Chess/ChessWidget.cpp
index 65e0006a60..8b3532bedc 100644
--- a/Userland/Games/Chess/ChessWidget.cpp
+++ b/Userland/Games/Chess/ChessWidget.cpp
@@ -11,7 +11,6 @@
#include <AK/String.h>
#include <LibCore/DateTime.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibGUI/MessageBox.h>
#include <LibGUI/Painter.h>
#include <LibGfx/AntiAliasingPainter.h>
diff --git a/Userland/Games/MasterWord/WordGame.cpp b/Userland/Games/MasterWord/WordGame.cpp
index 9a3d1ddfed..8bbea1dfe6 100644
--- a/Userland/Games/MasterWord/WordGame.cpp
+++ b/Userland/Games/MasterWord/WordGame.cpp
@@ -9,7 +9,6 @@
#include <AK/Random.h>
#include <AK/StringView.h>
#include <LibConfig/Client.h>
-#include <LibCore/Stream.h>
#include <LibCore/Timer.h>
#include <LibGUI/Application.h>
#include <LibGUI/MessageBox.h>
diff --git a/Userland/Libraries/LibArchive/TarStream.cpp b/Userland/Libraries/LibArchive/TarStream.cpp
index 19f1f6fb6f..53f8625d05 100644
--- a/Userland/Libraries/LibArchive/TarStream.cpp
+++ b/Userland/Libraries/LibArchive/TarStream.cpp
@@ -7,6 +7,7 @@
*/
#include <AK/Array.h>
+#include <AK/OwnPtr.h>
#include <LibArchive/TarStream.h>
#include <string.h>
diff --git a/Userland/Libraries/LibArchive/TarStream.h b/Userland/Libraries/LibArchive/TarStream.h
index 87ef75d21c..370b4a3621 100644
--- a/Userland/Libraries/LibArchive/TarStream.h
+++ b/Userland/Libraries/LibArchive/TarStream.h
@@ -9,8 +9,8 @@
#include <AK/MaybeOwned.h>
#include <AK/Span.h>
+#include <AK/Stream.h>
#include <LibArchive/Tar.h>
-#include <LibCore/Stream.h>
namespace Archive {
diff --git a/Userland/Libraries/LibArchive/Zip.h b/Userland/Libraries/LibArchive/Zip.h
index 2f9e8eedb3..2cf7c4341b 100644
--- a/Userland/Libraries/LibArchive/Zip.h
+++ b/Userland/Libraries/LibArchive/Zip.h
@@ -11,9 +11,10 @@
#include <AK/DOSPackedTime.h>
#include <AK/Function.h>
#include <AK/IterationDecision.h>
+#include <AK/NonnullOwnPtr.h>
+#include <AK/Stream.h>
#include <AK/String.h>
#include <AK/Vector.h>
-#include <LibCore/Stream.h>
#include <string.h>
namespace Archive {
diff --git a/Userland/Libraries/LibAudio/FlacLoader.cpp b/Userland/Libraries/LibAudio/FlacLoader.cpp
index 2eaa331ed7..e79c823b6a 100644
--- a/Userland/Libraries/LibAudio/FlacLoader.cpp
+++ b/Userland/Libraries/LibAudio/FlacLoader.cpp
@@ -22,7 +22,6 @@
#include <LibAudio/LoaderError.h>
#include <LibAudio/Resampler.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
namespace Audio {
diff --git a/Userland/Libraries/LibAudio/FlacLoader.h b/Userland/Libraries/LibAudio/FlacLoader.h
index abb7d34e72..3a4c7f1b28 100644
--- a/Userland/Libraries/LibAudio/FlacLoader.h
+++ b/Userland/Libraries/LibAudio/FlacLoader.h
@@ -12,7 +12,6 @@
#include <AK/Error.h>
#include <AK/Span.h>
#include <AK/Types.h>
-#include <LibCore/Stream.h>
namespace Audio {
diff --git a/Userland/Libraries/LibAudio/Loader.h b/Userland/Libraries/LibAudio/Loader.h
index ff05d34658..d7c2f3b9e4 100644
--- a/Userland/Libraries/LibAudio/Loader.h
+++ b/Userland/Libraries/LibAudio/Loader.h
@@ -19,7 +19,6 @@
#include <LibAudio/LoaderError.h>
#include <LibAudio/Sample.h>
#include <LibAudio/SampleFormats.h>
-#include <LibCore/Stream.h>
namespace Audio {
diff --git a/Userland/Libraries/LibAudio/MP3Loader.h b/Userland/Libraries/LibAudio/MP3Loader.h
index f64bf30b00..e27d21ed54 100644
--- a/Userland/Libraries/LibAudio/MP3Loader.h
+++ b/Userland/Libraries/LibAudio/MP3Loader.h
@@ -11,7 +11,6 @@
#include <AK/BitStream.h>
#include <AK/MemoryStream.h>
#include <AK/Tuple.h>
-#include <LibCore/Stream.h>
#include <LibDSP/MDCT.h>
namespace Audio {
diff --git a/Userland/Libraries/LibAudio/WavLoader.h b/Userland/Libraries/LibAudio/WavLoader.h
index d43b1e9129..0a022359e5 100644
--- a/Userland/Libraries/LibAudio/WavLoader.h
+++ b/Userland/Libraries/LibAudio/WavLoader.h
@@ -14,7 +14,6 @@
#include <AK/Span.h>
#include <AK/StringView.h>
#include <LibAudio/Loader.h>
-#include <LibCore/Stream.h>
namespace Audio {
diff --git a/Userland/Libraries/LibCompress/Brotli.h b/Userland/Libraries/LibCompress/Brotli.h
index 2df3c9c68b..acd44b41f5 100644
--- a/Userland/Libraries/LibCompress/Brotli.h
+++ b/Userland/Libraries/LibCompress/Brotli.h
@@ -9,7 +9,7 @@
#include <AK/BitStream.h>
#include <AK/CircularQueue.h>
#include <AK/FixedArray.h>
-#include <LibCore/Stream.h>
+#include <AK/Vector.h>
namespace Compress {
diff --git a/Userland/Libraries/LibCompress/Deflate.h b/Userland/Libraries/LibCompress/Deflate.h
index 454560891f..203af4e5a4 100644
--- a/Userland/Libraries/LibCompress/Deflate.h
+++ b/Userland/Libraries/LibCompress/Deflate.h
@@ -8,12 +8,13 @@
#pragma once
#include <AK/ByteBuffer.h>
+#include <AK/CircularBuffer.h>
#include <AK/Endian.h>
#include <AK/Forward.h>
#include <AK/MaybeOwned.h>
+#include <AK/Stream.h>
#include <AK/Vector.h>
#include <LibCompress/DeflateTables.h>
-#include <LibCore/Stream.h>
namespace Compress {
diff --git a/Userland/Libraries/LibCompress/Gzip.h b/Userland/Libraries/LibCompress/Gzip.h
index 990e78304e..acf50e15b6 100644
--- a/Userland/Libraries/LibCompress/Gzip.h
+++ b/Userland/Libraries/LibCompress/Gzip.h
@@ -7,8 +7,10 @@
#pragma once
+#include <AK/NonnullOwnPtr.h>
+#include <AK/OwnPtr.h>
+#include <AK/Stream.h>
#include <LibCompress/Deflate.h>
-#include <LibCore/Stream.h>
#include <LibCrypto/Checksum/CRC32.h>
namespace Compress {
diff --git a/Userland/Libraries/LibCompress/Zlib.h b/Userland/Libraries/LibCompress/Zlib.h
index a62420fb17..56bb0e0f11 100644
--- a/Userland/Libraries/LibCompress/Zlib.h
+++ b/Userland/Libraries/LibCompress/Zlib.h
@@ -7,12 +7,13 @@
#pragma once
#include <AK/ByteBuffer.h>
+#include <AK/Endian.h>
#include <AK/MaybeOwned.h>
#include <AK/Optional.h>
#include <AK/OwnPtr.h>
#include <AK/Span.h>
+#include <AK/Stream.h>
#include <AK/Types.h>
-#include <LibCore/Stream.h>
#include <LibCrypto/Checksum/Adler32.h>
namespace Compress {
diff --git a/Userland/Libraries/LibCore/ConfigFile.h b/Userland/Libraries/LibCore/ConfigFile.h
index 29bfc99e2e..c003fc6e56 100644
--- a/Userland/Libraries/LibCore/ConfigFile.h
+++ b/Userland/Libraries/LibCore/ConfigFile.h
@@ -11,11 +11,11 @@
#include <AK/DeprecatedString.h>
#include <AK/Forward.h>
#include <AK/HashMap.h>
+#include <AK/OwnPtr.h>
#include <AK/RefCounted.h>
#include <AK/RefPtr.h>
#include <AK/Vector.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
namespace Core {
diff --git a/Userland/Libraries/LibCore/Directory.h b/Userland/Libraries/LibCore/Directory.h
index c5ef10caf6..8743e1964e 100644
--- a/Userland/Libraries/LibCore/Directory.h
+++ b/Userland/Libraries/LibCore/Directory.h
@@ -12,7 +12,6 @@
#include <AK/Noncopyable.h>
#include <AK/Optional.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <dirent.h>
#include <sys/stat.h>
diff --git a/Userland/Libraries/LibCore/LocalServer.cpp b/Userland/Libraries/LibCore/LocalServer.cpp
index c15576b25c..88a614fc8b 100644
--- a/Userland/Libraries/LibCore/LocalServer.cpp
+++ b/Userland/Libraries/LibCore/LocalServer.cpp
@@ -8,7 +8,6 @@
#include <LibCore/Notifier.h>
#include <LibCore/SessionManagement.h>
#include <LibCore/Socket.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibCore/SystemServerTakeover.h>
#include <fcntl.h>
diff --git a/Userland/Libraries/LibCore/LocalServer.h b/Userland/Libraries/LibCore/LocalServer.h
index f5ed840cca..71b66fc44c 100644
--- a/Userland/Libraries/LibCore/LocalServer.h
+++ b/Userland/Libraries/LibCore/LocalServer.h
@@ -8,7 +8,6 @@
#include <LibCore/Notifier.h>
#include <LibCore/Object.h>
-#include <LibCore/Stream.h>
namespace Core {
diff --git a/Userland/Libraries/LibCore/NetworkJob.h b/Userland/Libraries/LibCore/NetworkJob.h
index ae19ea7a09..dcd024e093 100644
--- a/Userland/Libraries/LibCore/NetworkJob.h
+++ b/Userland/Libraries/LibCore/NetworkJob.h
@@ -8,9 +8,9 @@
#pragma once
#include <AK/Function.h>
+#include <AK/Stream.h>
#include <LibCore/Forward.h>
#include <LibCore/Object.h>
-#include <LibCore/Stream.h>
namespace Core {
diff --git a/Userland/Libraries/LibCore/ProcessStatisticsReader.h b/Userland/Libraries/LibCore/ProcessStatisticsReader.h
index 7bf81bf15b..8d79d69bd1 100644
--- a/Userland/Libraries/LibCore/ProcessStatisticsReader.h
+++ b/Userland/Libraries/LibCore/ProcessStatisticsReader.h
@@ -7,7 +7,7 @@
#pragma once
#include <AK/DeprecatedString.h>
-#include <LibCore/Stream.h>
+#include <AK/Vector.h>
#include <unistd.h>
namespace Core {
diff --git a/Userland/Libraries/LibCore/SOCKSProxyClient.h b/Userland/Libraries/LibCore/SOCKSProxyClient.h
index e63991cb65..aff0bf1a64 100644
--- a/Userland/Libraries/LibCore/SOCKSProxyClient.h
+++ b/Userland/Libraries/LibCore/SOCKSProxyClient.h
@@ -9,7 +9,6 @@
#include <AK/OwnPtr.h>
#include <LibCore/Proxy.h>
#include <LibCore/Socket.h>
-#include <LibCore/Stream.h>
namespace Core {
class SOCKSProxyClient final : public Socket {
diff --git a/Userland/Libraries/LibCore/Stream.h b/Userland/Libraries/LibCore/Stream.h
deleted file mode 100644
index 93f5cd6d67..0000000000
--- a/Userland/Libraries/LibCore/Stream.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2021, sin-ack <sin-ack@protonmail.com>
- * Copyright (c) 2022, the SerenityOS developers.
- *
- * SPDX-License-Identifier: BSD-2-Clause
- */
-
-#pragma once
-
-#include <AK/Badge.h>
-#include <AK/BufferedStream.h>
-#include <AK/CircularBuffer.h>
-#include <AK/DeprecatedString.h>
-#include <AK/EnumBits.h>
-#include <AK/Function.h>
-#include <AK/IPv4Address.h>
-#include <AK/Noncopyable.h>
-#include <AK/Result.h>
-#include <AK/Span.h>
-#include <AK/Stream.h>
-#include <AK/Time.h>
-#include <AK/Variant.h>
-#include <LibCore/Notifier.h>
-#include <LibCore/SocketAddress.h>
-#include <LibIPC/Forward.h>
-#include <errno.h>
-#include <netdb.h>
diff --git a/Userland/Libraries/LibCore/SystemServerTakeover.h b/Userland/Libraries/LibCore/SystemServerTakeover.h
index 5e6bd082c9..fb1fa97dbb 100644
--- a/Userland/Libraries/LibCore/SystemServerTakeover.h
+++ b/Userland/Libraries/LibCore/SystemServerTakeover.h
@@ -6,7 +6,7 @@
#pragma once
-#include <LibCore/Stream.h>
+#include <LibCore/Socket.h>
namespace Core {
diff --git a/Userland/Libraries/LibCore/TCPServer.h b/Userland/Libraries/LibCore/TCPServer.h
index a36eb195c0..18de744c5f 100644
--- a/Userland/Libraries/LibCore/TCPServer.h
+++ b/Userland/Libraries/LibCore/TCPServer.h
@@ -10,7 +10,6 @@
#include <AK/IPv4Address.h>
#include <LibCore/Notifier.h>
#include <LibCore/Object.h>
-#include <LibCore/Stream.h>
namespace Core {
diff --git a/Userland/Libraries/LibDNS/Name.cpp b/Userland/Libraries/LibDNS/Name.cpp
index ddd42bc82d..ccabb48c19 100644
--- a/Userland/Libraries/LibDNS/Name.cpp
+++ b/Userland/Libraries/LibDNS/Name.cpp
@@ -7,6 +7,7 @@
#include "Name.h"
#include <AK/Random.h>
+#include <AK/Stream.h>
#include <AK/Vector.h>
#include <ctype.h>
diff --git a/Userland/Libraries/LibDNS/Name.h b/Userland/Libraries/LibDNS/Name.h
index fab808d32f..59c9a05f28 100644
--- a/Userland/Libraries/LibDNS/Name.h
+++ b/Userland/Libraries/LibDNS/Name.h
@@ -9,7 +9,6 @@
#include <AK/DeprecatedString.h>
#include <AK/Forward.h>
-#include <LibCore/Stream.h>
namespace DNS {
diff --git a/Userland/Libraries/LibDebug/Dwarf/AddressRanges.cpp b/Userland/Libraries/LibDebug/Dwarf/AddressRanges.cpp
index b444eaa229..548480d0bd 100644
--- a/Userland/Libraries/LibDebug/Dwarf/AddressRanges.cpp
+++ b/Userland/Libraries/LibDebug/Dwarf/AddressRanges.cpp
@@ -7,7 +7,6 @@
#include "AddressRanges.h"
#include "DwarfTypes.h"
#include <AK/LEB128.h>
-#include <LibCore/Stream.h>
namespace Debug::Dwarf {
diff --git a/Userland/Libraries/LibDebug/Dwarf/AddressRanges.h b/Userland/Libraries/LibDebug/Dwarf/AddressRanges.h
index 7849b9778d..c1b77d254a 100644
--- a/Userland/Libraries/LibDebug/Dwarf/AddressRanges.h
+++ b/Userland/Libraries/LibDebug/Dwarf/AddressRanges.h
@@ -10,7 +10,6 @@
#include <AK/Forward.h>
#include <AK/Function.h>
#include <AK/Noncopyable.h>
-#include <LibCore/Stream.h>
namespace Debug::Dwarf {
diff --git a/Userland/Libraries/LibDebug/Dwarf/DwarfInfo.h b/Userland/Libraries/LibDebug/Dwarf/DwarfInfo.h
index 2c2cff07af..24a72e9f75 100644
--- a/Userland/Libraries/LibDebug/Dwarf/DwarfInfo.h
+++ b/Userland/Libraries/LibDebug/Dwarf/DwarfInfo.h
@@ -14,7 +14,6 @@
#include <AK/NonnullRefPtr.h>
#include <AK/RedBlackTree.h>
#include <AK/RefCounted.h>
-#include <LibCore/Stream.h>
#include <LibDebug/Dwarf/DIE.h>
#include <LibELF/Image.h>
diff --git a/Userland/Libraries/LibDebug/Dwarf/DwarfTypes.h b/Userland/Libraries/LibDebug/Dwarf/DwarfTypes.h
index 67419fb3d3..6ae6d81c31 100644
--- a/Userland/Libraries/LibDebug/Dwarf/DwarfTypes.h
+++ b/Userland/Libraries/LibDebug/Dwarf/DwarfTypes.h
@@ -6,8 +6,9 @@
#pragma once
+#include <AK/Error.h>
+#include <AK/Stream.h>
#include <AK/Types.h>
-#include <LibCore/Stream.h>
namespace Debug::Dwarf {
diff --git a/Userland/Libraries/LibDebug/Dwarf/LineProgram.h b/Userland/Libraries/LibDebug/Dwarf/LineProgram.h
index fb4c678fc1..15fba6b03c 100644
--- a/Userland/Libraries/LibDebug/Dwarf/LineProgram.h
+++ b/Userland/Libraries/LibDebug/Dwarf/LineProgram.h
@@ -8,7 +8,6 @@
#include <AK/DeprecatedFlyString.h>
#include <AK/Vector.h>
-#include <LibCore/Stream.h>
#include <LibDebug/Dwarf/DwarfTypes.h>
namespace Debug::Dwarf {
diff --git a/Userland/Libraries/LibGUI/CommonLocationsProvider.cpp b/Userland/Libraries/LibGUI/CommonLocationsProvider.cpp
index 99186d1d15..ba81d3aa19 100644
--- a/Userland/Libraries/LibGUI/CommonLocationsProvider.cpp
+++ b/Userland/Libraries/LibGUI/CommonLocationsProvider.cpp
@@ -11,7 +11,6 @@
#include <LibCore/DeprecatedFile.h>
#include <LibCore/File.h>
#include <LibCore/StandardPaths.h>
-#include <LibCore/Stream.h>
#include <LibGUI/CommonLocationsProvider.h>
#include <unistd.h>
diff --git a/Userland/Libraries/LibGUI/Variant.cpp b/Userland/Libraries/LibGUI/Variant.cpp
index d7b94f2455..95fdbcb976 100644
--- a/Userland/Libraries/LibGUI/Variant.cpp
+++ b/Userland/Libraries/LibGUI/Variant.cpp
@@ -6,6 +6,7 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
+#include <AK/JsonValue.h>
#include <AK/NonnullRefPtr.h>
#include <LibGUI/Icon.h>
#include <LibGUI/Variant.h>
diff --git a/Userland/Libraries/LibGemini/Job.cpp b/Userland/Libraries/LibGemini/Job.cpp
index 00d61e68af..dbf1c5688a 100644
--- a/Userland/Libraries/LibGemini/Job.cpp
+++ b/Userland/Libraries/LibGemini/Job.cpp
@@ -8,7 +8,6 @@
#include <AK/Error.h>
#include <AK/String.h>
#include <AK/Utf8View.h>
-#include <LibCore/Stream.h>
#include <LibGemini/GeminiResponse.h>
#include <LibGemini/Job.h>
#include <unistd.h>
diff --git a/Userland/Libraries/LibGfx/Font/BitmapFont.cpp b/Userland/Libraries/LibGfx/Font/BitmapFont.cpp
index 5db821d27b..fbaa81a8e5 100644
--- a/Userland/Libraries/LibGfx/Font/BitmapFont.cpp
+++ b/Userland/Libraries/LibGfx/Font/BitmapFont.cpp
@@ -10,7 +10,6 @@
#include <AK/Utf32View.h>
#include <AK/Utf8View.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibGfx/Font/FontDatabase.h>
#include <LibGfx/Font/FontStyleMapping.h>
#include <LibGfx/Painter.h>
diff --git a/Userland/Libraries/LibGfx/QOILoader.h b/Userland/Libraries/LibGfx/QOILoader.h
index 5588227127..7631f982f6 100644
--- a/Userland/Libraries/LibGfx/QOILoader.h
+++ b/Userland/Libraries/LibGfx/QOILoader.h
@@ -7,7 +7,6 @@
#pragma once
#include <AK/Forward.h>
-#include <LibCore/Stream.h>
#include <LibGfx/Forward.h>
#include <LibGfx/ImageDecoder.h>
diff --git a/Userland/Libraries/LibHTTP/HttpsJob.h b/Userland/Libraries/LibHTTP/HttpsJob.h
index e797228725..f93b66df36 100644
--- a/Userland/Libraries/LibHTTP/HttpsJob.h
+++ b/Userland/Libraries/LibHTTP/HttpsJob.h
@@ -8,7 +8,6 @@
#include <AK/HashMap.h>
#include <LibCore/NetworkJob.h>
-#include <LibCore/Stream.h>
#include <LibHTTP/HttpRequest.h>
#include <LibHTTP/HttpResponse.h>
#include <LibHTTP/Job.h>
diff --git a/Userland/Libraries/LibIDL/IDLParser.cpp b/Userland/Libraries/LibIDL/IDLParser.cpp
index 1e2dabb01e..e3fe59ec57 100644
--- a/Userland/Libraries/LibIDL/IDLParser.cpp
+++ b/Userland/Libraries/LibIDL/IDLParser.cpp
@@ -13,7 +13,6 @@
#include <AK/QuickSort.h>
#include <LibCore/DeprecatedFile.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
[[noreturn]] static void report_parsing_error(StringView message, StringView filename, StringView input, size_t offset)
{
diff --git a/Userland/Libraries/LibIMAP/Client.cpp b/Userland/Libraries/LibIMAP/Client.cpp
index bcfd36e5a6..22a89ccf25 100644
--- a/Userland/Libraries/LibIMAP/Client.cpp
+++ b/Userland/Libraries/LibIMAP/Client.cpp
@@ -5,7 +5,6 @@
*/
#include <AK/OwnPtr.h>
-#include <LibCore/Stream.h>
#include <LibIMAP/Client.h>
namespace IMAP {
diff --git a/Userland/Libraries/LibIMAP/Client.h b/Userland/Libraries/LibIMAP/Client.h
index 1aa558224f..9f5e6af389 100644
--- a/Userland/Libraries/LibIMAP/Client.h
+++ b/Userland/Libraries/LibIMAP/Client.h
@@ -8,7 +8,6 @@
#include <AK/Function.h>
#include <LibCore/Promise.h>
-#include <LibCore/Stream.h>
#include <LibIMAP/Parser.h>
#include <LibTLS/TLSv12.h>
diff --git a/Userland/Libraries/LibIPC/Connection.h b/Userland/Libraries/LibIPC/Connection.h
index 5ab8800f11..3982c2e252 100644
--- a/Userland/Libraries/LibIPC/Connection.h
+++ b/Userland/Libraries/LibIPC/Connection.h
@@ -14,7 +14,6 @@
#include <LibCore/EventLoop.h>
#include <LibCore/Notifier.h>
#include <LibCore/Socket.h>
-#include <LibCore/Stream.h>
#include <LibCore/Timer.h>
#include <LibIPC/Forward.h>
#include <LibIPC/Message.h>
diff --git a/Userland/Libraries/LibIPC/ConnectionToServer.h b/Userland/Libraries/LibIPC/ConnectionToServer.h
index c6857f34df..a62e9365bf 100644
--- a/Userland/Libraries/LibIPC/ConnectionToServer.h
+++ b/Userland/Libraries/LibIPC/ConnectionToServer.h
@@ -7,7 +7,6 @@
#pragma once
#include <LibCore/SessionManagement.h>
-#include <LibCore/Stream.h>
#include <LibIPC/Connection.h>
namespace IPC {
diff --git a/Userland/Libraries/LibIPC/Decoder.h b/Userland/Libraries/LibIPC/Decoder.h
index da81091bb8..5ddc815623 100644
--- a/Userland/Libraries/LibIPC/Decoder.h
+++ b/Userland/Libraries/LibIPC/Decoder.h
@@ -15,7 +15,7 @@
#include <AK/TypeList.h>
#include <AK/Variant.h>
#include <LibCore/SharedCircularQueue.h>
-#include <LibCore/Stream.h>
+#include <LibCore/Socket.h>
#include <LibIPC/Concepts.h>
#include <LibIPC/File.h>
#include <LibIPC/Forward.h>
diff --git a/Userland/Libraries/LibIPC/File.h b/Userland/Libraries/LibIPC/File.h
index d19156709e..aae37cd3fe 100644
--- a/Userland/Libraries/LibIPC/File.h
+++ b/Userland/Libraries/LibIPC/File.h
@@ -10,7 +10,6 @@
#include <AK/Noncopyable.h>
#include <AK/StdLibExtras.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <unistd.h>
namespace IPC {
diff --git a/Userland/Libraries/LibJS/Print.cpp b/Userland/Libraries/LibJS/Print.cpp
index b750e62d08..76b551b58e 100644
--- a/Userland/Libraries/LibJS/Print.cpp
+++ b/Userland/Libraries/LibJS/Print.cpp
@@ -8,6 +8,7 @@
#include <AK/Concepts.h>
#include <AK/DeprecatedString.h>
+#include <AK/Stream.h>
#include <LibJS/Print.h>
#include <LibJS/Runtime/Array.h>
#include <LibJS/Runtime/ArrayBuffer.h>
diff --git a/Userland/Libraries/LibJS/Print.h b/Userland/Libraries/LibJS/Print.h
index fb5d949587..d6cc9524a7 100644
--- a/Userland/Libraries/LibJS/Print.h
+++ b/Userland/Libraries/LibJS/Print.h
@@ -9,7 +9,6 @@
#pragma once
#include <AK/HashTable.h>
-#include <LibCore/Stream.h>
#include <LibJS/Runtime/Value.h>
namespace JS {
diff --git a/Userland/Libraries/LibLine/Editor.h b/Userland/Libraries/LibLine/Editor.h
index 80d8fc127d..8454794bce 100644
--- a/Userland/Libraries/LibLine/Editor.h
+++ b/Userland/Libraries/LibLine/Editor.h
@@ -23,7 +23,6 @@
#include <LibCore/EventLoop.h>
#include <LibCore/Notifier.h>
#include <LibCore/Object.h>
-#include <LibCore/Stream.h>
#include <LibLine/KeyCallbackMachine.h>
#include <LibLine/Span.h>
#include <LibLine/StringMetrics.h>
diff --git a/Userland/Libraries/LibLine/VT.h b/Userland/Libraries/LibLine/VT.h
index 27db0f6de1..1ead34c949 100644
--- a/Userland/Libraries/LibLine/VT.h
+++ b/Userland/Libraries/LibLine/VT.h
@@ -7,7 +7,6 @@
#pragma once
#include <AK/Types.h>
-#include <LibCore/Stream.h>
#include <LibLine/Style.h>
namespace Line {
diff --git a/Userland/Libraries/LibManual/Node.cpp b/Userland/Libraries/LibManual/Node.cpp
index 044b4143b7..a3c3805623 100644
--- a/Userland/Libraries/LibManual/Node.cpp
+++ b/Userland/Libraries/LibManual/Node.cpp
@@ -13,7 +13,6 @@
#include <AK/StringView.h>
#include <AK/URL.h>
#include <LibCore/DeprecatedFile.h>
-#include <LibCore/Stream.h>
#include <LibManual/Path.h>
namespace Manual {
diff --git a/Userland/Libraries/LibProtocol/Request.h b/Userland/Libraries/LibProtocol/Request.h
index 2995a8d598..9709b3761d 100644
--- a/Userland/Libraries/LibProtocol/Request.h
+++ b/Userland/Libraries/LibProtocol/Request.h
@@ -14,7 +14,6 @@
#include <AK/RefCounted.h>
#include <AK/WeakPtr.h>
#include <LibCore/Notifier.h>
-#include <LibCore/Stream.h>
#include <LibIPC/Forward.h>
namespace Protocol {
diff --git a/Userland/Libraries/LibSQL/Heap.h b/Userland/Libraries/LibSQL/Heap.h
index fa1a2cc9fe..40be6d5386 100644
--- a/Userland/Libraries/LibSQL/Heap.h
+++ b/Userland/Libraries/LibSQL/Heap.h
@@ -13,7 +13,6 @@
#include <AK/Vector.h>
#include <LibCore/File.h>
#include <LibCore/Object.h>
-#include <LibCore/Stream.h>
namespace SQL {
diff --git a/Userland/Libraries/LibSQL/SQLClient.cpp b/Userland/Libraries/LibSQL/SQLClient.cpp
index 08c9ec8c2d..dd6695c156 100644
--- a/Userland/Libraries/LibSQL/SQLClient.cpp
+++ b/Userland/Libraries/LibSQL/SQLClient.cpp
@@ -14,7 +14,6 @@
# include <LibCore/Directory.h>
# include <LibCore/SocketAddress.h>
# include <LibCore/StandardPaths.h>
-# include <LibCore/Stream.h>
# include <LibCore/System.h>
#endif
diff --git a/Userland/Libraries/LibTLS/TLSv12.h b/Userland/Libraries/LibTLS/TLSv12.h
index bbf82073db..c1241163d9 100644
--- a/Userland/Libraries/LibTLS/TLSv12.h
+++ b/Userland/Libraries/LibTLS/TLSv12.h
@@ -11,7 +11,6 @@
#include <AK/WeakPtr.h>
#include <LibCore/Notifier.h>
#include <LibCore/Socket.h>
-#include <LibCore/Stream.h>
#include <LibCore/Timer.h>
#include <LibCrypto/Authentication/HMAC.h>
#include <LibCrypto/BigInt/UnsignedBigInteger.h>
diff --git a/Userland/Libraries/LibTest/JavaScriptTestRunner.h b/Userland/Libraries/LibTest/JavaScriptTestRunner.h
index 7263612604..629513f90a 100644
--- a/Userland/Libraries/LibTest/JavaScriptTestRunner.h
+++ b/Userland/Libraries/LibTest/JavaScriptTestRunner.h
@@ -18,7 +18,6 @@
#include <AK/Tuple.h>
#include <LibCore/DirIterator.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibJS/Bytecode/Interpreter.h>
#include <LibJS/Interpreter.h>
#include <LibJS/Lexer.h>
diff --git a/Userland/Libraries/LibVirtGPU/Device.h b/Userland/Libraries/LibVirtGPU/Device.h
index ee7c31db18..96fad57443 100644
--- a/Userland/Libraries/LibVirtGPU/Device.h
+++ b/Userland/Libraries/LibVirtGPU/Device.h
@@ -10,7 +10,6 @@
#include <AK/NonnullRefPtr.h>
#include <AK/Vector.h>
#include <Kernel/API/VirGL.h>
-#include <LibCore/Stream.h>
#include <LibGPU/Device.h>
#include <LibVirtGPU/VirGLProtocol.h>
diff --git a/Userland/Libraries/LibWasm/AbstractMachine/BytecodeInterpreter.cpp b/Userland/Libraries/LibWasm/AbstractMachine/BytecodeInterpreter.cpp
index a1c383aa8e..2e11c1ccf1 100644
--- a/Userland/Libraries/LibWasm/AbstractMachine/BytecodeInterpreter.cpp
+++ b/Userland/Libraries/LibWasm/AbstractMachine/BytecodeInterpreter.cpp
@@ -6,6 +6,7 @@
*/
#include <AK/Debug.h>
+#include <AK/Endian.h>
#include <AK/MemoryStream.h>
#include <LibWasm/AbstractMachine/AbstractMachine.h>
#include <LibWasm/AbstractMachine/BytecodeInterpreter.h>
diff --git a/Userland/Libraries/LibWasm/Parser/Parser.cpp b/Userland/Libraries/LibWasm/Parser/Parser.cpp
index 42282fb7bd..4cab367580 100644
--- a/Userland/Libraries/LibWasm/Parser/Parser.cpp
+++ b/Userland/Libraries/LibWasm/Parser/Parser.cpp
@@ -5,6 +5,7 @@
*/
#include <AK/Debug.h>
+#include <AK/Endian.h>
#include <AK/LEB128.h>
#include <AK/MemoryStream.h>
#include <AK/ScopeGuard.h>
diff --git a/Userland/Libraries/LibWasm/Printer/Printer.h b/Userland/Libraries/LibWasm/Printer/Printer.h
index 44b8c28809..c79475fd7c 100644
--- a/Userland/Libraries/LibWasm/Printer/Printer.h
+++ b/Userland/Libraries/LibWasm/Printer/Printer.h
@@ -6,7 +6,6 @@
#pragma once
-#include <LibCore/Stream.h>
#include <LibWasm/Types.h>
namespace Wasm {
diff --git a/Userland/Libraries/LibWasm/Types.h b/Userland/Libraries/LibWasm/Types.h
index edab97c839..adbe900f27 100644
--- a/Userland/Libraries/LibWasm/Types.h
+++ b/Userland/Libraries/LibWasm/Types.h
@@ -13,7 +13,6 @@
#include <AK/NonnullOwnPtrVector.h>
#include <AK/Result.h>
#include <AK/Variant.h>
-#include <LibCore/Stream.h>
#include <LibWasm/Constants.h>
#include <LibWasm/Forward.h>
#include <LibWasm/Opcode.h>
diff --git a/Userland/Libraries/LibWeb/WebDriver/Client.h b/Userland/Libraries/LibWeb/WebDriver/Client.h
index 05757178fd..c44edddcc4 100644
--- a/Userland/Libraries/LibWeb/WebDriver/Client.h
+++ b/Userland/Libraries/LibWeb/WebDriver/Client.h
@@ -14,7 +14,6 @@
#include <AK/Variant.h>
#include <LibCore/Object.h>
#include <LibCore/Socket.h>
-#include <LibCore/Stream.h>
#include <LibHTTP/Forward.h>
#include <LibHTTP/HttpRequest.h>
#include <LibWeb/WebDriver/Error.h>
diff --git a/Userland/Services/EchoServer/Client.h b/Userland/Services/EchoServer/Client.h
index f252a6be8e..c7a5680cc6 100644
--- a/Userland/Services/EchoServer/Client.h
+++ b/Userland/Services/EchoServer/Client.h
@@ -7,7 +7,6 @@
#pragma once
#include <LibCore/Socket.h>
-#include <LibCore/Stream.h>
class Client : public RefCounted<Client> {
public:
diff --git a/Userland/Services/FileOperation/main.cpp b/Userland/Services/FileOperation/main.cpp
index c34ec35a96..e534252a52 100644
--- a/Userland/Services/FileOperation/main.cpp
+++ b/Userland/Services/FileOperation/main.cpp
@@ -12,7 +12,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/DirIterator.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <sched.h>
diff --git a/Userland/Services/FileSystemAccessServer/ConnectionFromClient.cpp b/Userland/Services/FileSystemAccessServer/ConnectionFromClient.cpp
index 33b37ece8e..236b347c97 100644
--- a/Userland/Services/FileSystemAccessServer/ConnectionFromClient.cpp
+++ b/Userland/Services/FileSystemAccessServer/ConnectionFromClient.cpp
@@ -6,7 +6,6 @@
#include <FileSystemAccessServer/ConnectionFromClient.h>
#include <LibCore/DeprecatedFile.h>
-#include <LibCore/Stream.h>
#include <LibGUI/Application.h>
#include <LibGUI/ConnectionToWindowServer.h>
#include <LibGUI/FilePicker.h>
diff --git a/Userland/Services/FileSystemAccessServer/FileSystemAccessServer.ipc b/Userland/Services/FileSystemAccessServer/FileSystemAccessServer.ipc
index a1970b9972..f705bb6811 100644
--- a/Userland/Services/FileSystemAccessServer/FileSystemAccessServer.ipc
+++ b/Userland/Services/FileSystemAccessServer/FileSystemAccessServer.ipc
@@ -1,5 +1,4 @@
#include <AK/URL.h>
-#include <LibCore/Stream.h>
endpoint FileSystemAccessServer
{
diff --git a/Userland/Services/InspectorServer/InspectableProcess.h b/Userland/Services/InspectorServer/InspectableProcess.h
index 51a1588a2a..4e6e2a7b3a 100644
--- a/Userland/Services/InspectorServer/InspectableProcess.h
+++ b/Userland/Services/InspectorServer/InspectableProcess.h
@@ -6,7 +6,8 @@
#pragma once
-#include <LibCore/Stream.h>
+#include <LibCore/Socket.h>
+#include <sys/types.h>
namespace InspectorServer {
diff --git a/Userland/Services/LookupServer/LookupServer.cpp b/Userland/Services/LookupServer/LookupServer.cpp
index a746c5875c..b0b618d11a 100644
--- a/Userland/Services/LookupServer/LookupServer.cpp
+++ b/Userland/Services/LookupServer/LookupServer.cpp
@@ -14,7 +14,6 @@
#include <LibCore/ConfigFile.h>
#include <LibCore/DeprecatedFile.h>
#include <LibCore/LocalServer.h>
-#include <LibCore/Stream.h>
#include <LibDNS/Packet.h>
#include <limits.h>
#include <stdio.h>
diff --git a/Userland/Services/TelnetServer/Client.h b/Userland/Services/TelnetServer/Client.h
index cfcee4b10f..ab3c565683 100644
--- a/Userland/Services/TelnetServer/Client.h
+++ b/Userland/Services/TelnetServer/Client.h
@@ -10,7 +10,6 @@
#include <AK/StringView.h>
#include <AK/Types.h>
#include <LibCore/Notifier.h>
-#include <LibCore/Stream.h>
#include "Command.h"
#include "Parser.h"
diff --git a/Userland/Services/WebContent/main.cpp b/Userland/Services/WebContent/main.cpp
index a19831cf80..6403fb95a2 100644
--- a/Userland/Services/WebContent/main.cpp
+++ b/Userland/Services/WebContent/main.cpp
@@ -9,7 +9,6 @@
#include <LibCore/EventLoop.h>
#include <LibCore/LocalServer.h>
#include <LibCore/StandardPaths.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibIPC/SingleServer.h>
#include <LibMain/Main.h>
diff --git a/Userland/Services/WebDriver/Client.h b/Userland/Services/WebDriver/Client.h
index 0c20f240ae..ad008a08b6 100644
--- a/Userland/Services/WebDriver/Client.h
+++ b/Userland/Services/WebDriver/Client.h
@@ -11,7 +11,6 @@
#include <AK/Function.h>
#include <AK/NonnullOwnPtrVector.h>
#include <LibCore/Object.h>
-#include <LibCore/Stream.h>
#include <LibWeb/WebDriver/Client.h>
#include <LibWeb/WebDriver/Error.h>
#include <LibWeb/WebDriver/Response.h>
diff --git a/Userland/Services/WebDriver/Session.cpp b/Userland/Services/WebDriver/Session.cpp
index 18afd0cccf..8e56c08192 100644
--- a/Userland/Services/WebDriver/Session.cpp
+++ b/Userland/Services/WebDriver/Session.cpp
@@ -12,7 +12,6 @@
#include "Client.h"
#include <LibCore/LocalServer.h>
#include <LibCore/StandardPaths.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <unistd.h>
diff --git a/Userland/Services/WebDriver/WebContentConnection.h b/Userland/Services/WebDriver/WebContentConnection.h
index 54f9f4c236..a04429631b 100644
--- a/Userland/Services/WebDriver/WebContentConnection.h
+++ b/Userland/Services/WebDriver/WebContentConnection.h
@@ -6,7 +6,6 @@
#pragma once
-#include <LibCore/Stream.h>
#include <LibIPC/ConnectionFromClient.h>
#include <WebContent/WebDriverClientEndpoint.h>
#include <WebContent/WebDriverServerEndpoint.h>
diff --git a/Userland/Services/WebServer/Client.h b/Userland/Services/WebServer/Client.h
index 8f5b60a0f5..fea868536e 100644
--- a/Userland/Services/WebServer/Client.h
+++ b/Userland/Services/WebServer/Client.h
@@ -10,7 +10,6 @@
#include <AK/String.h>
#include <LibCore/Object.h>
#include <LibCore/Socket.h>
-#include <LibCore/Stream.h>
#include <LibHTTP/Forward.h>
#include <LibHTTP/HttpRequest.h>
diff --git a/Userland/Shell/Shell.cpp b/Userland/Shell/Shell.cpp
index 3bbe927eed..32deed4f97 100644
--- a/Userland/Shell/Shell.cpp
+++ b/Userland/Shell/Shell.cpp
@@ -23,7 +23,6 @@
#include <LibCore/DirIterator.h>
#include <LibCore/Event.h>
#include <LibCore/EventLoop.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibCore/Timer.h>
#include <LibLine/Editor.h>
diff --git a/Userland/Utilities/arp.cpp b/Userland/Utilities/arp.cpp
index 89324c8f7a..020ee165da 100644
--- a/Userland/Utilities/arp.cpp
+++ b/Userland/Utilities/arp.cpp
@@ -13,7 +13,6 @@
#include <AK/Types.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <arpa/inet.h>
diff --git a/Userland/Utilities/base64.cpp b/Userland/Utilities/base64.cpp
index 9aa05d3197..fd07bf310e 100644
--- a/Userland/Utilities/base64.cpp
+++ b/Userland/Utilities/base64.cpp
@@ -7,7 +7,6 @@
#include <AK/Base64.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
diff --git a/Userland/Utilities/cat.cpp b/Userland/Utilities/cat.cpp
index ea5e558f0e..0905a03352 100644
--- a/Userland/Utilities/cat.cpp
+++ b/Userland/Utilities/cat.cpp
@@ -8,7 +8,6 @@
#include <AK/Vector.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
diff --git a/Userland/Utilities/checksum.cpp b/Userland/Utilities/checksum.cpp
index abb566ab04..78cf79ef5b 100644
--- a/Userland/Utilities/checksum.cpp
+++ b/Userland/Utilities/checksum.cpp
@@ -7,7 +7,6 @@
#include <AK/LexicalPath.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibCrypto/Hash/HashManager.h>
#include <LibMain/Main.h>
diff --git a/Userland/Utilities/cksum.cpp b/Userland/Utilities/cksum.cpp
index ba1b102801..cb663b4f78 100644
--- a/Userland/Utilities/cksum.cpp
+++ b/Userland/Utilities/cksum.cpp
@@ -6,7 +6,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibCrypto/Checksum/Adler32.h>
#include <LibCrypto/Checksum/CRC32.h>
diff --git a/Userland/Utilities/cmp.cpp b/Userland/Utilities/cmp.cpp
index ac213cb88b..426fb4151e 100644
--- a/Userland/Utilities/cmp.cpp
+++ b/Userland/Utilities/cmp.cpp
@@ -6,7 +6,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <unistd.h>
diff --git a/Userland/Utilities/comm.cpp b/Userland/Utilities/comm.cpp
index 0040c94ce4..5a49cfded9 100644
--- a/Userland/Utilities/comm.cpp
+++ b/Userland/Utilities/comm.cpp
@@ -8,7 +8,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/DeprecatedFile.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <string.h>
diff --git a/Userland/Utilities/copy.cpp b/Userland/Utilities/copy.cpp
index c9122d46f3..e054de77f0 100644
--- a/Userland/Utilities/copy.cpp
+++ b/Userland/Utilities/copy.cpp
@@ -10,7 +10,6 @@
#include <AK/StringBuilder.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibGUI/Application.h>
#include <LibGUI/Clipboard.h>
#include <LibMain/Main.h>
diff --git a/Userland/Utilities/cpp-lexer.cpp b/Userland/Utilities/cpp-lexer.cpp
index aa0fdafe20..eda344cd7d 100644
--- a/Userland/Utilities/cpp-lexer.cpp
+++ b/Userland/Utilities/cpp-lexer.cpp
@@ -7,7 +7,6 @@
#include <AK/Try.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCpp/Lexer.h>
#include <LibMain/Main.h>
diff --git a/Userland/Utilities/cpp-parser.cpp b/Userland/Utilities/cpp-parser.cpp
index 683b9ed241..243ccaf820 100644
--- a/Userland/Utilities/cpp-parser.cpp
+++ b/Userland/Utilities/cpp-parser.cpp
@@ -6,7 +6,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCpp/Parser.h>
#include <LibMain/Main.h>
diff --git a/Userland/Utilities/cpp-preprocessor.cpp b/Userland/Utilities/cpp-preprocessor.cpp
index 4414e53752..3efbf4f920 100644
--- a/Userland/Utilities/cpp-preprocessor.cpp
+++ b/Userland/Utilities/cpp-preprocessor.cpp
@@ -7,7 +7,6 @@
#include <AK/LexicalPath.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCpp/Preprocessor.h>
#include <LibMain/Main.h>
diff --git a/Userland/Utilities/df.cpp b/Userland/Utilities/df.cpp
index 56bef8ed89..2d5a95d375 100644
--- a/Userland/Utilities/df.cpp
+++ b/Userland/Utilities/df.cpp
@@ -9,7 +9,6 @@
#include <AK/NumberFormat.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibMain/Main.h>
#include <inttypes.h>
#include <stdlib.h>
diff --git a/Userland/Utilities/diff.cpp b/Userland/Utilities/diff.cpp
index c26318ac40..6ba5ae9ef2 100644
--- a/Userland/Utilities/diff.cpp
+++ b/Userland/Utilities/diff.cpp
@@ -6,7 +6,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibDiff/Generator.h>
#include <LibMain/Main.h>
diff --git a/Userland/Utilities/dmesg.cpp b/Userland/Utilities/dmesg.cpp
index 459b06e425..f6e0a81d73 100644
--- a/Userland/Utilities/dmesg.cpp
+++ b/Userland/Utilities/dmesg.cpp
@@ -5,7 +5,6 @@
*/
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
diff --git a/Userland/Utilities/du.cpp b/Userland/Utilities/du.cpp
index 041ef2b4d5..19cac716a6 100644
--- a/Userland/Utilities/du.cpp
+++ b/Userland/Utilities/du.cpp
@@ -12,7 +12,6 @@
#include <LibCore/DateTime.h>
#include <LibCore/DirIterator.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <limits.h>
diff --git a/Userland/Utilities/file.cpp b/Userland/Utilities/file.cpp
index ecf71bb532..75579a25c9 100644
--- a/Userland/Utilities/file.cpp
+++ b/Userland/Utilities/file.cpp
@@ -10,7 +10,6 @@
#include <LibCore/File.h>
#include <LibCore/MappedFile.h>
#include <LibCore/MimeData.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibELF/Image.h>
#include <LibELF/Validation.h>
diff --git a/Userland/Utilities/fortune.cpp b/Userland/Utilities/fortune.cpp
index f6da0e9631..cff26026fd 100644
--- a/Userland/Utilities/fortune.cpp
+++ b/Userland/Utilities/fortune.cpp
@@ -13,7 +13,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/DateTime.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <stdio.h>
diff --git a/Userland/Utilities/gml-format.cpp b/Userland/Utilities/gml-format.cpp
index ac4a7cbcbb..ef90964249 100644
--- a/Userland/Utilities/gml-format.cpp
+++ b/Userland/Utilities/gml-format.cpp
@@ -6,7 +6,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibGUI/GML/Formatter.h>
#include <LibMain/Main.h>
diff --git a/Userland/Utilities/grep.cpp b/Userland/Utilities/grep.cpp
index 31d8e00794..e3e7c66902 100644
--- a/Userland/Utilities/grep.cpp
+++ b/Userland/Utilities/grep.cpp
@@ -14,7 +14,6 @@
#include <LibCore/DeprecatedFile.h>
#include <LibCore/DirIterator.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <LibRegex/Regex.h>
diff --git a/Userland/Utilities/gron.cpp b/Userland/Utilities/gron.cpp
index 34721bec35..e30846e206 100644
--- a/Userland/Utilities/gron.cpp
+++ b/Userland/Utilities/gron.cpp
@@ -10,7 +10,6 @@
#include <AK/StringBuilder.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <unistd.h>
diff --git a/Userland/Utilities/headless-browser.cpp b/Userland/Utilities/headless-browser.cpp
index 43e2394e5e..52c62d712d 100644
--- a/Userland/Utilities/headless-browser.cpp
+++ b/Userland/Utilities/headless-browser.cpp
@@ -16,7 +16,6 @@
#include <LibCore/ConfigFile.h>
#include <LibCore/DeprecatedFile.h>
#include <LibCore/EventLoop.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibCore/SystemServerTakeover.h>
#include <LibCore/Timer.h>
diff --git a/Userland/Utilities/hexdump.cpp b/Userland/Utilities/hexdump.cpp
index 008c46e2dc..e27c2d2362 100644
--- a/Userland/Utilities/hexdump.cpp
+++ b/Userland/Utilities/hexdump.cpp
@@ -8,7 +8,6 @@
#include <AK/Array.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <ctype.h>
diff --git a/Userland/Utilities/ifconfig.cpp b/Userland/Utilities/ifconfig.cpp
index ad25907944..b074fa1d3d 100644
--- a/Userland/Utilities/ifconfig.cpp
+++ b/Userland/Utilities/ifconfig.cpp
@@ -12,7 +12,6 @@
#include <AK/NumberFormat.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <net/if.h>
diff --git a/Userland/Utilities/js.cpp b/Userland/Utilities/js.cpp
index 2528eb7b78..5c1f1b9213 100644
--- a/Userland/Utilities/js.cpp
+++ b/Userland/Utilities/js.cpp
@@ -9,7 +9,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/ConfigFile.h>
#include <LibCore/StandardPaths.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibJS/Bytecode/BasicBlock.h>
#include <LibJS/Bytecode/Generator.h>
diff --git a/Userland/Utilities/json.cpp b/Userland/Utilities/json.cpp
index f8ce64e7bf..6fd5addedc 100644
--- a/Userland/Utilities/json.cpp
+++ b/Userland/Utilities/json.cpp
@@ -15,7 +15,6 @@
#include <AK/Vector.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <unistd.h>
diff --git a/Userland/Utilities/lsblk.cpp b/Userland/Utilities/lsblk.cpp
index 443624b420..eaaa1b34b7 100644
--- a/Userland/Utilities/lsblk.cpp
+++ b/Userland/Utilities/lsblk.cpp
@@ -10,7 +10,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/DirIterator.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
diff --git a/Userland/Utilities/lscpu.cpp b/Userland/Utilities/lscpu.cpp
index 21b00cc492..ec12a4c3b2 100644
--- a/Userland/Utilities/lscpu.cpp
+++ b/Userland/Utilities/lscpu.cpp
@@ -10,7 +10,6 @@
#include <AK/JsonObject.h>
#include <AK/NumberFormat.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
diff --git a/Userland/Utilities/lsirq.cpp b/Userland/Utilities/lsirq.cpp
index 55dc1c34b0..3a43ca9240 100644
--- a/Userland/Utilities/lsirq.cpp
+++ b/Userland/Utilities/lsirq.cpp
@@ -8,7 +8,6 @@
#include <AK/JsonArray.h>
#include <AK/JsonObject.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
diff --git a/Userland/Utilities/lsjails.cpp b/Userland/Utilities/lsjails.cpp
index 06b6d02fd3..5cfc4abc82 100644
--- a/Userland/Utilities/lsjails.cpp
+++ b/Userland/Utilities/lsjails.cpp
@@ -7,7 +7,6 @@
#include <AK/JsonArray.h>
#include <AK/JsonObject.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
diff --git a/Userland/Utilities/lsof.cpp b/Userland/Utilities/lsof.cpp
index cc7901fab8..db2a7fcd3c 100644
--- a/Userland/Utilities/lsof.cpp
+++ b/Userland/Utilities/lsof.cpp
@@ -13,7 +13,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
#include <LibCore/ProcessStatisticsReader.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <ctype.h>
diff --git a/Userland/Utilities/lspci.cpp b/Userland/Utilities/lspci.cpp
index 6f97cf5414..e8768b6faa 100644
--- a/Userland/Utilities/lspci.cpp
+++ b/Userland/Utilities/lspci.cpp
@@ -14,7 +14,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/DirIterator.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <LibPCIDB/Database.h>
diff --git a/Userland/Utilities/lsusb.cpp b/Userland/Utilities/lsusb.cpp
index a3eeeb8796..1f8af13b45 100644
--- a/Userland/Utilities/lsusb.cpp
+++ b/Userland/Utilities/lsusb.cpp
@@ -13,7 +13,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/DirIterator.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <LibUSBDB/Database.h>
diff --git a/Userland/Utilities/man.cpp b/Userland/Utilities/man.cpp
index 95d365019c..c664e28fee 100644
--- a/Userland/Utilities/man.cpp
+++ b/Userland/Utilities/man.cpp
@@ -10,7 +10,6 @@
#include <AK/Utf8View.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <LibManual/Node.h>
diff --git a/Userland/Utilities/markdown-check.cpp b/Userland/Utilities/markdown-check.cpp
index 549a18f272..ab6ce84eb8 100644
--- a/Userland/Utilities/markdown-check.cpp
+++ b/Userland/Utilities/markdown-check.cpp
@@ -21,7 +21,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/DeprecatedFile.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibMain/Main.h>
#include <LibMarkdown/Document.h>
#include <LibMarkdown/Visitor.h>
diff --git a/Userland/Utilities/md.cpp b/Userland/Utilities/md.cpp
index 6c28fc31f9..c4fbd23b92 100644
--- a/Userland/Utilities/md.cpp
+++ b/Userland/Utilities/md.cpp
@@ -7,7 +7,6 @@
#include <AK/DeprecatedString.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <LibMarkdown/Document.h>
diff --git a/Userland/Utilities/mount.cpp b/Userland/Utilities/mount.cpp
index 3b6f9f323d..78cb8011aa 100644
--- a/Userland/Utilities/mount.cpp
+++ b/Userland/Utilities/mount.cpp
@@ -10,7 +10,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/DirIterator.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <fcntl.h>
diff --git a/Userland/Utilities/nc.cpp b/Userland/Utilities/nc.cpp
index 80465b38ce..99c5eb798a 100644
--- a/Userland/Utilities/nc.cpp
+++ b/Userland/Utilities/nc.cpp
@@ -9,7 +9,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/EventLoop.h>
#include <LibCore/Socket.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <arpa/inet.h>
diff --git a/Userland/Utilities/netstat.cpp b/Userland/Utilities/netstat.cpp
index 6e99860a45..f8110a922e 100644
--- a/Userland/Utilities/netstat.cpp
+++ b/Userland/Utilities/netstat.cpp
@@ -13,7 +13,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
#include <LibCore/ProcessStatisticsReader.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <arpa/inet.h>
diff --git a/Userland/Utilities/nologin.cpp b/Userland/Utilities/nologin.cpp
index c28572c626..905964c371 100644
--- a/Userland/Utilities/nologin.cpp
+++ b/Userland/Utilities/nologin.cpp
@@ -6,7 +6,6 @@
#include <AK/StringView.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
diff --git a/Userland/Utilities/nproc.cpp b/Userland/Utilities/nproc.cpp
index 4d8eccc00b..8d17aae188 100644
--- a/Userland/Utilities/nproc.cpp
+++ b/Userland/Utilities/nproc.cpp
@@ -6,7 +6,6 @@
#include <AK/JsonObject.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
diff --git a/Userland/Utilities/pmap.cpp b/Userland/Utilities/pmap.cpp
index 49bb7d8153..86b3d718b3 100644
--- a/Userland/Utilities/pmap.cpp
+++ b/Userland/Utilities/pmap.cpp
@@ -9,7 +9,6 @@
#include <AK/QuickSort.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
diff --git a/Userland/Utilities/reboot.cpp b/Userland/Utilities/reboot.cpp
index 2aea62645b..cd819bdb47 100644
--- a/Userland/Utilities/reboot.cpp
+++ b/Userland/Utilities/reboot.cpp
@@ -5,8 +5,8 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
+#include <AK/DeprecatedString.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibMain/Main.h>
ErrorOr<int> serenity_main(Main::Arguments)
diff --git a/Userland/Utilities/route.cpp b/Userland/Utilities/route.cpp
index 84fe136dcd..2c425cf655 100644
--- a/Userland/Utilities/route.cpp
+++ b/Userland/Utilities/route.cpp
@@ -13,7 +13,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
#include <LibCore/ProcessStatisticsReader.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <net/if.h>
diff --git a/Userland/Utilities/sed.cpp b/Userland/Utilities/sed.cpp
index cd1d4363e2..abb1057204 100644
--- a/Userland/Utilities/sed.cpp
+++ b/Userland/Utilities/sed.cpp
@@ -9,7 +9,6 @@
#include <AK/Vector.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <LibRegex/RegexMatcher.h>
diff --git a/Userland/Utilities/shot.cpp b/Userland/Utilities/shot.cpp
index f39f8df362..0848130391 100644
--- a/Userland/Utilities/shot.cpp
+++ b/Userland/Utilities/shot.cpp
@@ -13,7 +13,6 @@
#include <LibCore/DateTime.h>
#include <LibCore/DeprecatedFile.h>
#include <LibCore/Process.h>
-#include <LibCore/Stream.h>
#include <LibGUI/Application.h>
#include <LibGUI/Clipboard.h>
#include <LibGUI/ConnectionToWindowServer.h>
diff --git a/Userland/Utilities/shuf.cpp b/Userland/Utilities/shuf.cpp
index 1b0c94bf99..ad42e3df68 100644
--- a/Userland/Utilities/shuf.cpp
+++ b/Userland/Utilities/shuf.cpp
@@ -10,7 +10,6 @@
#include <AK/Vector.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
diff --git a/Userland/Utilities/shutdown.cpp b/Userland/Utilities/shutdown.cpp
index 968e88e835..432d59b251 100644
--- a/Userland/Utilities/shutdown.cpp
+++ b/Userland/Utilities/shutdown.cpp
@@ -6,8 +6,8 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
+#include <AK/DeprecatedString.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibMain/Main.h>
#include <fcntl.h>
#include <stdio.h>
diff --git a/Userland/Utilities/sort.cpp b/Userland/Utilities/sort.cpp
index d91cbf3d08..02c28a4e55 100644
--- a/Userland/Utilities/sort.cpp
+++ b/Userland/Utilities/sort.cpp
@@ -6,11 +6,11 @@
*/
#include <AK/DeprecatedString.h>
+#include <AK/HashMap.h>
#include <AK/QuickSort.h>
#include <AK/Vector.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <ctype.h>
diff --git a/Userland/Utilities/sql.cpp b/Userland/Utilities/sql.cpp
index 31be2c664f..9d68d4646d 100644
--- a/Userland/Utilities/sql.cpp
+++ b/Userland/Utilities/sql.cpp
@@ -12,7 +12,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/DeprecatedFile.h>
#include <LibCore/StandardPaths.h>
-#include <LibCore/Stream.h>
#include <LibLine/Editor.h>
#include <LibMain/Main.h>
#include <LibSQL/AST/Lexer.h>
diff --git a/Userland/Utilities/strace.cpp b/Userland/Utilities/strace.cpp
index a20ae8a55a..f077d47e3a 100644
--- a/Userland/Utilities/strace.cpp
+++ b/Userland/Utilities/strace.cpp
@@ -6,13 +6,13 @@
#include <AK/Assertions.h>
#include <AK/Format.h>
+#include <AK/HashTable.h>
#include <AK/IPv4Address.h>
#include <AK/StdLibExtras.h>
#include <AK/Types.h>
#include <Kernel/API/SyscallString.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <errno.h>
diff --git a/Userland/Utilities/strings.cpp b/Userland/Utilities/strings.cpp
index 2fb364c97f..752db60395 100644
--- a/Userland/Utilities/strings.cpp
+++ b/Userland/Utilities/strings.cpp
@@ -8,7 +8,6 @@
#include <AK/Forward.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <unistd.h>
diff --git a/Userland/Utilities/sysctl.cpp b/Userland/Utilities/sysctl.cpp
index 3834f9aa12..5c3a75307e 100644
--- a/Userland/Utilities/sysctl.cpp
+++ b/Userland/Utilities/sysctl.cpp
@@ -8,7 +8,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/DirIterator.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibMain/Main.h>
static bool s_set_variable = false;
diff --git a/Userland/Utilities/tail.cpp b/Userland/Utilities/tail.cpp
index 658c4aba34..687654ce1f 100644
--- a/Userland/Utilities/tail.cpp
+++ b/Userland/Utilities/tail.cpp
@@ -8,7 +8,6 @@
#include <LibCore/EventLoop.h>
#include <LibCore/File.h>
#include <LibCore/FileWatcher.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#define DEFAULT_LINE_COUNT 10
diff --git a/Userland/Utilities/tar.cpp b/Userland/Utilities/tar.cpp
index 2a156b9d02..31b2dc98bf 100644
--- a/Userland/Utilities/tar.cpp
+++ b/Userland/Utilities/tar.cpp
@@ -14,7 +14,6 @@
#include <LibCore/DeprecatedFile.h>
#include <LibCore/DirIterator.h>
#include <LibCore/Directory.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <fcntl.h>
diff --git a/Userland/Utilities/test-fuzz.cpp b/Userland/Utilities/test-fuzz.cpp
index 8f01380dd0..77128a6a1a 100644
--- a/Userland/Utilities/test-fuzz.cpp
+++ b/Userland/Utilities/test-fuzz.cpp
@@ -7,7 +7,6 @@
#include <AK/DeprecatedString.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibMain/Main.h>
#include <unistd.h>
diff --git a/Userland/Utilities/tsort.cpp b/Userland/Utilities/tsort.cpp
index f51b2f96f6..31fb603be3 100644
--- a/Userland/Utilities/tsort.cpp
+++ b/Userland/Utilities/tsort.cpp
@@ -8,7 +8,6 @@
#include <AK/HashMap.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
diff --git a/Userland/Utilities/uniq.cpp b/Userland/Utilities/uniq.cpp
index 35b502e4c8..a1f249d694 100644
--- a/Userland/Utilities/uniq.cpp
+++ b/Userland/Utilities/uniq.cpp
@@ -9,7 +9,6 @@
#include <AK/StringView.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <unistd.h>
diff --git a/Userland/Utilities/uptime.cpp b/Userland/Utilities/uptime.cpp
index f70cdaf8c4..ee0f65ec34 100644
--- a/Userland/Utilities/uptime.cpp
+++ b/Userland/Utilities/uptime.cpp
@@ -7,7 +7,6 @@
#include <AK/NumberFormat.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
diff --git a/Userland/Utilities/utmpupdate.cpp b/Userland/Utilities/utmpupdate.cpp
index 0bca719706..381e5573b9 100644
--- a/Userland/Utilities/utmpupdate.cpp
+++ b/Userland/Utilities/utmpupdate.cpp
@@ -11,7 +11,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/DateTime.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <unistd.h>
diff --git a/Userland/Utilities/w.cpp b/Userland/Utilities/w.cpp
index e92f791055..16c6741082 100644
--- a/Userland/Utilities/w.cpp
+++ b/Userland/Utilities/w.cpp
@@ -9,7 +9,6 @@
#include <LibCore/DateTime.h>
#include <LibCore/File.h>
#include <LibCore/ProcessStatisticsReader.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <pwd.h>
diff --git a/Userland/Utilities/xml.cpp b/Userland/Utilities/xml.cpp
index 78796142c5..3b042e2fc0 100644
--- a/Userland/Utilities/xml.cpp
+++ b/Userland/Utilities/xml.cpp
@@ -11,7 +11,6 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/DeprecatedFile.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibMain/Main.h>
#include <LibXML/DOM/Document.h>
#include <LibXML/DOM/Node.h>
diff --git a/Userland/Utilities/zip.cpp b/Userland/Utilities/zip.cpp
index 12679b67e0..b0a7e8c84a 100644
--- a/Userland/Utilities/zip.cpp
+++ b/Userland/Utilities/zip.cpp
@@ -13,7 +13,6 @@
#include <LibCore/DeprecatedFile.h>
#include <LibCore/DirIterator.h>
#include <LibCore/File.h>
-#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibCrypto/Checksum/CRC32.h>