diff --git a/sys/arch/arm32/arm32/machdep.c b/sys/arch/arm32/arm32/machdep.c
index ba8f185c6ffb..2cff1481b45d 100644
--- a/sys/arch/arm32/arm32/machdep.c
+++ b/sys/arch/arm32/arm32/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.44 1998/08/26 14:51:57 tv Exp $	*/
+/*	$NetBSD: machdep.c,v 1.45 1998/08/27 04:00:53 mark Exp $	*/
 
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
@@ -115,12 +115,6 @@ extern int max_processes;
 extern u_int memory_disc_size;		/* Memory disc size */
 #endif	/* NMD && MEMORY_DISK_HOOKS && !MINIROOTSIZE */
 
-/* XXX - this needs to be properly defined elsewhere */
-typedef struct {
-	vm_offset_t physical;
-	vm_offset_t virtual;
-} pv_addr_t;
-
 pv_addr_t systempage;
 pv_addr_t kernelstack;
 
diff --git a/sys/arch/arm32/arm32/pmap.c b/sys/arch/arm32/arm32/pmap.c
index 78cd159ce169..1f2634cd7b7e 100644
--- a/sys/arch/arm32/arm32/pmap.c
+++ b/sys/arch/arm32/arm32/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.31 1998/08/20 05:46:20 thorpej Exp $	*/
+/*	$NetBSD: pmap.c,v 1.32 1998/08/27 04:00:54 mark Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -131,11 +131,6 @@ vm_offset_t virtual_end;
 vm_offset_t avail_start;
 vm_offset_t avail_end;
 
-typedef struct {
-	vm_offset_t physical;
-	vm_offset_t virtual;
-} pv_addr_t;
-
 extern pv_addr_t systempage;
 
 #if NHYDRABUS > 0
diff --git a/sys/arch/arm32/arm32/postmortem.c b/sys/arch/arm32/arm32/postmortem.c
index 90c980c03da9..1fe5e32a3280 100644
--- a/sys/arch/arm32/arm32/postmortem.c
+++ b/sys/arch/arm32/arm32/postmortem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: postmortem.c,v 1.14 1998/06/17 19:29:28 mark Exp $	*/
+/*	$NetBSD: postmortem.c,v 1.15 1998/08/27 04:00:53 mark Exp $	*/
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe.
@@ -51,11 +51,6 @@
 
 #ifdef POSTMORTEM
 
-typedef struct {
-	vm_offset_t physical;
-	vm_offset_t virtual;
-} pv_addr_t;
-
 #ifdef ROTTEN_INARDS
 #ifndef	OFWGENCFG
 extern pv_addr_t irqstack;
diff --git a/sys/arch/arm32/arm32/syscall.c b/sys/arch/arm32/arm32/syscall.c
index 9ea5e4d05ca8..d3e4d198f4d6 100644
--- a/sys/arch/arm32/arm32/syscall.c
+++ b/sys/arch/arm32/arm32/syscall.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: syscall.c,v 1.18 1998/08/16 02:01:16 mark Exp $	*/
+/*	$NetBSD: syscall.c,v 1.19 1998/08/27 04:00:53 mark Exp $	*/
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe.
@@ -83,21 +83,12 @@ u_int arm700bugcount = 0;
 extern int usertraceback;
 
 #if NHYDRABUS > 0
-typedef struct {
-	vm_offset_t physical;
-	vm_offset_t virtual;
-} pv_addr_t;
-
 extern pv_addr_t hydrascratch;
 #endif
 
 extern int vmem_mapdram		__P((void));
 extern int vmem_mapvram		__P((void));
 extern int vmem_cachectl	__P((int flag));
-extern void pmap_dump_pvs	__P((void));
-extern int pmap_page_attributes	__P((vm_offset_t va));
-extern void pmap_pagedir_dump	__P((void));
-extern void debug_show_all_procs	__P((int argc, char *argv[]));
 
 /* Macors to simplify the switch statement below */
 
diff --git a/sys/arch/arm32/arm32/vm_machdep.c b/sys/arch/arm32/arm32/vm_machdep.c
index 4e24233bf432..8e5e204bea4f 100644
--- a/sys/arch/arm32/arm32/vm_machdep.c
+++ b/sys/arch/arm32/arm32/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.28 1998/07/28 18:34:53 thorpej Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.29 1998/08/27 04:00:53 mark Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -75,11 +75,6 @@
 #include <arm32/fpe-arm/armfpe.h>
 #endif
 
-typedef struct {
-	vm_offset_t physical;
-	vm_offset_t virtual;
-} pv_addr_t;
-
 extern pv_addr_t systempage;
 
 #ifdef PMAP_DEBUG
