diff --git a/arch/arm/include/arch/arch_ops.h b/arch/arm/include/arch/arch_ops.h
index 4a2c7f8b..8095bda2 100644
--- a/arch/arm/include/arch/arch_ops.h
+++ b/arch/arm/include/arch/arch_ops.h
@@ -9,6 +9,8 @@
 
 #ifndef ASSEMBLY
 
+#include <arch/ops.h>
+
 #include <stdbool.h>
 #include <lk/compiler.h>
 #include <lk/reg.h>
diff --git a/arch/arm64/include/arch/arch_ops.h b/arch/arm64/include/arch/arch_ops.h
index d0726126..e69482b3 100644
--- a/arch/arm64/include/arch/arch_ops.h
+++ b/arch/arm64/include/arch/arch_ops.h
@@ -9,11 +9,13 @@
 
 #ifndef ASSEMBLY
 
+#include <arch/ops.h>
 #include <stdbool.h>
 #include <lk/compiler.h>
 #include <lk/reg.h>
 #include <arch/arm64.h>
 
+
 __BEGIN_CDECLS
 
 #define ENABLE_CYCLE_COUNTER 1
diff --git a/arch/include/arch/ops.h b/arch/include/arch/ops.h
index 71a78837..c4384cee 100644
--- a/arch/include/arch/ops.h
+++ b/arch/include/arch/ops.h
@@ -16,15 +16,13 @@
 
 __BEGIN_CDECLS
 
-/* fast routines that most arches will implement inline */
-static void arch_enable_ints(void);
-static void arch_disable_ints(void);
-static bool arch_ints_disabled(void);
-static bool arch_in_int_handler(void);
-
-static ulong arch_cycle_count(void);
-
-static uint arch_curr_cpu_num(void);
+/* Fast routines that all arches must implement inline in arch_ops.h. */
+static inline void arch_enable_ints(void);
+static inline void arch_disable_ints(void);
+static inline bool arch_ints_disabled(void);
+static inline bool arch_in_int_handler(void);
+static inline ulong arch_cycle_count(void);
+static inline uint arch_curr_cpu_num(void);
 
 /* Use to align structures on cache lines to avoid cpu aliasing. */
 #define __CPU_ALIGN __ALIGNED(CACHE_LINE)
@@ -48,5 +46,6 @@ __END_CDECLS
 #define ARCH_CACHE_FLAG_DCACHE 2
 #define ARCH_CACHE_FLAG_UCACHE (ARCH_CACHE_FLAG_ICACHE|ARCH_CACHE_FLAG_DCACHE)
 
+/* include the arch specific implementations */
 #include <arch/arch_ops.h>
 
diff --git a/arch/m68k/include/arch/arch_ops.h b/arch/m68k/include/arch/arch_ops.h
index f486afa6..5e21f062 100644
--- a/arch/m68k/include/arch/arch_ops.h
+++ b/arch/m68k/include/arch/arch_ops.h
@@ -7,6 +7,7 @@
  */
 #pragma once
 
+#include <arch/ops.h>
 #include <lk/compiler.h>
 #include <lk/debug.h>
 
diff --git a/arch/microblaze/include/arch/arch_ops.h b/arch/microblaze/include/arch/arch_ops.h
index ab22f5de..2b80370d 100644
--- a/arch/microblaze/include/arch/arch_ops.h
+++ b/arch/microblaze/include/arch/arch_ops.h
@@ -7,6 +7,8 @@
  */
 #pragma once
 
+#include <arch/ops.h>
+
 #include <lk/compiler.h>
 
 #define USE_MSRSET 1
diff --git a/arch/mips/include/arch/arch_ops.h b/arch/mips/include/arch/arch_ops.h
index 2e3fcb4e..107c4766 100644
--- a/arch/mips/include/arch/arch_ops.h
+++ b/arch/mips/include/arch/arch_ops.h
@@ -7,6 +7,7 @@
  */
 #pragma once
 
+#include <arch/ops.h>
 #include <lk/compiler.h>
 #include <arch/mips.h>
 
diff --git a/arch/or1k/include/arch/arch_ops.h b/arch/or1k/include/arch/arch_ops.h
index ff8f785f..c12575be 100644
--- a/arch/or1k/include/arch/arch_ops.h
+++ b/arch/or1k/include/arch/arch_ops.h
@@ -7,6 +7,7 @@
  */
 #pragma once
 
+#include <arch/ops.h>
 #include <lk/compiler.h>
 #include <arch/or1k.h>
 
diff --git a/arch/riscv/include/arch/arch_ops.h b/arch/riscv/include/arch/arch_ops.h
index 6ff15f89..7c94f6a2 100644
--- a/arch/riscv/include/arch/arch_ops.h
+++ b/arch/riscv/include/arch/arch_ops.h
@@ -7,6 +7,7 @@
  */
 #pragma once
 
+#include <arch/ops.h>
 #include <lk/compiler.h>
 #include <lk/debug.h>
 #include <arch/riscv.h>
diff --git a/arch/x86/include/arch/arch_ops.h b/arch/x86/include/arch/arch_ops.h
index 6b539c00..697d135a 100644
--- a/arch/x86/include/arch/arch_ops.h
+++ b/arch/x86/include/arch/arch_ops.h
@@ -8,10 +8,10 @@
  */
 #pragma once
 
-#include <lk/compiler.h>
-
 #ifndef ASSEMBLY
 
+#include <arch/ops.h>
+#include <lk/compiler.h>
 #include <arch/x86.h>
 
 /* override of some routines */