diff --git a/sys/arch/amiga/amiga/locore.s b/sys/arch/amiga/amiga/locore.s
index 34e6a339ccb6..acd0dab8a1a7 100644
--- a/sys/arch/amiga/amiga/locore.s
+++ b/sys/arch/amiga/amiga/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.169 2024/01/17 12:19:05 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.170 2024/01/17 12:33:49 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -1047,14 +1047,6 @@ Lnoflush:
 	addql	#8,%sp			| pop SSP and stack adjust count
   	rte
 
-/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
 /*
  * Primitives
  */
diff --git a/sys/arch/atari/atari/locore.s b/sys/arch/atari/atari/locore.s
index bb95d128f148..4ece117e22e2 100644
--- a/sys/arch/atari/atari/locore.s
+++ b/sys/arch/atari/atari/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.125 2024/01/17 12:19:05 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.126 2024/01/17 12:33:49 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -1036,14 +1036,6 @@ Lnoflush:
 	addql	#8,%sp			|  pop SSP and stack adjust count
 	rte
 
-/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
 /*
  * Primitives
  */
diff --git a/sys/arch/cesfic/cesfic/locore.s b/sys/arch/cesfic/cesfic/locore.s
index 97712c5a8714..6e72f6174941 100644
--- a/sys/arch/cesfic/cesfic/locore.s
+++ b/sys/arch/cesfic/cesfic/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.45 2024/01/17 12:19:06 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.46 2024/01/17 12:33:49 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1980, 1990, 1993
@@ -719,14 +719,6 @@ Lnosir:
 Ldorte:
 	rte				| real return
 
-/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
 /*
  * Primitives
  */ 
diff --git a/sys/arch/hp300/hp300/locore.s b/sys/arch/hp300/hp300/locore.s
index 353c369a3db4..2502f3b855d2 100644
--- a/sys/arch/hp300/hp300/locore.s
+++ b/sys/arch/hp300/hp300/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.183 2024/01/17 12:19:06 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.184 2024/01/17 12:33:49 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1980, 1990, 1993
@@ -941,14 +941,6 @@ Laststkadj:
 	movl	%sp@,%sp		| and our SP
 	rte				| and do real RTE
 
-/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
 /*
  * Primitives
  */
diff --git a/sys/arch/luna68k/luna68k/locore.s b/sys/arch/luna68k/luna68k/locore.s
index b99dfd62efc8..053926906a1a 100644
--- a/sys/arch/luna68k/luna68k/locore.s
+++ b/sys/arch/luna68k/luna68k/locore.s
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.81 2024/01/17 12:19:06 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.82 2024/01/17 12:33:49 thorpej Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -643,14 +643,6 @@ Laststkadj:
 	movl	%sp@,%sp		| and our SP
 	rte				| and do real RTE
 
-/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
 /*
  * Primitives
  */
diff --git a/sys/arch/m68k/conf/files.m68k b/sys/arch/m68k/conf/files.m68k
index 9356f3a51f36..65ab885941fe 100644
--- a/sys/arch/m68k/conf/files.m68k
+++ b/sys/arch/m68k/conf/files.m68k
@@ -1,4 +1,4 @@
-#	$NetBSD: files.m68k,v 1.53 2024/01/17 12:19:07 thorpej Exp $
+#	$NetBSD: files.m68k,v 1.54 2024/01/17 12:33:51 thorpej Exp $
 #
 
 defflag	opt_fpsp.h		FPSP
@@ -26,9 +26,13 @@ file	arch/m68k/m68k/process_machdep.c
 file	arch/m68k/m68k/reenter_syscall.s
 file	arch/m68k/m68k/regdump.c
 file	arch/m68k/m68k/sig_machdep.c
+file	arch/m68k/m68k/sigcode.s
 file	arch/m68k/m68k/support.s
 file	arch/m68k/m68k/m68k_syscall.c
+
+file	arch/m68k/m68k/sunos_sigcode.s		compat_sunos
 file	arch/m68k/m68k/sunos_syscall.c		compat_sunos
+
 file	arch/m68k/m68k/linux_syscall.c		compat_linux
 
 file	arch/m68k/m68k/compat_13_machdep.c	compat_13
diff --git a/sys/arch/m68k/m68k/sigcode.s b/sys/arch/m68k/m68k/sigcode.s
index 6f66a4d1d463..d8f8c1851359 100644
--- a/sys/arch/m68k/m68k/sigcode.s
+++ b/sys/arch/m68k/m68k/sigcode.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: sigcode.s,v 1.15 2013/08/01 13:42:52 matt Exp $	*/
+/*	$NetBSD: sigcode.s,v 1.16 2024/01/17 12:33:50 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -38,12 +38,11 @@
  *	@(#)locore.s	8.6 (Berkeley) 5/27/94
  */
 
-/*
- * NOTICE: This is not a standalone file.  To use it, #include it in
- * your port's locore.s, like so:
- *
- *	#include <m68k/m68k/sigcode.s>
- */
+#include <machine/asm.h>
+
+#include "assym.h"
+
+	.file	"sigcode.s"
 
 /*
  * Signal trampoline; copied to top of user stack.
diff --git a/sys/arch/m68k/m68k/sunos_sigcode.s b/sys/arch/m68k/m68k/sunos_sigcode.s
index 4a9fc28519fc..6b6804fdbde8 100644
--- a/sys/arch/m68k/m68k/sunos_sigcode.s
+++ b/sys/arch/m68k/m68k/sunos_sigcode.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: sunos_sigcode.s,v 1.7 2023/09/26 14:33:55 tsutsui Exp $	*/
+/*	$NetBSD: sunos_sigcode.s,v 1.8 2024/01/17 12:33:50 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -40,13 +40,7 @@
 
 #include <machine/asm.h>
 
-/*
- * NOTICE: This is typically included in port's locore.s, like so:
- *
- *	#ifdef COMPAT_SUNOS
- *	#include <m68k/m68k/sunos_sigcode.s>
- *	#endif
- */
+	.file	"sunos_sigcode.s"
 
 	.data
 	.align	2
