From: guenther <guenther@openbsd.org>
Date: Fri, 19 Dec 2014 22:44:58 +0000 (+0000)
Subject: Use <sys/endian.h> instead of <machine/endian.h>
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=9b18ffb8507e1a97fa391314bca6471c6889ce16;p=openbsd

Use <sys/endian.h> instead of <machine/endian.h>

ok dlg@ mpi@ bcook@ millert@ miod@
---

diff --git a/sys/arch/octeon/dev/if_cnmac.c b/sys/arch/octeon/dev/if_cnmac.c
index 8499da50afa..85f67700c6e 100644
--- a/sys/arch/octeon/dev/if_cnmac.c
+++ b/sys/arch/octeon/dev/if_cnmac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cnmac.c,v 1.19 2014/08/11 19:00:50 miod Exp $	*/
+/*	$OpenBSD: if_cnmac.c,v 1.20 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -49,6 +49,7 @@
 #include <sys/stdint.h> /* uintptr_t */
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
+#include <sys/endian.h>
 #ifdef MBUF_TIMESTAMP
 #include <sys/time.h>
 #endif
@@ -65,7 +66,6 @@
 
 #include <machine/bus.h>
 #include <machine/intr.h>
-#include <machine/endian.h>
 #include <machine/octeonvar.h>
 #include <machine/octeon_model.h>
 
diff --git a/sys/ddb/db_access.c b/sys/ddb/db_access.c
index e58388b8205..6bac42b48ab 100644
--- a/sys/ddb/db_access.c
+++ b/sys/ddb/db_access.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_access.c,v 1.12 2014/09/14 14:17:24 jsg Exp $	*/
+/*	$OpenBSD: db_access.c,v 1.13 2014/12/19 22:44:58 guenther Exp $	*/
 /*	$NetBSD: db_access.c,v 1.8 1994/10/09 08:37:35 mycroft Exp $	*/
 
 /* 
@@ -31,9 +31,9 @@
  */
 
 #include <sys/param.h>
+#include <sys/endian.h>
 
 #include <machine/db_machdep.h>		/* type definitions */
-#include <machine/endian.h>
 
 #include <ddb/db_access.h>
 
diff --git a/sys/dev/audio.c b/sys/dev/audio.c
index a8aa7e11b6a..9a12fecfc5f 100644
--- a/sys/dev/audio.c
+++ b/sys/dev/audio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: audio.c,v 1.124 2014/11/16 12:30:59 deraadt Exp $	*/
+/*	$OpenBSD: audio.c,v 1.125 2014/12/19 22:44:58 guenther Exp $	*/
 /*	$NetBSD: audio.c,v 1.119 1999/11/09 16:50:47 augustss Exp $	*/
 
 /*
@@ -49,13 +49,12 @@
 #include <sys/audioio.h>
 #include <sys/device.h>
 #include <sys/task.h>
+#include <sys/endian.h>
 
 #include <dev/audio_if.h>
 
 #include <dev/rndvar.h>
 
-#include <machine/endian.h>
-
 #include "wskbd.h"	/* NWSKBD (mixer tuning using keyboard) */
 
 #ifdef AUDIO_DEBUG
diff --git a/sys/dev/cardbus/if_ath_cardbus.c b/sys/dev/cardbus/if_ath_cardbus.c
index 8f7e7c8e812..68409e13c4a 100644
--- a/sys/dev/cardbus/if_ath_cardbus.c
+++ b/sys/dev/cardbus/if_ath_cardbus.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: if_ath_cardbus.c,v 1.16 2010/09/06 19:20:21 deraadt Exp $   */
+/*      $OpenBSD: if_ath_cardbus.c,v 1.17 2014/12/19 22:44:58 guenther Exp $   */
 /*	$NetBSD: if_ath_cardbus.c,v 1.4 2004/08/02 19:14:28 mycroft Exp $ */
 
 /*
@@ -48,8 +48,7 @@
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/gpio.h>
-
-#include <machine/endian.h>
+#include <sys/endian.h>
  
 #include <net/if.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/cardbus/if_atw_cardbus.c b/sys/dev/cardbus/if_atw_cardbus.c
index ef864e3c0b6..24f51cf0408 100644
--- a/sys/dev/cardbus/if_atw_cardbus.c
+++ b/sys/dev/cardbus/if_atw_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_atw_cardbus.c,v 1.20 2011/04/02 17:47:04 jasper Exp $	*/
+/*	$OpenBSD: if_atw_cardbus.c,v 1.21 2014/12/19 22:44:58 guenther Exp $	*/
 /*	$NetBSD: if_atw_cardbus.c,v 1.9 2004/07/23 07:07:55 dyoung Exp $	*/
 
 /*-
@@ -47,8 +47,7 @@
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
-
-#include <machine/endian.h>
+#include <sys/endian.h>
  
 #include <net/if.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/cardbus/if_fxp_cardbus.c b/sys/dev/cardbus/if_fxp_cardbus.c
index 7768906b564..aaf7a682ad1 100644
--- a/sys/dev/cardbus/if_fxp_cardbus.c
+++ b/sys/dev/cardbus/if_fxp_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_fxp_cardbus.c,v 1.33 2014/08/11 12:45:45 mpi Exp $ */
+/*	$OpenBSD: if_fxp_cardbus.c,v 1.34 2014/12/19 22:44:58 guenther Exp $ */
 /*	$NetBSD: if_fxp_cardbus.c,v 1.12 2000/05/08 18:23:36 thorpej Exp $	*/
 
 /*
@@ -46,14 +46,13 @@
 #include <sys/kernel.h>
 #include <sys/timeout.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/if_media.h>
 
-#include <machine/endian.h>
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
diff --git a/sys/dev/cardbus/if_rl_cardbus.c b/sys/dev/cardbus/if_rl_cardbus.c
index 63181ec64a9..ed50e850e6b 100644
--- a/sys/dev/cardbus/if_rl_cardbus.c
+++ b/sys/dev/cardbus/if_rl_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rl_cardbus.c,v 1.27 2014/11/24 02:03:37 brad Exp $ */
+/*	$OpenBSD: if_rl_cardbus.c,v 1.28 2014/12/19 22:44:58 guenther Exp $ */
 /*	$NetBSD: if_rl_cardbus.c,v 1.3.8.3 2001/11/14 19:14:02 nathanw Exp $	*/
 
 /*
@@ -48,14 +48,13 @@
 #include <sys/kernel.h>
 #include <sys/timeout.h>
 #include <sys/device.h>
+#include <sys/endian.h>
  
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/if_media.h>
 
-#include <machine/endian.h>
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
diff --git a/sys/dev/cardbus/if_rtw_cardbus.c b/sys/dev/cardbus/if_rtw_cardbus.c
index 0e98c26ddc8..e07ea20846a 100644
--- a/sys/dev/cardbus/if_rtw_cardbus.c
+++ b/sys/dev/cardbus/if_rtw_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rtw_cardbus.c,v 1.22 2014/11/18 23:55:01 krw Exp $	*/
+/*	$OpenBSD: if_rtw_cardbus.c,v 1.23 2014/12/19 22:44:58 guenther Exp $	*/
 /* $NetBSD: if_rtw_cardbus.c,v 1.4 2004/12/20 21:05:34 dyoung Exp $ */
 
 /*-
@@ -78,8 +78,7 @@
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
-
-#include <machine/endian.h>
+#include <sys/endian.h>
  
 #include <net/if.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/ic/acx.c b/sys/dev/ic/acx.c
index 00743be42db..a21341dba78 100644
--- a/sys/dev/ic/acx.c
+++ b/sys/dev/ic/acx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acx.c,v 1.107 2014/09/14 14:17:24 jsg Exp $ */
+/*	$OpenBSD: acx.c,v 1.108 2014/12/19 22:44:58 guenther Exp $ */
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -98,9 +98,9 @@
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #include <net/if.h>
diff --git a/sys/dev/ic/ar5008.c b/sys/dev/ic/ar5008.c
index f52ae5c88cc..1dff6d5a722 100644
--- a/sys/dev/ic/ar5008.c
+++ b/sys/dev/ic/ar5008.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar5008.c,v 1.26 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: ar5008.c,v 1.27 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -36,9 +36,9 @@
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/stdint.h>	/* uintptr_t */
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/ar5416.c b/sys/dev/ic/ar5416.c
index b2a0ca4b9a9..c252fcdbb6f 100644
--- a/sys/dev/ic/ar5416.c
+++ b/sys/dev/ic/ar5416.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar5416.c,v 1.14 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: ar5416.c,v 1.15 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -35,9 +35,9 @@
 #include <sys/timeout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/ar5xxx.h b/sys/dev/ic/ar5xxx.h
