diff --git a/sys/arch/vax/boot/boot/boot.c b/sys/arch/vax/boot/boot/boot.c
index 4df42ded11ed..b52b81bea49e 100644
--- a/sys/arch/vax/boot/boot/boot.c
+++ b/sys/arch/vax/boot/boot/boot.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.22 2005/06/27 11:21:25 junyoung Exp $ */
+/*	$NetBSD: boot.c,v 1.23 2005/06/27 11:26:02 junyoung Exp $ */
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * All rights reserved.
@@ -33,9 +33,10 @@
 #include <sys/param.h>
 #include <sys/reboot.h>
 #include <sys/boot_flag.h>
-#include "lib/libsa/stand.h"
-#include "lib/libsa/loadfile.h"
-#include "lib/libkern/libkern.h"
+
+#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
+#include <lib/libkern/libkern.h>
 
 #define V750UCODE(x)    ((x>>8)&255)
 
diff --git a/sys/arch/vax/boot/boot/conf.c b/sys/arch/vax/boot/boot/conf.c
index b774e31ae1e8..5ca529682186 100644
--- a/sys/arch/vax/boot/boot/conf.c
+++ b/sys/arch/vax/boot/boot/conf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.c,v 1.12 2005/06/23 19:44:01 junyoung Exp $ */
+/*	$NetBSD: conf.c,v 1.13 2005/06/27 11:26:02 junyoung Exp $ */
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -31,19 +31,19 @@
 
  /* All bugs are subject to removal without further notice */
 
-#include "sys/param.h"
+#include <sys/param.h>
 
 #include <netinet/in.h>
 
 #include "../../include/rpb.h"
 
-#include "lib/libkern/libkern.h"
+#include <lib/libkern/libkern.h>
 
-#include "lib/libsa/stand.h"
-#include "lib/libsa/ufs.h"
-#include "lib/libsa/nfs.h"
-#include "lib/libsa/cd9660.h"
-#include "lib/libsa/ustarfs.h"
+#include <lib/libsa/stand.h>
+#include <lib/libsa/ufs.h>
+#include <lib/libsa/nfs.h>
+#include <lib/libsa/cd9660.h>
+#include <lib/libsa/ustarfs.h>
 
 #include "vaxstand.h"
 
diff --git a/sys/arch/vax/boot/boot/devopen.c b/sys/arch/vax/boot/boot/devopen.c
index a79474f96716..d37debdadb6a 100644
--- a/sys/arch/vax/boot/boot/devopen.c
+++ b/sys/arch/vax/boot/boot/devopen.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: devopen.c,v 1.12 2005/06/27 11:21:25 junyoung Exp $ */
+/*	$NetBSD: devopen.c,v 1.13 2005/06/27 11:26:02 junyoung Exp $ */
 /*
  * Copyright (c) 1997 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -30,16 +30,16 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "lib/libsa/stand.h"
-#include "lib/libkern/libkern.h"
+#include <lib/libsa/stand.h>
+#include <lib/libkern/libkern.h>
 
-#include "machine/rpb.h"
-#include "machine/sid.h"
-#include "machine/pte.h"
+#include <machine/rpb.h>
+#include <machine/sid.h>
+#include <machine/pte.h>
 #define	VAX780 1
-#include "machine/ka750.h"
+#include <machine/ka750.h>
 
-#include "dev/bi/bireg.h"
+#include <dev/bi/bireg.h>
 
 #include "vaxstand.h"
 
diff --git a/sys/arch/vax/boot/boot/hp.c b/sys/arch/vax/boot/boot/hp.c
index 06823c020c56..32d26b57d6b4 100644
--- a/sys/arch/vax/boot/boot/hp.c
+++ b/sys/arch/vax/boot/boot/hp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hp.c,v 1.6 2005/06/27 11:21:25 junyoung Exp $ */
+/*	$NetBSD: hp.c,v 1.7 2005/06/27 11:26:02 junyoung Exp $ */
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -31,12 +31,12 @@
 
  /* All bugs are subject to removal without further notice */
 
-#include "sys/param.h"
-#include "sys/disklabel.h"
+#include <sys/param.h>
+#include <sys/disklabel.h>
 
-#include "lib/libsa/stand.h"
+#include <lib/libsa/stand.h>
 
-#include "lib/libkern/libkern.h"
+#include <lib/libkern/libkern.h>
 
 #include "../include/pte.h"
 #include "../include/rpb.h"
diff --git a/sys/arch/vax/boot/boot/mfm.c b/sys/arch/vax/boot/boot/mfm.c
index a3828277628f..f4aed61aee79 100644
--- a/sys/arch/vax/boot/boot/mfm.c
+++ b/sys/arch/vax/boot/boot/mfm.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mfm.c,v 1.4 2001/07/26 22:55:13 wiz Exp $	*/
+/*	$NetBSD: mfm.c,v 1.5 2005/06/27 11:26:02 junyoung Exp $	*/
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -42,14 +42,14 @@
  * - ???
  */
 
-#include "sys/param.h"
-#include "sys/reboot.h"
-#include "sys/disklabel.h"
+#include <sys/param.h>
+#include <sys/reboot.h>
+#include <sys/disklabel.h>
 
-#include "lib/libsa/stand.h"
-#include "lib/libsa/ufs.h"
+#include <lib/libsa/stand.h>
+#include <lib/libsa/ufs.h>
 
