diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index 51ae5dd2c4..44ce34a0ab 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -594,6 +594,7 @@ rule KernelArchitectureSetup architecture
 
 	# defines
 	HAIKU_KERNEL_DEFINES += _KERNEL_MODE ;
+	HAIKU_BOOT_DEFINES += _BOOT_MODE ;
 
 	# kernel add-on glue code
 	HAIKU_KERNEL_ADDON_BEGIN_GLUE_CODE = <$(architecture)>crtbeginS.o
diff --git a/build/jam/BootRules b/build/jam/BootRules
index 468fb240f5..0f30cd6105 100644
--- a/build/jam/BootRules
+++ b/build/jam/BootRules
@@ -95,7 +95,7 @@ rule SetupBoot
 		# add boot flags for the object
 		ObjectCcFlags $(object) : $(HAIKU_BOOT_CCFLAGS) $(HAIKU_BOOT_$(platform)_CCFLAGS) $(2) ;
 		ObjectC++Flags $(object) : $(HAIKU_BOOT_C++FLAGS) $(HAIKU_BOOT_$(platform)_C++FLAGS) $(2) ;
-		ObjectDefines $(object) : $(TARGET_KERNEL_DEFINES) ;
+		ObjectDefines $(object) : $(TARGET_KERNEL_DEFINES) $(TARGET_BOOT_DEFINES) ;
 		ASFLAGS on $(object) = $(HAIKU_BOOT_CCFLAGS) $(HAIKU_BOOT_$(platform)_CCFLAGS) ;
 		OPTIM on $(object) = $(HAIKU_BOOT_OPTIM) ;
 
diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 6529a844cb..0c3a534ee9 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -573,6 +573,7 @@ local buildVars =
 
 	DEFINES
 	KERNEL_DEFINES
+	BOOT_DEFINES
 
 	KERNEL_CCFLAGS KERNEL_C++FLAGS
 	KERNEL_PIC_CCFLAGS KERNEL_PIC_LINKFLAGS KERNEL_ADDON_LINKFLAGS
diff --git a/src/system/boot/Jamfile b/src/system/boot/Jamfile
index c69e98488d..1a0f09148e 100644
--- a/src/system/boot/Jamfile
+++ b/src/system/boot/Jamfile
@@ -1,7 +1,5 @@
 SubDir HAIKU_TOP src system boot ;
 
