diff --git a/sys/arch/cesfic/cesfic/machdep.c b/sys/arch/cesfic/cesfic/machdep.c
index 67d783dfcd04..5dd925676ae3 100644
--- a/sys/arch/cesfic/cesfic/machdep.c
+++ b/sys/arch/cesfic/cesfic/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.2 2001/05/30 15:24:28 lukem Exp $	*/
+/*	$NetBSD: machdep.c,v 1.3 2001/06/15 17:48:13 drochner Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -110,9 +110,9 @@ char machine[] = MACHINE;		/* cpu "architecture" */
 /* Our exported CPU info; we can have only one. */  
 struct cpu_info cpu_info_store;
 
-vm_map_t exec_map = NULL;  
-vm_map_t mb_map = NULL;
-vm_map_t phys_map = NULL;
+struct vm_map *exec_map = NULL;  
+struct vm_map *mb_map = NULL;
+struct vm_map *phys_map = NULL;
 
 extern vaddr_t virtual_avail;
 
diff --git a/sys/arch/cesfic/cesfic/pmap.c b/sys/arch/cesfic/cesfic/pmap.c
index 5baa88481182..1441149b04d8 100644
--- a/sys/arch/cesfic/cesfic/pmap.c
+++ b/sys/arch/cesfic/cesfic/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.2 2001/05/16 18:47:04 drochner Exp $	*/
+/*	$NetBSD: pmap.c,v 1.3 2001/06/15 17:48:13 drochner Exp $	*/
 
 /* 
  * Copyright (c) 1991, 1993
@@ -211,7 +211,7 @@ st_entry_t	*Segtabzero, *Segtabzeropa;
 vsize_t		Sysptsize = VM_KERNEL_PT_PAGES;
 
 struct pmap	kernel_pmap_store;
-vm_map_t	st_map, pt_map;
+struct vm_map	*st_map, *pt_map;
 struct vm_map	st_map_store, pt_map_store;
 
 paddr_t		avail_start;	/* PA of first available physical page */
@@ -2603,7 +2603,7 @@ void
 pmap_ptpage_addref(ptpva)
 	vaddr_t ptpva;
 {
-	vm_page_t m;
+	struct vm_page *m;
 
 	simple_lock(&uvm.kernel_object->vmobjlock);
 	m = uvm_pagelookup(uvm.kernel_object, ptpva - vm_map_min(kernel_map));
@@ -2620,7 +2620,7 @@ int
 pmap_ptpage_delref(ptpva)
 	vaddr_t ptpva;
 {
-	vm_page_t m;
+	struct vm_page *m;
 	int rv;
 
 	simple_lock(&uvm.kernel_object->vmobjlock);
@@ -2666,7 +2666,7 @@ pmap_check_wiring(str, va)
 {
 	pt_entry_t *pte;
 	paddr_t pa;
-	vm_page_t m;
+	struct vm_page *m;
 	int count;
 
 	if (!pmap_ste_v(pmap_kernel(), va) ||
diff --git a/sys/arch/cesfic/cesfic/trap.c b/sys/arch/cesfic/cesfic/trap.c
index b1fcc8032d8d..bcae9a9eaa83 100644
--- a/sys/arch/cesfic/cesfic/trap.c
+++ b/sys/arch/cesfic/cesfic/trap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.3 2001/05/30 15:24:28 lukem Exp $	*/
+/*	$NetBSD: trap.c,v 1.4 2001/06/15 17:48:13 drochner Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -573,10 +573,10 @@ trap(type, code, v, frame)
 	    {
 		vaddr_t va;
 		struct vmspace *vm = p->p_vmspace;
-		vm_map_t map;
+		struct vm_map *map;
 		int rv;
 		vm_prot_t ftype;
-		extern vm_map_t kernel_map;
+		extern struct vm_map *kernel_map;
 
 #ifdef DEBUG
 		if ((mmudebug & MDB_WBFOLLOW) || MDB_ISPID(p->p_pid))
diff --git a/sys/arch/cesfic/cesfic/vm_machdep.c b/sys/arch/cesfic/cesfic/vm_machdep.c
index 388ff9e8baf5..6c7d143c7559 100644
--- a/sys/arch/cesfic/cesfic/vm_machdep.c
+++ b/sys/arch/cesfic/cesfic/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.2 2001/05/16 18:49:05 drochner Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.3 2001/06/15 17:48:13 drochner Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -284,7 +284,7 @@ kvtop(addr)
 	return((int)pa);
 }
 
-extern vm_map_t phys_map;
+extern struct vm_map *phys_map;
 
 /*
  * Map an IO request into kernel virtual address space.
diff --git a/sys/arch/cesfic/include/pmap.h b/sys/arch/cesfic/include/pmap.h
index 0e9b69070d87..0c2f7b876aa5 100644
--- a/sys/arch/cesfic/include/pmap.h
+++ b/sys/arch/cesfic/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.2 2001/05/16 18:50:52 drochner Exp $	*/
+/*	$NetBSD: pmap.h,v 1.3 2001/06/15 17:48:14 drochner Exp $	*/
 
 /* 
  * Copyright (c) 1987 Carnegie-Mellon University
@@ -65,7 +65,7 @@ struct pmap {
 	st_entry_t		*pm_stpa;	/* 040: ST phys addr */
 	short			pm_sref;	/* segment table ref count */
 	short			pm_count;	/* pmap reference count */
-	simple_lock_data_t	pm_lock;	/* lock on pmap */
+	struct simplelock	pm_lock;	/* lock on pmap */
 	struct pmap_statistics	pm_stats;	/* pmap statistics */
 	long			pm_ptpages;	/* more stats: PT pages */
 };
@@ -98,7 +98,7 @@ typedef struct pmap	*pmap_t;
 }
 
 /*
- * For each vm_page_t, there is a list of all currently valid virtual
+ * For each struct vm_page, there is a list of all currently valid virtual
  * mappings of that page.  An entry is a pv_entry, the list is pv_table.
  */
 struct pv_entry {