diff --git a/src/drivers/intel/fsp2_0/temp_ram_exit.c b/src/drivers/intel/fsp2_0/temp_ram_exit.c
index ceb30fd636..5532c43c02 100644
--- a/src/drivers/intel/fsp2_0/temp_ram_exit.c
+++ b/src/drivers/intel/fsp2_0/temp_ram_exit.c
@@ -15,7 +15,6 @@
 #include <fsp/util.h>
 #include <memrange.h>
 #include <string.h>
-#include <timestamp.h>
 #include <cbfs.h>
 
 void fsp_temp_ram_exit(void)
diff --git a/src/lib/fit.c b/src/lib/fit.c
index 090d34afd7..9184d6344e 100644
--- a/src/lib/fit.c
+++ b/src/lib/fit.c
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <cbfs.h>
 #include <program_loading.h>
-#include <timestamp.h>
 #include <memrange.h>
 #include <fit.h>
 #include <boardid.h>
diff --git a/src/lib/lzma.c b/src/lib/lzma.c
index dbc464cc80..eecbb267d2 100644
--- a/src/lib/lzma.c
+++ b/src/lib/lzma.c
@@ -13,7 +13,6 @@
 #include <console/console.h>
 #include <string.h>
 #include <lib.h>
-#include <timestamp.h>
 
 #include "lzmadecode.h"
 
diff --git a/src/mainboard/google/butterfly/romstage.c b/src/mainboard/google/butterfly/romstage.c
index f5383a770d..9f98c8bb7e 100644
--- a/src/mainboard/google/butterfly/romstage.c
+++ b/src/mainboard/google/butterfly/romstage.c
@@ -16,7 +16,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <timestamp.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/google/cheza/bootblock.c b/src/mainboard/google/cheza/bootblock.c
index c72856dee6..ad858429c7 100644
--- a/src/mainboard/google/cheza/bootblock.c
+++ b/src/mainboard/google/cheza/bootblock.c
@@ -14,7 +14,6 @@
  */
 
 #include <bootblock_common.h>
-#include <timestamp.h>
 #include "board.h"
 
 void bootblock_mainboard_init(void)
diff --git a/src/mainboard/google/cheza/mainboard.c b/src/mainboard/google/cheza/mainboard.c
index fdec3fb50e..cb4f5d061a 100644
--- a/src/mainboard/google/cheza/mainboard.c
+++ b/src/mainboard/google/cheza/mainboard.c
@@ -16,7 +16,6 @@
 #include <device/device.h>
 #include <bootblock_common.h>
 #include <gpio.h>