diff --git a/sys/arch/mac68k/mac68k/locore.s b/sys/arch/mac68k/mac68k/locore.s
index 6a494abb2db1..5169a46b4e5a 100644
--- a/sys/arch/mac68k/mac68k/locore.s
+++ b/sys/arch/mac68k/mac68k/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.182 2024/01/17 12:19:06 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.183 2024/01/17 12:33:50 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -883,14 +883,6 @@ ASENTRY_NOPROFILE(rei)
 .Ldorte:
 	rte				| real return
 
-/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
 /*
  * Primitives
  */ 
diff --git a/sys/arch/mvme68k/mvme68k/locore.s b/sys/arch/mvme68k/mvme68k/locore.s
index a20207fc35dd..68f7ef859e3c 100644
--- a/sys/arch/mvme68k/mvme68k/locore.s
+++ b/sys/arch/mvme68k/mvme68k/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.129 2024/01/17 12:19:06 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.130 2024/01/17 12:33:50 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -954,14 +954,6 @@ Laststkadj:
 	movl	%sp@,%sp		| and our SP
 	rte				| and do real RTE
 
-/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
 /*
  * Primitives
  */
diff --git a/sys/arch/news68k/news68k/locore.s b/sys/arch/news68k/news68k/locore.s
index b34156a8431d..287a0c7ea0ab 100644
--- a/sys/arch/news68k/news68k/locore.s
+++ b/sys/arch/news68k/news68k/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.84 2024/01/17 12:19:06 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.85 2024/01/17 12:33:50 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -761,14 +761,6 @@ Laststkadj:
 	movl	%sp@,%sp		| and our SP
 	rte				| real return
 
-/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
 /*
  * Primitives
  */
diff --git a/sys/arch/next68k/next68k/locore.s b/sys/arch/next68k/next68k/locore.s
index abd43c80bb95..7016f5ff97b1 100644
--- a/sys/arch/next68k/next68k/locore.s
+++ b/sys/arch/next68k/next68k/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.84 2024/01/17 12:19:06 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.85 2024/01/17 12:33:50 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1998 Darrin B. Jewell
@@ -708,14 +708,6 @@ Laststkadj:
 	movl	%sp@,%sp		| and our SP
 	rte				| and do real RTE
 
-/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
 /*
  * Primitives
  */
diff --git a/sys/arch/sun2/sun2/locore.s b/sys/arch/sun2/sun2/locore.s
index dc442371e1b5..b70865e5dcc5 100644
--- a/sys/arch/sun2/sun2/locore.s
+++ b/sys/arch/sun2/sun2/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.37 2024/01/17 12:19:07 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.38 2024/01/17 12:33:50 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1980, 1990, 1993
@@ -475,16 +475,6 @@ Ldorte:
  * (The MMU has a "boot" bit that forces access to the PROM)
  */
 
-/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
-	.text
-
 /*
  * Primitives
  */
diff --git a/sys/arch/sun3/sun3/locore.s b/sys/arch/sun3/sun3/locore.s
index ee17ca891df9..a6778b784d2c 100644
--- a/sys/arch/sun3/sun3/locore.s
+++ b/sys/arch/sun3/sun3/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.109 2024/01/17 12:19:07 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.110 2024/01/17 12:33:50 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1980, 1990, 1993
@@ -521,16 +521,6 @@ Ldorte:
  * (The MMU has a "boot" bit that forces access to the PROM)
  */
 
-/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
-	.text
-
 /*
  * Primitives
  */
diff --git a/sys/arch/sun3/sun3x/locore.s b/sys/arch/sun3/sun3x/locore.s
index 8886dff08a4f..03e1ea12e2ff 100644
--- a/sys/arch/sun3/sun3x/locore.s
+++ b/sys/arch/sun3/sun3x/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.77 2024/01/17 12:19:07 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.78 2024/01/17 12:33:51 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -506,16 +506,6 @@ Ldorte:
  * (The MMU has a "boot" bit that forces access to the PROM)
  */
 
-/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
-	.text
-
 /*
  * Primitives
  */
diff --git a/sys/arch/virt68k/virt68k/locore.s b/sys/arch/virt68k/virt68k/locore.s
index 6fd7ee71bee7..728324ce98fd 100644
--- a/sys/arch/virt68k/virt68k/locore.s
+++ b/sys/arch/virt68k/virt68k/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.12 2024/01/17 12:19:07 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.13 2024/01/17 12:33:51 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -551,14 +551,6 @@ Laststkadj:
 	movl	%sp@,%sp		| and our SP
 	rte				| and do real RTE
 
-/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
 /*
  * Primitives
  */
diff --git a/sys/arch/x68k/x68k/locore.s b/sys/arch/x68k/x68k/locore.s
index 851db1f0876f..2f88746b6430 100644
--- a/sys/arch/x68k/x68k/locore.s
+++ b/sys/arch/x68k/x68k/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.130 2024/01/17 12:19:07 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.131 2024/01/17 12:33:51 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -757,14 +757,6 @@ Laststkadj:
 	movl	%sp@,%sp		| and our SP
 	rte				| and do real RTE
 
-/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
 /*
  * Primitives
  */