diff --git a/sys/arch/arc/include/cpu.h b/sys/arch/arc/include/cpu.h
index 160f231f84a8..357cf585523f 100644
--- a/sys/arch/arc/include/cpu.h
+++ b/sys/arch/arc/include/cpu.h
@@ -1,14 +1,9 @@
-/*	$NetBSD: cpu.h,v 1.12 2000/04/15 22:05:52 soda Exp $	*/
+/*	$NetBSD: cpu.h,v 1.13 2000/05/05 03:18:25 soren Exp $	*/
 /*	$OpenBSD: cpu.h,v 1.9 1998/01/28 13:46:10 pefo Exp $ */
 
 #ifndef _ARC_CPU_H_
 #define _ARC_CPU_H_
 
-/*
- *  Internal timer causes hard interrupt 5.
- */
-#define MIPS_INT_MASK_CLOCK	MIPS_INT_MASK_5
-
 #include <mips/cpu.h>
 #include <mips/cpuregs.h>
 
@@ -18,8 +13,6 @@
  */
 #define	COPY_SIGCODE		/* copy sigcode above user stack in exec */
 
-#define	INT_MASK_REAL_DEV	MIPS3_HARD_INT_MASK	/* XXX */
-
 #ifndef _LOCORE
 struct tlb;
 extern void mips3_TLBWriteIndexedVPS __P((u_int index, struct tlb *tlb));
diff --git a/sys/arch/cobalt/include/cpu.h b/sys/arch/cobalt/include/cpu.h
index 9a158ff42304..801d0fb0dd89 100644
--- a/sys/arch/cobalt/include/cpu.h
+++ b/sys/arch/cobalt/include/cpu.h
@@ -1,6 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.4 2000/04/15 22:05:52 soda Exp $	*/
+/*	$NetBSD: cpu.h,v 1.5 2000/05/05 03:18:26 soren Exp $	*/
 
 #include <mips/cpu.h>
 #include <mips/cpuregs.h>
-
-#define INT_MASK_REAL_DEV	MIPS_HARD_INT_MASK
diff --git a/sys/arch/hpcmips/include/cpu.h b/sys/arch/hpcmips/include/cpu.h
index 257aef672927..500f7a5639fe 100644
--- a/sys/arch/hpcmips/include/cpu.h
+++ b/sys/arch/hpcmips/include/cpu.h
@@ -1,20 +1,9 @@
-/*	$NetBSD: cpu.h,v 1.5 2000/04/15 22:05:52 soda Exp $	*/
+/*	$NetBSD: cpu.h,v 1.6 2000/05/05 03:18:26 soren Exp $	*/
 
 #ifndef __HPCMIPS_CPU_H
 #define __HPCMIPS_CPU_H
 
-/*
- *  VR4100: Internal timer causes hard interrupt 5.
- */
-#define MIPS_INT_MASK_CLOCK	MIPS_INT_MASK_5
-
 #include <mips/cpu.h>
-#include <mips/cpuregs.h> /* XXX */
-
-#ifdef ENABLE_MIPS_TX3900
-#define	INT_MASK_REAL_DEV	MIPS_HARD_INT_MASK
-#else
-#define	INT_MASK_REAL_DEV	MIPS3_HARD_INT_MASK	/* XXX */
-#endif
+#include <mips/cpuregs.h>
 
 #endif __HPCMIPS_CPU_H