diff --git a/sys/arch/arm32/include/cpu.h b/sys/arch/arm32/include/cpu.h
index c74340a76bf1..7935ac6c0b63 100644
--- a/sys/arch/arm32/include/cpu.h
+++ b/sys/arch/arm32/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.14 1997/10/14 09:20:07 mark Exp $	*/
+/*	$NetBSD: cpu.h,v 1.15 1998/02/21 22:49:18 mark Exp $	*/
 
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
@@ -221,13 +221,6 @@
 
 #define cpu_wait(p)	/* nothing */
 
-#ifndef _LOCORE
-void need_resched __P((void));
-void need_proftick __P((struct proc *p));
-
-extern int current_intr_depth;
-#endif	/* !_LOCORE */
-
 /*
  * Notify the current process (p) that it has a signal pending,
  * process as soon as possible.
@@ -235,6 +228,33 @@ extern int current_intr_depth;
 
 #define signotify(p)            setsoftast()
 
+
+#if defined(_KERNEL) && !defined(_LOCORE)
+extern int current_intr_depth;
+
+/* stubs.c */
+void need_resched	__P((void));
+void need_proftick	__P((struct proc *p));
+
+/* locore.S */
+void atomic_set_bit	__P((u_int *address, u_int setmask));
+void atomic_clear_bit	__P((u_int *address, u_int clearmask));
+
+/* cpuswitch.S */
+struct pcb;
+void	savectx		__P((struct pcb *pcb));
+
+/* ast.c */
+void userret		__P((register struct proc *p, int pc, u_quad_t oticks));
+
+/* machdep.h */
+void bootsync		__P((void));
+
+/* strstr.c */
+char *strstr		__P((const char *s1, const char *s2));
+
+#endif	/* _KERNEL && !_LOCORE */
+
 /* 
  * CTL_MACHDEP definitions.
  */
diff --git a/sys/arch/arm32/include/katelib.h b/sys/arch/arm32/include/katelib.h
index 207b08620d01..742d086d9484 100644
--- a/sys/arch/arm32/include/katelib.h
+++ b/sys/arch/arm32/include/katelib.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: katelib.h,v 1.11 1997/10/14 09:20:22 mark Exp $	*/
+/*	$NetBSD: katelib.h,v 1.12 1998/02/21 22:49:18 mark Exp $	*/
 
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
@@ -61,11 +61,6 @@
 
 /* Assembly modules */
 
-/* In locore.S */
-
-void atomic_set_bit	__P((u_int *address, u_int setmask));
-void atomic_clear_bit	__P((u_int *address, u_int clearmask));
-
 /* In blockio.S */
 
 void insw	__P((u_int io, void *dest, u_int size));
@@ -121,12 +116,6 @@ u_int simpletraceback	__P((void));
 u_int irqtraceback	__P((u_int, u_int));
 u_int user_traceback	__P((u_int));
 void kstack_stuff	__P((struct proc */*p*/));
-void bootsync		__P((void));
-void boot0		__P((void))
-    __attribute__((__noreturn__));
-
-char *strstr	__P((char *s1, char *s2));
-void userret	__P((register struct proc *p, int pc, u_quad_t oticks));
 #endif
 
 /* End of katelib.h */