index 359107a526b..f602fcf9b26 100644
--- a/sys/dev/ic/ar5xxx.h
+++ b/sys/dev/ic/ar5xxx.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar5xxx.h,v 1.51 2013/11/21 16:16:08 mpi Exp $	*/
+/*	$OpenBSD: ar5xxx.h,v 1.52 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*
  * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
@@ -40,8 +40,8 @@
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/errno.h>
+#include <sys/endian.h>
 
-#include <machine/endian.h>
 #include <machine/bus.h>
 
 #include <net/if.h>
diff --git a/sys/dev/ic/ar9003.c b/sys/dev/ic/ar9003.c
index ac50ecb5ba2..4f4195fb4d8 100644
--- a/sys/dev/ic/ar9003.c
+++ b/sys/dev/ic/ar9003.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9003.c,v 1.30 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: ar9003.c,v 1.31 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -36,9 +36,9 @@
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/stdint.h>	/* uintptr_t */
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/ar9280.c b/sys/dev/ic/ar9280.c
index 297eb665eff..b359a38a77a 100644
--- a/sys/dev/ic/ar9280.c
+++ b/sys/dev/ic/ar9280.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9280.c,v 1.20 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: ar9280.c,v 1.21 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -35,9 +35,9 @@
 #include <sys/timeout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/ar9285.c b/sys/dev/ic/ar9285.c
index 4c738b11197..e4774e17fd2 100644
--- a/sys/dev/ic/ar9285.c
+++ b/sys/dev/ic/ar9285.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9285.c,v 1.21 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: ar9285.c,v 1.22 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2009-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -36,9 +36,9 @@
 #include <sys/timeout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/ar9287.c b/sys/dev/ic/ar9287.c
index 3b05e0c281f..7c8f1be2e3e 100644
--- a/sys/dev/ic/ar9287.c
+++ b/sys/dev/ic/ar9287.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9287.c,v 1.19 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: ar9287.c,v 1.20 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -35,9 +35,9 @@
 #include <sys/timeout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/ar9380.c b/sys/dev/ic/ar9380.c
index 092de1a1622..1eea58054bf 100644
--- a/sys/dev/ic/ar9380.c
+++ b/sys/dev/ic/ar9380.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9380.c,v 1.19 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: ar9380.c,v 1.20 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2011 Damien Bergamini <damien.bergamini@free.fr>
@@ -34,9 +34,9 @@
 #include <sys/queue.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
diff --git a/sys/dev/ic/arcofi.c b/sys/dev/ic/arcofi.c
index 88ef3b920d8..d99ceb3f122 100644
--- a/sys/dev/ic/arcofi.c
+++ b/sys/dev/ic/arcofi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arcofi.c,v 1.10 2014/08/20 07:19:42 ratchov Exp $	*/
+/*	$OpenBSD: arcofi.c,v 1.11 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*
  * Copyright (c) 2011 Miodrag Vallat.
@@ -34,6 +34,7 @@
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
+#include <sys/endian.h>
 
 #include <sys/audioio.h>
 #include <dev/audio_if.h>
@@ -42,7 +43,6 @@
 
 #include <machine/autoconf.h>
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #include <dev/ic/arcofivar.h>
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c
index 202a4eb4324..549560644b1 100644
--- a/sys/dev/ic/ath.c
+++ b/sys/dev/ic/ath.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ath.c,v 1.101 2014/07/12 18:48:17 tedu Exp $  */
+/*      $OpenBSD: ath.c,v 1.102 2014/12/19 22:44:58 guenther Exp $  */
 /*	$NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $	*/
 
 /*-
@@ -55,8 +55,8 @@
 #include <sys/errno.h>
 #include <sys/timeout.h>
 #include <sys/gpio.h>
+#include <sys/endian.h>
 
-#include <machine/endian.h>
 #include <machine/bus.h>
 
 #include <net/if.h>
@@ -2134,7 +2134,7 @@ ath_tx_start(struct ath_softc *sc, struct ieee80211_node *ni,
 		 * NB: Preserve byte order of IV for packet
 		 *     sniffers; it doesn't matter otherwise.
 		 */
