diff --git a/src/arch/x86/gdt.c b/src/arch/x86/gdt.c
index c9aec6d111..d3ad01e1df 100644
--- a/src/arch/x86/gdt.c
+++ b/src/arch/x86/gdt.c
@@ -46,7 +46,7 @@ static void move_gdt(int is_recovery)
 	newgdt = cbmem_find(CBMEM_ID_GDT);
 	num_gdt_bytes = (uintptr_t)&gdt_end - (uintptr_t)&gdt;
 	if (!newgdt) {
-		newgdt = cbmem_add(CBMEM_ID_GDT, ALIGN(num_gdt_bytes, 512));
+		newgdt = cbmem_add(CBMEM_ID_GDT, ALIGN_UP(num_gdt_bytes, 512));
 		if (!newgdt) {
 			printk(BIOS_ERR, "Error: Could not relocate GDT.\n");
 			return;
diff --git a/src/arch/x86/include/arch/early_variables.h b/src/arch/x86/include/arch/early_variables.h
index 9ea1537d81..b3042c34d2 100644
--- a/src/arch/x86/include/arch/early_variables.h
+++ b/src/arch/x86/include/arch/early_variables.h
@@ -69,7 +69,7 @@ int car_active(void);
 static inline size_t car_data_size(void)
 {
 	size_t car_size = _car_relocatable_data_size;
-	return ALIGN(car_size, 64);
+	return ALIGN_UP(car_size, 64);
 }
 
 static inline size_t car_object_offset(void *ptr)
diff --git a/src/arch/x86/pirq_routing.c b/src/arch/x86/pirq_routing.c
index 194efb4ad2..70df201c99 100644
--- a/src/arch/x86/pirq_routing.c
+++ b/src/arch/x86/pirq_routing.c
@@ -191,7 +191,7 @@ unsigned long copy_pirq_routing_table(unsigned long addr,
 	const struct irq_routing_table *routing_table)
 {
 	/* Align the table to be 16 byte aligned. */
-	addr = ALIGN(addr, 16);
+	addr = ALIGN_UP(addr, 16);
 
 	/* This table must be between 0xf0000 & 0x100000 */
 	printk(BIOS_INFO, "Copying Interrupt Routing Table to 0x%08lx... ",