-DEFINES += _BOOT_MODE ;
-
 UsePrivateHeaders [ FDirName libroot locale ] ;
 
 rule BuildOpenFirmwareLoader {
diff --git a/src/system/boot/arch/arm/Jamfile b/src/system/boot/arch/arm/Jamfile
index 66d81b7d91..1e84a21dfa 100644
--- a/src/system/boot/arch/arm/Jamfile
+++ b/src/system/boot/arch/arm/Jamfile
@@ -26,7 +26,6 @@ local kernelGenericDriverSources =
 local platform ;
 for platform in [ MultiBootSubDirSetup efi ] {
     on $(platform) {
-		DEFINES += _BOOT_MODE ;
 		BootMergeObject [ FGristFiles boot_arch_$(TARGET_KERNEL_ARCH).o ] :
 			# Kernel Drivers (src/system/kernel)
 			$(kernelGenericDriverSources)
diff --git a/src/system/boot/arch/arm64/Jamfile b/src/system/boot/arch/arm64/Jamfile
index f906ad7ed5..02741f5c99 100644
--- a/src/system/boot/arch/arm64/Jamfile
+++ b/src/system/boot/arch/arm64/Jamfile
@@ -29,9 +29,6 @@ local librootOsArchSources =
 
 for platform in [ MultiBootSubDirSetup efi ] {
 	on $(platform) {
-		DEFINES += _BOOT_MODE ;
-
-
 		BootMergeObject [ FGristFiles boot_arch_$(TARGET_KERNEL_ARCH).o ] :
 			$(kernelGenericDriverSources)
 			$(kernelArchSources)
diff --git a/src/system/boot/arch/m68k/Jamfile b/src/system/boot/arch/m68k/Jamfile
index f287e9d987..491633ea4d 100644
--- a/src/system/boot/arch/m68k/Jamfile
+++ b/src/system/boot/arch/m68k/Jamfile
@@ -3,8 +3,6 @@ SubDir HAIKU_TOP src system boot arch m68k ;
 local platform ;
 for platform in [ MultiBootSubDirSetup amiga_m68k atari_m68k next_m68k ] {
 	on $(platform) {
-		DEFINES += _BOOT_MODE ;
-
 		local kernelArchSources =
 			arch_elf.cpp
 		;
diff --git a/src/system/boot/arch/ppc/Jamfile b/src/system/boot/arch/ppc/Jamfile
index 498bb2300f..29b1a27fe6 100644
--- a/src/system/boot/arch/ppc/Jamfile
+++ b/src/system/boot/arch/ppc/Jamfile
@@ -14,8 +14,6 @@ local kernelGenericDriverSources =
 local platform ;
 for platform in [ MultiBootSubDirSetup openfirmware ] {
     on $(platform) {
-		DEFINES += _BOOT_MODE ;
-
 		BootMergeObject [ FGristFiles boot_arch_$(TARGET_KERNEL_ARCH).o ] :
 			$(kernelGenericDriverSources)
 			arch_elf.cpp
diff --git a/src/system/boot/arch/riscv64/Jamfile b/src/system/boot/arch/riscv64/Jamfile
index 94a5c810d0..12cb9c33ce 100644
--- a/src/system/boot/arch/riscv64/Jamfile
+++ b/src/system/boot/arch/riscv64/Jamfile
@@ -1,18 +1,12 @@
 SubDir HAIKU_TOP src system boot arch riscv64 ;
 
-{
-	local defines = _BOOT_MODE ;
-
-	defines = [ FDefines $(defines) ] ;
-	SubDirCcFlags $(defines) ;
-	SubDirC++Flags $(defines) -fno-rtti ;
-}
+SubDirC++Flags -fno-rtti ;
 
 # Optimizations create infinite recursion otherwise.
 SubDirCcFlags -fno-builtin ;
 
 local librootArchSources =
-        byteorder.S
+	byteorder.S
 ;
 
 local librootGenericSources =
@@ -34,7 +28,6 @@ local kernelGenericDriverSources =
 local platform ;
 for platform in [ MultiBootSubDirSetup efi riscv ] {
 	on $(platform) {
-		DEFINES += _BOOT_MODE ;
 		BootMergeObject [ FGristFiles boot_arch_$(TARGET_KERNEL_ARCH).o ] :
 			$(kernelArchDriverSources)
 			$(kernelGenericDriverSources)
diff --git a/src/system/boot/arch/sparc/Jamfile b/src/system/boot/arch/sparc/Jamfile
index 68b9de3e83..a6ba9ceea0 100644
--- a/src/system/boot/arch/sparc/Jamfile
+++ b/src/system/boot/arch/sparc/Jamfile
@@ -13,8 +13,6 @@ local kernelGenericDriverSources =
 local platform ;
 for platform in [ MultiBootSubDirSetup openfirmware ] {
     on $(platform) {
-		DEFINES += _BOOT_MODE ;
-
 		BootMergeObject [ FGristFiles boot_arch_$(TARGET_KERNEL_ARCH).o ] :
 			$(kernelGenericDriverSources)
 			arch_elf.cpp
diff --git a/src/system/boot/arch/x86/Jamfile b/src/system/boot/arch/x86/Jamfile
index 08939d5c91..e424f91c0b 100644
--- a/src/system/boot/arch/x86/Jamfile
+++ b/src/system/boot/arch/x86/Jamfile
@@ -8,7 +8,6 @@ for platform in [ MultiBootSubDirSetup bios_ia32 efi pxe_ia32 ] {
 		SubDirHdrs $(HAIKU_TOP) src system boot platform $(TARGET_BOOT_PLATFORM) ;
 
 		DEFINES = $(defines) ;
-		DEFINES += _BOOT_MODE ;
 
 		if $(TARGET_BOOT_PLATFORM) = efi {
 			if $(TARGET_ARCH) = x86_64 {
diff --git a/src/system/boot/libs/Jamfile b/src/system/boot/libs/Jamfile
index e9a26ea172..50b12f0f4f 100644
--- a/src/system/boot/libs/Jamfile
+++ b/src/system/boot/libs/Jamfile
@@ -4,8 +4,6 @@ local zlibSourceDirectory = [ BuildFeatureAttribute zlib : sources : path ] ;
 UseHeaders $(zlibSourceDirectory) ;
 UseHeaders $(zlibSourceDirectory) : true ;
 
-DEFINES += _BOOT_MODE ;
-
 local zlibSources =
 	adler32.c
 	crc32.c
diff --git a/src/system/boot/loader/Jamfile b/src/system/boot/loader/Jamfile
index 4746bcfd53..a89a99a75e 100644
--- a/src/system/boot/loader/Jamfile
+++ b/src/system/boot/loader/Jamfile
@@ -19,7 +19,6 @@ for platform in [ MultiBootSubDirSetup ] {
 			DEFINES = $(defines) ;
 
 			DEFINES +=
-				_BOOT_MODE
 				BOOT_ARCH=\\\"$(TARGET_KERNEL_ARCH_DIR)\\\"
 				KMESSAGE_CONTAINER_ONLY
 
diff --git a/src/system/boot/loader/file_systems/bfs/Jamfile b/src/system/boot/loader/file_systems/bfs/Jamfile
index b1c1b546cf..c6f49b42c4 100644
--- a/src/system/boot/loader/file_systems/bfs/Jamfile
+++ b/src/system/boot/loader/file_systems/bfs/Jamfile
@@ -5,10 +5,7 @@ UsePrivateHeaders file_systems shared storage ;
 
 SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_systems bfs ;
 
-local defines = [ FDefines _BOOT_MODE ] ;
-
-SubDirCcFlags $(defines) ;
-SubDirC++Flags -fno-rtti $(defines) ;
+SubDirC++Flags -fno-rtti ;
 
 local platform ;
 for platform in [ MultiBootSubDirSetup ] {
diff --git a/src/system/boot/loader/file_systems/fat/Jamfile b/src/system/boot/loader/file_systems/fat/Jamfile
index 25d3d2e83d..97a646bc2c 100644
--- a/src/system/boot/loader/file_systems/fat/Jamfile
+++ b/src/system/boot/loader/file_systems/fat/Jamfile
@@ -3,10 +3,7 @@ SubDir HAIKU_TOP src system boot loader file_systems fat ;
 UsePrivateKernelHeaders ;
 UsePrivateHeaders shared storage ;
 
-local defines = [ FDefines _BOOT_MODE ] ;
-
-SubDirCcFlags $(defines) ;
-SubDirC++Flags -fno-rtti $(defines) ;
+SubDirC++Flags -fno-rtti ;
 
 local platform ;
 for platform in [ MultiBootSubDirSetup ] {
diff --git a/src/system/boot/loader/file_systems/packagefs/Jamfile b/src/system/boot/loader/file_systems/packagefs/Jamfile
index 033a2fa0df..27d28801d4 100644
--- a/src/system/boot/loader/file_systems/packagefs/Jamfile
+++ b/src/system/boot/loader/file_systems/packagefs/Jamfile
@@ -4,8 +4,6 @@ UsePrivateHeaders kernel shared storage support ;
 UseBuildFeatureHeaders zlib ;
 UseBuildFeatureHeaders zstd ;
 
-DEFINES += _BOOT_MODE ;
-
 if [ FIsBuildFeatureEnabled zstd ] {
 	DEFINES += ZSTD_ENABLED ;
 }
diff --git a/src/system/boot/loader/file_systems/tarfs/Jamfile b/src/system/boot/loader/file_systems/tarfs/Jamfile
index 6e79189c6d..9a7658f8ff 100644
--- a/src/system/boot/loader/file_systems/tarfs/Jamfile
+++ b/src/system/boot/loader/file_systems/tarfs/Jamfile
@@ -5,9 +5,7 @@ UsePrivateHeaders kernel shared storage ;
 
 UseBuildFeatureHeaders zlib ;
 
-local defines = [ FDefines _BOOT_MODE ] ;
-SubDirCcFlags $(defines) ;
-SubDirC++Flags -fno-rtti $(defines) ;
+SubDirC++Flags -fno-rtti ;
 
 local platform ;
 for platform in [ MultiBootSubDirSetup ] {
diff --git a/src/system/boot/loader/net/Jamfile b/src/system/boot/loader/net/Jamfile
index bb6932e545..a94232fb4e 100644
--- a/src/system/boot/loader/net/Jamfile
+++ b/src/system/boot/loader/net/Jamfile
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src system boot loader net ;
 
 UsePrivateHeaders drivers ;
 
-SubDirC++Flags -D_BOOT_MODE -fno-rtti ;
+SubDirC++Flags -fno-rtti ;
 
 local platform ;
 for platform in [ MultiBootSubDirSetup ] {
diff --git a/src/system/boot/platform/amiga_m68k/Jamfile b/src/system/boot/platform/amiga_m68k/Jamfile
index def1729c43..23df43fa9f 100644
--- a/src/system/boot/platform/amiga_m68k/Jamfile
+++ b/src/system/boot/platform/amiga_m68k/Jamfile
@@ -9,13 +9,7 @@ UsePrivateHeaders [ FDirName graphics common ] ;
 #UsePrivateHeaders [ FDirName graphics vesa ] ;
 UsePrivateHeaders [ FDirName storage ] ;
 
-{
-	local defines = _BOOT_MODE ;
-
-	defines = [ FDefines $(defines) ] ;
-	SubDirCcFlags $(defines) ;
-	SubDirC++Flags $(defines) -fno-rtti ;
-}
+SubDirC++Flags -fno-rtti ;
 
 local platform ;
 for platform in [ MultiBootSubDirSetup amiga_m68k ] {
diff --git a/src/system/boot/platform/atari_m68k/Jamfile b/src/system/boot/platform/atari_m68k/Jamfile
index 16568de1f3..809cf8bf75 100644
--- a/src/system/boot/platform/atari_m68k/Jamfile
+++ b/src/system/boot/platform/atari_m68k/Jamfile
@@ -9,13 +9,7 @@ UsePrivateHeaders [ FDirName graphics common ] ;
 #UsePrivateHeaders [ FDirName graphics vesa ] ;
 UsePrivateHeaders [ FDirName storage ] ;
 
-{
-	local defines = _BOOT_MODE ;
-
-	defines = [ FDefines $(defines) ] ;
-	SubDirCcFlags $(defines) ;
-	SubDirC++Flags $(defines) -fno-rtti ;
-}
+SubDirC++Flags -fno-rtti ;
 
 local platform ;
 for platform in [ MultiBootSubDirSetup atari_m68k ] {
diff --git a/src/system/boot/platform/bios_ia32/Jamfile b/src/system/boot/platform/bios_ia32/Jamfile
index ee59322252..36ee83318e 100644
--- a/src/system/boot/platform/bios_ia32/Jamfile
+++ b/src/system/boot/platform/bios_ia32/Jamfile
@@ -8,7 +8,7 @@ UsePrivateHeaders [ FDirName graphics vesa ] ;
 UsePrivateHeaders [ FDirName storage ] ;
 
 {
-	local defines = _BOOT_MODE _BOOT_PLATFORM_BIOS ;
+	local defines = _BOOT_PLATFORM_BIOS ;
 
 	defines = [ FDefines $(defines) ] ;
 	SubDirCcFlags $(defines) ;
diff --git a/src/system/boot/platform/efi/Jamfile b/src/system/boot/platform/efi/Jamfile
index 6ee2846a93..7600f937d1 100644
--- a/src/system/boot/platform/efi/Jamfile
+++ b/src/system/boot/platform/efi/Jamfile
@@ -12,7 +12,7 @@ if $(TARGET_ARCH) != x86_64 && $(TARGET_ARCH) != x86 {
 SubDirHdrs $(HAIKU_TOP) src add-ons kernel partitioning_systems gpt ;
 
 {
-	local defines = _BOOT_MODE _BOOT_PLATFORM_EFI ;
+	local defines = _BOOT_PLATFORM_EFI ;
 
 	if $(TARGET_ARCH) != x86_64 && $(TARGET_ARCH) != x86 {
 		defines += _BOOT_FDT_SUPPORT ;
diff --git a/src/system/boot/platform/efi/arch/arm/Jamfile b/src/system/boot/platform/efi/arch/arm/Jamfile
index 94ce331346..565e3f06a9 100644
--- a/src/system/boot/platform/efi/arch/arm/Jamfile
+++ b/src/system/boot/platform/efi/arch/arm/Jamfile
@@ -14,7 +14,7 @@ local platform ;
 for platform in [ MultiBootSubDirSetup efi ] {
 	on $(platform) {
 		{
-			local defines = _BOOT_MODE _BOOT_PLATFORM_EFI ;
+			local defines = _BOOT_PLATFORM_EFI ;
 			defines = [ FDefines $(defines) ] ;
 			SubDirCcFlags $(defines) ;
 			SubDirC++Flags $(defines) -fno-rtti ;
diff --git a/src/system/boot/platform/efi/arch/arm64/Jamfile b/src/system/boot/platform/efi/arch/arm64/Jamfile
index 0f1510e94f..569902e9a5 100644
--- a/src/system/boot/platform/efi/arch/arm64/Jamfile
+++ b/src/system/boot/platform/efi/arch/arm64/Jamfile
@@ -12,7 +12,7 @@ local platform ;
 for platform in [ MultiBootSubDirSetup efi ] {
 	on $(platform) {
 		{
-			local defines = _BOOT_MODE _BOOT_PLATFORM_EFI ;
+			local defines = _BOOT_PLATFORM_EFI ;
 			defines = [ FDefines $(defines) ] ;
 			SubDirCcFlags $(defines) ;
 			SubDirC++Flags $(defines) -fno-rtti ;
diff --git a/src/system/boot/platform/efi/arch/x86/Jamfile b/src/system/boot/platform/efi/arch/x86/Jamfile
index a1e7855834..32e5143072 100644
--- a/src/system/boot/platform/efi/arch/x86/Jamfile
+++ b/src/system/boot/platform/efi/arch/x86/Jamfile
@@ -10,7 +10,7 @@ local platform ;
 for platform in [ MultiBootSubDirSetup efi ] {
 	on $(platform) {
 		{
-			local defines = _BOOT_MODE _BOOT_PLATFORM_EFI ;
+			local defines = _BOOT_PLATFORM_EFI ;
 			defines = [ FDefines $(defines) ] ;
 			SubDirCcFlags $(defines) ;
 			SubDirC++Flags $(defines) -fno-rtti ;
diff --git a/src/system/boot/platform/efi/arch/x86_64/Jamfile b/src/system/boot/platform/efi/arch/x86_64/Jamfile
index 4a1ba0bb79..57dbca2481 100644
--- a/src/system/boot/platform/efi/arch/x86_64/Jamfile
+++ b/src/system/boot/platform/efi/arch/x86_64/Jamfile
@@ -9,7 +9,7 @@ local platform ;
 for platform in [ MultiBootSubDirSetup efi ] {
     on $(platform) {
 	{
-		local defines = _BOOT_MODE _BOOT_PLATFORM_EFI ;
+		local defines = _BOOT_PLATFORM_EFI ;
 		defines = [ FDefines $(defines) ] ;
 		SubDirCcFlags $(defines) ;
 		SubDirC++Flags $(defines) -fno-rtti ;
diff --git a/src/system/boot/platform/generic/Jamfile b/src/system/boot/platform/generic/Jamfile
index c84e7a8e63..8100bc4f23 100644
--- a/src/system/boot/platform/generic/Jamfile
+++ b/src/system/boot/platform/generic/Jamfile
@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src system boot platform generic ;
 UseBuildFeatureHeaders zlib ;
 UsePrivateKernelHeaders ;
 
-SubDirC++Flags -D_BOOT_MODE -fno-rtti ;
+SubDirC++Flags -fno-rtti ;
 
 local platform ;
 for platform in [ MultiBootSubDirSetup ] {
diff --git a/src/system/boot/platform/next_m68k/Jamfile b/src/system/boot/platform/next_m68k/Jamfile
index ead6f371db..3f6e2c727e 100644
--- a/src/system/boot/platform/next_m68k/Jamfile
+++ b/src/system/boot/platform/next_m68k/Jamfile
@@ -9,13 +9,7 @@ UsePrivateHeaders [ FDirName graphics common ] ;
 #UsePrivateHeaders [ FDirName graphics vesa ] ;
 UsePrivateHeaders [ FDirName storage ] ;
 
-{
-	local defines = _BOOT_MODE ;
-
-	defines = [ FDefines $(defines) ] ;
-	SubDirCcFlags $(defines) ; # -save-temps
-	SubDirC++Flags $(defines) -fno-rtti ;
-}
+SubDirC++Flags -fno-rtti ;
 
 local platform ;
 for platform in [ MultiBootSubDirSetup next_m68k ] {
diff --git a/src/system/boot/platform/openfirmware/Jamfile b/src/system/boot/platform/openfirmware/Jamfile
index 33d8e1439e..defd12c587 100644
--- a/src/system/boot/platform/openfirmware/Jamfile
+++ b/src/system/boot/platform/openfirmware/Jamfile
@@ -1,11 +1,9 @@
 SubDir HAIKU_TOP src system boot platform openfirmware ;
 
-SubDirC++Flags -D_BOOT_MODE -fno-rtti ;
-
 UsePrivateHeaders [ FDirName graphics common ] ;
 
 {
-	local defines = _BOOT_MODE _BOOT_PLATFORM_OPENFIRMWARE ;
+	local defines = _BOOT_PLATFORM_OPENFIRMWARE ;
 	defines = [ FDefines $(defines) ] ;
 	SubDirCcFlags $(defines) ;
 	SubDirC++Flags $(defines) -fno-rtti ;
diff --git a/src/system/boot/platform/pxe_ia32/Jamfile b/src/system/boot/platform/pxe_ia32/Jamfile
index 5ea910175e..bb6a9b5351 100644
--- a/src/system/boot/platform/pxe_ia32/Jamfile
+++ b/src/system/boot/platform/pxe_ia32/Jamfile
@@ -10,7 +10,7 @@ UsePrivateHeaders [ FDirName graphics vesa ] ;
 UsePrivateHeaders [ FDirName storage ] ;
 
 {
-	local defines = _BOOT_MODE _PXE_ENV _BOOT_PLATFORM_BIOS ;
+	local defines = _PXE_ENV _BOOT_PLATFORM_BIOS ;
 
 	defines = [ FDefines $(defines) ] ;
 	SubDirCcFlags $(defines) ;
diff --git a/src/system/boot/platform/riscv/Jamfile b/src/system/boot/platform/riscv/Jamfile
index f9b179cf42..272b4ab021 100644
--- a/src/system/boot/platform/riscv/Jamfile
+++ b/src/system/boot/platform/riscv/Jamfile
@@ -11,11 +11,7 @@ UsePrivateHeaders [ FDirName virtio ] ;
 UseLibraryHeaders [ FDirName libfdt ] ;
 
 {
-	local defines = _BOOT_MODE ;
-
-	defines = [ FDefines $(defines) ] ;
-	SubDirCcFlags $(defines) ;
-	SubDirC++Flags $(defines) -fno-rtti ;
+	SubDirC++Flags -fno-rtti ;
 	SubDirAsFlags -I $(SUBDIR) ;
 }
 
diff --git a/src/system/boot/platform/u-boot/Jamfile b/src/system/boot/platform/u-boot/Jamfile
index 87577f52b2..08ee666a8b 100644
--- a/src/system/boot/platform/u-boot/Jamfile
+++ b/src/system/boot/platform/u-boot/Jamfile
@@ -16,11 +16,8 @@ UsePrivateHeaders [ FDirName storage ] ;
 UsePrivateHeaders [ FDirName kernel arch generic ] ;
 
 {
-    local defines = _BOOT_MODE ;
-
-    defines = [ FDefines $(defines) ] ;
-    SubDirCcFlags $(defines) -g3 -O0 ;
-    SubDirC++Flags $(defines) -fno-rtti -g3 -O0 ;
+    SubDirCcFlags -g3 -O0 ;
+    SubDirC++Flags -fno-rtti -g3 -O0 ;
 }
 
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons accelerants common ] ;
diff --git a/src/tests/system/boot/loader/Jamfile b/src/tests/system/boot/loader/Jamfile
index 9f27c8c5cf..5b78322b03 100644
--- a/src/tests/system/boot/loader/Jamfile
+++ b/src/tests/system/boot/loader/Jamfile
@@ -51,7 +51,6 @@ ObjectDefines
 
 {
 	local defines =
-		_BOOT_MODE
 		BOOT_ARCH=\\\"$(TARGET_ARCH)\\\"
 			# the boot loader test application will try to load the BeOS kernel
 			# from a supported partition/file system
diff --git a/src/tests/system/boot/loader/file_systems/amiga_ffs/Jamfile b/src/tests/system/boot/loader/file_systems/amiga_ffs/Jamfile
index f4c32bcfe5..8c45bb690f 100644
--- a/src/tests/system/boot/loader/file_systems/amiga_ffs/Jamfile
+++ b/src/tests/system/boot/loader/file_systems/amiga_ffs/Jamfile
@@ -13,7 +13,7 @@ ObjectDefines
 	Directory.cpp
 	File.cpp
 	:
-	read_pos=boot_read_pos fstat=boot_fstat open=boot_open close=boot_close _BOOT_MODE
+	read_pos=boot_read_pos fstat=boot_fstat open=boot_open close=boot_close
 	;
 
 KernelStaticLibrary boottest_amiga_ffs :
diff --git a/src/tests/system/boot/loader/file_systems/bfs/Jamfile b/src/tests/system/boot/loader/file_systems/bfs/Jamfile
index 08f98a9768..b93f6e52d7 100644
--- a/src/tests/system/boot/loader/file_systems/bfs/Jamfile
+++ b/src/tests/system/boot/loader/file_systems/bfs/Jamfile
@@ -17,7 +17,7 @@ ObjectDefines
 	BPlusTree.cpp
 	:
 	read_pos=boot_read_pos fstat=boot_fstat open=boot_open close=boot_close
-	_BOOT_MODE #BFS_BIG_ENDIAN_ONLY
+	#BFS_BIG_ENDIAN_ONLY
 	;
 
 KernelStaticLibrary boottest_bfs.a :
diff --git a/src/tests/system/boot/loader/file_systems/tarfs/Jamfile b/src/tests/system/boot/loader/file_systems/tarfs/Jamfile
index 4388dac3b5..8fabedfe6e 100644
--- a/src/tests/system/boot/loader/file_systems/tarfs/Jamfile
+++ b/src/tests/system/boot/loader/file_systems/tarfs/Jamfile
@@ -11,7 +11,7 @@ SubDirHdrs $(HAIKU_TOP) src system boot loader file_systems tarfs ;
 ObjectDefines
 	tarfs.cpp
 	:
-	read_pos=boot_read_pos fstat=boot_fstat open=boot_open close=boot_close _BOOT_MODE
+	read_pos=boot_read_pos fstat=boot_fstat open=boot_open close=boot_close
 	;
 
 #SubDirCcFlags -DGUNZIP=1 ;