-#if _BYTE_ORDER == _BIG_ENDIAN
+#if BYTE_ORDER == BIG_ENDIAN
 		ivp[0] = iv >> 0;
 		ivp[1] = iv >> 8;
 		ivp[2] = iv >> 16;
diff --git a/sys/dev/ic/athn.c b/sys/dev/ic/athn.c
index 4ea035b874a..cf14573557b 100644
--- a/sys/dev/ic/athn.c
+++ b/sys/dev/ic/athn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: athn.c,v 1.83 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: athn.c,v 1.84 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -36,9 +36,9 @@
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/stdint.h>	/* uintptr_t */
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/atw.c b/sys/dev/ic/atw.c
index 64a8e3637e2..8961e957b44 100644
--- a/sys/dev/ic/atw.c
+++ b/sys/dev/ic/atw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atw.c,v 1.83 2014/07/12 18:48:17 tedu Exp $	*/
+/*	$OpenBSD: atw.c,v 1.84 2014/12/19 22:44:58 guenther Exp $	*/
 /*	$NetBSD: atw.c,v 1.69 2004/07/23 07:07:55 dyoung Exp $	*/
 
 /*-
@@ -46,8 +46,7 @@
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/time.h>
-
-#include <machine/endian.h>
+#include <sys/endian.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c
index 30c62383d1f..7ef625f0dc1 100644
--- a/sys/dev/ic/bwi.c
+++ b/sys/dev/ic/bwi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bwi.c,v 1.111 2014/12/16 18:03:17 miod Exp $	*/
+/*	$OpenBSD: bwi.c,v 1.112 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*
  * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
@@ -48,9 +48,9 @@
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/systm.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #include <net/if.h>
diff --git a/sys/dev/ic/dpt.c b/sys/dev/ic/dpt.c
index feaddcf2494..983f630241d 100644
--- a/sys/dev/ic/dpt.c
+++ b/sys/dev/ic/dpt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dpt.c,v 1.34 2013/05/30 16:15:02 deraadt Exp $	*/
+/*	$OpenBSD: dpt.c,v 1.35 2014/12/19 22:44:58 guenther Exp $	*/
 /*	$NetBSD: dpt.c,v 1.12 1999/10/23 16:26:33 ad Exp $	*/
 
 /*-
@@ -69,8 +69,8 @@
 #include <sys/queue.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
+#include <sys/endian.h>
 
-#include <machine/endian.h>
 #include <machine/bus.h>
 
 #include <scsi/scsi_all.h>
diff --git a/sys/dev/ic/gem.c b/sys/dev/ic/gem.c
index 0394b78b55b..50aa4777f31 100644
--- a/sys/dev/ic/gem.c
+++ b/sys/dev/ic/gem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gem.c,v 1.106 2014/08/27 05:54:15 dlg Exp $	*/
+/*	$OpenBSD: gem.c,v 1.107 2014/12/19 22:44:58 guenther Exp $	*/
 /*	$NetBSD: gem.c,v 1.1 2001/09/16 00:11:43 eeh Exp $ */
 
 /*
@@ -47,8 +47,7 @@
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
-
-#include <machine/endian.h>
+#include <sys/endian.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/ic/malo.c b/sys/dev/ic/malo.c
index 19397c65bb1..8278bcf0aef 100644
--- a/sys/dev/ic/malo.c
+++ b/sys/dev/ic/malo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: malo.c,v 1.102 2014/09/14 14:17:24 jsg Exp $ */
+/*	$OpenBSD: malo.c,v 1.103 2014/12/19 22:44:58 guenther Exp $ */
 
 /*
  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -29,9 +29,9 @@
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/systm.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #include <net/if.h>
diff --git a/sys/dev/ic/pgt.c b/sys/dev/ic/pgt.c
index 5e707288d64..934d9355fa9 100644
--- a/sys/dev/ic/pgt.c
+++ b/sys/dev/ic/pgt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pgt.c,v 1.75 2014/07/22 13:12:12 mpi Exp $  */
+/*	$OpenBSD: pgt.c,v 1.76 2014/12/19 22:44:58 guenther Exp $  */
 
 /*
  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -60,7 +60,6 @@
 #include <sys/device.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #include <net/if.h>
diff --git a/sys/dev/ic/rt2560.c b/sys/dev/ic/rt2560.c
index fc67dc93192..5a40c6158d3 100644
--- a/sys/dev/ic/rt2560.c
+++ b/sys/dev/ic/rt2560.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2560.c,v 1.67 2014/09/06 05:41:35 jsg Exp $  */
+/*	$OpenBSD: rt2560.c,v 1.68 2014/12/19 22:44:58 guenther Exp $  */
 
 /*-
  * Copyright (c) 2005, 2006
@@ -34,9 +34,9 @@
 #include <sys/timeout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/rt2661.c b/sys/dev/ic/rt2661.c
index 72ecd5b477d..61f3a4b2db6 100644
--- a/sys/dev/ic/rt2661.c
+++ b/sys/dev/ic/rt2661.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2661.c,v 1.76 2014/09/06 05:41:35 jsg Exp $	*/
+/*	$OpenBSD: rt2661.c,v 1.77 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2006
@@ -35,9 +35,9 @@
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/queue.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c
index 52fa1167557..75859db260c 100644
--- a/sys/dev/ic/rt2860.c
+++ b/sys/dev/ic/rt2860.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2860.c,v 1.76 2014/11/18 02:37:30 tedu Exp $	*/
+/*	$OpenBSD: rt2860.c,v 1.77 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -34,9 +34,9 @@
 #include <sys/timeout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c
index 7bb81932970..1897e5a5e12 100644
--- a/sys/dev/ic/rtw.c
+++ b/sys/dev/ic/rtw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtw.c,v 1.87 2014/07/13 23:10:23 deraadt Exp $	*/
+/*	$OpenBSD: rtw.c,v 1.88 2014/12/19 22:44:58 guenther Exp $	*/
 /*	$NetBSD: rtw.c,v 1.29 2004/12/27 19:49:16 dyoung Exp $ */
 
 /*-
@@ -46,8 +46,8 @@
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#include <sys/endian.h>
 
-#include <machine/endian.h>
 #include <machine/bus.h>
 #include <machine/intr.h>	/* splnet */
 
