--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/cmd/fm/schemes/cpu/Makefile.com	Mon Feb 13 14:45:56 2006 -0800
@@ -0,0 +1,41 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../../Makefile.com
+
+SCHEME_COMMON = ../../common
+
+sparc_SRCS =	\
+	cpu_mdesc.c \
+	mdesc_devinit.c
+
+SRCS =	\
+	cpu.c \
+	$($(MACH)_SRCS)
+
+LDLIBS += -lkstat

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/lib/fm/topo/libtopo/common/cpu.h	Mon Feb 13 14:45:56 2006 -0800
@@ -0,0 +1,43 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef	CPU_H
+#define	CPU_H
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+extern void cpu_init(topo_mod_t *);
+extern void cpu_fini(topo_mod_t *);
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* CPU_H */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/lib/fm/topo/libtopo/common/hc.h	Mon Feb 13 14:45:56 2006 -0800
@@ -0,0 +1,43 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef	HC_H
+#define	HC_H
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+extern void hc_init(topo_mod_t *);
+extern void hc_fini(topo_mod_t *);
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* HC_H */

--- a/usr/src/cmd/fm/eversholt/common/ptree.h	Mon Feb 13 14:37:49 2006 -0800
+++ b/usr/src/cmd/fm/eversholt/common/ptree.h	Mon Feb 13 14:45:56 2006 -0800
@@ -38,7 +38,7 @@
 extern "C" {
 #endif
 
-#include "tree.h"
+#include <tree.h>
 
 /*
  * Use a pointer to one of these structs as the "arg" argument when

--- a/usr/src/cmd/fm/modules/common/eversholt/platform.h	Mon Feb 13 14:37:49 2006 -0800
+++ b/usr/src/cmd/fm/modules/common/eversholt/platform.h	Mon Feb 13 14:45:56 2006 -0800
@@ -37,7 +37,7 @@
 extern "C" {
 #endif
 
-#include "config.h"
+#include <config.h>
 
 nvlist_t *Action_nvl;	/* nvl for problem with action=... prop on it */
 

--- a/usr/src/cmd/fm/schemes/cpu/Makefile.com	Mon Feb 13 14:37:49 2006 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-include ../../Makefile.com
-
-SCHEME_COMMON = ../../common
-
-sparc_SRCS =	\
-	cpu_mdesc.c \
-	mdesc_devinit.c
-
-SRCS =	\
-	cpu.c \
-	$($(MACH)_SRCS)
-
-LDLIBS += -lkstat

--- a/usr/src/cmd/fm/schemes/cpu/sparc/cpu_mdesc.h	Mon Feb 13 14:37:49 2006 -0800
+++ b/usr/src/cmd/fm/schemes/cpu/sparc/cpu_mdesc.h	Mon Feb 13 14:45:56 2006 -0800
@@ -25,8 +25,8 @@
  * Use is subject to license terms.
  */
 
-#ifndef	_CPU_H
-#define	_CPU_H
+#ifndef	_CPU_MDESC_H
+#define	_CPU_MDESC_H
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
@@ -59,4 +59,4 @@
 }
 #endif
 
-#endif	/* _CPU_H */
+#endif	/* _CPU_MDESC_H */

--- a/usr/src/lib/fm/topo/libtopo/common/cpu.h	Mon Feb 13 14:37:49 2006 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#ifndef	CPU_H
-#define	CPU_H
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-extern void cpu_init(topo_mod_t *);
-extern void cpu_fini(topo_mod_t *);
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* CPU_H */

--- a/usr/src/lib/fm/topo/libtopo/common/hc.h	Mon Feb 13 14:37:49 2006 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#ifndef	HC_H
-#define	HC_H
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-extern void hc_init(topo_mod_t *);
-extern void hc_fini(topo_mod_t *);
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* HC_H */

--- a/usr/src/lib/fm/topo/modules/common/pcibus_labels.h	Mon Feb 13 14:37:49 2006 -0800
+++ b/usr/src/lib/fm/topo/modules/common/pcibus_labels.h	Mon Feb 13 14:45:56 2006 -0800
@@ -24,12 +24,12 @@
  * Use is subject to license terms.
  */
 
-#ifndef _PCI_LABELS_H
-#define	_PCI_LABELS_H
+#ifndef _PCIBUS_LABELS_H
+#define	_PCIBUS_LABELS_H
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#include "hostbridge.h"
+#include <hostbridge.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -107,4 +107,4 @@
 }
 #endif
 
-#endif /* _PCI_LABELS_H */
+#endif /* _PCIBUS_LABELS_H */

--- a/usr/src/lib/fm/topo/modules/sun4/ioboard/ioboard.h	Mon Feb 13 14:37:49 2006 -0800
+++ b/usr/src/lib/fm/topo/modules/sun4/ioboard/ioboard.h	Mon Feb 13 14:45:56 2006 -0800
@@ -30,7 +30,7 @@
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <libdevinfo.h>
-#include "did.h"
+#include <did.h>
 
 #ifdef __cplusplus
 extern "C" {

--- a/usr/src/lib/fm/topo/modules/sun4u/pcibus/pci_sun4u.h	Mon Feb 13 14:37:49 2006 -0800
+++ b/usr/src/lib/fm/topo/modules/sun4u/pcibus/pci_sun4u.h	Mon Feb 13 14:45:56 2006 -0800
@@ -29,7 +29,7 @@
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#include "pcibus_labels.h"
+#include <pcibus_labels.h>
 
 #ifdef __cplusplus
 extern "C" {

--- a/usr/src/uts/i86pc/cpu/amd_opteron/ao_mca_disp.h	Mon Feb 13 14:37:49 2006 -0800
+++ b/usr/src/uts/i86pc/cpu/amd_opteron/ao_mca_disp.h	Mon Feb 13 14:45:56 2006 -0800
@@ -32,7 +32,7 @@
 #include <sys/mca_amd.h>
 #include <sys/fm/cpu/AMD.h>
 
-#include "ao.h"
+#include <ao.h>
 
 #ifdef __cplusplus
 extern "C" {