Remove some unused header files.

7 files changed, 8 insertions, 613 deletions

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index b18c0ea..0844d71 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -14,6 +14,14 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20100415: [mips] removed unused headers
+.if ${TARGET_ARCH} == "mips"
+OLD_FILES+=usr/include/machine/archtype.h
+OLD_FILES+=usr/include/machine/segments.h
+OLD_FILES+=usr/include/machine/rm7000.h
+OLD_FILES+=usr/include/machine/defs.h
+OLD_FILES+=usr/include/machine/queue.h
+.endif
 # 20100326: [ia64] removed <machine/nexusvar.h>
 .if ${TARGET_ARCH} == "ia64"
 OLD_FILES+=usr/include/machine/nexusvar.h
diff --git a/sys/mips/include/archtype.h b/sys/mips/include/archtype.h
deleted file mode 100644
index ed1b5ea..0000000
--- a/sys/mips/include/archtype.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$OpenBSD: archtype.h,v 1.6 1999/01/27 04:46:04 imp Exp $	*/
-/*
- * Copyright (c) 1997 Per Fogelstrom
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed under OpenBSD by
- *	Per Fogelstrom.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	JNPR: archtype.h,v 1.6 2007/08/09 11:23:32 katta
- *
- * $FreeBSD$
- */
-
-#ifndef _MACHINE_ARCHTYPE_H_
-#define	_MACHINE_ARCHTYPE_H_
-/*
- * Define architectural identitys for the different Mips machines.
- */
-
-/*
- * FREEBSD_DEVELOPERS_FIXME
- * Define constants for the supported MIPS CPU's
- */
-#define	MIPS_CLASS_UNKNOWN	0x00
-
-#endif /* !_MACHINE_ARCHTYPE_H_ */
diff --git a/sys/mips/include/defs.h b/sys/mips/include/defs.h
deleted file mode 100644
index 20d093e..0000000
--- a/sys/mips/include/defs.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * Copyright (c) 1996, 2001-2003, 2005, Juniper Networks, Inc.
- * All rights reserved.
- *
- * defs.h -- Simple universal types and definitions for use by the microkernel
- * Jim Hayes, November 1996
- *
- *	JNPR: defs.h,v 1.3.2.1 2007/09/10 08:16:32 girish
- * $FreeBSD$
- */
-
-#ifndef __DEFS_H__
-#define	__DEFS_H__
-
-/*
- * Paranoid compilation. If defined, the PARANOID flag will enable asserts,
- * data structure magic stamping and a suite of other debug tools. To disable
- * it, comment out its definition.
- */
-#define	PARANOID
-
-/*
- * This is the ONLY place you should see hardware specific information
- * encoded as #ifdefs. (Well, except for stdarg.h, perhaps.)
- * I apologize in advance!
- */
-#include <machine/defs_mips.h>
-#define	CPU_GOT_ONE
-
-#if !defined(CPU_GOT_ONE)
-#error "YOU NEED TO SPECIFY ONE CPU TYPE TO USE THIS FILE"
-#endif
-
-#ifdef	TRUE
-#undef	TRUE
-#endif
-
-#ifdef	FALSE
-#undef	FALSE
-#endif
-
-typedef enum boolean_
-{
-	FALSE = 0,
-	TRUE = 1
-} boolean;
-
-/*
- * Make NULL a pointer within the microkernel environment to catch
- * pointer semantic miscreants.
- *
- * The reason it's conditional here is that some of the BSD includes
- * define it multiple times as a straight integer and GCC barfs on
- * the alternative prototypes.
- */
-
-#ifndef NULL
-#define	NULL (void *)0
-#endif
-
-/*
- * Define some standard sized types.  (Defined in cpu-specific type files
- * included above.)
- */
-
-#define	MAX_U8  255
-#define	MAX_S8  128
-#define	MIN_S8 -127
-
-#define	MAX_U16  0xffff
-#define	MIN_S16  ((int16_t)(1 << 15))
-#define	MAX_S16  ((int16_t)~MIN_S16)
-
-#define	MAX_U32  0xffffffff
-#define	MIN_S32  ((int32_t)(1 << 31))
-#define	MAX_S32  ((int32_t)~MIN_S32)
-
-#define	MAX_U64  ((u_int64_t)0 - 1)
-#define	MAX_S64  ((int64_t)(MAX_U64 >> 1))
-#define	MIN_S64  (-MAX_S64-1)
-
-/*
- * Solaris uses _SIZE_T to mark the fact that "size_t" has already
- * been defined.  _SYS_TYPES_H_ is used by BSD.
- * 
- */
-#if !defined(_SYS_TYPES_H_) && !defined(_SIZE_T)
-typedef UNSIGNED_32  size_t;
-#define	_SIZE_T
-#endif
-
-#if !defined(_SYS_TYPES_H_)
-typedef char *		caddr_t;
-
-typedef UNSIGNED_8	u_int8_t;
-typedef SIGNED_8	int8_t;
-
-typedef UNSIGNED_16	u_int16_t;
-typedef SIGNED_16	int16_t;
-
-typedef UNSIGNED_32	u_int32_t;
-typedef SIGNED_32	int32_t;
-
-typedef UNSIGNED_64	u_int64_t;
-typedef SIGNED_64	int64_t;
-
-typedef UNSIGNED_32	u_long;
-typedef UNSIGNED_16	u_short;
-typedef UNSIGNED_8	u_char;
-
-
-/*
- * Define the standard terminology used in the diag software
- * with regards to bytes, words, etc.
- * BYTE = 8 bits
- * HWORD (halfword) = 2 bytes or 16 bits
- * WORD = 4 bytes or 32 bits
- * QUAD = 8 bytes or 64 bits
- *
- * (The term QUAD seems less-than-intuitive here, but it is
- * derived from BSD sources where it is defined as int64_t.)
- *
- * For consistency use the following defines wherever appropriate.
- */
-
-typedef enum {
-	NBI_BYTE  = (sizeof(u_int8_t) * 8),
-	NBI_HWORD = (sizeof(u_int16_t) * 8),
-	NBI_WORD  = (sizeof(u_int32_t) * 8),
-	NBI_QUAD  = (sizeof(u_int64_t) * 8)
-} num_bits_t;
-
-typedef enum {
-	NBY_BYTE  = sizeof(u_int8_t),
-	NBY_HWORD = sizeof(u_int16_t),
-	NBY_WORD  = sizeof(u_int32_t),
-	NBY_QUAD  = sizeof(u_int64_t)
-} num_bytes_t;
-
-/*
- * We assume that pid values are 16 bit integers
- */
-
-typedef u_int16_t pid_t;
-
-#endif /* _SYS_TYPES_H_ */
-
-typedef UNSIGNED_32	magic_t;
-typedef int		status_t;
-
-#define	BITS_IN_BYTE	8
-
-/*
- * Packed definition. We use this for fields in network frames where we
- * don't want the compiler to pack out to even alignment
- */
-
-#ifdef PACKED
-#undef PACKED
-#endif
-#define	PACKED(x)	x __attribute__ ((packed))
-
-/*
- * __unused is a FreeBSDism that prevents the compiler from choking
- * on function parameters that remain unused through the life of a
- * function.  This is not an issue for the Cygnus toolchain.  In general
- * it SHOULD NOT BE USED in the martini embedded software repository.
- * It should only be used inside of shared code.
- */
-#ifndef __unused
-#define	__unused	__attribute__ ((__unused__))
-#endif
-
-/*
- * Basic memory multiples
- */
-
-#define	SIZE_1K		0x00000400
-#define	SIZE_2K		0x00000800
-#define	SIZE_4K		0x00001000
-#define	SIZE_8K		0x00002000
-#define	SIZE_16K	0x00004000
-#define	SIZE_32K	0x00008000
-#define	SIZE_64K	0x00010000
-#define	SIZE_128K	0x00020000
-#define	SIZE_256K	0x00040000
-#define	SIZE_512K	0x00080000
-#define	SIZE_1M		0x00100000
-#define	SIZE_2M		0x00200000
-#define	SIZE_4M		0x00400000
-#define	SIZE_8M		0x00800000
-#define	SIZE_16M	0x01000000
-#define	SIZE_32M	0x02000000
-#define	SIZE_64M	0x04000000
-#define	SIZE_128M	0x08000000
-#define	SIZE_256M	0x10000000
-#define	SIZE_512M	0x20000000
-#define	SIZE_1G		0x40000000
-#define	SIZE_2G		0x80000000
-
-/*
- * swap16_inline
- * swap32_inline
- *
- * Byteswap a 16 and 32 bit quantities
- */
-
-static inline u_int16_t
-swap16_inline(u_int16_t data)
-{
-	return(((data & 0x00ff) << 8) |
-	       ((data & 0xff00) >> 8));
-}
-
-static inline u_int32_t
-swap32_inline(u_int32_t data)
-{
-	return(((data & 0x000000ff) << 24) |
-	       ((data & 0x0000ff00) << 8) |
-	       ((data & 0x00ff0000) >> 8) |
-	       ((data & 0xff000000) >> 24));
-}
-
-/*
- * Define errno_t here as it is needed by the rom and ukernel
- */
-typedef u_int32_t errno_t;
-
-#define	EOK	0
-
-/*
- * Define the main communication structure used for passing
- * information from the rom to the ukernel (done here as it is
- * used by them both)
- */
-typedef struct rom_info_ rom_info_t;
-
-/*
- * Typedef the return code from the ukernel to the ROM
- */
-typedef u_int32_t rom_return_t;
-
-/*
- * Pull in the relevant global environment header file
- *
- * This file is shared by the uKernel and the system simulation effort.
- */
-#if defined(ENV_UKERN) || defined (ENV_SYS_SIM)
-#include "ukern.h"
-#endif /* ENV_UKERN */
-
-#if defined(ENV_ROM)
-#include "rom.h"
-#endif
- 
-#endif /* __DEFS_H__ */
diff --git a/sys/mips/include/queue.h b/sys/mips/include/queue.h
deleted file mode 100644
index d992332..0000000
--- a/sys/mips/include/queue.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*-
- * Copyright (c) 1996-1997, 2001, 2005, Juniper Networks, Inc.
- * All rights reserved.
- * Jim Hayes, November 1996
- *
- * queue.h - Description of uKernel queues, for the Juniper Kernel
- *
- *	JNPR: queue.h,v 1.1 2006/08/07 05:38:57 katta
- * $FreeBSD$
- *
- */
-
-#ifndef __QUEUE_H__
-#define	__QUEUE_H__
-
-/*---------------------------------------------------------------------------
- * QUEUE MANAGEMENT DOCUMENTATION
- */
-
-/*
-   --------
-   Q_INIT()
-   --------
-
-   void q_init(void)
-
-   Initialize the queue management system for the microkernel.
-   This initializes the debugging flags and sets up accounting.
-
-   ---------
-   Q_ALLOC()
-   ---------
-
-   queue_t *q_alloc()
-
-   Allocates a queue from kernel memory, and initializes it for you.
-
-   The default initialization provides a queue that is unbounded.
-
-   If you want to be bounded with special features, use q_control
-   after initialization.
-
-   q_alloc() returns NULL in the face of peril or low memory.
-
-   --------
-   Q_FREE()
-   --------
-
-   void *q_free(queue_t *queue_pointer)
-
-   Returns a queue to kernel memory, and frees the queue contents
-   for you using free() and complains (with a traceback) that you
-   tried to kill of a non-empty queue.
-
-   If any threads are waiting on the queue, wake them up.
-
-   -----------
-   Q_CONTROL()
-   -----------
-   void q_control(queue_t *queue_pointer, queue_size_t max_queue_size);
-
-   For now, allows you to limit queue growth.
-
-   ----------------
-   Q_DEQUEUE_WAIT() ** MAY CAUSE THREAD TO BLOCK/CANNOT BE CALLED FROM ISRs **
-   ----------------
-
-   void *q_dequeue_wait(queue_t *queue_pointer, wakeup_mask_t *mask)
-
-   Removes and returns a pointer to the next message in the specified
-   queue.  If the queue is empty, the calling thread goes to sleep
-   until something is queued to the queue.  If this call returns NULL,
-   then an extraordinary event requires this thread's attention--
-   check errno in this case.
-
-   ---------
-   Q_DEQUEUE	 ** CAN BE CALLED FROM ISRs **
-   ---------
-
-   void *q_dequeue(queue_t *queue_pointer)
-
-   Just like q_dequeue_wait(), but instead of blocking, return NULL.
-
-   -----------
-   Q_ENQUEUE()		   ** CAN BE CALLED FROM ISRs **
-   -----------
-
-   boolean q_enqueue(queue_t *queue_pointer, void *element_pointer)
-
-   Add the element to the end of the named queue.  If the add fails
-   because a limit has been reached, return TRUE.  Otherwise return
-   FALSE if everything went OK.
-
-   ----------
-   Q_URGENT()
-   ----------
-
-   boolean q_urgent(queue_t *queue_pointer, void *element_pointer)
-
-   Same as q_enqueue(), except this element will be placed at the top
-   of the queue, and will be picked off at the next q_dequeue_wait()
-   operation.
-
-   --------
-   Q_PEEK()		   ** CAN BE CALLED FROM ISRs **
-   --------
-
-   void *q_peek(queue_t *queue_pointer)
-
-   Returns a pointer to the top element of the queue without actually
-   dequeuing it.  Returns NULL of the queue is empty.
-
-   This routine will never block.
-
-   ----------
-   Q_DELETE()
-   ----------
-
-   void q_delete(queue_t *queue_pointer, void *element_pointer)
-
-   Delete the element_pointer from the queue, if it exists.  This
-   isn't speedy, and isn't meant for tasks requiring performance.
-   It's primary use is to pull something off the queue when you know
-   in the common case that it's gonna be at or near the top of the
-   list.  (I.e. waking a thread from a wake list when extraordinary
-   conditions exist, and you have to pluck it from the middle of the
-   list.)
-
-   This routine does not block or return anything.
-
-   --------
-   Q_SIZE()
-   --------
-
-   queue_size_t q_size(queue_t *queue_pointer)
-
-   Returns the number of elements in the queue.
-
-   ------------
-   Q_MAX_SIZE()
-   ------------
-
-   queue_size_t q_max_size(queue_t *queue_pointer);
-
-   Returns the maximum size of this queue, or 0 if this queue is
-   unbounded.
-
-*/
-
-/*-------------------------------------------------------------------------
- * Basic queue management structures.
- */
-
-/*
- * Typedefs
- */
-
-typedef u_int32_t queue_size_t;
-
-/*
- * Prototypes
- */
-
-void		 q_init(void);
-queue_t		*q_alloc(void);
-void		*q_peek(queue_t *queue);
-void		*q_dequeue(queue_t *queue);
-boolean		 q_enqueue(queue_t *queue, void *item);
-boolean		 q_urgent(queue_t *queue, void *item);
-
-#endif /* __QUEUE_H__ */
diff --git a/sys/mips/include/rm7000.h b/sys/mips/include/rm7000.h
deleted file mode 100644
index f1c0c44..0000000
--- a/sys/mips/include/rm7000.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*	$OpenBSD$ */
-
-/*
- * Copyright (c) 2000 Opsycon Open System Consulting AB	 (www.opsycon.se)
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Opsycon Open System
- *	Consulting AB, Sweden under contract to QED, Inc.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	JNPR: rm7000.h,v 1.2.4.1 2007/08/29 12:06:30 girish
- * $FreeBSD$
- */
-
-#ifndef _MACHINE_RM7000_H_
-#define	_MACHINE_RM7000_H_
-
-/*
- *  QED RM7000 specific defines.
- */
-
-/*
- *  Performance counters.
- */
-
-#define	PCNT_SRC_CLOCKS		0x00	/* Clock cycles */
-#define	PCNT_SRC_INSTR		0x01	/* Total instructions issued */
-#define	PCNT_SRC_FPINSTR	0x02	/* Float instructions issued */
-#define	PCNT_SRC_IINSTR		0x03	/* Integer instructions issued */
-#define	PCNT_SRC_LOAD		0x04	/* Load instructions issued */
-#define	PCNT_SRC_STORE		0x05	/* Store instructions issued */
-#define	PCNT_SRC_DUAL		0x06	/* Dual issued pairs */
-#define	PCNT_SRC_BRPREF		0x07	/* Branch prefetches */
-#define	PCNT_SRC_EXTMISS	0x08	/* External cache misses */
-#define	PCNT_SRC_STALL		0x09	/* Stall cycles */
-#define	PCNT_SRC_SECMISS	0x0a	/* Secondary cache misses */
-#define	PCNT_SRC_INSMISS	0x0b	/* Instruction cache misses */
-#define	PCNT_SRC_DTAMISS	0x0c	/* Data cache misses */
-#define	PCNT_SRC_DTLBMISS	0x0d	/* Data TLB misses */
-#define	PCNT_SRC_ITLBMISS	0x0e	/* Instruction TLB misses */
-#define	PCNT_SRC_JTLBIMISS	0x0f	/* Joint TLB instruction misses */
-#define	PCNT_SRC_JTLBDMISS	0x10	/* Joint TLB data misses */
-#define	PCNT_SRC_BRTAKEN	0x11	/* Branches taken */
-#define	PCNT_SRC_BRISSUED	0x12	/* Branches issued */
-#define	PCNT_SRC_SECWBACK	0x13	/* Secondary cache writebacks */
-#define	PCNT_SRC_PRIWBACK	0x14	/* Primary cache writebacks */
-#define	PCNT_SRC_DCSTALL	0x15	/* Dcache miss stall cycles */
-#define	PCNT_SRC_MISS		0x16	/* Cache misses */
-#define	PCNT_SRC_FPEXC		0x17	/* FP possible execption cycles */
-#define	PCNT_SRC_MULSLIP	0x18	/* Slip cycles due to mult. busy */
-#define	PCNT_SRC_CP0SLIP	0x19	/* CP0 Slip cycles */
-#define	PCNT_SRC_LDSLIP		0x1a	/* Slip cycles	due to pend. non-b ld */
-#define	PCNT_SRC_WBFULL		0x1b	/* Write buffer full stall cycles  */
-#define	PCNT_SRC_CISTALL	0x1c	/* Cache instruction stall cycles  */
-#define	PCNT_SRC_MULSTALL	0x1d	/* Multiplier stall cycles  */
-#define	PCNT_SRC_ELDSTALL	0x1d	/* Excepion stall due to non-b ld */
-#define	PCNT_SRC_MAX		0x1d	/* Maximum PCNT select code */
-
-/*
- *  Counter control bits.
- */
-
-#define	PCNT_CE			0x0400	/* Count enable */
-#define	PCNT_UM			0x0200	/* Count in User mode */
-#define	PCNT_KM			0x0100	/* Count in kernel mode */
-
-/*
- *  Performance counter system call function codes.
- */
-#define	PCNT_FNC_SELECT		0x0001	/* Select counter source */
-#define	PCNT_FNC_READ		0x0002	/* Read current value of counter */
-
-#endif /* _MACHINE_RM7000_H_ */
diff --git a/sys/mips/include/segments.h b/sys/mips/include/segments.h
deleted file mode 100644
index 406b965..0000000
--- a/sys/mips/include/segments.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * Copyright (c) 1989, 1990 William F. Jolitz
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	from: @(#)segments.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
- */
-
-#ifndef _MACHINE_SEGMENTS_H_
-#define	_MACHINE_SEGMENTS_H_
-
-#endif /* !_MACHINE_SEGMENTS_H_ */
diff --git a/sys/mips/mips/trap.c b/sys/mips/mips/trap.c
index 124087c..8bfc6e7 100644
--- a/sys/mips/mips/trap.c
+++ b/sys/mips/mips/trap.c
@@ -83,8 +83,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/mips_opcode.h>
 #include <machine/frame.h>
 #include <machine/regnum.h>
-#include <machine/rm7000.h>
-#include <machine/archtype.h>
 #include <machine/asm.h>
 
 #ifdef DDB