diff --git a/sys/dev/ic/siop.c b/sys/dev/ic/siop.c
index dcb6ab77c9e..9dade4b89cb 100644
--- a/sys/dev/ic/siop.c
+++ b/sys/dev/ic/siop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: siop.c,v 1.68 2014/07/13 23:10:23 deraadt Exp $ */
+/*	$OpenBSD: siop.c,v 1.69 2014/12/19 22:44:58 guenther Exp $ */
 /*	$NetBSD: siop.c,v 1.79 2005/11/18 23:10:32 bouyer Exp $	*/
 
 /*
@@ -34,8 +34,8 @@
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/kernel.h>
+#include <sys/endian.h>
 
-#include <machine/endian.h>
 #include <machine/bus.h>
 
 #include <dev/microcode/siop/siop.out>
diff --git a/sys/dev/ic/siop_common.c b/sys/dev/ic/siop_common.c
index e6b47b0a4f7..2b0e56fef5c 100644
--- a/sys/dev/ic/siop_common.c
+++ b/sys/dev/ic/siop_common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: siop_common.c,v 1.35 2012/02/24 06:19:00 guenther Exp $ */
+/*	$OpenBSD: siop_common.c,v 1.36 2014/12/19 22:44:58 guenther Exp $ */
 /*	$NetBSD: siop_common.c,v 1.37 2005/02/27 00:27:02 perry Exp $	*/
 
 /*
@@ -35,8 +35,8 @@
 #include <sys/buf.h>
 #include <sys/kernel.h>
 #include <sys/scsiio.h>
+#include <sys/endian.h>
 
-#include <machine/endian.h>
 #include <machine/bus.h>
 
 #include <scsi/scsi_all.h>
diff --git a/sys/dev/microcode/aic7xxx/aicasm.c b/sys/dev/microcode/aic7xxx/aicasm.c
index a9d90a1061f..4bdee59ce31 100644
--- a/sys/dev/microcode/aic7xxx/aicasm.c
+++ b/sys/dev/microcode/aic7xxx/aicasm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aicasm.c,v 1.15 2012/12/05 23:20:19 deraadt Exp $ */
+/* $OpenBSD: aicasm.c,v 1.16 2014/12/19 22:44:58 guenther Exp $ */
 /*
  * Aic7xxx SCSI host adapter firmware asssembler
  *
@@ -38,7 +38,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: aicasm.c,v 1.15 2012/12/05 23:20:19 deraadt Exp $
+ * $Id: aicasm.c,v 1.16 2014/12/19 22:44:58 guenther Exp $
  *
  * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.c,v 1.37 2004/03/12 21:45:25 trhodes Exp $
  */
@@ -53,12 +53,7 @@
 #include <string.h>
 #include <sysexits.h>
 #include <unistd.h>
-
-#if linux
 #include <endian.h>
-#else
-#include <machine/endian.h>
-#endif
 
 #include "aicasm.h"
 #include "aicasm_symbol.h"