-#include <timestamp.h>
 
 static void setup_usb(void)
 {
diff --git a/src/mainboard/google/link/romstage.c b/src/mainboard/google/link/romstage.c
index 31051ef720..46e2d608b6 100644
--- a/src/mainboard/google/link/romstage.c
+++ b/src/mainboard/google/link/romstage.c
@@ -16,7 +16,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <timestamp.h>
 #include <device/pci_ops.h>
 #include <device/pci.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/google/parrot/romstage.c b/src/mainboard/google/parrot/romstage.c
index c9b4e9158c..ce902bef41 100644
--- a/src/mainboard/google/parrot/romstage.c
+++ b/src/mainboard/google/parrot/romstage.c
@@ -16,7 +16,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <timestamp.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/google/stout/romstage.c b/src/mainboard/google/stout/romstage.c
index f6f36118e8..f60f8228b1 100644
--- a/src/mainboard/google/stout/romstage.c
+++ b/src/mainboard/google/stout/romstage.c
@@ -16,7 +16,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <timestamp.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/intel/bayleybay_fsp/romstage.c b/src/mainboard/intel/bayleybay_fsp/romstage.c
index 7c906ce368..c34d82fde1 100644
--- a/src/mainboard/intel/bayleybay_fsp/romstage.c
+++ b/src/mainboard/intel/bayleybay_fsp/romstage.c
@@ -18,7 +18,6 @@
 #include <arch/cbfs.h>
 #include <cpu/x86/mtrr.h>
 #include <romstage_handoff.h>
-#include <timestamp.h>
 #include <soc/gpio.h>
 #include <soc/iomap.h>
 #include <soc/lpc.h>
diff --git a/src/mainboard/intel/emeraldlake2/romstage.c b/src/mainboard/intel/emeraldlake2/romstage.c
index d5ba961bdb..a9b80e8285 100644
--- a/src/mainboard/intel/emeraldlake2/romstage.c
+++ b/src/mainboard/intel/emeraldlake2/romstage.c
@@ -16,7 +16,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <timestamp.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/kontron/ktqm77/romstage.c b/src/mainboard/kontron/ktqm77/romstage.c
index 8c53420899..6539cde812 100644
--- a/src/mainboard/kontron/ktqm77/romstage.c
+++ b/src/mainboard/kontron/ktqm77/romstage.c
@@ -28,8 +28,6 @@
 #include <southbridge/intel/bd82x6x/pch.h>
 #include <southbridge/intel/common/gpio.h>
 #include <superio/winbond/common/winbond.h>
-#include <timestamp.h>
-
 
 void pch_enable_lpc(void)
 {
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/romstage.c b/src/mainboard/lenovo/x1_carbon_gen1/romstage.c
index e3d2000d1e..c65060f9f9 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/romstage.c
+++ b/src/mainboard/lenovo/x1_carbon_gen1/romstage.c
@@ -18,7 +18,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <timestamp.h>
 #include <arch/byteorder.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/lenovo/x220/romstage.c b/src/mainboard/lenovo/x220/romstage.c
index d50c7cd608..38ede4bfff 100644
--- a/src/mainboard/lenovo/x220/romstage.c
+++ b/src/mainboard/lenovo/x220/romstage.c
@@ -17,7 +17,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <timestamp.h>
 #include <arch/byteorder.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/lenovo/x230/romstage.c b/src/mainboard/lenovo/x230/romstage.c
index b85e72078d..614ad5e807 100644
--- a/src/mainboard/lenovo/x230/romstage.c
+++ b/src/mainboard/lenovo/x230/romstage.c
@@ -17,7 +17,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <timestamp.h>
 #include <arch/byteorder.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/samsung/lumpy/romstage.c b/src/mainboard/samsung/lumpy/romstage.c
index d39d59c735..1bb0b797d7 100644
--- a/src/mainboard/samsung/lumpy/romstage.c
+++ b/src/mainboard/samsung/lumpy/romstage.c
@@ -16,7 +16,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <timestamp.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/samsung/stumpy/romstage.c b/src/mainboard/samsung/stumpy/romstage.c
index 1c4e3d8f2f..8370cfe0a8 100644
--- a/src/mainboard/samsung/stumpy/romstage.c
+++ b/src/mainboard/samsung/stumpy/romstage.c
@@ -16,7 +16,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <timestamp.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/siemens/mc_tcu3/romstage.c b/src/mainboard/siemens/mc_tcu3/romstage.c
index d0e5e8283d..3c36833900 100644
--- a/src/mainboard/siemens/mc_tcu3/romstage.c
+++ b/src/mainboard/siemens/mc_tcu3/romstage.c
@@ -19,7 +19,6 @@
 #include <console/console.h>
 #include <cpu/x86/mtrr.h>
 #include <romstage_handoff.h>
-#include <timestamp.h>
 #include <soc/gpio.h>
 #include <soc/iomap.h>
 #include <soc/lpc.h>
diff --git a/src/security/vboot/vboot_handoff.c b/src/security/vboot/vboot_handoff.c
index 684b4956ca..5ed50110a6 100644
--- a/src/security/vboot/vboot_handoff.c
+++ b/src/security/vboot/vboot_handoff.c
@@ -31,7 +31,6 @@
 #include <console/vtxprintf.h>
 #include <fmap.h>
 #include <stdlib.h>
-#include <timestamp.h>
 #include <vboot_struct.h>
 #include <security/vboot/vbnv.h>
 #include <security/vboot/misc.h>
diff --git a/src/soc/imgtec/pistachio/monotonic_timer.c b/src/soc/imgtec/pistachio/monotonic_timer.c
index f351ea1e30..6e40a39148 100644
--- a/src/soc/imgtec/pistachio/monotonic_timer.c
+++ b/src/soc/imgtec/pistachio/monotonic_timer.c
@@ -18,7 +18,6 @@
 #include <soc/cpu.h>
 #include <stdint.h>
 #include <timer.h>
-#include <timestamp.h>
 
 #define PISTACHIO_CLOCK_SWITCH		0xB8144200
 #define MIPS_EXTERN_PLL_BYPASS_MASK	0x00000002
diff --git a/src/soc/intel/skylake/romstage/romstage.c b/src/soc/intel/skylake/romstage/romstage.c
index cf4bffccd6..e147f0c0aa 100644
--- a/src/soc/intel/skylake/romstage/romstage.c
+++ b/src/soc/intel/skylake/romstage/romstage.c
@@ -37,7 +37,6 @@
 #include <stage_cache.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <timestamp.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 
 /* SOC initialization before RAM is enabled */
diff --git a/src/soc/nvidia/tegra210/bootblock.c b/src/soc/nvidia/tegra210/bootblock.c
index c10920db04..97ea1c9b08 100644
--- a/src/soc/nvidia/tegra210/bootblock.c
+++ b/src/soc/nvidia/tegra210/bootblock.c
@@ -26,7 +26,6 @@
 #include <soc/nvidia/tegra/apbmisc.h>
 #include <soc/pmc.h>
 #include <soc/power.h>
-#include <timestamp.h>
 
 #define BCT_OFFSET_IN_BIT	0x4c
 #define ODMDATA_OFFSET_IN_BCT	0x508
diff --git a/src/soc/nvidia/tegra210/romstage.c b/src/soc/nvidia/tegra210/romstage.c
index bce8404707..213d69d6ba 100644
--- a/src/soc/nvidia/tegra210/romstage.c
+++ b/src/soc/nvidia/tegra210/romstage.c
@@ -29,7 +29,6 @@
 #include <soc/nvidia/tegra/apbmisc.h>
 #include <symbols.h>
 #include <timer.h>
-#include <timestamp.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 
 void __weak romstage_mainboard_init(void)
diff --git a/src/soc/qualcomm/ipq40xx/blobs_init.c b/src/soc/qualcomm/ipq40xx/blobs_init.c
index d9cb131c8d..761b5714ed 100644
--- a/src/soc/qualcomm/ipq40xx/blobs_init.c
+++ b/src/soc/qualcomm/ipq40xx/blobs_init.c
@@ -20,7 +20,6 @@
 #include <console/console.h>
 #include <string.h>
 #include <timer.h>
-#include <timestamp.h>
 #include <program_loading.h>
 
 #include <soc/iomap.h>
diff --git a/src/soc/qualcomm/sdm845/clock.c b/src/soc/qualcomm/sdm845/clock.c
index c4e5efa64f..bdbcfb827e 100644
--- a/src/soc/qualcomm/sdm845/clock.c
+++ b/src/soc/qualcomm/sdm845/clock.c
@@ -18,7 +18,6 @@
 #include <console/console.h>
 #include <delay.h>
 #include <timer.h>
-#include <timestamp.h>
 #include <commonlib/helpers.h>
 #include <assert.h>
 
diff --git a/src/soc/qualcomm/sdm845/gpio.c b/src/soc/qualcomm/sdm845/gpio.c
index 9c3782a09e..a2a6fb9959 100644
--- a/src/soc/qualcomm/sdm845/gpio.c
+++ b/src/soc/qualcomm/sdm845/gpio.c
@@ -17,7 +17,6 @@
 #include <types.h>
 #include <delay.h>
 #include <timer.h>
-#include <timestamp.h>
 
 #include <gpio.h>
 
diff --git a/src/soc/qualcomm/sdm845/soc.c b/src/soc/qualcomm/sdm845/soc.c
index e4eac96276..bc7235f3ed 100644
--- a/src/soc/qualcomm/sdm845/soc.c
+++ b/src/soc/qualcomm/sdm845/soc.c
@@ -15,7 +15,6 @@
 
 #include <symbols.h>
 #include <device/device.h>
-#include <timestamp.h>
 #include <soc/mmu.h>
 #include <soc/symbols.h>
 
diff --git a/src/soc/rockchip/rk3288/bootblock.c b/src/soc/rockchip/rk3288/bootblock.c
index 941d8a7650..8988804931 100644
--- a/src/soc/rockchip/rk3288/bootblock.c
+++ b/src/soc/rockchip/rk3288/bootblock.c
@@ -20,7 +20,6 @@
 #include <soc/grf.h>
 #include <soc/timer.h>
 #include <symbols.h>
-#include <timestamp.h>
 
 void bootblock_soc_init(void)
 {