Kernel: Move FIFO into FileSystem/ and Socket+LocalSocket into Net/.

Kernel/Devices/Device.h

@@ -2,7 +2,7 @@
 
 #include <AK/Retainable.h>
 #include <AK/Types.h>
-#include "FileDescriptor.h"
+#include <Kernel/FileSystem/FileDescriptor.h>
 
 class Process;
 

Kernel/FIFO.cpp → Kernel/FileSystem/FIFO.cpp

@@ -1,4 +1,4 @@
-#include "FIFO.h"
+#include <Kernel/FileSystem/FIFO.h>
 #include <AK/StdLibExtras.h>
 
 //#define FIFO_DEBUG

Kernel/FileDescriptor.cpp → Kernel/FileSystem/FileDescriptor.cpp

@@ -4,10 +4,10 @@
 #include <LibC/errno_numbers.h>
 #include "UnixTypes.h"
 #include <AK/BufferStream.h>
-#include "FIFO.h"
+#include <Kernel/FileSystem/FIFO.h>
 #include <Kernel/TTY/TTY.h>
 #include <Kernel/TTY/MasterPTY.h>
-#include <Kernel/Socket.h>
+#include <Kernel/Net/Socket.h>
 #include <Kernel/Process.h>
 #include <Kernel/Devices/BlockDevice.h>
 #include <Kernel/VM/MemoryManager.h>

Kernel/FileDescriptor.h → Kernel/FileSystem/FileDescriptor.h

@@ -2,13 +2,13 @@
 
 #include <Kernel/FileSystem/VirtualFileSystem.h>
 #include <Kernel/FileSystem/InodeMetadata.h>
+#include <Kernel/FileSystem/FIFO.h>
 #include <Kernel/LinearAddress.h>
-#include <Kernel/FIFO.h>
 #include <AK/ByteBuffer.h>
 #include <AK/CircularQueue.h>
 #include <AK/Retainable.h>
 #include <AK/Badge.h>
-#include <Kernel/Socket.h>
+#include <Kernel/Net/Socket.h>
 
 class TTY;
 class MasterPTY;

Kernel/FileSystem/FileSystem.cpp

@@ -4,7 +4,7 @@
 #include <LibC/errno_numbers.h>
 #include "FileSystem.h"
 #include <Kernel/VM/MemoryManager.h>
-#include <Kernel/LocalSocket.h>
+#include <Kernel/Net/LocalSocket.h>
 
 static dword s_lastFileSystemID;
 static HashMap<dword, FS*>* s_fs_map;

Kernel/FileSystem/SyntheticFileSystem.cpp

@@ -1,5 +1,5 @@
 #include <Kernel/FileSystem/SyntheticFileSystem.h>
-#include <Kernel/FileDescriptor.h>
+#include <Kernel/FileSystem/FileDescriptor.h>
 #include <LibC/errno_numbers.h>
 #include <AK/StdLibExtras.h>
 

Kernel/FileSystem/VirtualFileSystem.cpp

@@ -1,5 +1,5 @@
 #include "VirtualFileSystem.h"
-#include "FileDescriptor.h"
+#include <Kernel/FileSystem/FileDescriptor.h>
 #include "FileSystem.h"
 #include <AK/FileSystemPath.h>
 #include <AK/StringBuilder.h>

Kernel/Makefile

@@ -25,7 +25,7 @@ KERNEL_OBJS = \
        TTY/MasterPTY.o \
        TTY/SlavePTY.o \
        TTY/VirtualConsole.o \
-       FIFO.o \
+       FileSystem/FIFO.o \
        Scheduler.o \
        DoubleBuffer.o \
        ELF/ELFImage.o \
@@ -35,8 +35,8 @@ KERNEL_OBJS = \
        Devices/BXVGADevice.o \
        PCI.o \
        Devices/PS2MouseDevice.o \
-       Socket.o \
-       LocalSocket.o \
+       Net/Socket.o \
+       Net/LocalSocket.o \
        Net/IPv4Socket.o \
        Net/TCPSocket.o \
        Net/UDPSocket.o \

Kernel/Net/IPv4Socket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/Socket.h>
+#include <Kernel/Net/Socket.h>
 #include <Kernel/DoubleBuffer.h>
 #include <Kernel/Net/IPv4.h>
 #include <AK/HashMap.h>

Kernel/LocalSocket.cpp → Kernel/Net/LocalSocket.cpp

@@ -1,4 +1,4 @@
-#include <Kernel/LocalSocket.h>
+#include <Kernel/Net/LocalSocket.h>
 #include <Kernel/UnixTypes.h>
 #include <Kernel/Process.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>

Kernel/LocalSocket.h → Kernel/Net/LocalSocket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/Socket.h>
+#include <Kernel/Net/Socket.h>
 #include <Kernel/DoubleBuffer.h>
 
 class FileDescriptor;

Kernel/Socket.cpp → Kernel/Net/Socket.cpp

@@ -1,5 +1,5 @@
-#include <Kernel/Socket.h>
-#include <Kernel/LocalSocket.h>
+#include <Kernel/Net/Socket.h>
+#include <Kernel/Net/LocalSocket.h>
 #include <Kernel/Net/IPv4Socket.h>
 #include <Kernel/UnixTypes.h>
 #include <Kernel/Process.h>

Kernel/Process.cpp

@@ -4,7 +4,7 @@
 #include "StdLib.h"
 #include "i386.h"
 #include "system.h"
-#include <Kernel/FileDescriptor.h>
+#include <Kernel/FileSystem/FileDescriptor.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
 #include <Kernel/Devices/NullDevice.h>
 #include <Kernel/ELF/ELFLoader.h>
@@ -16,9 +16,9 @@
 #include <LibC/errno_numbers.h>
 #include "Syscall.h"
 #include "Scheduler.h"
-#include "FIFO.h"
+#include <Kernel/FileSystem/FIFO.h>
 #include "KSyms.h"
-#include <Kernel/Socket.h>
+#include <Kernel/Net/Socket.h>
 #include <Kernel/TTY/MasterPTY.h>
 #include <Kernel/ELF/exec_elf.h>
 #include <AK/StringBuilder.h>