Include local headers before system headers.

config.h must always be included before stdio.h because it can contain
defines that enable Large File Support (e.g. _FILE_OFFSET_BITS=64 for
glibc on 32-bit machines).

13 files changed, 24 insertions, 22 deletions

diff --git a/dump/main.c b/dump/main.c
index b85d4a3..8713f64 100644
--- a/dump/main.c
+++ b/dump/main.c
@@ -20,12 +20,12 @@
 	51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include <exfat.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <string.h>
-#include <exfat.h>
 
 static void print_generic_info(const struct exfat_super_block* sb)
 {
diff --git a/fsck/main.c b/fsck/main.c
index 3e60ac3..b3709ce 100644
--- a/fsck/main.c
+++ b/fsck/main.c
@@ -20,10 +20,9 @@
 	51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include <exfat.h>
 #include <stdio.h>
 #include <string.h>
-#include <exfat.h>
-#include <exfatfs.h>
 #include <inttypes.h>
 #include <unistd.h>
 
diff --git a/fuse/main.c b/fuse/main.c
index 52aad4b..5370359 100644
--- a/fuse/main.c
+++ b/fuse/main.c
@@ -20,6 +20,7 @@
 	51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include <exfat.h>
 #define FUSE_USE_VERSION 26
 #include <fuse.h>
 #include <errno.h>
@@ -27,7 +28,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <exfat.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <sys/types.h>
diff --git a/label/main.c b/label/main.c
index c50b769..f2bca13 100644
--- a/label/main.c
+++ b/label/main.c
@@ -20,9 +20,9 @@
 	51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include <exfat.h>
 #include <stdio.h>
 #include <string.h>
-#include <exfat.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/libexfat/byteorder.h b/libexfat/byteorder.h
index f63c12a..472cb48 100644
--- a/libexfat/byteorder.h
+++ b/libexfat/byteorder.h
@@ -23,8 +23,9 @@
 #ifndef BYTEORDER_H_INCLUDED
 #define BYTEORDER_H_INCLUDED
 
-#include <stdint.h>
 #include "platform.h"
+#include <stdint.h>
+#include <stddef.h>
 
 typedef struct { uint16_t __u16; } le16_t;
 typedef struct { uint32_t __u32; } le32_t;
diff --git a/libexfat/exfat.h b/libexfat/exfat.h
index 9684914..a141c67 100644
--- a/libexfat/exfat.h
+++ b/libexfat/exfat.h
@@ -24,15 +24,16 @@
 #ifndef EXFAT_H_INCLUDED
 #define EXFAT_H_INCLUDED
 
+#include "config.h"
+#include "compiler.h"
+#include "exfatfs.h"
+#include "version.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
 #include <stdbool.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include "compiler.h"
-#include "exfatfs.h"
-#include "version.h"
 
 #define EXFAT_NAME_MAX 256
 #define EXFAT_ATTRIB_CONTIGUOUS 0x10000
diff --git a/libexfat/exfatfs.h b/libexfat/exfatfs.h
index 87b47b5..eca2cac 100644
--- a/libexfat/exfatfs.h
+++ b/libexfat/exfatfs.h
@@ -24,6 +24,7 @@
 #define EXFATFS_H_INCLUDED
 
 #include "byteorder.h"
+#include "compiler.h"
 
 typedef uint32_t cluster_t;		/* cluster number */
 
diff --git a/mkfs/cbm.c b/mkfs/cbm.c
index a25b290..0250571 100644
--- a/mkfs/cbm.c
+++ b/mkfs/cbm.c
@@ -20,12 +20,12 @@
 	51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include <limits.h>
-#include <string.h>
 #include "cbm.h"
 #include "fat.h"
 #include "uct.h"
 #include "rootdir.h"
+#include <limits.h>
+#include <string.h>
 
 static off_t cbm_alignment(void)
 {
diff --git a/mkfs/fat.c b/mkfs/fat.c
index e5dbdce..c70dc86 100644
--- a/mkfs/fat.c
+++ b/mkfs/fat.c
@@ -20,11 +20,11 @@
 	51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include <unistd.h>
 #include "fat.h"
 #include "cbm.h"
 #include "uct.h"
 #include "rootdir.h"
+#include <unistd.h>
 
 static off_t fat_alignment(void)
 {
diff --git a/mkfs/main.c b/mkfs/main.c
index c10edf2..eee51f1 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -20,6 +20,13 @@
 	51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include "mkexfat.h"
+#include "vbr.h"
+#include "fat.h"
+#include "cbm.h"
+#include "uct.h"
+#include "rootdir.h"
+#include <exfat.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <unistd.h>
@@ -27,13 +34,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <limits.h>
-#include <exfat.h>
-#include "mkexfat.h"
-#include "vbr.h"
-#include "fat.h"
-#include "cbm.h"
-#include "uct.h"
-#include "rootdir.h"
 
 const struct fs_object* objects[] =
 {
diff --git a/mkfs/mkexfat.c b/mkfs/mkexfat.c
index cd164e9..4b7a344 100644
--- a/mkfs/mkexfat.c
+++ b/mkfs/mkexfat.c
@@ -20,12 +20,12 @@
 	51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include "mkexfat.h"
 #include <sys/types.h>
 #include <unistd.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <string.h>
-#include "mkexfat.h"
 
 static int check_size(off_t volume_size)
 {
diff --git a/mkfs/rootdir.c b/mkfs/rootdir.c
index 337e5be..84fa31f 100644
--- a/mkfs/rootdir.c
+++ b/mkfs/rootdir.c
@@ -20,11 +20,11 @@
 	51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include <string.h>
 #include "rootdir.h"
 #include "uct.h"
 #include "cbm.h"
 #include "uctc.h"
+#include <string.h>
 
 static off_t rootdir_alignment(void)
 {
diff --git a/mkfs/vbr.c b/mkfs/vbr.c
index de9fe09..702aa6d 100644
--- a/mkfs/vbr.c
+++ b/mkfs/vbr.c
@@ -20,12 +20,12 @@
 	51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include <string.h>
 #include "vbr.h"
 #include "fat.h"
 #include "cbm.h"
 #include "uct.h"
 #include "rootdir.h"
+#include <string.h>
 
 static off_t vbr_alignment(void)
 {