diff --git a/src/arch/arm64/include/arch/spintable.h b/src/arch/arm64/include/arch/spintable.h
index b583ddbeea..8d8d662d89 100644
--- a/src/arch/arm64/include/arch/spintable.h
+++ b/src/arch/arm64/include/arch/spintable.h
@@ -30,16 +30,12 @@ struct spintable_attributes {
 /* Initialize spintable with provided monitor address. */
 void spintable_init(void *monitor_address);
 
-/* Start spinning on the non-boot CPUS. */
-void spintable_start(void);
-
 /* Return NULL on failure, otherwise the spintable info. */
 const struct spintable_attributes *spintable_get_attributes(void);
 
 #else /* IS_ENABLED(CONFIG_SPINTABLE) */
 
 static inline void spintable_init(void *monitor_address) {}
-static inline void spintable_start(void) {}
 static inline const struct spintable_attributes *spintable_get_attributes(void)
 {
 	return NULL;
@@ -47,4 +43,7 @@ static inline const struct spintable_attributes *spintable_get_attributes(void)
 
 #endif /* IS_ENABLED(CONFIG_SPINTABLE) */
 
+/* Start spinning on the non-boot CPUs. */
+void spintable_start(void);
+
 #endif /* __ARCH_SPINTABLE_H__ */
diff --git a/src/arch/arm64/include/armv8/arch/secmon.h b/src/arch/arm64/include/armv8/arch/secmon.h
index 3d368a70e5..98b998a08f 100644
--- a/src/arch/arm64/include/armv8/arch/secmon.h
+++ b/src/arch/arm64/include/armv8/arch/secmon.h
@@ -22,8 +22,6 @@
 
 #include <arch/cpu.h>
 
-#if IS_ENABLED(CONFIG_ARCH_USE_SECURE_MONITOR)
-
 struct secmon_params {
 	size_t online_cpus;
 	struct cpu_action bsp;
@@ -33,10 +31,4 @@ struct secmon_params {
 void secmon_run(void (*entry)(void *), void *arg);
 void soc_get_secmon_base_size(uint64_t *secmon_base, size_t *secmon_size);
 
-#else
-
-static inline void secmon_run(void (*entry)(void *), void *arg) {}
-
-#endif /* IS_ENABLED(CONFIG_ARCH_USE_SECURE_MONITOR) */
-
 #endif /*__ARCH_ARM64_ARMV8_SECMON__ */