-#include "lib/libkern/libkern.h"
+#include <lib/libkern/libkern.h>
 
 #include "../include/pte.h"
 #include "../include/sid.h"
diff --git a/sys/arch/vax/boot/boot/netio.c b/sys/arch/vax/boot/boot/netio.c
index 6fdf4822a93f..b91b596aa41c 100644
--- a/sys/arch/vax/boot/boot/netio.c
+++ b/sys/arch/vax/boot/boot/netio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netio.c,v 1.7 2003/03/28 18:16:59 he Exp $	*/
+/*	$NetBSD: netio.c,v 1.8 2005/06/27 11:26:02 junyoung Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -91,12 +91,12 @@
 #include <netinet/if_ether.h>
 #include <netinet/in_systm.h>
 
-#include "lib/libsa/stand.h"
-#include "lib/libsa/net.h"
-#include "lib/libsa/netif.h"
-#include "lib/libsa/bootparam.h"
-#include "lib/libsa/nfs.h"
-#include "lib/libsa/bootp.h"
+#include <lib/libsa/stand.h>
+#include <lib/libsa/net.h>
+#include <lib/libsa/netif.h>
+#include <lib/libsa/bootparam.h>
+#include <lib/libsa/nfs.h>
+#include <lib/libsa/bootp.h>
 
 #include <lib/libkern/libkern.h>
 
diff --git a/sys/arch/vax/boot/boot/ra.c b/sys/arch/vax/boot/boot/ra.c
index 1fc05f427856..5be46859a8e2 100644
--- a/sys/arch/vax/boot/boot/ra.c
+++ b/sys/arch/vax/boot/boot/ra.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ra.c,v 1.12 2005/06/27 11:21:25 junyoung Exp $ */
+/*	$NetBSD: ra.c,v 1.13 2005/06/27 11:26:02 junyoung Exp $ */
 /*
  * Copyright (c) 1995 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -34,21 +34,21 @@
 #define NRSP 1 /* Kludge */
 #define NCMD 1 /* Kludge */
 
-#include "sys/param.h"
-#include "sys/disklabel.h"
+#include <sys/param.h>
+#include <sys/disklabel.h>
 
-#include "lib/libsa/stand.h"
+#include <lib/libsa/stand.h>
 
-#include "lib/libkern/libkern.h"
+#include <lib/libkern/libkern.h>
 
 #include "../include/pte.h"
 #include "../include/rpb.h"
 
-#include "dev/mscp/mscp.h"
-#include "dev/mscp/mscpreg.h"
+#include <dev/mscp/mscp.h>
+#include <dev/mscp/mscpreg.h>
 
-#include "dev/bi/bireg.h"
-#include "dev/bi/kdbreg.h"
+#include <dev/bi/bireg.h>
+#include <dev/bi/kdbreg.h>
 
 #include "vaxstand.h"
 
diff --git a/sys/arch/vax/boot/boot/rom.c b/sys/arch/vax/boot/boot/rom.c
index 4a9042e9bb37..bb86f22d7d52 100644
--- a/sys/arch/vax/boot/boot/rom.c
+++ b/sys/arch/vax/boot/boot/rom.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rom.c,v 1.5 2002/09/19 17:41:21 ragge Exp $ */
+/*	$NetBSD: rom.c,v 1.6 2005/06/27 11:26:02 junyoung Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -16,7 +16,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *      This product includes software developed at Ludd, University of 
+ *      This product includes software developed at Ludd, University of
  *      Lule}, Sweden and its contributors.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission
@@ -33,16 +33,16 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "sys/param.h"
-#include "sys/reboot.h"
-#include "sys/disklabel.h"
+#include <sys/param.h>
+#include <sys/reboot.h>
+#include <sys/disklabel.h>
 
 #define RF_PROTECTED_SECTORS	64	/* XXX <dev/raidframe/raidframevar.h> */
 
-#include "lib/libsa/stand.h"
-#include "lib/libsa/ufs.h"
+#include <lib/libsa/stand.h>
+#include <lib/libsa/ufs.h>
 
-#include "lib/libkern/libkern.h"
+#include <lib/libkern/libkern.h>
 
 #include "../include/pte.h"
 #include "../include/sid.h"
diff --git a/sys/arch/vax/boot/boot/tmscp.c b/sys/arch/vax/boot/boot/tmscp.c
index 6be49e20531a..f82307728b02 100644
--- a/sys/arch/vax/boot/boot/tmscp.c
+++ b/sys/arch/vax/boot/boot/tmscp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tmscp.c,v 1.4 2005/06/27 11:21:25 junyoung Exp $ */
+/*	$NetBSD: tmscp.c,v 1.5 2005/06/27 11:26:02 junyoung Exp $ */
 /*
  * Copyright (c) 1995 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -34,14 +34,14 @@
 #define NRSP 0 /* Kludge */
 #define NCMD 0 /* Kludge */
 
-#include "sys/param.h"
-#include "sys/disklabel.h"
+#include <sys/param.h>
+#include <sys/disklabel.h>
 
-#include "lib/libsa/stand.h"
+#include <lib/libsa/stand.h>
 
 #include "../include/pte.h"
-#include "dev/mscp/mscp.h"
-#include "dev/mscp/mscpreg.h"
+#include <dev/mscp/mscp.h>
+#include <dev/mscp/mscpreg.h>
 
 #include "vaxstand.h"