diff --git a/sys/dev/pci/aac_pci.c b/sys/dev/pci/aac_pci.c
index b79fed81b39..21d2e29239b 100644
--- a/sys/dev/pci/aac_pci.c
+++ b/sys/dev/pci/aac_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aac_pci.c,v 1.24 2009/04/06 15:18:45 kettenis Exp $	*/
+/*	$OpenBSD: aac_pci.c,v 1.25 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2000 Michael Smith
@@ -46,9 +46,9 @@
 #include <sys/queue.h>
 #include <sys/selinfo.h>
 #include <sys/rwlock.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #include <scsi/scsi_all.h>
diff --git a/sys/dev/pci/cac_pci.c b/sys/dev/pci/cac_pci.c
index 144cfe5a888..b0db83ed21e 100644
--- a/sys/dev/pci/cac_pci.c
+++ b/sys/dev/pci/cac_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cac_pci.c,v 1.14 2013/05/30 16:15:02 deraadt Exp $	*/
+/*	$OpenBSD: cac_pci.c,v 1.15 2014/12/19 22:44:58 guenther Exp $	*/
 /*	$NetBSD: cac_pci.c,v 1.10 2001/01/10 16:48:04 ad Exp $	*/
 
 /*-
@@ -39,8 +39,8 @@
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/queue.h>
+#include <sys/endian.h>
 
-#include <machine/endian.h>
 #include <machine/bus.h>
 
 #include <dev/pci/pcidevs.h>
diff --git a/sys/dev/pci/dpt_pci.c b/sys/dev/pci/dpt_pci.c
index 13a309e35fd..e7f6a9412fe 100644
--- a/sys/dev/pci/dpt_pci.c
+++ b/sys/dev/pci/dpt_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dpt_pci.c,v 1.8 2013/12/06 21:03:03 deraadt Exp $	*/
+/*	$OpenBSD: dpt_pci.c,v 1.9 2014/12/19 22:44:58 guenther Exp $	*/
 /*	$NetBSD: dpt_pci.c,v 1.2 1999/09/29 17:33:02 ad Exp $	*/
 
 /*
@@ -38,8 +38,8 @@
 #include <sys/device.h>
 #include <sys/queue.h>
 #include <sys/proc.h>
+#include <sys/endian.h>
 
-#include <machine/endian.h>
 #include <machine/bus.h>
 
 #ifdef __NetBSD__
diff --git a/sys/dev/pci/gdt_pci.c b/sys/dev/pci/gdt_pci.c
index 87004b36c27..573d9a2bc09 100644
--- a/sys/dev/pci/gdt_pci.c
+++ b/sys/dev/pci/gdt_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gdt_pci.c,v 1.23 2014/05/04 20:09:15 sf Exp $	*/
+/*	$OpenBSD: gdt_pci.c,v 1.24 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Niklas Hallqvist.  All rights reserved.
@@ -35,9 +35,9 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #include <scsi/scsi_all.h>
diff --git a/sys/dev/pci/hifn7751reg.h b/sys/dev/pci/hifn7751reg.h
index e8407603d24..a1bc208181e 100644
--- a/sys/dev/pci/hifn7751reg.h
+++ b/sys/dev/pci/hifn7751reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hifn7751reg.h,v 1.45 2005/09/06 18:27:54 jolan Exp $	*/
+/*	$OpenBSD: hifn7751reg.h,v 1.46 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*
  * Invertex AEON / Hifn 7751 driver
@@ -41,7 +41,7 @@
 #ifndef __HIFN_H__
 #define	__HIFN_H__
 
-#include <machine/endian.h>
+#include <sys/endian.h>
 
 /*
  * Some PCI configuration space offset defines.  The names were made
diff --git a/sys/dev/pci/if_atw_pci.c b/sys/dev/pci/if_atw_pci.c
index a2a14d33f9a..615939aee47 100644
--- a/sys/dev/pci/if_atw_pci.c
+++ b/sys/dev/pci/if_atw_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_atw_pci.c,v 1.15 2012/10/18 21:44:21 deraadt Exp $	*/
+/*	$OpenBSD: if_atw_pci.c,v 1.16 2014/12/19 22:44:58 guenther Exp $	*/
 /*	$NetBSD: if_atw_pci.c,v 1.7 2004/07/23 07:07:55 dyoung Exp $	*/
 
 /*-
@@ -46,8 +46,7 @@
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
-
-#include <machine/endian.h>
+#include <sys/endian.h>
  
 #include <net/if.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/pci/if_cas.c b/sys/dev/pci/if_cas.c
index cdab4e1245e..42f54369ef6 100644
--- a/sys/dev/pci/if_cas.c
+++ b/sys/dev/pci/if_cas.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cas.c,v 1.35 2014/11/18 01:56:32 brad Exp $	*/
+/*	$OpenBSD: if_cas.c,v 1.36 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*
  *
@@ -55,8 +55,7 @@
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
-
-#include <machine/endian.h>
+#include <sys/endian.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/pci/if_gem_pci.c b/sys/dev/pci/if_gem_pci.c
index d30bd4bb038..d6d436c93f6 100644
--- a/sys/dev/pci/if_gem_pci.c
+++ b/sys/dev/pci/if_gem_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_gem_pci.c,v 1.34 2012/10/16 10:58:04 jsg Exp $	*/
+/*	$OpenBSD: if_gem_pci.c,v 1.35 2014/12/19 22:44:58 guenther Exp $	*/
 /*	$NetBSD: if_gem_pci.c,v 1.1 2001/09/16 00:11:42 eeh Exp $ */
 
 /*
@@ -41,8 +41,7 @@
 #include <sys/socket.h>
 #include <sys/errno.h>
 #include <sys/device.h>
-
-#include <machine/endian.h>
+#include <sys/endian.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c
index 1385cea1671..78dae1db277 100644
--- a/sys/dev/pci/if_ipw.c
+++ b/sys/dev/pci/if_ipw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ipw.c,v 1.103 2014/12/19 15:46:22 krw Exp $	*/
+/*	$OpenBSD: if_ipw.c,v 1.104 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2004-2008
@@ -32,9 +32,9 @@
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c
index 5e506e42b4e..01d58612383 100644
--- a/sys/dev/pci/if_iwi.c
+++ b/sys/dev/pci/if_iwi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iwi.c,v 1.119 2014/11/18 02:37:30 tedu Exp $	*/
+/*	$OpenBSD: if_iwi.c,v 1.120 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2004-2008
@@ -32,9 +32,9 @@
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/task.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c
index 963ea1538e1..4b63190ecbf 100644
--- a/sys/dev/pci/if_iwn.c
+++ b/sys/dev/pci/if_iwn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iwn.c,v 1.135 2014/09/10 07:22:09 dcoppa Exp $	*/
+/*	$OpenBSD: if_iwn.c,v 1.136 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -33,9 +33,9 @@
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/task.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/if_pcn.c b/sys/dev/pci/if_pcn.c
index 107bc4ba58b..5b0d57b12d9 100644
--- a/sys/dev/pci/if_pcn.c
+++ b/sys/dev/pci/if_pcn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pcn.c,v 1.31 2014/12/08 16:21:38 brad Exp $	*/
+/*	$OpenBSD: if_pcn.c,v 1.32 2014/12/19 22:44:58 guenther Exp $	*/
 /*	$NetBSD: if_pcn.c,v 1.26 2005/05/07 09:15:44 is Exp $	*/
 
 /*
@@ -78,6 +78,7 @@
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/queue.h>
+#include <sys/endian.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
@@ -95,7 +96,6 @@
 
 #include <machine/bus.h>
 #include <machine/intr.h>
-#include <machine/endian.h>
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_rtw_pci.c b/sys/dev/pci/if_rtw_pci.c
index aafad4db5b2..7d787a1d49e 100644
--- a/sys/dev/pci/if_rtw_pci.c
+++ b/sys/dev/pci/if_rtw_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rtw_pci.c,v 1.17 2012/12/05 23:20:20 deraadt Exp $	*/
+/*	$OpenBSD: if_rtw_pci.c,v 1.18 2014/12/19 22:44:58 guenther Exp $	*/
 /*	$NetBSD: if_rtw_pci.c,v 1.1 2004/09/26 02:33:36 dyoung Exp $	*/
 
 /*-
@@ -48,8 +48,7 @@
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
-
-#include <machine/endian.h>
+#include <sys/endian.h>
  
 #include <net/if.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c
index 9910ecdd999..993338a74ca 100644
--- a/sys/dev/pci/if_wpi.c
+++ b/sys/dev/pci/if_wpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wpi.c,v 1.120 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: if_wpi.c,v 1.121 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2006-2008
@@ -33,9 +33,9 @@
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/task.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/if_xge.c b/sys/dev/pci/if_xge.c
index edd937f5b1b..796ebd22709 100644
--- a/sys/dev/pci/if_xge.c
+++ b/sys/dev/pci/if_xge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_xge.c,v 1.57 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: if_xge.c,v 1.58 2014/12/19 22:44:58 guenther Exp $	*/
 /*	$NetBSD: if_xge.c,v 1.1 2005/09/09 10:30:27 ragge Exp $	*/
 
 /*
@@ -50,6 +50,7 @@
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
@@ -71,7 +72,6 @@
 
 #include <machine/bus.h>
 #include <machine/intr.h>
-#include <machine/endian.h>
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index 36a29bcb57b..1201948e2c8 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciide.c,v 1.349 2014/10/16 19:30:59 kettenis Exp $	*/
+/*	$OpenBSD: pciide.c,v 1.350 2014/12/19 22:44:58 guenther Exp $	*/
 /*	$NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $	*/
 
 /*
@@ -89,9 +89,9 @@ int wdcdebug_pciide_mask = WDCDEBUG_PCIIDE_MASK;
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 
 #include <dev/ata/atavar.h>
 #include <dev/ata/satareg.h>
diff --git a/sys/dev/pci/siop_pci_common.c b/sys/dev/pci/siop_pci_common.c
index 6faa6909c21..bd5c8a621de 100644
--- a/sys/dev/pci/siop_pci_common.c
+++ b/sys/dev/pci/siop_pci_common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: siop_pci_common.c,v 1.18 2010/07/23 07:47:13 jsg Exp $ */
+/*	$OpenBSD: siop_pci_common.c,v 1.19 2014/12/19 22:44:58 guenther Exp $ */
 /*	$NetBSD: siop_pci_common.c,v 1.25 2005/06/28 00:28:42 thorpej Exp $ */
 
 /*
@@ -33,8 +33,7 @@
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/kernel.h>
-
-#include <machine/endian.h>
+#include <sys/endian.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
diff --git a/sys/dev/rasops/rasops.c b/sys/dev/rasops/rasops.c
index ba1f8bf2c20..f881a6540eb 100644
--- a/sys/dev/rasops/rasops.c
+++ b/sys/dev/rasops/rasops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rasops.c,v 1.35 2014/12/13 21:05:33 doug Exp $	*/
+/*	$OpenBSD: rasops.c,v 1.36 2014/12/19 22:44:58 guenther Exp $	*/
 /*	$NetBSD: rasops.c,v 1.35 2001/02/02 06:01:01 marcus Exp $	*/
 
 /*-
@@ -35,8 +35,7 @@
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/workq.h>
-
-#include <machine/endian.h>
+#include <sys/endian.h>
 
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wscons/wsconsio.h>
diff --git a/sys/dev/rasops/rasops1.c b/sys/dev/rasops/rasops1.c
index 0b2a0ada397..ce5a1ce73b9 100644
--- a/sys/dev/rasops/rasops1.c
+++ b/sys/dev/rasops/rasops1.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rasops1.c,v 1.8 2010/08/28 12:48:14 miod Exp $	*/
+/*	$OpenBSD: rasops1.c,v 1.9 2014/12/19 22:44:58 guenther Exp $	*/
 /*	$NetBSD: rasops1.c,v 1.11 2000/04/12 14:22:29 pk Exp $	*/
 
 /*-
@@ -33,7 +33,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
-#include <machine/endian.h>
+#include <sys/endian.h>
 
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wscons/wsconsio.h>
diff --git a/sys/dev/rasops/rasops2.c b/sys/dev/rasops/rasops2.c
index 32ef47aa89e..904d5301f17 100644
--- a/sys/dev/rasops/rasops2.c
+++ b/sys/dev/rasops/rasops2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rasops2.c,v 1.10 2010/08/28 12:48:14 miod Exp $	*/
+/*	$OpenBSD: rasops2.c,v 1.11 2014/12/19 22:44:59 guenther Exp $	*/
 /*	$NetBSD: rasops2.c,v 1.5 2000/04/12 14:22:29 pk Exp $	*/
 
 /*-
@@ -33,7 +33,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
-#include <machine/endian.h>
+#include <sys/endian.h>
 
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wscons/wsconsio.h>
diff --git a/sys/dev/rasops/rasops24.c b/sys/dev/rasops/rasops24.c
index 788c36e6679..9022a898f22 100644
--- a/sys/dev/rasops/rasops24.c
+++ b/sys/dev/rasops/rasops24.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rasops24.c,v 1.9 2010/08/28 12:48:14 miod Exp $	*/
+/*	$OpenBSD: rasops24.c,v 1.10 2014/12/19 22:44:59 guenther Exp $	*/
 /*	$NetBSD: rasops24.c,v 1.12 2000/04/12 14:22:29 pk Exp $	*/
 
 /*-
@@ -33,8 +33,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
-
-#include <machine/endian.h>
+#include <sys/endian.h>
 
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wscons/wsconsio.h>
diff --git a/sys/dev/rasops/rasops4.c b/sys/dev/rasops/rasops4.c
index de5405055b1..a510ebd0345 100644
--- a/sys/dev/rasops/rasops4.c
+++ b/sys/dev/rasops/rasops4.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rasops4.c,v 1.10 2010/08/28 12:48:14 miod Exp $	*/
+/*	$OpenBSD: rasops4.c,v 1.11 2014/12/19 22:44:59 guenther Exp $	*/
 /*	$NetBSD: rasops4.c,v 1.4 2001/11/15 09:48:15 lukem Exp $	*/
 
 /*-
@@ -33,7 +33,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
-#include <machine/endian.h>
+#include <sys/endian.h>
 
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wscons/wsconsio.h>
diff --git a/sys/dev/rasops/rasops_masks.h b/sys/dev/rasops/rasops_masks.h
index e831d77d7af..ba9991f8c01 100644
--- a/sys/dev/rasops/rasops_masks.h
+++ b/sys/dev/rasops/rasops_masks.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rasops_masks.h,v 1.4 2008/06/26 05:42:18 ray Exp $ */
+/*	$OpenBSD: rasops_masks.h,v 1.5 2014/12/19 22:44:59 guenther Exp $ */
 /* 	$NetBSD: rasops_masks.h,v 1.5 2000/06/13 13:37:01 ad Exp $	*/
 
 /*-
@@ -34,7 +34,7 @@
 #define _RASOPS_MASKS_H_ 1
 
 #include <sys/types.h>
-#include <machine/endian.h>
+#include <sys/endian.h>
 
 /*
  * Convenience macros. To get around the problem of dealing with properly
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c
index 83931dfc050..4406d0da6d3 100644
--- a/sys/dev/usb/ehci.c
+++ b/sys/dev/usb/ehci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ehci.c,v 1.172 2014/12/17 15:27:49 kettenis Exp $ */
+/*	$OpenBSD: ehci.c,v 1.173 2014/12/19 22:44:59 guenther Exp $ */
 /*	$NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $	*/
 
 /*
@@ -49,9 +49,9 @@
 #include <sys/queue.h>
 #include <sys/timeout.h>
 #include <sys/pool.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
diff --git a/sys/dev/usb/if_athn_usb.c b/sys/dev/usb/if_athn_usb.c
index 9a9dbbd1650..378e2c76ed4 100644
--- a/sys/dev/usb/if_athn_usb.c
+++ b/sys/dev/usb/if_athn_usb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_athn_usb.c,v 1.23 2014/10/31 21:19:14 tedu Exp $	*/
+/*	$OpenBSD: if_athn_usb.c,v 1.24 2014/12/19 22:44:59 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2011 Damien Bergamini <damien.bergamini@free.fr>
@@ -31,9 +31,9 @@
 #include <sys/timeout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/usb/if_otus.c b/sys/dev/usb/if_otus.c
index 89d8eb787c3..2c148fcc028 100644
--- a/sys/dev/usb/if_otus.c
+++ b/sys/dev/usb/if_otus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_otus.c,v 1.42 2014/07/13 15:52:49 mpi Exp $	*/
+/*	$OpenBSD: if_otus.c,v 1.43 2014/12/19 22:44:59 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -31,9 +31,9 @@
 #include <sys/timeout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/usb/if_ral.c b/sys/dev/usb/if_ral.c
index 9d712d33e36..345da1f3972 100644
--- a/sys/dev/usb/if_ral.c
+++ b/sys/dev/usb/if_ral.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ral.c,v 1.128 2014/07/13 15:52:49 mpi Exp $	*/
+/*	$OpenBSD: if_ral.c,v 1.129 2014/12/19 22:44:59 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006
@@ -33,9 +33,9 @@
 #include <sys/timeout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/usb/if_rsu.c b/sys/dev/usb/if_rsu.c
index 96e7cddbdaa..2cea40a00a1 100644
--- a/sys/dev/usb/if_rsu.c
+++ b/sys/dev/usb/if_rsu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rsu.c,v 1.22 2014/07/13 15:52:49 mpi Exp $	*/
+/*	$OpenBSD: if_rsu.c,v 1.23 2014/12/19 22:44:59 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -31,9 +31,9 @@
 #include <sys/timeout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c
index 92920eb646f..b9c4ba3076e 100644
--- a/sys/dev/usb/if_rum.c
+++ b/sys/dev/usb/if_rum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rum.c,v 1.106 2014/07/13 15:52:49 mpi Exp $	*/
+/*	$OpenBSD: if_rum.c,v 1.107 2014/12/19 22:44:59 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr>
@@ -33,9 +33,9 @@
 #include <sys/timeout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c
index 5288e982087..f68847352d9 100644
--- a/sys/dev/usb/if_run.c
+++ b/sys/dev/usb/if_run.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_run.c,v 1.104 2014/09/26 12:04:07 mlarkin Exp $	*/
+/*	$OpenBSD: if_run.c,v 1.105 2014/12/19 22:44:59 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -33,9 +33,9 @@
 #include <sys/timeout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c
index 636da5f8090..09b73f08978 100644
--- a/sys/dev/usb/if_uath.c
+++ b/sys/dev/usb/if_uath.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_uath.c,v 1.63 2014/11/18 02:37:30 tedu Exp $	*/
+/*	$OpenBSD: if_uath.c,v 1.64 2014/12/19 22:44:59 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2006
@@ -37,9 +37,9 @@
 #include <sys/timeout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/usb/if_upgt.c b/sys/dev/usb/if_upgt.c
index d56020ed82f..605f6ac6251 100644
--- a/sys/dev/usb/if_upgt.c
+++ b/sys/dev/usb/if_upgt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_upgt.c,v 1.64 2014/07/13 15:52:49 mpi Exp $ */
+/*	$OpenBSD: if_upgt.c,v 1.65 2014/12/19 22:44:59 guenther Exp $ */
 
 /*
  * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
@@ -27,9 +27,9 @@
 #include <sys/timeout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/usb/if_urtw.c b/sys/dev/usb/if_urtw.c
index 7407a790b3a..557a0bb37e0 100644
--- a/sys/dev/usb/if_urtw.c
+++ b/sys/dev/usb/if_urtw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_urtw.c,v 1.48 2014/09/01 16:02:06 mpi Exp $	*/
+/*	$OpenBSD: if_urtw.c,v 1.49 2014/12/19 22:44:59 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org>
@@ -29,9 +29,9 @@
 #include <sys/timeout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
diff --git a/sys/dev/usb/if_urtwn.c b/sys/dev/usb/if_urtwn.c
index cecd9363e6e..6f0f3c139f9 100644
--- a/sys/dev/usb/if_urtwn.c
+++ b/sys/dev/usb/if_urtwn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_urtwn.c,v 1.38 2014/07/13 15:52:49 mpi Exp $	*/
+/*	$OpenBSD: if_urtwn.c,v 1.39 2014/12/19 22:44:59 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -31,9 +31,9 @@
 #include <sys/timeout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c
index be3112781ec..88a161f45c8 100644
--- a/sys/dev/usb/if_zyd.c
+++ b/sys/dev/usb/if_zyd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_zyd.c,v 1.104 2014/07/13 15:52:49 mpi Exp $	*/
+/*	$OpenBSD: if_zyd.c,v 1.105 2014/12/19 22:44:59 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
@@ -33,9 +33,9 @@
 #include <sys/timeout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 8ad8a9c1129..6e3bfe53d27 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ohci.c,v 1.141 2014/12/08 21:47:10 mpi Exp $ */
