fix include file path related to ip6.

32 files changed, 85 insertions, 91 deletions

diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c
index 9fa3ed64b67..7c935b40709 100644
--- a/sys/net/if_atmsubr.c
+++ b/sys/net/if_atmsubr.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: if_atmsubr.c,v 1.11 1999/02/04 00:04:18 deraadt Exp $       */
+/*      $OpenBSD: if_atmsubr.c,v 1.12 2000/02/07 06:09:08 itojun Exp $       */
 
 /*
  *
@@ -78,7 +78,6 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
 #include <netnatm/natm.h>
 #endif
 #ifdef INET6
-#include <netinet6/in6.h>
 #include <netinet6/in6_var.h>
 #endif /* INET6 */
 
diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c
index 024ff91d674..c944154cb5b 100644
--- a/sys/net/if_enc.c
+++ b/sys/net/if_enc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_enc.c,v 1.19 2000/01/25 17:18:59 espie Exp $	*/
+/*	$OpenBSD: if_enc.c,v 1.20 2000/02/07 06:09:08 itojun Exp $	*/
 
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
@@ -66,8 +66,10 @@
 #endif
 
 #ifdef INET6
-#include <netinet6/in6.h>
-#include <netinet6/ip6.h>
+#ifndef INET
+#include <netinet/in.h>
+#endif
+#include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 #endif /* INET6 */
 
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index c0b474601a2..ea854f087fa 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ethersubr.c,v 1.33 2000/01/11 19:27:52 fgsch Exp $	*/
+/*	$OpenBSD: if_ethersubr.c,v 1.34 2000/02/07 06:09:08 itojun Exp $	*/
 /*	$NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $	*/
 
 /*
@@ -155,11 +155,6 @@ extern u_char	aarp_org_code[ 3 ];
 #include <sys/socketvar.h>
 #endif
 
-#if 0	/*NRL INET6*/
-#include <netinet6/in6.h>
-#include <netinet6/in6_var.h>
-#endif /* INET6 */
-
 u_char	etherbroadcastaddr[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 #define senderr(e) { error = (e); goto bad;}
 
diff --git a/sys/net/if_faith.c b/sys/net/if_faith.c
index 360cfc3d58c..f2d5d2b8fda 100644
--- a/sys/net/if_faith.c
+++ b/sys/net/if_faith.c
@@ -70,7 +70,7 @@
 #include <netinet/in.h>
 #endif
 #include <netinet6/in6_var.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #endif
 
 #include "bpfilter.h"
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index d2be62fc9b5..99f6c6448f7 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_fddisubr.c,v 1.21 2000/01/11 19:27:53 fgsch Exp $	*/
+/*	$OpenBSD: if_fddisubr.c,v 1.22 2000/02/07 06:09:08 itojun Exp $	*/
 /*	$NetBSD: if_fddisubr.c,v 1.5 1996/05/07 23:20:21 christos Exp $	*/
 
 /*
@@ -115,11 +115,6 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
 #include <netccitt/dll.h>
 #include <netccitt/llc_var.h>
 
-#ifdef INET6
-#include <netinet6/in6.h>
-#include <netinet6/in6_var.h>
-#endif /* INET6 */
-
 #if defined(CCITT)
 extern struct ifqueue pkintrq;
 #endif
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 46eb07ec1fb..6a127b4b759 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_loop.c,v 1.12 1999/12/08 06:50:18 itojun Exp $	*/
+/*	$OpenBSD: if_loop.c,v 1.13 2000/02/07 06:09:08 itojun Exp $	*/
 /*	$NetBSD: if_loop.c,v 1.15 1996/05/07 02:40:33 thorpej Exp $	*/
 
 /*
@@ -112,7 +112,7 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
 #include <netinet/in.h>
 #endif
 #include <netinet6/in6_var.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #endif
 
 #ifdef NS
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index 228ebe5ea07..ed5f2932b61 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_pcb.h,v 1.21 2000/01/11 01:13:49 angelos Exp $	*/
+/*	$OpenBSD: in_pcb.h,v 1.22 2000/02/07 06:09:09 itojun Exp $	*/
 /*	$NetBSD: in_pcb.h,v 1.14 1996/02/13 23:42:00 christos Exp $	*/
 
 /*
@@ -66,9 +66,9 @@
  */
 
 #include <sys/queue.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
-#include <netinet6/icmp6.h>
+#include <netinet/icmp6.h>
 #include <netinet/ip_ipsp.h>
 
 union inpaddru {
diff --git a/sys/netinet/ip_ah.c b/sys/netinet/ip_ah.c
index 39e54483cb9..b4a412b7a07 100644
--- a/sys/netinet/ip_ah.c
+++ b/sys/netinet/ip_ah.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ah.c,v 1.33 2000/01/27 08:09:08 angelos Exp $ */
+/*	$OpenBSD: ip_ah.c,v 1.34 2000/02/07 06:09:09 itojun Exp $ */
 
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
@@ -60,8 +60,7 @@
 #include <netinet/ip.h>
 
 #ifdef INET6
-#include <netinet6/in6.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #endif /* INET6 */
 
 #include <netinet/ip_ipsp.h>
diff --git a/sys/netinet/ip_esp.c b/sys/netinet/ip_esp.c
index e9cc0356dae..b6bf578d455 100644
--- a/sys/netinet/ip_esp.c
+++ b/sys/netinet/ip_esp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_esp.c,v 1.31 2000/01/27 08:09:09 angelos Exp $ */
+/*	$OpenBSD: ip_esp.c,v 1.32 2000/02/07 06:09:09 itojun Exp $ */
 
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
@@ -62,8 +62,10 @@
 #endif /* INET */
 
 #ifdef INET6
-#include <netinet6/in6.h>
-#include <netinet6/ip6.h>
+#ifndef INET
+#include <netinet/in.h>
+#endif
+#include <netinet/ip6.h>
 #endif /* INET6 */
 
 #include <netinet/ip_ipsp.h>
diff --git a/sys/netinet/ip_ipsp.c b/sys/netinet/ip_ipsp.c
index 9dc7f9c30c0..d97c25a97f4 100644
--- a/sys/netinet/ip_ipsp.c
+++ b/sys/netinet/ip_ipsp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ipsp.c,v 1.77 2000/01/27 08:09:12 angelos Exp $	*/
+/*	$OpenBSD: ip_ipsp.c,v 1.78 2000/02/07 06:09:09 itojun Exp $	*/
 
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
@@ -63,7 +63,9 @@
 #endif /* INET */
 
 #ifdef INET6
-#include <netinet6/in6.h>
+#ifndef INET
+#include <netinet/in.h>
+#endif
 #include <netinet6/in6.h>
 #endif /* INET6 */
 
diff --git a/sys/netinet/ipsec_input.c b/sys/netinet/ipsec_input.c
index 7249fbe5887..a46d2921356 100644
--- a/sys/netinet/ipsec_input.c
+++ b/sys/netinet/ipsec_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipsec_input.c,v 1.18 2000/01/27 08:09:12 angelos Exp $	*/
+/*	$OpenBSD: ipsec_input.c,v 1.19 2000/02/07 06:09:09 itojun Exp $	*/
 
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
@@ -69,8 +69,8 @@
 #include <netinet/udp.h>
 
 #ifdef INET6
-#include <netinet6/in6.h>
-#include <netinet6/ip6.h>
+#include <netinet/in.h>
+#include <netinet/ip6.h>
 #endif /* INET6 */
 
 #include <netinet/ip_ipsp.h>
diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c
index 13e1c89eb52..03d67ebb1a0 100644
--- a/sys/netinet/tcp_debug.c
+++ b/sys/netinet/tcp_debug.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_debug.c,v 1.6 1999/12/08 06:50:20 itojun Exp $	*/
+/*	$OpenBSD: tcp_debug.c,v 1.7 2000/02/07 06:09:09 itojun Exp $	*/
 /*	$NetBSD: tcp_debug.c,v 1.10 1996/02/13 23:43:36 christos Exp $	*/
 
 /*
@@ -84,7 +84,7 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
 #ifndef INET
 #include <netinet/in.h>
 #endif
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #endif /* INET6 */
 
 #ifdef TCPDEBUG
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 25f22489ba7..aa082a2499b 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udp_usrreq.c,v 1.37 2000/01/07 16:34:10 angelos Exp $	*/
+/*	$OpenBSD: udp_usrreq.c,v 1.38 2000/02/07 06:09:09 itojun Exp $	*/
 /*	$NetBSD: udp_usrreq.c,v 1.28 1996/03/16 23:54:03 christos Exp $	*/
 
 /*
@@ -87,10 +87,10 @@ extern int     	check_ipsec_policy  __P((struct inpcb *, u_int32_t));
 #ifndef INET
 #include <netinet/in.h>
 #endif
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #include <netinet6/in6_var.h>
 #include <netinet6/ip6_var.h>
-#include <netinet6/icmp6.h>
+#include <netinet/icmp6.h>
 #include <netinet6/ip6protosw.h>
 
 extern int ip6_defhlim;
diff --git a/sys/netinet6/dest6.c b/sys/netinet6/dest6.c
index 11ec60b0f6e..6dcfc4f1950 100644
--- a/sys/netinet6/dest6.c
+++ b/sys/netinet6/dest6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dest6.c,v 1.2 1999/12/10 10:04:27 angelos Exp $	*/
+/*	$OpenBSD: dest6.c,v 1.3 2000/02/07 06:09:09 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -45,9 +45,9 @@
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
-#include <netinet6/icmp6.h>
+#include <netinet/icmp6.h>
 
 /*
  * Destination options header processing.
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c
index 2f84c07d804..9074cf00705 100644
--- a/sys/netinet6/frag6.c
+++ b/sys/netinet6/frag6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frag6.c,v 1.5 2000/02/04 18:11:38 itojun Exp $	*/
+/*	$OpenBSD: frag6.c,v 1.6 2000/02/07 06:09:09 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -46,9 +46,9 @@
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
-#include <netinet6/icmp6.h>
+#include <netinet/icmp6.h>
 
 #include <net/net_osdep.h>
 
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 78db3053f74..2cb30386901 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: icmp6.c,v 1.5 2000/01/08 13:54:36 itojun Exp $	*/
+/*	$OpenBSD: icmp6.c,v 1.6 2000/02/07 06:09:09 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -85,9 +85,9 @@
 #include <netinet/in_var.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
-#include <netinet6/icmp6.h>
+#include <netinet/icmp6.h>
 #include <netinet6/mld6_var.h>
 #include <netinet/in_pcb.h>
 #include <netinet6/nd6.h>
diff --git a/sys/netinet6/in6_cksum.c b/sys/netinet6/in6_cksum.c
index a8775312bce..630283fb896 100644
--- a/sys/netinet6/in6_cksum.c
+++ b/sys/netinet6/in6_cksum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in6_cksum.c,v 1.3 1999/12/10 08:53:17 angelos Exp $ */
+/* $OpenBSD: in6_cksum.c,v 1.4 2000/02/07 06:09:09 itojun Exp $ */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -68,7 +68,7 @@
 #include <sys/mbuf.h>
 #include <sys/systm.h>
 #include <netinet/in.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 
 #include <net/net_osdep.h>
 
diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c
index dba946b8b42..1686a6597d5 100644
--- a/sys/netinet6/in6_gif.c
+++ b/sys/netinet6/in6_gif.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6_gif.c,v 1.5 2000/01/21 03:15:06 angelos Exp $	*/
+/*	$OpenBSD: in6_gif.c,v 1.6 2000/02/07 06:09:10 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -53,12 +53,12 @@
 #include <netinet/ip.h>
 #endif
 
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 #include <netinet6/in6_gif.h>
 
 #ifdef INET6
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #endif
 
 #include <netinet/ip_ecn.h>
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c
index 9ed1318d7b0..16dcb3894aa 100644
--- a/sys/netinet6/in6_ifattach.c
+++ b/sys/netinet6/in6_ifattach.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6_ifattach.c,v 1.5 2000/02/04 18:13:36 itojun Exp $	*/
+/*	$OpenBSD: in6_ifattach.c,v 1.6 2000/02/07 06:09:10 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -46,10 +46,10 @@
 #include <netinet/in_var.h>
 #include <netinet/if_ether.h>
 
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 #include <netinet6/in6_ifattach.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 #include <netinet6/nd6.h>
 
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
index 02191ec6d24..8d955ac107c 100644
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in6_pcb.c,v 1.8 1999/12/10 08:53:17 angelos Exp $ */
+/* $OpenBSD: in6_pcb.c,v 1.9 2000/02/07 06:09:10 itojun Exp $ */
 
 /*
 %%% copyright-nrl-95
@@ -66,7 +66,7 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
 #include <netinet/in_pcb.h>
 
 #include <netinet6/in6_var.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 
 /*
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c
index 5ba5bd111f9..c85c335bd40 100644
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in6_proto.c,v 1.16 2000/02/02 17:01:51 itojun Exp $ */
+/* $OpenBSD: in6_proto.c,v 1.17 2000/02/07 06:09:10 itojun Exp $ */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -81,9 +81,9 @@
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/in_pcb.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
-#include <netinet6/icmp6.h>
+#include <netinet/icmp6.h>
 
 #include <netinet/tcp.h>
 #include <netinet/tcp_timer.h>
diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c
index e996ce837b4..2d5a443c2b9 100644
--- a/sys/netinet6/in6_src.c
+++ b/sys/netinet6/in6_src.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6_src.c,v 1.2 1999/12/10 10:04:28 angelos Exp $	*/
+/*	$OpenBSD: in6_src.c,v 1.3 2000/02/07 06:09:10 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -85,7 +85,7 @@
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet6/in6_var.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #if 0
 #include <netinet6/in6_pcb.h>
 #endif
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
index 0b10bb2a8c9..a28ac69c199 100644
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_forward.c,v 1.2 1999/12/10 10:04:28 angelos Exp $	*/
+/*	$OpenBSD: ip6_forward.c,v 1.3 2000/02/07 06:09:10 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -46,9 +46,9 @@
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
-#include <netinet6/icmp6.h>
+#include <netinet/icmp6.h>
 #include <netinet6/nd6.h>
 
 #undef IPSEC
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index 3626d80c472..6180f47b1f4 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_input.c,v 1.7 2000/01/08 04:49:22 deraadt Exp $	*/
+/*	$OpenBSD: ip6_input.c,v 1.8 2000/02/07 06:09:10 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -94,9 +94,9 @@
 
 #include <netinet/in_pcb.h>
 #include <netinet6/in6_var.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
-#include <netinet6/icmp6.h>
+#include <netinet/icmp6.h>
 #include <netinet6/in6_ifattach.h>
 #include <netinet6/nd6.h>
 #include <netinet6/in6_prefix.h>
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index e1643e8b448..3053c266a6d 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_mroute.c,v 1.2 1999/12/10 10:04:28 angelos Exp $	*/
+/*	$OpenBSD: ip6_mroute.c,v 1.3 2000/02/07 06:09:10 itojun Exp $	*/
 
 /*
  * Copyright (C) 1998 WIDE Project.
@@ -70,7 +70,7 @@
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 #include <netinet6/ip6_mroute.h>
 #include <netinet6/pim6.h>
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index f3a7da9d9cf..711a69f1300 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_output.c,v 1.3 1999/12/20 07:49:06 itojun Exp $	*/
+/*	$OpenBSD: ip6_output.c,v 1.4 2000/02/07 06:09:10 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -83,8 +83,8 @@
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 
-#include <netinet6/ip6.h>
-#include <netinet6/icmp6.h>
+#include <netinet/ip6.h>
+#include <netinet/icmp6.h>
 #include <netinet6/ip6_var.h>
 #include <netinet6/nd6.h>
 
diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c
index 905f999c7c6..fa3d929cc55 100644
--- a/sys/netinet6/mld6.c
+++ b/sys/netinet6/mld6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mld6.c,v 1.4 2000/01/08 05:49:40 angelos Exp $	*/
+/*	$OpenBSD: mld6.c,v 1.5 2000/02/07 06:09:10 itojun Exp $	*/
 
 /*
  * Copyright (C) 1998 WIDE Project.
@@ -80,9 +80,9 @@
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
-#include <netinet6/icmp6.h>
+#include <netinet/icmp6.h>
 #include <netinet6/mld6_var.h>
 
 #include <net/net_osdep.h>
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index 3555c8dd905..d2eeda40b29 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nd6.c,v 1.5 2000/02/04 18:13:36 itojun Exp $	*/
+/*	$OpenBSD: nd6.c,v 1.6 2000/02/07 06:09:10 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,11 +61,11 @@
 #include <netinet/if_ether.h>
 
 #include <netinet6/in6_var.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 #include <netinet6/nd6.h>
 #include <netinet6/in6_prefix.h>
-#include <netinet6/icmp6.h>
+#include <netinet/icmp6.h>
 
 #include "loop.h"
 
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c
index 1534e62a748..868813782c9 100644
--- a/sys/netinet6/nd6_rtr.c
+++ b/sys/netinet6/nd6_rtr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nd6_rtr.c,v 1.3 2000/01/08 05:49:41 angelos Exp $	*/
+/*	$OpenBSD: nd6_rtr.c,v 1.4 2000/02/07 06:09:10 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -50,10 +50,10 @@
 
 #include <netinet/in.h>
 #include <netinet6/in6_var.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 #include <netinet6/nd6.h>
-#include <netinet6/icmp6.h>
+#include <netinet/icmp6.h>
 
 #include <net/net_osdep.h>
 
diff --git a/sys/netinet6/raw_ipv6.c b/sys/netinet6/raw_ipv6.c
index 8c53adbd5cf..a2cae4bcbdb 100644
--- a/sys/netinet6/raw_ipv6.c
+++ b/sys/netinet6/raw_ipv6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: raw_ipv6.c,v 1.12 2000/01/05 17:30:52 itojun Exp $ */
+/* $OpenBSD: raw_ipv6.c,v 1.13 2000/02/07 06:09:10 itojun Exp $ */
 /*
 %%% copyright-nrl-95
 This software is Copyright 1995-1998 by Randall Atkinson, Ronald Lee,
@@ -43,7 +43,7 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
  * SUCH DAMAGE.
  *
  *	@(#)raw_ip.c	8.7 (Berkeley) 5/15/95
- *	$Id: raw_ipv6.c,v 1.12 2000/01/05 17:30:52 itojun Exp $
+ *	$Id: raw_ipv6.c,v 1.13 2000/02/07 06:09:10 itojun Exp $
  */
 
 #include <sys/param.h>
@@ -67,9 +67,9 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
 #include <netinet/in_pcb.h>
 
 #include <netinet6/in6_var.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
-#include <netinet6/icmp6.h>
+#include <netinet/icmp6.h>
 
 #undef IPSEC
 
diff --git a/sys/netinet6/route6.c b/sys/netinet6/route6.c
index 7fda631cec5..b77ef3df175 100644
--- a/sys/netinet6/route6.c
+++ b/sys/netinet6/route6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route6.c,v 1.1 1999/12/08 06:50:24 itojun Exp $	*/
+/*	$OpenBSD: route6.c,v 1.2 2000/02/07 06:09:10 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -38,7 +38,7 @@
 
 #include <netinet/in.h>
 #include <netinet6/in6_var.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 
 #include <netinet/icmp6.h>
diff --git a/sys/netinet6/tcpipv6.h b/sys/netinet6/tcpipv6.h
index 37ab052e990..a9559602049 100644
--- a/sys/netinet6/tcpipv6.h
+++ b/sys/netinet6/tcpipv6.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcpipv6.h,v 1.4 1999/12/10 08:53:18 angelos Exp $ */
+/* $OpenBSD: tcpipv6.h,v 1.5 2000/02/07 06:09:10 itojun Exp $ */
 
 /*
 %%% copyright-nrl-95
@@ -14,7 +14,7 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
 #ifndef _NETINET6_TCPIPV6_H
 #define _NETINET6_TCPIPV6_H 1
 
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #include <netinet/tcp.h>
 
 struct tcpipv6hdr {