7 files changed, 31 insertions, 34 deletions

diff --git a/sys/dev/evdev/cdev.c b/sys/dev/evdev/cdev.c
index 62534a4c339e7..d5015bf521a80 100644
--- a/sys/dev/evdev/cdev.c
+++ b/sys/dev/evdev/cdev.c
@@ -29,24 +29,23 @@
 
 #include "opt_evdev.h"
 
-#include <sys/types.h>
-#include <sys/bitstring.h>
-#include <sys/systm.h>
 #include <sys/param.h>
-#include <sys/kernel.h>
+#include <sys/bitstring.h>
 #include <sys/conf.h>
-#include <sys/uio.h>
-#include <sys/proc.h>
-#include <sys/poll.h>
 #include <sys/filio.h>
 #include <sys/fcntl.h>
-#include <sys/selinfo.h>
+#include <sys/kernel.h>
 #include <sys/malloc.h>
+#include <sys/poll.h>
+#include <sys/proc.h>
+#include <sys/selinfo.h>
+#include <sys/systm.h>
 #include <sys/time.h>
+#include <sys/uio.h>
 
-#include <dev/evdev/input.h>
 #include <dev/evdev/evdev.h>
 #include <dev/evdev/evdev_private.h>
+#include <dev/evdev/input.h>
 
 #ifdef EVDEV_DEBUG
 #define	debugf(client, fmt, args...)	printf("evdev cdev: "fmt"\n", ##args)
diff --git a/sys/dev/evdev/evdev.c b/sys/dev/evdev/evdev.c
index 9827a7a9cd91b..f55cf58e1cf8c 100644
--- a/sys/dev/evdev/evdev.c
+++ b/sys/dev/evdev/evdev.c
@@ -29,19 +29,18 @@
 
 #include "opt_evdev.h"
 
-#include <sys/types.h>
-#include <sys/systm.h>
 #include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
+#include <sys/bitstring.h>
 #include <sys/conf.h>
+#include <sys/kernel.h>
 #include <sys/malloc.h>
-#include <sys/bitstring.h>
+#include <sys/module.h>
 #include <sys/sysctl.h>
+#include <sys/systm.h>
 
-#include <dev/evdev/input.h>
 #include <dev/evdev/evdev.h>
 #include <dev/evdev/evdev_private.h>
+#include <dev/evdev/input.h>
 
 #ifdef EVDEV_DEBUG
 #define	debugf(evdev, fmt, args...)	printf("evdev: " fmt "\n", ##args)
diff --git a/sys/dev/evdev/evdev_mt.c b/sys/dev/evdev/evdev_mt.c
index 82f36d8478e29..2425365265a4b 100644
--- a/sys/dev/evdev/evdev_mt.c
+++ b/sys/dev/evdev/evdev_mt.c
@@ -27,14 +27,14 @@
  */
 
 #include <sys/param.h>
-#include <sys/malloc.h>
 #include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/systm.h>
 
-#include <dev/evdev/input.h>
 #include <dev/evdev/evdev.h>
 #include <dev/evdev/evdev_private.h>
+#include <dev/evdev/input.h>
 
 #ifdef DEBUG
 #define	debugf(fmt, args...)	printf("evdev: " fmt "\n", ##args)
diff --git a/sys/dev/evdev/evdev_private.h b/sys/dev/evdev/evdev_private.h
index b3de1bf0fa40b..27dff6a633554 100644
--- a/sys/dev/evdev/evdev_private.h
+++ b/sys/dev/evdev/evdev_private.h
@@ -31,10 +31,11 @@
 #define	_DEV_EVDEV_EVDEV_PRIVATE_H
 
 #include <sys/bitstring.h>
-#include <sys/queue.h>
-#include <sys/malloc.h>
 #include <sys/kbio.h>
+#include <sys/malloc.h>
+#include <sys/queue.h>
 #include <sys/selinfo.h>
+
 #include <dev/evdev/evdev.h>
 #include <dev/evdev/input.h>
 #include <dev/kbd/kbdreg.h>
diff --git a/sys/dev/evdev/evdev_utils.c b/sys/dev/evdev/evdev_utils.c
index 5436ab55d967c..53f8595f87d3d 100644
--- a/sys/dev/evdev/evdev_utils.c
+++ b/sys/dev/evdev/evdev_utils.c
@@ -27,17 +27,16 @@
  * $FreeBSD$
  */
 
-#include <sys/types.h>
-#include <sys/systm.h>
 #include <sys/param.h>
 #include <sys/bus.h>
-#include <sys/kernel.h>
 #include <sys/conf.h>
-#include <sys/malloc.h>
 #include <sys/kbio.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/systm.h>
 
-#include <dev/evdev/input.h>
 #include <dev/evdev/evdev.h>
+#include <dev/evdev/input.h>
 
 #include <dev/kbd/kbdreg.h>
 
diff --git a/sys/dev/evdev/input.h b/sys/dev/evdev/input.h
index 04638444d964f..fb7a73af62b14 100644
--- a/sys/dev/evdev/input.h
+++ b/sys/dev/evdev/input.h
@@ -31,8 +31,8 @@
 #define	_EVDEV_INPUT_H
 
 #ifndef __KERNEL__
-#include <sys/time.h>
 #include <sys/ioccom.h>
+#include <sys/time.h>
 #include <sys/types.h>
 #endif
 
diff --git a/sys/dev/evdev/uinput.c b/sys/dev/evdev/uinput.c
index f6d397605b9a9..b13a2e71c2fa9 100644
--- a/sys/dev/evdev/uinput.c
+++ b/sys/dev/evdev/uinput.c
@@ -29,25 +29,24 @@
 
 #include "opt_evdev.h"
 
-#include <sys/types.h>
-#include <sys/systm.h>
 #include <sys/param.h>
+#include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/module.h>
-#include <sys/conf.h>
-#include <sys/uio.h>
-#include <sys/proc.h>
 #include <sys/poll.h>
+#include <sys/proc.h>
 #include <sys/selinfo.h>
-#include <sys/malloc.h>
-#include <sys/lock.h>
+#include <sys/systm.h>
 #include <sys/sx.h>
+#include <sys/uio.h>
 
-#include <dev/evdev/input.h>
-#include <dev/evdev/uinput.h>
 #include <dev/evdev/evdev.h>
 #include <dev/evdev/evdev_private.h>
+#include <dev/evdev/input.h>
+#include <dev/evdev/uinput.h>
 
 #ifdef UINPUT_DEBUG
 #define	debugf(state, fmt, args...)	printf("uinput: " fmt "\n", ##args)