+/*	$OpenBSD: ohci.c,v 1.142 2014/12/19 22:44:59 guenther Exp $ */
 /*	$NetBSD: ohci.c,v 1.139 2003/02/22 05:24:16 tsutsui Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $	*/
 
@@ -40,9 +40,9 @@
 #include <sys/queue.h>
 #include <sys/timeout.h>
 #include <sys/pool.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
diff --git a/sys/dev/usb/uberry.c b/sys/dev/usb/uberry.c
index 9de45c87003..a2ec6bfba1e 100644
--- a/sys/dev/usb/uberry.c
+++ b/sys/dev/usb/uberry.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uberry.c,v 1.22 2014/07/12 20:26:33 mpi Exp $	*/
+/*	$OpenBSD: uberry.c,v 1.23 2014/12/19 22:44:59 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2006 Theo de Raadt <deraadt@openbsd.org>
@@ -25,9 +25,9 @@
 #include <sys/timeout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #include <dev/usb/usb.h>
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 660d3e21523..3676bd26b95 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhci.c,v 1.134 2014/12/17 15:27:50 kettenis Exp $	*/
+/*	$OpenBSD: uhci.c,v 1.135 2014/12/19 22:44:59 guenther Exp $	*/
 /*	$NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $	*/
 
@@ -40,9 +40,9 @@
 #include <sys/queue.h>
 #include <sys/timeout.h>
 #include <sys/pool.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
