Kernel+Userland: Move LibC/sys/ioctl_numbers to Kernel/API/Ioctl.h

This header has always been fundamentally a Kernel API file. Move it
where it belongs. Include it directly in Kernel files, and make
Userland applications include it via sys/ioctl.h rather than directly.

23 files changed, 25 insertions, 26 deletions

diff --git a/Userland/Libraries/LibC/sys/ioctl_numbers.h b/Kernel/API/Ioctl.h
index df044ddf8f..354944b135 100644
--- a/Userland/Libraries/LibC/sys/ioctl_numbers.h
+++ b/Kernel/API/Ioctl.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 struct winsize {
     unsigned short ws_row;
@@ -76,7 +76,9 @@ enum ConsoleModes {
     KD_GRAPHICS = 0x01,
 };
 
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 enum IOCtlNumber {
     TIOCGPGRP,
diff --git a/Kernel/Devices/Audio/Channel.cpp b/Kernel/Devices/Audio/Channel.cpp
index 729170df74..104d9dc233 100644
--- a/Kernel/Devices/Audio/Channel.cpp
+++ b/Kernel/Devices/Audio/Channel.cpp
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <Kernel/API/Ioctl.h>
 #include <Kernel/Devices/Audio/Management.h>
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/Devices/RandomDevice.h>
 #include <Kernel/Random.h>
 #include <Kernel/Sections.h>
-#include <LibC/sys/ioctl_numbers.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Devices/HID/KeyboardDevice.cpp b/Kernel/Devices/HID/KeyboardDevice.cpp
index 9556daa42f..b967d2a86d 100644
--- a/Kernel/Devices/HID/KeyboardDevice.cpp
+++ b/Kernel/Devices/HID/KeyboardDevice.cpp
@@ -8,10 +8,10 @@
 
 #include <AK/Assertions.h>
 #include <AK/Types.h>
+#include <Kernel/API/Ioctl.h>
 #include <Kernel/Devices/HID/KeyboardDevice.h>
 #include <Kernel/Sections.h>
 #include <Kernel/TTY/VirtualConsole.h>
-#include <LibC/sys/ioctl_numbers.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Devices/KCOVDevice.cpp b/Kernel/Devices/KCOVDevice.cpp
index 634562aea4..86f34b1a3f 100644
--- a/Kernel/Devices/KCOVDevice.cpp
+++ b/Kernel/Devices/KCOVDevice.cpp
@@ -6,11 +6,11 @@
 
 #include <AK/Assertions.h>
 #include <AK/NonnullOwnPtr.h>
+#include <Kernel/API/Ioctl.h>
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/Devices/KCOVDevice.h>
 #include <Kernel/Devices/KCOVInstance.h>
 #include <Kernel/FileSystem/OpenFileDescription.h>
-#include <LibC/sys/ioctl_numbers.h>
 
 #include <Kernel/Panic.h>
 
diff --git a/Kernel/FileSystem/InodeFile.cpp b/Kernel/FileSystem/InodeFile.cpp
index d1406b51b0..b225f31a9a 100644
--- a/Kernel/FileSystem/InodeFile.cpp
+++ b/Kernel/FileSystem/InodeFile.cpp
@@ -5,6 +5,7 @@
  */
 
 #include <AK/StringView.h>
+#include <Kernel/API/Ioctl.h>
 #include <Kernel/API/POSIX/errno.h>
 #include <Kernel/FileSystem/Inode.h>
 #include <Kernel/FileSystem/InodeFile.h>
@@ -13,7 +14,6 @@
 #include <Kernel/Memory/PrivateInodeVMObject.h>
 #include <Kernel/Memory/SharedInodeVMObject.h>
 #include <Kernel/Process.h>
-#include <LibC/sys/ioctl_numbers.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Graphics/DisplayConnector.cpp b/Kernel/Graphics/DisplayConnector.cpp
index 056f95c597..9d95ddfa65 100644
--- a/Kernel/Graphics/DisplayConnector.cpp
+++ b/Kernel/Graphics/DisplayConnector.cpp
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <Kernel/API/Ioctl.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/DeviceIdentifiers/CharacterDevicesDirectory.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceDirectory.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/Directory.h>
 #include <Kernel/Graphics/DisplayConnector.h>
 #include <Kernel/Graphics/GraphicsManagement.h>
 #include <Kernel/Memory/MemoryManager.h>
-#include <LibC/sys/ioctl_numbers.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Graphics/DisplayConnector.h b/Kernel/Graphics/DisplayConnector.h
index 5448ecce47..e49b219320 100644
--- a/Kernel/Graphics/DisplayConnector.h
+++ b/Kernel/Graphics/DisplayConnector.h
@@ -7,9 +7,9 @@
 #pragma once
 
 #include <AK/Types.h>
+#include <Kernel/API/Ioctl.h>
 #include <Kernel/Devices/CharacterDevice.h>
 #include <Kernel/Memory/SharedFramebufferVMObject.h>
-#include <LibC/sys/ioctl_numbers.h>
 #include <LibEDID/EDID.h>
 
 namespace Kernel {
diff --git a/Kernel/Graphics/VirtIOGPU/GPU3DDevice.cpp b/Kernel/Graphics/VirtIOGPU/GPU3DDevice.cpp
index e2a3ab9ae7..5d66a92c9d 100644
--- a/Kernel/Graphics/VirtIOGPU/GPU3DDevice.cpp
+++ b/Kernel/Graphics/VirtIOGPU/GPU3DDevice.cpp
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <Kernel/API/Ioctl.h>
 #include <Kernel/API/VirGL.h>
 #include <Kernel/Graphics/GraphicsManagement.h>
 #include <Kernel/Graphics/VirtIOGPU/Console.h>
@@ -11,7 +12,6 @@
 #include <Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h>
 #include <Kernel/Graphics/VirtIOGPU/Protocol.h>
 #include <Kernel/Random.h>
-#include <LibC/sys/ioctl_numbers.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Net/IPv4Socket.cpp b/Kernel/Net/IPv4Socket.cpp
index 1d43d8dde6..21de0cca03 100644
--- a/Kernel/Net/IPv4Socket.cpp
+++ b/Kernel/Net/IPv4Socket.cpp
@@ -6,6 +6,7 @@
 
 #include <AK/Singleton.h>
 #include <AK/StringBuilder.h>
+#include <Kernel/API/Ioctl.h>
 #include <Kernel/API/POSIX/errno.h>
 #include <Kernel/Debug.h>
 #include <Kernel/FileSystem/OpenFileDescription.h>
@@ -22,7 +23,6 @@
 #include <Kernel/Net/UDPSocket.h>
 #include <Kernel/Process.h>
 #include <Kernel/UnixTypes.h>
-#include <LibC/sys/ioctl_numbers.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Net/LocalSocket.cpp b/Kernel/Net/LocalSocket.cpp
index 0ad680b654..bc4afc01e3 100644
--- a/Kernel/Net/LocalSocket.cpp
+++ b/Kernel/Net/LocalSocket.cpp
@@ -6,6 +6,7 @@
 
 #include <AK/Singleton.h>
 #include <AK/StringBuilder.h>
+#include <Kernel/API/Ioctl.h>
 #include <Kernel/API/POSIX/errno.h>
 #include <Kernel/Debug.h>
 #include <Kernel/FileSystem/OpenFileDescription.h>
@@ -16,7 +17,6 @@
 #include <Kernel/Process.h>
 #include <Kernel/StdLib.h>
 #include <Kernel/UnixTypes.h>
-#include <LibC/sys/ioctl_numbers.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/StorageDevice.cpp b/Kernel/Storage/StorageDevice.cpp
index af4ea96f3f..6a36f8ad3b 100644
--- a/Kernel/Storage/StorageDevice.cpp
+++ b/Kernel/Storage/StorageDevice.cpp
@@ -5,6 +5,7 @@
  */
 
 #include <AK/StringView.h>
+#include <Kernel/API/Ioctl.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/FileSystem/OpenFileDescription.h>
@@ -14,7 +15,6 @@
 #include <Kernel/FileSystem/SysFS/Subsystems/Devices/Storage/Directory.h>
 #include <Kernel/Storage/StorageDevice.h>
 #include <Kernel/Storage/StorageManagement.h>
-#include <LibC/sys/ioctl_numbers.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Syscalls/ioctl.cpp b/Kernel/Syscalls/ioctl.cpp
index 029fe9d53f..f83affd14d 100644
--- a/Kernel/Syscalls/ioctl.cpp
+++ b/Kernel/Syscalls/ioctl.cpp
@@ -5,9 +5,9 @@
  */
 
 #include <AK/Userspace.h>
+#include <Kernel/API/Ioctl.h>
 #include <Kernel/FileSystem/OpenFileDescription.h>
 #include <Kernel/Process.h>
-#include <LibC/sys/ioctl_numbers.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Syscalls/jail.cpp b/Kernel/Syscalls/jail.cpp
index ba0eb092eb..4d84935fb6 100644
--- a/Kernel/Syscalls/jail.cpp
+++ b/Kernel/Syscalls/jail.cpp
@@ -5,11 +5,11 @@
  */
 
 #include <AK/Userspace.h>
+#include <Kernel/API/Ioctl.h>
 #include <Kernel/Jail.h>
 #include <Kernel/JailManagement.h>
 #include <Kernel/Process.h>
 #include <Kernel/StdLib.h>
-#include <LibC/sys/ioctl_numbers.h>
 
 namespace Kernel {
 
diff --git a/Kernel/TTY/MasterPTY.cpp b/Kernel/TTY/MasterPTY.cpp
index 5c4253a061..1faa423305 100644
--- a/Kernel/TTY/MasterPTY.cpp
+++ b/Kernel/TTY/MasterPTY.cpp
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <Kernel/API/Ioctl.h>
 #include <Kernel/API/POSIX/errno.h>
 #include <Kernel/API/POSIX/signal_numbers.h>
 #include <Kernel/Debug.h>
@@ -12,7 +13,6 @@
 #include <Kernel/TTY/MasterPTY.h>
 #include <Kernel/TTY/PTYMultiplexer.h>
 #include <Kernel/TTY/SlavePTY.h>
-#include <LibC/sys/ioctl_numbers.h>
 
 namespace Kernel {
 
diff --git a/Kernel/TTY/TTY.cpp b/Kernel/TTY/TTY.cpp
index 59c2b47981..12c02c9425 100644
--- a/Kernel/TTY/TTY.cpp
+++ b/Kernel/TTY/TTY.cpp
@@ -7,13 +7,13 @@
 
 #include <AK/ScopeGuard.h>
 #include <AK/StringView.h>
+#include <Kernel/API/Ioctl.h>
 #include <Kernel/API/POSIX/errno.h>
 #include <Kernel/API/POSIX/signal_numbers.h>
 #include <Kernel/Debug.h>
 #include <Kernel/InterruptDisabler.h>
 #include <Kernel/Process.h>
 #include <Kernel/TTY/TTY.h>
-#include <LibC/sys/ioctl_numbers.h>
 #define TTYDEFCHARS
 #include <LibC/sys/ttydefaults.h>
 #undef TTYDEFCHARS
diff --git a/Userland/Libraries/LibC/stdlib.cpp b/Userland/Libraries/LibC/stdlib.cpp
index 36ba788412..30ed94626b 100644
--- a/Userland/Libraries/LibC/stdlib.cpp
+++ b/Userland/Libraries/LibC/stdlib.cpp
@@ -28,7 +28,6 @@
 #include <string.h>
 #include <sys/internals.h>
 #include <sys/ioctl.h>
-#include <sys/ioctl_numbers.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/sysmacros.h>
diff --git a/Userland/Libraries/LibC/sys/ioctl.h b/Userland/Libraries/LibC/sys/ioctl.h
index 55d4affa27..e1d6fdcb67 100644
--- a/Userland/Libraries/LibC/sys/ioctl.h
+++ b/Userland/Libraries/LibC/sys/ioctl.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
+#include <Kernel/API/Ioctl.h>
 #include <sys/cdefs.h>
-#include <sys/ioctl_numbers.h>
 
 __BEGIN_DECLS
 
diff --git a/Userland/Libraries/LibVirtGPU/CommandBufferBuilder.cpp b/Userland/Libraries/LibVirtGPU/CommandBufferBuilder.cpp
index daefccd5bd..7992d76bbf 100644
--- a/Userland/Libraries/LibVirtGPU/CommandBufferBuilder.cpp
+++ b/Userland/Libraries/LibVirtGPU/CommandBufferBuilder.cpp
@@ -8,7 +8,7 @@
 
 #include <AK/StringView.h>
 #include <Kernel/API/VirGL.h>
-#include <sys/ioctl_numbers.h>
+#include <sys/ioctl.h>
 
 #include <LibVirtGPU/CommandBufferBuilder.h>
 #include <LibVirtGPU/Commands.h>
diff --git a/Userland/Libraries/LibVirtGPU/CommandBufferBuilder.h b/Userland/Libraries/LibVirtGPU/CommandBufferBuilder.h
index 76a28ddc71..2711910705 100644
--- a/Userland/Libraries/LibVirtGPU/CommandBufferBuilder.h
+++ b/Userland/Libraries/LibVirtGPU/CommandBufferBuilder.h
@@ -13,7 +13,7 @@
 #include <LibGfx/Size.h>
 #include <LibVirtGPU/Commands.h>
 #include <LibVirtGPU/VirGLProtocol.h>
-#include <sys/ioctl_numbers.h>
+#include <sys/ioctl.h>
 
 namespace VirtGPU {
 
diff --git a/Userland/Services/WindowServer/HardwareScreenBackend.h b/Userland/Services/WindowServer/HardwareScreenBackend.h
index 877af92762..9660c8a2ba 100644
--- a/Userland/Services/WindowServer/HardwareScreenBackend.h
+++ b/Userland/Services/WindowServer/HardwareScreenBackend.h
@@ -11,7 +11,7 @@
 #include <AK/DeprecatedString.h>
 #include <AK/Error.h>
 #include <AK/Span.h>
-#include <sys/ioctl_numbers.h>
+#include <sys/ioctl.h>
 
 namespace WindowServer {
 class HardwareScreenBackend : public ScreenBackend {
diff --git a/Userland/Services/WindowServer/ScreenBackend.h b/Userland/Services/WindowServer/ScreenBackend.h
index 1523566cc7..b5f057f236 100644
--- a/Userland/Services/WindowServer/ScreenBackend.h
+++ b/Userland/Services/WindowServer/ScreenBackend.h
@@ -10,7 +10,7 @@
 #include <AK/Error.h>
 #include <AK/Span.h>
 #include <LibGfx/Color.h>
-#include <sys/ioctl_numbers.h>
+#include <sys/ioctl.h>
 
 namespace WindowServer {
 
diff --git a/Userland/Services/WindowServer/VirtualScreenBackend.h b/Userland/Services/WindowServer/VirtualScreenBackend.h
index c63df43513..0bc5cfab13 100644
--- a/Userland/Services/WindowServer/VirtualScreenBackend.h
+++ b/Userland/Services/WindowServer/VirtualScreenBackend.h
@@ -11,7 +11,6 @@
 #include <AK/DeprecatedString.h>
 #include <AK/Error.h>
 #include <AK/Span.h>
-#include <sys/ioctl_numbers.h>
 
 namespace WindowServer {
 
diff --git a/Userland/Utilities/kcov-example.cpp b/Userland/Utilities/kcov-example.cpp
index 5bae1a5518..6f86538667 100644
--- a/Userland/Utilities/kcov-example.cpp
+++ b/Userland/Utilities/kcov-example.cpp
@@ -9,7 +9,6 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <sys/ioctl.h>
-#include <sys/ioctl_numbers.h>
 #include <sys/kcov.h>
 #include <sys/mman.h>
 #include <unistd.h>