diff --git a/sys/arch/arm32/ofw/ofw.c b/sys/arch/arm32/ofw/ofw.c
index ba5e4c689665..d5914d8f4fc3 100644
--- a/sys/arch/arm32/ofw/ofw.c
+++ b/sys/arch/arm32/ofw/ofw.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ofw.c,v 1.13 1998/08/08 23:39:40 mycroft Exp $	*/
+/*	$NetBSD: ofw.c,v 1.14 1998/08/27 04:00:55 mark Exp $	*/
 
 /*
  * Copyright 1997
@@ -78,15 +78,6 @@
 #define IO_VIRT_BASE (OFW_VIRT_BASE + OFW_VIRT_SIZE)
 #define IO_VIRT_SIZE 0x01000000
 
-/*
- *  Imported types
- */
-typedef	struct {
-        vm_offset_t physical;
-        vm_offset_t virtual;
-} pv_addr_t;
-
-
 /*
  *  Imported variables
  */
diff --git a/sys/arch/arm32/ofw/ofwgencfg_machdep.c b/sys/arch/arm32/ofw/ofwgencfg_machdep.c
index 6dd7117c14ae..8910eeeee7c8 100644
--- a/sys/arch/arm32/ofw/ofwgencfg_machdep.c
+++ b/sys/arch/arm32/ofw/ofwgencfg_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ofwgencfg_machdep.c,v 1.7 1998/07/07 00:48:13 mark Exp $	*/
+/*	$NetBSD: ofwgencfg_machdep.c,v 1.8 1998/08/27 04:00:55 mark Exp $	*/
 
 /*
  * Copyright 1997
@@ -68,16 +68,6 @@
 #include <dev/ofw/openfirm.h>
 #include <machine/ofw.h>
 
-
-/*
- *  Imported types
- */
-typedef	struct {
-        vm_offset_t physical;
-        vm_offset_t virtual;
-} pv_addr_t;
-
-
 /*
  *  Imported variables
  */
diff --git a/sys/arch/arm32/rc7500/rc7500_machdep.c b/sys/arch/arm32/rc7500/rc7500_machdep.c
index 68c02d2cd953..7a427a239575 100644
--- a/sys/arch/arm32/rc7500/rc7500_machdep.c
+++ b/sys/arch/arm32/rc7500/rc7500_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rc7500_machdep.c,v 1.12 1998/08/25 22:03:07 mark Exp $	*/
+/*	$NetBSD: rc7500_machdep.c,v 1.13 1998/08/27 04:00:54 mark Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -125,11 +125,6 @@ vm_offset_t videodram_start;
 vm_offset_t physical_pt_start;
 vm_offset_t virtual_pt_end;
 
-typedef struct {
-	vm_offset_t physical;
-	vm_offset_t virtual;
-} pv_addr_t;
-
 pv_addr_t systempage;
 pv_addr_t irqstack;
 pv_addr_t undstack;
diff --git a/sys/arch/arm32/riscpc/rpc_machdep.c b/sys/arch/arm32/riscpc/rpc_machdep.c
index 2dbb39b40dc7..7c7fe43f5376 100644
--- a/sys/arch/arm32/riscpc/rpc_machdep.c
+++ b/sys/arch/arm32/riscpc/rpc_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_machdep.c,v 1.15 1998/08/25 22:03:07 mark Exp $	*/
+/*	$NetBSD: rpc_machdep.c,v 1.16 1998/08/27 04:00:54 mark Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -121,11 +121,6 @@ vm_offset_t videodram_start;
 vm_offset_t physical_pt_start;
 vm_offset_t virtual_pt_end;
 
-typedef struct {
-	vm_offset_t physical;
-	vm_offset_t virtual;
-} pv_addr_t;
-
 pv_addr_t systempage;
 pv_addr_t irqstack;
 pv_addr_t undstack;
diff --git a/sys/arch/arm32/shark/shark_machdep.c b/sys/arch/arm32/shark/shark_machdep.c
index 50560f85d451..874570b48308 100644
--- a/sys/arch/arm32/shark/shark_machdep.c
+++ b/sys/arch/arm32/shark/shark_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: shark_machdep.c,v 1.9 1998/07/08 05:01:56 thorpej Exp $	*/
+/*	$NetBSD: shark_machdep.c,v 1.10 1998/08/27 04:00:55 mark Exp $	*/
 
 /*
  * Copyright 1997
@@ -72,15 +72,6 @@
 #include <arm32/isa/isa_machdep.h>
 #include <arm32/shark/sequoia.h>
 
-/*
- *  Imported types
- */
-typedef	struct {
-        vm_offset_t physical;
-        vm_offset_t virtual;
-} pv_addr_t;
-
-
 /*
  *  Imported variables
  */