Index: lib/libc/mips/gen/_setjmp.S
===================================================================
--- lib/libc/mips/gen/_setjmp.S
+++ lib/libc/mips/gen/_setjmp.S
@@ -34,6 +34,7 @@
 
 #include <machine/asm.h>
 __FBSDID("$FreeBSD$");
+#define	_WANT_MIPS_REGNUM
 #include <machine/regnum.h>
 
 #include "SYS.h"
Index: lib/libc/mips/gen/longjmp.c
===================================================================
--- lib/libc/mips/gen/longjmp.c
+++ lib/libc/mips/gen/longjmp.c
@@ -40,6 +40,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define	_WANT_MIPS_REGNUM
 #include <machine/regnum.h>
 
 void
Index: lib/libc/mips/gen/makecontext.c
===================================================================
--- lib/libc/mips/gen/makecontext.c
+++ lib/libc/mips/gen/makecontext.c
@@ -39,6 +39,7 @@
 
 #include <sys/param.h>
 #include <machine/abi.h>
+#define	_WANT_MIPS_REGNUM
 #include <machine/regnum.h>
 
 #include <stdarg.h>
Index: lib/libc/mips/gen/setjmp.S
===================================================================
--- lib/libc/mips/gen/setjmp.S
+++ lib/libc/mips/gen/setjmp.S
@@ -34,6 +34,7 @@
 
 #include <machine/asm.h>
 __FBSDID("$FreeBSD$");
+#define	_WANT_MIPS_REGNUM
 #include <machine/regnum.h>
 
 #if defined(LIBC_SCCS) && !defined(lint)
Index: lib/libc/mips/gen/sigsetjmp.S
===================================================================
--- lib/libc/mips/gen/sigsetjmp.S
+++ lib/libc/mips/gen/sigsetjmp.S
@@ -34,6 +34,7 @@
 
 #include <machine/asm.h>
 __FBSDID("$FreeBSD$");
+#define	_WANT_MIPS_REGNUM
 #include <machine/regnum.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)setjmp.s	8.1 (Berkeley) 6/4/93")
Index: lib/libproc/proc_regs.c
===================================================================
--- lib/libproc/proc_regs.c
+++ lib/libproc/proc_regs.c
@@ -33,6 +33,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
+#define	_WANT_MIPS_REGNUM
 #include <sys/ptrace.h>
 
 #include <err.h>
Index: lib/libthread_db/arch/mips/libpthread_md.c
===================================================================
--- lib/libthread_db/arch/mips/libpthread_md.c
+++ lib/libthread_db/arch/mips/libpthread_md.c
@@ -33,6 +33,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
+#define	_WANT_MIPS_REGNUM
 #include <sys/procfs.h>
 #include <ucontext.h>
 #include <string.h>
Index: stand/libsa/mips/_setjmp.S
===================================================================
--- stand/libsa/mips/_setjmp.S
+++ stand/libsa/mips/_setjmp.S
@@ -36,6 +36,7 @@
  * $FreeBSD$
  */
 
+#define	_WANT_MIPS_REGNUM
 #include <machine/regnum.h>
 #include <machine/asm.h>
 
Index: sys/mips/include/regnum.h
===================================================================
--- sys/mips/include/regnum.h
+++ sys/mips/include/regnum.h
@@ -44,11 +44,15 @@
 #ifndef _MACHINE_REGNUM_H_
 #define	_MACHINE_REGNUM_H_
 
+#define	NUMSAVEREGS	40
+#define	NUMFPREGS	34
+
 /*
  * Location of the saved registers relative to ZERO.
  * This must match struct trapframe defined in frame.h exactly.
  * This must also match regdef.h.
  */
+#if defined(_KERNEL) || defined(_WANT_MIPS_REGNUM)
 #define	ZERO	0
 #define	AST	1
 #define	V0	2
@@ -105,7 +109,6 @@
  */
 #define	IC	38
 #define	DUMMY	39	/* for 8 byte alignment */
-#define	NUMSAVEREGS 40
 
 /*
  * Pseudo registers so we save a complete set of registers regardless of
@@ -164,8 +167,6 @@
 #define	FSR	(FPBASE+32)
 #define FIR	(FPBASE+33)
 
-#define	NUMFPREGS	34
-
 #define	NREGS	(NUMSAVEREGS + NUMFPREGS)
 
 /*
@@ -208,4 +209,6 @@
 #define	FSR_NUM	(32)
 #define	FIR_NUM	(33)
 
+#endif	/* _KERNEL || _WANT_MIPS_REGNUM */
+
 #endif /* !_MACHINE_REGNUM_H_ */
Index: tests/sys/kern/ptrace_test.c
===================================================================
--- tests/sys/kern/ptrace_test.c
+++ tests/sys/kern/ptrace_test.c
@@ -33,6 +33,7 @@
 #include <sys/time.h>
 #include <sys/procctl.h>
 #include <sys/procdesc.h>
+#define	_WANT_MIPS_REGNUM
 #include <sys/ptrace.h>
 #include <sys/queue.h>
 #include <sys/runq.h>