diff --git a/src/device/oprom/yabel/biosemu.c b/src/device/oprom/yabel/biosemu.c
index 1c94d92230..d0586c2783 100644
--- a/src/device/oprom/yabel/biosemu.c
+++ b/src/device/oprom/yabel/biosemu.c
@@ -53,6 +53,7 @@
 #include "compat/rtas.h"
 
 #if CONFIG(X86EMU_DEBUG_TIMINGS)
+#include <timer.h>
 struct mono_time zero;
 #endif
 
diff --git a/src/include/thread.h b/src/include/thread.h
index e8041c7a99..e6af2efd55 100644
--- a/src/include/thread.h
+++ b/src/include/thread.h
@@ -18,7 +18,6 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <bootstate.h>
-#include <timer.h>
 #include <arch/cpu.h>
 
 #if CONFIG(COOP_MULTITASKING) && !defined(__SMM__) && !defined(__PRE_RAM__)
diff --git a/src/soc/qualcomm/qcs405/clock.c b/src/soc/qualcomm/qcs405/clock.c
index 31fdc3ddc8..cd7c1f2f41 100644
--- a/src/soc/qualcomm/qcs405/clock.c
+++ b/src/soc/qualcomm/qcs405/clock.c
@@ -16,7 +16,6 @@
 #include <types.h>
 #include <console/console.h>
 #include <delay.h>
-#include <timer.h>
 #include <timestamp.h>
 #include <commonlib/helpers.h>
 #include <string.h>
diff --git a/src/soc/qualcomm/qcs405/gpio.c b/src/soc/qualcomm/qcs405/gpio.c
index db8b7a1c3f..5904cb3dc5 100644
--- a/src/soc/qualcomm/qcs405/gpio.c
+++ b/src/soc/qualcomm/qcs405/gpio.c
@@ -17,7 +17,6 @@
 #include <types.h>
 #include <console/console.h>
 #include <delay.h>
-#include <timer.h>
 #include <timestamp.h>
 
 #include <gpio.h>
diff --git a/src/soc/qualcomm/qcs405/usb.c b/src/soc/qualcomm/qcs405/usb.c
index b727248952..49eac72da5 100644
--- a/src/soc/qualcomm/qcs405/usb.c
+++ b/src/soc/qualcomm/qcs405/usb.c
@@ -20,7 +20,6 @@
 #include <delay.h>
 #include <soc/usb.h>
 #include <soc/clock.h>
-#include <timer.h>
 
 /* USB BASE ADDRESS */
 #define USB_HOST0_DWC3_BASE		0x758C100