diff --git a/sys/dev/usb/uts.c b/sys/dev/usb/uts.c
index d3759f797a0..d04675546e1 100644
--- a/sys/dev/usb/uts.c
+++ b/sys/dev/usb/uts.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uts.c,v 1.34 2014/07/12 18:48:53 tedu Exp $ */
+/*	$OpenBSD: uts.c,v 1.35 2014/12/19 22:44:59 guenther Exp $ */
 
 /*
  * Copyright (c) 2007 Robert Nagy <robert@openbsd.org>
@@ -26,9 +26,9 @@
 #include <sys/timeout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #include <dev/usb/usb.h>
diff --git a/sys/dev/usb/xhci.c b/sys/dev/usb/xhci.c
index 4928be70f30..f247fdc49b6 100644
--- a/sys/dev/usb/xhci.c
+++ b/sys/dev/usb/xhci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xhci.c,v 1.46 2014/12/15 17:10:44 mpi Exp $ */
+/* $OpenBSD: xhci.c,v 1.47 2014/12/19 22:44:59 guenther Exp $ */
 
 /*
  * Copyright (c) 2014 Martin Pieuchot
@@ -24,9 +24,9 @@
 #include <sys/queue.h>
 #include <sys/timeout.h>
 #include <sys/pool.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
diff --git a/sys/lib/libkern/htonl.c b/sys/lib/libkern/htonl.c
index 5b3a26ad479..f01cc7ef9a9 100644
--- a/sys/lib/libkern/htonl.c
+++ b/sys/lib/libkern/htonl.c
@@ -3,8 +3,7 @@
  * Public domain.
  */
 
