diff --git a/headers/private/kernel/arch/x86/arch_kernel_args.h b/headers/private/kernel/arch/x86/arch_kernel_args.h
index 7e6c967582..a0dbae7bdb 100644
--- a/headers/private/kernel/arch/x86/arch_kernel_args.h
+++ b/headers/private/kernel/arch/x86/arch_kernel_args.h
@@ -40,8 +40,8 @@ typedef struct {
 	uint32	apic_phys;
 	FixedWidthPointer<void> apic;
 	uint32	ioapic_phys;
-	uint32	cpu_apic_id[MAX_BOOT_CPUS];
-	uint32	cpu_apic_version[MAX_BOOT_CPUS];
+	uint32	cpu_apic_id[SMP_MAX_CPUS];
+	uint32	cpu_apic_version[SMP_MAX_CPUS];
 	// hpet stuff
 	uint32	hpet_phys;
 	FixedWidthPointer<void> hpet;
diff --git a/headers/private/kernel/boot/kernel_args.h b/headers/private/kernel/boot/kernel_args.h
index 95542b1cd3..1ebd5c1ef4 100644
--- a/headers/private/kernel/boot/kernel_args.h
+++ b/headers/private/kernel/boot/kernel_args.h
@@ -59,7 +59,7 @@ typedef struct kernel_args {
 	uint64		ignored_physical_memory;
 
 	uint32		num_cpus;
-	addr_range	cpu_kstack[MAX_BOOT_CPUS];
+	addr_range	cpu_kstack[SMP_MAX_CPUS];
 
 	// boot volume KMessage data
 	FixedWidthPointer<void> boot_volume;
diff --git a/headers/private/kernel/boot/platform/bios_ia32/platform_kernel_args.h b/headers/private/kernel/boot/platform/bios_ia32/platform_kernel_args.h
index a191a0db14..6772222f01 100644
--- a/headers/private/kernel/boot/platform/bios_ia32/platform_kernel_args.h
+++ b/headers/private/kernel/boot/platform/bios_ia32/platform_kernel_args.h
@@ -15,8 +15,8 @@
 #include <util/FixedWidthPointer.h>
 
 
-// must match SMP_MAX_CPUS in arch_smp.h
-#define MAX_BOOT_CPUS 8
+#define SMP_MAX_CPUS 8
+
 #define MAX_PHYSICAL_MEMORY_RANGE 32
 #define MAX_PHYSICAL_ALLOCATED_RANGE 32
 #define MAX_VIRTUAL_ALLOCATED_RANGE 32
diff --git a/headers/private/kernel/smp.h b/headers/private/kernel/smp.h
index 1f4b0f4298..88a89e4064 100644
--- a/headers/private/kernel/smp.h
+++ b/headers/private/kernel/smp.h
@@ -17,9 +17,6 @@
 #include <string.h>
 
 
-#define SMP_MAX_CPUS MAX_BOOT_CPUS
-
-
 struct kernel_args;
 
 
diff --git a/src/system/boot/platform/bios_ia32/smp.cpp b/src/system/boot/platform/bios_ia32/smp.cpp
index a0ed686415..9a2e77ea01 100644
--- a/src/system/boot/platform/bios_ia32/smp.cpp
+++ b/src/system/boot/platform/bios_ia32/smp.cpp
@@ -158,9 +158,9 @@ smp_do_mp_config(mp_floating_struct *floatingStruct)
 					= (struct mp_base_processor *)pointer;
 				pointer += sizeof(struct mp_base_processor);
 
-				if (gKernelArgs.num_cpus == MAX_BOOT_CPUS) {
-					TRACE(("smp: already reached maximum boot CPUs (%d)\n",
-						MAX_BOOT_CPUS));
+				if (gKernelArgs.num_cpus == SMP_MAX_CPUS) {
+					TRACE(("smp: already reached maximum CPUs (%d)\n",
+						SMP_MAX_CPUS));
 					continue;
 				}
 
@@ -277,9 +277,9 @@ smp_do_acpi_config(void)
 		switch (apic->type) {
 			case ACPI_MADT_LOCAL_APIC:
 			{
-				if (gKernelArgs.num_cpus == MAX_BOOT_CPUS) {
-					TRACE(("smp: already reached maximum boot CPUs (%d)\n",
-						MAX_BOOT_CPUS));
+				if (gKernelArgs.num_cpus == SMP_MAX_CPUS) {
+					TRACE(("smp: already reached maximum CPUs (%d)\n",
+						SMP_MAX_CPUS));
 					break;
 				}
 
diff --git a/src/system/kernel/cpu.cpp b/src/system/kernel/cpu.cpp
index 2fdf6fd1da..3a3df3a043 100644
--- a/src/system/kernel/cpu.cpp
+++ b/src/system/kernel/cpu.cpp
@@ -25,7 +25,7 @@
 
 
 /* global per-cpu structure */
-cpu_ent gCPU[MAX_BOOT_CPUS];
+cpu_ent gCPU[SMP_MAX_CPUS];
 
 uint32 gCPUCacheLevelCount;
 static cpu_topology_node sCPUTopology;
diff --git a/src/system/kernel/smp.cpp b/src/system/kernel/smp.cpp
index 63d280569d..9e987a5212 100644
--- a/src/system/kernel/smp.cpp
+++ b/src/system/kernel/smp.cpp
@@ -188,9 +188,9 @@ dump_spinlock(int argc, char** argv)
 static struct {
 	spinlock	*lock;
 	bigtime_t	timestamp;
-} sLatency[B_MAX_CPU_COUNT][NUM_LATENCY_LOCKS];
+} sLatency[SMP_MAX_CPUS][NUM_LATENCY_LOCKS];
 
-static int32 sLatencyIndex[B_MAX_CPU_COUNT];
+static int32 sLatencyIndex[SMP_MAX_CPUS];
 static bool sEnableLatencyCheck;