LibCore: Remove Stream.h

Author: https://github.com/timschumi Commit: https://github.com/SerenityOS/serenity/commit/874c7bba28 Pull-request: https://github.com/SerenityOS/serenity/pull/17406 Reviewed-by: https://github.com/linusg
2024-09-11 05:25:32 +03:00 · 2023-02-09 03:11:50 +01:00 · 2023-02-09 03:11:50 +01:00 · 874c7bba28 · 2024-07-18 02:13:10 +09:00
commit 874c7bba28
parent 606a3982f3
200 changed files with 36 additions and 219 deletions
--- 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 {
--- 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>

--- 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>
--- 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>
--- 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)
--- 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>
--- 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>
--- 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,
--- 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 {
--- 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>

--- 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)
 {
--- 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>
--- 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)
--- 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>

--- 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 {
--- 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 {
--- 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:
--- 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>
--- 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>

--- 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>
--- 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)
--- 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>

--- 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>
--- 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>
 +
--- 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)
--- 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 {
--- 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)
 {
--- 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>
--- 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>
--- 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>

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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;
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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 {
--- 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>
--- 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)
 {
--- 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>
--- 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>
--- 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>

--- 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>
--- 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()
 {
--- 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>
--- 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>
--- 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 {

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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 {
--- 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>
--- 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 {

--- 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 {

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>

--- 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 {

--- 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 {
--- 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 {

--- 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 {

--- 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 {

--- 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 {
--- 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 {

--- 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 {

--- 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 {

--- 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 {
--- 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 {
--- 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 {

--- 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>

--- 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>
--- 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 {

--- 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 {

--- 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 {
--- 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 {
--- a/Userland/Libraries/LibCore/Stream.h
+++ b/Userland/Libraries/LibCore/Stream.h
@ -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>
--- 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 {

--- 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 {

--- 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>

--- 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 {

--- 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 {

--- 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 {

--- 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>

--- 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 {

--- 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 {
--- 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>

--- 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>
--- 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>
--- 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>
--- a/Show More
+++ b/Show More