Tidy up some #include lines.

2 files changed, 11 insertions, 10 deletions

diff --git a/usr.bin/file/file.c b/usr.bin/file/file.c
index d6987e32f2a..66709054a92 100644
--- a/usr.bin/file/file.c
+++ b/usr.bin/file/file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: file.c,v 1.57 2015/12/24 11:45:34 jca Exp $ */
+/* $OpenBSD: file.c,v 1.58 2016/05/01 20:34:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
@@ -19,21 +19,25 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
-#include <sys/socket.h>
 #include <sys/queue.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
 #include <sys/uio.h>
 #include <sys/wait.h>
 
+#include <err.h>
 #include <errno.h>
+#include <fcntl.h>
+#include <getopt.h>
 #include <imsg.h>
 #include <libgen.h>
-#include <getopt.h>
-#include <fcntl.h>
+#include <limits.h>
 #include <pwd.h>
 #include <stdlib.h>
+#include <stdlib.h>
+#include <string.h>
 #include <time.h>
 #include <unistd.h>
-#include <limits.h>
 
 #include "file.h"
 #include "magic.h"
diff --git a/usr.bin/file/magic.h b/usr.bin/file/magic.h
index cd458181f04..1fd8c96290c 100644
--- a/usr.bin/file/magic.h
+++ b/usr.bin/file/magic.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: magic.h,v 1.14 2016/05/01 10:56:03 nicm Exp $ */
+/* $OpenBSD: magic.h,v 1.15 2016/05/01 20:34:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
@@ -19,16 +19,13 @@
 #ifndef MAGIC_H
 #define MAGIC_H
 
+#include <sys/types.h>
 #include <sys/tree.h>
 #include <sys/queue.h>
-#include <sys/stat.h>
 
-#include <err.h>
 #include <regex.h>
 #include <stdio.h>
 #include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
 
 #define MAGIC_STRING_SIZE 31
 #define MAGIC_STRENGTH_MULTIPLIER 10