-#include <sys/types.h>
-#include <machine/endian.h>
+#include <sys/endian.h>
 
 #undef htonl
 
diff --git a/sys/lib/libkern/htons.c b/sys/lib/libkern/htons.c
index 2f50d082ee3..b7907e14558 100644
--- a/sys/lib/libkern/htons.c
+++ b/sys/lib/libkern/htons.c
@@ -3,8 +3,7 @@
  * Public domain.
  */
 
-#include <sys/types.h>
-#include <machine/endian.h>
+#include <sys/endian.h>
 
 #undef htons
 
diff --git a/sys/msdosfs/bpb.h b/sys/msdosfs/bpb.h
index d9550a1b40c..c1550ec2585 100644
--- a/sys/msdosfs/bpb.h
+++ b/sys/msdosfs/bpb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bpb.h,v 1.5 2006/12/15 03:04:24 krw Exp $	*/
+/*	$OpenBSD: bpb.h,v 1.6 2014/12/19 22:44:59 guenther Exp $	*/
 /*	$NetBSD: bpb.h,v 1.6 1997/10/17 11:23:35 ws Exp $	*/
 
 /*
@@ -91,7 +91,7 @@ struct bpb710 {
  * 16-bit and 32-bit quantities on byte boundaries.  If this is not true,
  * use the macros for the big-endian case.
  */
-#include <machine/endian.h>
+#include <sys/endian.h>
 #if (BYTE_ORDER == LITTLE_ENDIAN) && !defined(__STRICT_ALIGNMENT)
 #define	getushort(x)	*((u_int16_t *)(x))
 #define	getulong(x)	*((u_int32_t *)(x))
diff --git a/sys/ufs/ext2fs/ext2fs.h b/sys/ufs/ext2fs/ext2fs.h
index 778645a7c79..1dbd3a2fc46 100644
--- a/sys/ufs/ext2fs/ext2fs.h
+++ b/sys/ufs/ext2fs/ext2fs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2fs.h,v 1.21 2014/07/14 08:54:13 pelikan Exp $	*/
+/*	$OpenBSD: ext2fs.h,v 1.22 2014/12/19 22:44:59 guenther Exp $	*/
 /*	$NetBSD: ext2fs.h,v 1.10 2000/01/28 16:00:23 bouyer Exp $	*/
 
 /*
@@ -34,7 +34,7 @@
  *  Modified for ext2fs by Manuel Bouyer.
  */
 
-#include <machine/endian.h>
+#include <sys/endian.h>
 
 /*
  * Each disk drive contains some number of file systems.