3 files changed, 14 insertions, 24 deletions
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 9ba6fc6..dfc3443 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.48 1995/02/02 08:45:14 davidg Exp $
+ *	$Id: pmap.c,v 1.49 1995/02/15 04:36:31 davidg Exp $
  */
 
 /*
@@ -95,7 +95,7 @@
 #include <vm/vm_kern.h>
 #include <vm/vm_page.h>
 
-#include <i386/include/cputypes.h>
+#include <machine/cputypes.h>
 
 #include <i386/isa/isa.h>
 
diff --git a/sys/amd64/pci/pci_bus.c b/sys/amd64/pci/pci_bus.c
index fd22e08..f1cdd1e 100644
--- a/sys/amd64/pci/pci_bus.c
+++ b/sys/amd64/pci/pci_bus.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.2 1995/02/09 20:16:19 se Exp $
+**  $Id: pcibus.c,v 1.3 1995/02/25 17:51:18 se Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -45,23 +45,18 @@
 #define HAS_CPUFUNC_H
 #endif
 
-#include <types.h>
-#include <param.h>
-#include <kernel.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+
+#include <i386/isa/icu.h>
 #include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
-#include <i386/isa/icu.h>
-
-#ifdef HAS_CPUFUNC_H
-#include <i386/include/cpufunc.h>
-#endif
 
 #include <pci/pcivar.h>
 #include <pci/pcireg.h>
 #include <pci/pcibus.h>
 
-extern int printf();
-
 static char pci_mode;
 
 /*-----------------------------------------------------------------
diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c
index fd22e08..f1cdd1e 100644
--- a/sys/amd64/pci/pci_cfgreg.c
+++ b/sys/amd64/pci/pci_cfgreg.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.2 1995/02/09 20:16:19 se Exp $
+**  $Id: pcibus.c,v 1.3 1995/02/25 17:51:18 se Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -45,23 +45,18 @@
 #define HAS_CPUFUNC_H
 #endif
 
-#include <types.h>
-#include <param.h>
-#include <kernel.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+
+#include <i386/isa/icu.h>
 #include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
-#include <i386/isa/icu.h>
-
-#ifdef HAS_CPUFUNC_H
-#include <i386/include/cpufunc.h>
-#endif
 
 #include <pci/pcivar.h>
 #include <pci/pcireg.h>
 #include <pci/pcibus.h>
 
-extern int printf();
-
 static char pci_mode;
 
 /*-----------------------------------------------------------------