diff --git a/src/lib/cbmem.c b/src/lib/cbmem.c
index 8d69435..8a39647 100644
--- a/src/lib/cbmem.c
+++ b/src/lib/cbmem.c
@@ -23,7 +23,7 @@
 #include <cbmem.h>
 #include <boot/coreboot_tables.h>
 #include <console/console.h>
-#include <cpu/x86/car.h>
+#include <arch/early_variables.h>
 #if CONFIG_HAVE_ACPI_RESUME && !defined(__PRE_RAM__)
 #include <arch/acpi.h>
 #endif
diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c
index 881865c..dd88300 100644
--- a/src/lib/cbmem_console.c
+++ b/src/lib/cbmem_console.c
@@ -19,7 +19,7 @@
 
 #include <console/console.h>
 #include <cbmem.h>
-#include <cpu/x86/car.h>
+#include <arch/early_variables.h>
 #include <string.h>
 
 /*
diff --git a/src/lib/dynamic_cbmem.c b/src/lib/dynamic_cbmem.c
index ba7760d..e21f96e 100644
--- a/src/lib/dynamic_cbmem.c
+++ b/src/lib/dynamic_cbmem.c
@@ -23,7 +23,7 @@
 #include <cbmem.h>
 #include <string.h>
 #include <stdlib.h>
-#include <cpu/x86/car.h>
+#include <arch/early_variables.h>
 #if CONFIG_HAVE_ACPI_RESUME && !defined(__PRE_RAM__)
 #include <arch/acpi.h>
 #endif
diff --git a/src/lib/timestamp.c b/src/lib/timestamp.c
index a9c354e..8942649 100644
--- a/src/lib/timestamp.c
+++ b/src/lib/timestamp.c
@@ -22,7 +22,7 @@
 #include <console/console.h>
 #include <cbmem.h>
 #include <timestamp.h>
-#include <cpu/x86/car.h>
+#include <arch/early_variables.h>
 #include <cpu/x86/lapic.h>
 
 #define MAX_TIMESTAMPS 30
diff --git a/src/lib/usbdebug.c b/src/lib/usbdebug.c
index 39cd138..3faec10 100644
--- a/src/lib/usbdebug.c
+++ b/src/lib/usbdebug.c
@@ -24,7 +24,7 @@
 #include <device/pci.h>
 #include <device/pci_def.h>
 #include <arch/byteorder.h>
-#include <cpu/x86/car.h>
+#include <arch/early_variables.h>
 #include <string.h>
 #include <cbmem.h>