--- ./machine.h.orig	2005-05-12 15:39:36.000000000 -0700
+++ ./machine.h	2005-10-31 10:04:35.000000000 -0800
@@ -80,32 +80,9 @@
 #ifndef	_MACH_MACHINE_H_
 #define _MACH_MACHINE_H_
 
-#import <mach/machine/vm_types.h>
-#import <mach/boolean.h>
-
-/*
- *	For each host, there is a maximum possible number of
- *	cpus that may be available in the system.  This is the
- *	compile-time constant NCPUS, which is defined in cpus.h.
- *
- *	In addition, there is a machine_slot specifier for each
- *	possible cpu in the system.
- */
-
-struct machine_info {
-	int		major_version;	/* kernel major version id */
-	int		minor_version;	/* kernel minor version id */
-	int		max_cpus;	/* max number of cpus compiled */
-	int		avail_cpus;	/* number actually available */
-	vm_size_t	memory_size;	/* size of memory in bytes */
-};
-
-typedef struct machine_info	*machine_info_t;
-typedef struct machine_info	machine_info_data_t;	/* bogus */
-
 typedef int	cpu_type_t;
 typedef int	cpu_subtype_t;
-typedef integer_t	cpu_threadtype_t;
+typedef int	cpu_threadtype_t;
 
 #define CPU_STATE_MAX		3
 
@@ -113,24 +90,6 @@
 #define CPU_STATE_SYSTEM	1
 #define CPU_STATE_IDLE		2
 
-struct machine_slot {
-	boolean_t	is_cpu;		/* is there a cpu in this slot? */
-	cpu_type_t	cpu_type;	/* type of cpu */
-	cpu_subtype_t	cpu_subtype;	/* subtype of cpu */
-	volatile boolean_t running;	/* is cpu running */
-	long		cpu_ticks[CPU_STATE_MAX];
-	int		clock_freq;	/* clock interrupt frequency */
-};
-
-typedef struct machine_slot	*machine_slot_t;
-typedef struct machine_slot	machine_slot_data_t;	/* bogus */
-
-#ifdef	KERNEL
-extern struct machine_info	machine_info;
-extern struct machine_slot	machine_slot[];
-
-extern vm_offset_t		interrupt_stack[];
-#endif	/* KERNEL */
 
 /*
  *	Machine types known by all.