diff --git a/sys/sys/lock.h b/sys/sys/lock.h
index e82ff7db4825..9dd4e642f320 100644
--- a/sys/sys/lock.h
+++ b/sys/sys/lock.h
@@ -162,16 +162,6 @@ struct lock_class {
 
 #define	lock_initialized(lo)	((lo)->lo_flags & LO_INITIALIZED)
 
-/*
- * Helpful macros for quickly coming up with assertions with informative
- * panic messages.
- */
-#define MPASS(ex)		MPASS4(ex, #ex, __FILE__, __LINE__)
-#define MPASS2(ex, what)	MPASS4(ex, what, __FILE__, __LINE__)
-#define MPASS3(ex, file, line)	MPASS4(ex, #ex, file, line)
-#define MPASS4(ex, what, file, line)					\
-	KASSERT((ex), ("Assertion %s failed at %s:%d", what, file, line))
-
 extern struct lock_class lock_class_mtx_sleep;
 extern struct lock_class lock_class_mtx_spin;
 extern struct lock_class lock_class_sx;
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index a8322845d759..cadd3994dd9d 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -141,6 +141,16 @@ void	kassert_panic(const char *fmt, ...)  __printflike(1, 2);
 #include <sys/kpilite.h>
 #endif
 
+/*
+ * Helpful macros for quickly coming up with assertions with informative
+ * panic messages.
+ */
+#define MPASS(ex)		MPASS4(ex, #ex, __FILE__, __LINE__)
+#define MPASS2(ex, what)	MPASS4(ex, what, __FILE__, __LINE__)
+#define MPASS3(ex, file, line)	MPASS4(ex, #ex, file, line)
+#define MPASS4(ex, what, file, line)					\
+	KASSERT((ex), ("Assertion %s failed at %s:%d", what, file, line))
+
 /*
  * Assert that a pointer can be loaded from memory atomically.
  *