diff --git a/sys/arch/mips/mips/locore.S b/sys/arch/mips/mips/locore.S
index 563b10deef61..a829a59d4c76 100644
--- a/sys/arch/mips/mips/locore.S
+++ b/sys/arch/mips/mips/locore.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.23 1996/09/30 01:30:21 jonathan Exp $	*/
+/*	$NetBSD: locore.S,v 1.24 1996/09/30 02:21:21 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -61,10 +61,11 @@
 #include <sys/errno.h>
 #include <sys/syscall.h>
 
+#include <mips/regnum.h>
+#include <mips/asm.h>
+
 #include <machine/param.h>
 #include <machine/psl.h>
-#include <machine/regnum.h>
-#include <machine/machAsmDefs.h>
 #include <machine/pte.h>
 
 /*----------------------------------------------------------------------------
diff --git a/sys/arch/pica/pica/locore_machdep.S b/sys/arch/pica/pica/locore_machdep.S
index 2707f2973a36..f419a3672427 100644
--- a/sys/arch/pica/pica/locore_machdep.S
+++ b/sys/arch/pica/pica/locore_machdep.S
@@ -1,9 +1,11 @@
-/*	$NetBSD: locore_machdep.S,v 1.1 1996/09/30 01:51:17 jonathan Exp $	*/
+/*	$NetBSD: locore_machdep.S,v 1.2 1996/09/30 02:21:23 jonathan Exp $	*/
+
 
 /*
  * ARC-specific mips locore code
  */
 
+#include <mips/asm.h>
 
 /*
  * Interrupt counters for vmstat.
diff --git a/sys/arch/pmax/pmax/locore_machdep.S b/sys/arch/pmax/pmax/locore_machdep.S
index cbbe3e4fbedd..26c5f5e7b790 100644
--- a/sys/arch/pmax/pmax/locore_machdep.S
+++ b/sys/arch/pmax/pmax/locore_machdep.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore_machdep.S,v 1.1 1996/09/30 01:51:16 jonathan Exp $	*/
+/*	$NetBSD: locore_machdep.S,v 1.2 1996/09/30 02:21:20 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -58,6 +58,7 @@
  * DEcstation-specific mips locore code.
  */
 
+#include <mips/asm.h>
 
 /*
  * Copy data to a DMA buffer padded with 16 bits of data, 16