diff --git a/src/system/boot/arch/arm/Jamfile b/src/system/boot/arch/arm/Jamfile
index f7f4d3766a..d4fbd69932 100644
--- a/src/system/boot/arch/arm/Jamfile
+++ b/src/system/boot/arch/arm/Jamfile
@@ -20,13 +20,6 @@ local kernelArchSources =
 	arch_uart_pl011.cpp
 ;
 
-local kernelDebugSources =
-	blue_screen.cpp
-	font.cpp
-	font_spleen.cpp
-	frame_buffer_console.cpp
-;
-
 local kernelGenericDriverSources =
 	debug_uart.cpp
 	debug_uart_8250.cpp
@@ -43,10 +36,6 @@ for platform in [ MultiBootSubDirSetup u-boot efi ] {
 
 			arch_cpu.cpp
 
-			# Reuse a subset of kernel debugging.
-			kernel_stubs.cpp
-			$(kernelDebugSources)
-
 			$(librootGenericSources)
 			$(librootArchSources)
 			:
@@ -68,9 +57,6 @@ for platform in [ MultiBootSubDirSetup u-boot efi ] {
 
 		SEARCH on [ FGristFiles $(librootGenericSources) ]
 			= [ FDirName $(HAIKU_TOP) src system libroot posix string arch generic ] ;
-
-		SEARCH on [ FGristFiles $(kernelDebugSources) ]
-			= [ FDirName $(HAIKU_TOP) src system kernel debug ] ;
 	}
 }
 
diff --git a/src/system/boot/arch/arm/kernel_stubs.cpp b/src/system/boot/arch/arm/kernel_stubs.cpp
deleted file mode 100644
index 817b779e2c..0000000000
--- a/src/system/boot/arch/arm/kernel_stubs.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2012 Haiku, Inc. All rights reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *		Michael Lotz, mmlr@mlotz.ch
- */
-
-// This file just collects stubs that allow kernel sources to be used in the
-// bootloader more easily.
-
-#include <OS.h>
-#include <lock.h>
-#include <arch_config.h>
-
-
-extern "C" bool
-in_command_invocation()
-{
-	return false;
-}
-
-
-extern "C" void
-abort_debugger_command()
-{
-}
-
-
-extern "C" char
-kgetc()
-{
-	return -1;
-}
-
-
-extern "C" status_t
-_mutex_lock(mutex*, void*)
-{
-	return B_OK;
-}
-
-
-extern "C" void
-_mutex_unlock(mutex*)
-{
-}
-
-
-#ifdef ATOMIC_FUNCS_ARE_SYSCALLS
-
-/* needed by packagefs */
-extern "C" int32
-atomic_add(vint32 *value, int32 addValue)
-{
-	int32 old = *value;
-	*value += addValue;
-	return old;
-}
-
-#endif /*ATOMIC_FUNCS_ARE_SYSCALLS*/
diff --git a/src/system/boot/arch/riscv64/Jamfile b/src/system/boot/arch/riscv64/Jamfile
index 7c9ce7ecb1..3dac45ac39 100644
--- a/src/system/boot/arch/riscv64/Jamfile
+++ b/src/system/boot/arch/riscv64/Jamfile
@@ -34,7 +34,6 @@ for platform in [ MultiBootSubDirSetup u-boot efi riscv ] {
 			$(kernelArchDriverSources)
 			$(kernelGenericDriverSources)
 			arch_cpu.cpp
-			kernel_stubs.cpp
 			: # additional flags
 			:
 			$(kernelArchObjects)
diff --git a/src/system/boot/arch/riscv64/kernel_stubs.cpp b/src/system/boot/arch/riscv64/kernel_stubs.cpp
deleted file mode 100644
index 817b779e2c..0000000000
--- a/src/system/boot/arch/riscv64/kernel_stubs.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2012 Haiku, Inc. All rights reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *		Michael Lotz, mmlr@mlotz.ch
- */
-
-// This file just collects stubs that allow kernel sources to be used in the
-// bootloader more easily.
-
-#include <OS.h>
-#include <lock.h>
-#include <arch_config.h>
-
-
-extern "C" bool
-in_command_invocation()
-{
-	return false;
-}
-
-
-extern "C" void
-abort_debugger_command()
-{
-}
-
-
-extern "C" char
-kgetc()
-{
-	return -1;
-}
-
-
-extern "C" status_t
-_mutex_lock(mutex*, void*)
-{
-	return B_OK;
-}
-
-
-extern "C" void
-_mutex_unlock(mutex*)
-{
-}
-
-
-#ifdef ATOMIC_FUNCS_ARE_SYSCALLS
-
-/* needed by packagefs */
-extern "C" int32
-atomic_add(vint32 *value, int32 addValue)
-{
-	int32 old = *value;
-	*value += addValue;
-	return old;
-}
-
-#endif /*ATOMIC_FUNCS_ARE_SYSCALLS*/