summaryrefslogtreecommitdiff
path: root/Userland
diff options
context:
space:
mode:
Diffstat (limited to 'Userland')
-rw-r--r--Userland/Applications/CrashReporter/main.cpp4
-rw-r--r--Userland/Applications/Debugger/main.cpp2
-rw-r--r--Userland/DynamicLoader/main.cpp4
-rw-r--r--Userland/Libraries/LibC/bits/stdio_file_implementation.h6
-rw-r--r--Userland/Libraries/LibC/cxxabi.cpp4
-rw-r--r--Userland/Libraries/LibC/ifaddrs.cpp4
-rw-r--r--Userland/Libraries/LibC/math.cpp2
-rw-r--r--Userland/Libraries/LibC/net.cpp6
-rw-r--r--Userland/Libraries/LibC/stdio.cpp4
-rw-r--r--Userland/Libraries/LibDebug/DebugSession.h2
-rw-r--r--Userland/Libraries/LibDebug/ProcessInspector.h2
-rw-r--r--Userland/Services/SpiceAgent/SpiceAgent.cpp4
-rw-r--r--Userland/Services/SpiceAgent/main.cpp2
-rw-r--r--Userland/Utilities/functrace.cpp2
-rw-r--r--Userland/Utilities/strace.cpp2
15 files changed, 25 insertions, 25 deletions
diff --git a/Userland/Applications/CrashReporter/main.cpp b/Userland/Applications/CrashReporter/main.cpp
index e2553e9aec..feb28fd3a3 100644
--- a/Userland/Applications/CrashReporter/main.cpp
+++ b/Userland/Applications/CrashReporter/main.cpp
@@ -11,8 +11,6 @@
#include <AK/Types.h>
#include <AK/URL.h>
#include <Applications/CrashReporter/CrashReporterWindowGML.h>
-#include <LibC/serenity.h>
-#include <LibC/spawn.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
#include <LibCore/System.h>
@@ -39,6 +37,8 @@
#include <LibGUI/Window.h>
#include <LibMain/Main.h>
#include <LibThreading/BackgroundAction.h>
+#include <serenity.h>
+#include <spawn.h>
#include <string.h>
#include <unistd.h>
diff --git a/Userland/Applications/Debugger/main.cpp b/Userland/Applications/Debugger/main.cpp
index 56374ae4e3..0c17c9431a 100644
--- a/Userland/Applications/Debugger/main.cpp
+++ b/Userland/Applications/Debugger/main.cpp
@@ -11,7 +11,6 @@
#include <AK/Platform.h>
#include <AK/StringBuilder.h>
#include <AK/Try.h>
-#include <LibC/sys/arch/regs.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/System.h>
#include <LibDebug/DebugInfo.h>
@@ -23,6 +22,7 @@
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
+#include <sys/arch/regs.h>
#include <unistd.h>
RefPtr<Line::Editor> editor;
diff --git a/Userland/DynamicLoader/main.cpp b/Userland/DynamicLoader/main.cpp
index 5e6c0a5d42..5e61355a86 100644
--- a/Userland/DynamicLoader/main.cpp
+++ b/Userland/DynamicLoader/main.cpp
@@ -4,11 +4,11 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
-#include <LibC/sys/internals.h>
-#include <LibC/unistd.h>
#include <LibELF/AuxiliaryVector.h>
#include <LibELF/DynamicLinker.h>
#include <LibELF/Relocation.h>
+#include <sys/internals.h>
+#include <unistd.h>
char* __static_environ[] = { nullptr }; // We don't get the environment without some libc workarounds..
diff --git a/Userland/Libraries/LibC/bits/stdio_file_implementation.h b/Userland/Libraries/LibC/bits/stdio_file_implementation.h
index 555cdcbc97..2bf8aa2e20 100644
--- a/Userland/Libraries/LibC/bits/stdio_file_implementation.h
+++ b/Userland/Libraries/LibC/bits/stdio_file_implementation.h
@@ -9,9 +9,9 @@
#include <AK/Array.h>
#include <AK/IntrusiveList.h>
#include <AK/Types.h>
-#include <LibC/bits/FILE.h>
-#include <LibC/bits/pthread_integration.h>
-#include <LibC/bits/wchar.h>
+#include <bits/FILE.h>
+#include <bits/pthread_integration.h>
+#include <bits/wchar.h>
#include <pthread.h>
#include <sys/types.h>
diff --git a/Userland/Libraries/LibC/cxxabi.cpp b/Userland/Libraries/LibC/cxxabi.cpp
index 4da6b2fe14..6b23aec013 100644
--- a/Userland/Libraries/LibC/cxxabi.cpp
+++ b/Userland/Libraries/LibC/cxxabi.cpp
@@ -9,9 +9,9 @@
#include <AK/Debug.h>
#include <AK/Format.h>
#include <AK/NeverDestroyed.h>
-#include <LibC/bits/pthread_integration.h>
-#include <LibC/mallocdefs.h>
#include <assert.h>
+#include <bits/pthread_integration.h>
+#include <mallocdefs.h>
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/Userland/Libraries/LibC/ifaddrs.cpp b/Userland/Libraries/LibC/ifaddrs.cpp
index a42345a6e4..697579a3b6 100644
--- a/Userland/Libraries/LibC/ifaddrs.cpp
+++ b/Userland/Libraries/LibC/ifaddrs.cpp
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
-#include <LibC/errno.h>
-#include <LibC/ifaddrs.h>
+#include <errno.h>
+#include <ifaddrs.h>
int getifaddrs(struct ifaddrs**)
{
diff --git a/Userland/Libraries/LibC/math.cpp b/Userland/Libraries/LibC/math.cpp
index ada821963a..f7ad62996e 100644
--- a/Userland/Libraries/LibC/math.cpp
+++ b/Userland/Libraries/LibC/math.cpp
@@ -16,7 +16,7 @@
#include <AK/Math.h>
#include <AK/Platform.h>
#include <AK/StdLibExtras.h>
-#include <LibC/assert.h>
+#include <assert.h>
#include <fenv.h>
#include <math.h>
#include <stdint.h>
diff --git a/Userland/Libraries/LibC/net.cpp b/Userland/Libraries/LibC/net.cpp
index 9a6b113529..f147c6bb23 100644
--- a/Userland/Libraries/LibC/net.cpp
+++ b/Userland/Libraries/LibC/net.cpp
@@ -4,9 +4,9 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
-#include <LibC/errno.h>
-#include <LibC/net/if.h>
-#include <LibC/netinet/in.h>
+#include <errno.h>
+#include <net/if.h>
+#include <netinet/in.h>
const in6_addr in6addr_any = IN6ADDR_ANY_INIT;
const in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT;
diff --git a/Userland/Libraries/LibC/stdio.cpp b/Userland/Libraries/LibC/stdio.cpp
index ed34dd8101..4546a533c6 100644
--- a/Userland/Libraries/LibC/stdio.cpp
+++ b/Userland/Libraries/LibC/stdio.cpp
@@ -11,9 +11,9 @@
#include <AK/PrintfImplementation.h>
#include <AK/ScopedValueRollback.h>
#include <AK/StdLibExtras.h>
-#include <LibC/bits/mutex_locker.h>
-#include <LibC/bits/stdio_file_implementation.h>
#include <assert.h>
+#include <bits/mutex_locker.h>
+#include <bits/stdio_file_implementation.h>
#include <errno.h>
#include <fcntl.h>
#include <stdarg.h>
diff --git a/Userland/Libraries/LibDebug/DebugSession.h b/Userland/Libraries/LibDebug/DebugSession.h
index ed6e3750f8..dad0e4bd2c 100644
--- a/Userland/Libraries/LibDebug/DebugSession.h
+++ b/Userland/Libraries/LibDebug/DebugSession.h
@@ -13,12 +13,12 @@
#include <AK/NonnullRefPtr.h>
#include <AK/Optional.h>
#include <AK/OwnPtr.h>
-#include <LibC/sys/arch/regs.h>
#include <LibCore/MappedFile.h>
#include <LibDebug/DebugInfo.h>
#include <LibDebug/ProcessInspector.h>
#include <signal.h>
#include <stdio.h>
+#include <sys/arch/regs.h>
#include <sys/ptrace.h>
#include <sys/wait.h>
#include <unistd.h>
diff --git a/Userland/Libraries/LibDebug/ProcessInspector.h b/Userland/Libraries/LibDebug/ProcessInspector.h
index d72aac6b65..8247f6bb19 100644
--- a/Userland/Libraries/LibDebug/ProcessInspector.h
+++ b/Userland/Libraries/LibDebug/ProcessInspector.h
@@ -9,7 +9,7 @@
#include "LoadedLibrary.h"
#include <AK/Types.h>
-#include <LibC/sys/arch/regs.h>
+#include <sys/arch/regs.h>
namespace Debug {
diff --git a/Userland/Services/SpiceAgent/SpiceAgent.cpp b/Userland/Services/SpiceAgent/SpiceAgent.cpp
index da0f97a92b..9119ab84b5 100644
--- a/Userland/Services/SpiceAgent/SpiceAgent.cpp
+++ b/Userland/Services/SpiceAgent/SpiceAgent.cpp
@@ -7,14 +7,14 @@
#include "SpiceAgent.h"
#include "ConnectionToClipboardServer.h"
#include <AK/DeprecatedString.h>
-#include <LibC/memory.h>
-#include <LibC/unistd.h>
#include <LibGfx/BMPLoader.h>
#include <LibGfx/BMPWriter.h>
#include <LibGfx/Bitmap.h>
#include <LibGfx/JPGLoader.h>
#include <LibGfx/PNGLoader.h>
#include <LibGfx/PNGWriter.h>
+#include <memory.h>
+#include <unistd.h>
SpiceAgent::SpiceAgent(int fd, ConnectionToClipboardServer& connection)
: m_fd(fd)
diff --git a/Userland/Services/SpiceAgent/main.cpp b/Userland/Services/SpiceAgent/main.cpp
index 00c7d8aa75..89588df46d 100644
--- a/Userland/Services/SpiceAgent/main.cpp
+++ b/Userland/Services/SpiceAgent/main.cpp
@@ -5,10 +5,10 @@
*/
#include "SpiceAgent.h"
-#include <LibC/fcntl.h>
#include <LibCore/System.h>
#include <LibIPC/ConnectionToServer.h>
#include <LibMain/Main.h>
+#include <fcntl.h>
static constexpr auto SPICE_DEVICE = "/dev/hvc0p1"sv;
diff --git a/Userland/Utilities/functrace.cpp b/Userland/Utilities/functrace.cpp
index 3bcf652dce..4368ce3575 100644
--- a/Userland/Utilities/functrace.cpp
+++ b/Userland/Utilities/functrace.cpp
@@ -9,7 +9,6 @@
#include <AK/NonnullOwnPtr.h>
#include <AK/StringBuilder.h>
#include <Kernel/API/SyscallString.h>
-#include <LibC/sys/arch/regs.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
#include <LibCore/System.h>
@@ -21,6 +20,7 @@
#include <signal.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/arch/regs.h>
#include <syscall.h>
#include <unistd.h>
diff --git a/Userland/Utilities/strace.cpp b/Userland/Utilities/strace.cpp
index 29e29e6ec3..8d34465eb8 100644
--- a/Userland/Utilities/strace.cpp
+++ b/Userland/Utilities/strace.cpp
@@ -10,7 +10,6 @@
#include <AK/StdLibExtras.h>
#include <AK/Types.h>
#include <Kernel/API/SyscallString.h>
-#include <LibC/sys/arch/regs.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/Stream.h>
#include <LibCore/System.h>
@@ -21,6 +20,7 @@
#include <signal.h>
#include <stdio.h>
#include <string.h>
+#include <sys/arch/regs.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <sys/ptrace.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 09:48:57 +0000