diff --git a/Kernel/Arch/riscv64/DebugOutput.cpp b/Kernel/Arch/riscv64/DebugOutput.cpp
index 653e1cc3e02..57071bda9ed 100644
--- a/Kernel/Arch/riscv64/DebugOutput.cpp
+++ b/Kernel/Arch/riscv64/DebugOutput.cpp
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <Kernel/Arch/DebugOutput.h>
 #include <Kernel/Library/Assertions.h>
 
 namespace Kernel {
diff --git a/Kernel/Arch/riscv64/Interrupts.cpp b/Kernel/Arch/riscv64/Interrupts.cpp
index 620ca4e659d..48455d1586e 100644
--- a/Kernel/Arch/riscv64/Interrupts.cpp
+++ b/Kernel/Arch/riscv64/Interrupts.cpp
@@ -7,6 +7,8 @@
 #include <AK/Error.h>
 #include <AK/Types.h>
 
+#include <Kernel/Arch/CPU.h>
+#include <Kernel/Arch/Interrupts.h>
 #include <Kernel/Arch/TrapFrame.h>
 #include <Kernel/Interrupts/GenericInterruptHandler.h>
 
diff --git a/Kernel/Arch/riscv64/PCI.cpp b/Kernel/Arch/riscv64/PCI/Initializer.cpp
similarity index 88%
rename from Kernel/Arch/riscv64/PCI.cpp
rename to Kernel/Arch/riscv64/PCI/Initializer.cpp
index 83f80bdf826..9d9a3324ec7 100644
--- a/Kernel/Arch/riscv64/PCI.cpp
+++ b/Kernel/Arch/riscv64/PCI/Initializer.cpp
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <Kernel/Bus/PCI/Initializer.h>
 #include <Kernel/Library/Assertions.h>
 
 namespace Kernel::PCI {
diff --git a/Kernel/Arch/riscv64/PageDirectory.h b/Kernel/Arch/riscv64/PageDirectory.h
index 5079cf07bb4..52c9a5c8b45 100644
--- a/Kernel/Arch/riscv64/PageDirectory.h
+++ b/Kernel/Arch/riscv64/PageDirectory.h
@@ -172,7 +172,7 @@ public:
 
     RISCV64::CSR::SATP satp() const
     {
-        return {
+        return RISCV64::CSR::SATP {
             .PPN = m_directory_table->paddr().get() >> PADDR_PPN_OFFSET,
             .ASID = 0,
             .MODE = RISCV64::CSR::SATP::Mode::Sv39,
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index d479d338dae..842733cde90 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -522,7 +522,7 @@ elseif("${SERENITY_ARCH}" STREQUAL "riscv64")
         Arch/riscv64/Interrupts.cpp
         Arch/riscv64/PageDirectory.cpp
         Arch/riscv64/Panic.cpp
-        Arch/riscv64/PCI.cpp
+        Arch/riscv64/PCI/Initializer.cpp
         Arch/riscv64/PowerState.cpp
         Arch/riscv64/pre_init.cpp
         Arch/riscv64/Processor.cpp