From 30f72098267602239c3b30adcae57086976c109d Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benpicco@googlemail.com>
Date: Wed, 6 Nov 2019 00:08:22 +0100
Subject: [PATCH] fix the build

It still spews tons of warnings and I'm not sure what all
those copues of squashfs are supposed to be about, but at
least now it compiles.
---
 src/bff/bff_huffman_decompress.c                               | 1 +
 src/cramfs-2.x/mkcramfs.c                                      | 1 +
 .../squashfs-2.0-nb4/nb4-mksquashfs/squashfs/mksquashfs.c      | 1 +
 src/others/squashfs-2.0-nb4/nb4-unsquashfs/nb4-unsquash.c      | 1 +
 src/others/squashfs-2.2-r2-7z/mksquashfs.c                     | 1 +
 src/others/squashfs-2.2-r2-7z/unsquashfs.c                     | 1 +
 src/others/squashfs-3.0-e2100/mksquashfs.c                     | 1 +
 src/others/squashfs-3.0-e2100/unsquashfs.c                     | 1 +
 .../squashfs3.2-r2/squashfs-tools/mksquashfs.c                 | 1 +
 .../squashfs3.2-r2/squashfs-tools/unsquashfs.c                 | 1 +
 .../squashfs3.2-r2/squashfs-tools/mksquashfs.c                 | 1 +
 .../squashfs3.2-r2/squashfs-tools/unsquashfs.c                 | 1 +
 src/others/squashfs-3.2-r2-rtn12/mksquashfs.c                  | 1 +
 src/others/squashfs-3.2-r2-rtn12/unsquashfs.c                  | 1 +
 src/others/squashfs-3.2-r2-wnr1000/mksquashfs.c                | 1 +
 src/others/squashfs-3.2-r2-wnr1000/unsquashfs.c                | 1 +
 src/others/squashfs-3.2-r2/mksquashfs.c                        | 1 +
 src/others/squashfs-3.2-r2/unsquashfs.c                        | 1 +
 .../squashfs3.3/squashfs-tools/mksquashfs.c                    | 1 +
 .../squashfs3.3/squashfs-tools/unsquashfs.c                    | 1 +
 .../squashfs-3.3-lzma/squashfs3.3/squashfs-tools/mksquashfs.c  | 1 +
 .../squashfs-3.3-lzma/squashfs3.3/squashfs-tools/unsquashfs.c  | 1 +
 src/others/squashfs-3.3/mksquashfs.c                           | 1 +
 src/others/squashfs-3.3/unsquashfs.c                           | 1 +
 src/others/squashfs-3.4-cisco/squashfs-tools/mksquashfs.c      | 1 +
 src/others/squashfs-3.4-cisco/squashfs-tools/unsquashfs.c      | 1 +
 .../squashfs-3.4-nb4/squashfs3.4/squashfs-tools/mksquashfs.c   | 1 +
 .../squashfs-3.4-nb4/squashfs3.4/squashfs-tools/unsquashfs.c   | 1 +
 src/others/squashfs-4.0-lzma/mksquashfs.c                      | 1 +
 src/others/squashfs-4.0-lzma/unsquashfs.c                      | 1 +
 src/others/squashfs-4.0-realtek/mksquashfs.c                   | 1 +
 src/others/squashfs-4.0-realtek/unsquashfs.c                   | 1 +
 src/others/squashfs-4.2-official/mksquashfs.c                  | 1 +
 src/others/squashfs-4.2-official/unsquashfs.c                  | 1 +
 src/others/squashfs-4.2/squashfs-tools/mksquashfs.c            | 1 +
 src/others/squashfs-4.2/squashfs-tools/unsquashfs.c            | 1 +
 src/squashfs-2.1-r2/mksquashfs.c                               | 1 +
 src/squashfs-2.1-r2/unsquashfs.c                               | 2 ++
 src/squashfs-3.0-lzma-damn-small-variant/mksquashfs.c          | 1 +
 src/squashfs-3.0-lzma-damn-small-variant/unsquashfs.c          | 2 ++
 src/squashfs-3.0/mksquashfs.c                                  | 1 +
 src/squashfs-3.0/unsquashfs.c                                  | 1 +
 src/uncramfs-lzma/lzma-uncramfs.c                              | 1 +
 src/uncramfs/uncramfs.c                                        | 3 ++-
 44 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/src/bff/bff_huffman_decompress.c b/src/bff/bff_huffman_decompress.c
index 4ef0a7d..6969c05 100644
--- a/src/bff/bff_huffman_decompress.c
+++ b/src/bff/bff_huffman_decompress.c
@@ -55,6 +55,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #define	PACK_HEADER_LENGTH	1
 #define	HTREE_MAXLEVEL		24
 
diff --git a/src/cramfs-2.x/mkcramfs.c b/src/cramfs-2.x/mkcramfs.c
index a2ef018..c5807d1 100755
--- a/src/cramfs-2.x/mkcramfs.c
+++ b/src/cramfs-2.x/mkcramfs.c
@@ -34,6 +34,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <linux/cramfs_fs.h>
+#include <sys/sysmacros.h>
 #include <zlib.h>
 
 /* Exit codes used by mkfs-type programs */
diff --git a/src/others/squashfs-2.0-nb4/nb4-mksquashfs/squashfs/mksquashfs.c b/src/others/squashfs-2.0-nb4/nb4-mksquashfs/squashfs/mksquashfs.c
index 8ac1092..7a3da73 100644
--- a/src/others/squashfs-2.0-nb4/nb4-mksquashfs/squashfs/mksquashfs.c
+++ b/src/others/squashfs-2.0-nb4/nb4-mksquashfs/squashfs/mksquashfs.c
@@ -33,6 +33,7 @@
 #include <dirent.h>
 #include <string.h>
 #include <zlib.h>
+#include <sys/sysmacros.h>
 #ifdef __MACOSX__
   #define __BYTE_ORDER BYTE_ORDER
   #define __BIG_ENDIAN BIG_ENDIAN
diff --git a/src/others/squashfs-2.0-nb4/nb4-unsquashfs/nb4-unsquash.c b/src/others/squashfs-2.0-nb4/nb4-unsquashfs/nb4-unsquash.c
index 86bd5c9..51723d2 100644
--- a/src/others/squashfs-2.0-nb4/nb4-unsquashfs/nb4-unsquash.c
+++ b/src/others/squashfs-2.0-nb4/nb4-unsquashfs/nb4-unsquash.c
@@ -45,6 +45,7 @@
 #include <time.h>
 #include <regex.h>
 #include <fnmatch.h>
+#include <sys/sysmacros.h>
 
 #if defined(__GNUC__) && !defined(__MACOSX__)
   #include <endian.h>
diff --git a/src/others/squashfs-2.2-r2-7z/mksquashfs.c b/src/others/squashfs-2.2-r2-7z/mksquashfs.c
index eb613c6..6a9f826 100644
--- a/src/others/squashfs-2.2-r2-7z/mksquashfs.c
+++ b/src/others/squashfs-2.2-r2-7z/mksquashfs.c
@@ -41,6 +41,7 @@
 #include <signal.h>
 #include <setjmp.h>
 #include <sys/mman.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/others/squashfs-2.2-r2-7z/unsquashfs.c b/src/others/squashfs-2.2-r2-7z/unsquashfs.c
index c49c080..fdf623b 100644
--- a/src/others/squashfs-2.2-r2-7z/unsquashfs.c
+++ b/src/others/squashfs-2.2-r2-7z/unsquashfs.c
@@ -35,6 +35,7 @@
 #include <zlib.h>
 #include <sys/mman.h>
 #include <utime.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/others/squashfs-3.0-e2100/mksquashfs.c b/src/others/squashfs-3.0-e2100/mksquashfs.c
index e773f53..5b66a9f 100755
--- a/src/others/squashfs-3.0-e2100/mksquashfs.c
+++ b/src/others/squashfs-3.0-e2100/mksquashfs.c
@@ -40,6 +40,7 @@
 #include <signal.h>
 #include <setjmp.h>
 #include <sys/mman.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/others/squashfs-3.0-e2100/unsquashfs.c b/src/others/squashfs-3.0-e2100/unsquashfs.c
index dae8fd6..371d3da 100755
--- a/src/others/squashfs-3.0-e2100/unsquashfs.c
+++ b/src/others/squashfs-3.0-e2100/unsquashfs.c
@@ -32,6 +32,7 @@
 #include <zlib.h>
 #include <sys/mman.h>
 #include <utime.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/others/squashfs-3.2-r2-hg612-lzma/squashfs3.2-r2/squashfs-tools/mksquashfs.c b/src/others/squashfs-3.2-r2-hg612-lzma/squashfs3.2-r2/squashfs-tools/mksquashfs.c
index f51a565..53ab234 100644
--- a/src/others/squashfs-3.2-r2-hg612-lzma/squashfs3.2-r2/squashfs-tools/mksquashfs.c
+++ b/src/others/squashfs-3.2-r2-hg612-lzma/squashfs3.2-r2/squashfs-tools/mksquashfs.c
@@ -44,6 +44,7 @@
 #include <sys/mman.h>
 #include <pthread.h>
 #include <math.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/others/squashfs-3.2-r2-hg612-lzma/squashfs3.2-r2/squashfs-tools/unsquashfs.c b/src/others/squashfs-3.2-r2-hg612-lzma/squashfs3.2-r2/squashfs-tools/unsquashfs.c
index 46af090..18edec8 100644
--- a/src/others/squashfs-3.2-r2-hg612-lzma/squashfs3.2-r2/squashfs-tools/unsquashfs.c
+++ b/src/others/squashfs-3.2-r2-hg612-lzma/squashfs3.2-r2/squashfs-tools/unsquashfs.c
@@ -48,6 +48,7 @@
 #include "global.h"
 #include "sqlzma.h"
 #include "sqmagic.h"
+#include <sys/sysmacros.h>
 
 #include <stdlib.h>
 
diff --git a/src/others/squashfs-3.2-r2-lzma/squashfs3.2-r2/squashfs-tools/mksquashfs.c b/src/others/squashfs-3.2-r2-lzma/squashfs3.2-r2/squashfs-tools/mksquashfs.c
index 4e5a1d1..07593da 100644
--- a/src/others/squashfs-3.2-r2-lzma/squashfs3.2-r2/squashfs-tools/mksquashfs.c
+++ b/src/others/squashfs-3.2-r2-lzma/squashfs3.2-r2/squashfs-tools/mksquashfs.c
@@ -44,6 +44,7 @@
 #include <sys/mman.h>
 #include <pthread.h>
 #include <math.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/others/squashfs-3.2-r2-lzma/squashfs3.2-r2/squashfs-tools/unsquashfs.c b/src/others/squashfs-3.2-r2-lzma/squashfs3.2-r2/squashfs-tools/unsquashfs.c
index 8f10083..7e36ed0 100644
--- a/src/others/squashfs-3.2-r2-lzma/squashfs3.2-r2/squashfs-tools/unsquashfs.c
+++ b/src/others/squashfs-3.2-r2-lzma/squashfs3.2-r2/squashfs-tools/unsquashfs.c
@@ -48,6 +48,7 @@
 #include "global.h"
 #include "sqlzma.h"
 #include "sqmagic.h"
+#include <sys/sysmacros.h>
 
 #include <stdlib.h>
 
diff --git a/src/others/squashfs-3.2-r2-rtn12/mksquashfs.c b/src/others/squashfs-3.2-r2-rtn12/mksquashfs.c
index 5f4df33..f5e0cbc 100644
--- a/src/others/squashfs-3.2-r2-rtn12/mksquashfs.c
+++ b/src/others/squashfs-3.2-r2-rtn12/mksquashfs.c
@@ -44,6 +44,7 @@
 #include <sys/mman.h>
 #include <pthread.h>
 #include <math.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/others/squashfs-3.2-r2-rtn12/unsquashfs.c b/src/others/squashfs-3.2-r2-rtn12/unsquashfs.c
index 7bb714d..5b1664b 100644
--- a/src/others/squashfs-3.2-r2-rtn12/unsquashfs.c
+++ b/src/others/squashfs-3.2-r2-rtn12/unsquashfs.c
@@ -34,6 +34,7 @@
 #include <zlib.h>
 #include <sys/mman.h>
 #include <utime.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/others/squashfs-3.2-r2-wnr1000/mksquashfs.c b/src/others/squashfs-3.2-r2-wnr1000/mksquashfs.c
index 4716abd..3bc6167 100755
--- a/src/others/squashfs-3.2-r2-wnr1000/mksquashfs.c
+++ b/src/others/squashfs-3.2-r2-wnr1000/mksquashfs.c
@@ -44,6 +44,7 @@
 #include <sys/mman.h>
 #include <pthread.h>
 #include <math.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/others/squashfs-3.2-r2-wnr1000/unsquashfs.c b/src/others/squashfs-3.2-r2-wnr1000/unsquashfs.c
index 7bb714d..5b1664b 100755
--- a/src/others/squashfs-3.2-r2-wnr1000/unsquashfs.c
+++ b/src/others/squashfs-3.2-r2-wnr1000/unsquashfs.c
@@ -34,6 +34,7 @@
 #include <zlib.h>
 #include <sys/mman.h>
 #include <utime.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/others/squashfs-3.2-r2/mksquashfs.c b/src/others/squashfs-3.2-r2/mksquashfs.c
index 4a6b99e..bd6c7a3 100644
--- a/src/others/squashfs-3.2-r2/mksquashfs.c
+++ b/src/others/squashfs-3.2-r2/mksquashfs.c
@@ -44,6 +44,7 @@
 #include <sys/mman.h>
 #include <pthread.h>
 #include <math.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/others/squashfs-3.2-r2/unsquashfs.c b/src/others/squashfs-3.2-r2/unsquashfs.c
index 4e6e5ae..f452b90 100644
--- a/src/others/squashfs-3.2-r2/unsquashfs.c
+++ b/src/others/squashfs-3.2-r2/unsquashfs.c
@@ -34,6 +34,7 @@
 #include <zlib.h>
 #include <sys/mman.h>
 #include <utime.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/others/squashfs-3.3-grml-lzma/squashfs3.3/squashfs-tools/mksquashfs.c b/src/others/squashfs-3.3-grml-lzma/squashfs3.3/squashfs-tools/mksquashfs.c
index 47c1fe9..0681a24 100644
--- a/src/others/squashfs-3.3-grml-lzma/squashfs3.3/squashfs-tools/mksquashfs.c
+++ b/src/others/squashfs-3.3-grml-lzma/squashfs3.3/squashfs-tools/mksquashfs.c
@@ -46,6 +46,7 @@
 #include <math.h>
 #include <regex.h>
 #include <fnmatch.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/others/squashfs-3.3-grml-lzma/squashfs3.3/squashfs-tools/unsquashfs.c b/src/others/squashfs-3.3-grml-lzma/squashfs3.3/squashfs-tools/unsquashfs.c
index 80bd5fe..6ad42db 100644
--- a/src/others/squashfs-3.3-grml-lzma/squashfs3.3/squashfs-tools/unsquashfs.c
+++ b/src/others/squashfs-3.3-grml-lzma/squashfs3.3/squashfs-tools/unsquashfs.c
@@ -40,6 +40,7 @@
 #include <time.h>
 #include <regex.h>
 #include <fnmatch.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/others/squashfs-3.3-lzma/squashfs3.3/squashfs-tools/mksquashfs.c b/src/others/squashfs-3.3-lzma/squashfs3.3/squashfs-tools/mksquashfs.c
index 2459dc5..f0b0147 100644
--- a/src/others/squashfs-3.3-lzma/squashfs3.3/squashfs-tools/mksquashfs.c
+++ b/src/others/squashfs-3.3-lzma/squashfs3.3/squashfs-tools/mksquashfs.c
@@ -46,6 +46,7 @@
 #include <math.h>
 #include <regex.h>
 #include <fnmatch.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/others/squashfs-3.3-lzma/squashfs3.3/squashfs-tools/unsquashfs.c b/src/others/squashfs-3.3-lzma/squashfs3.3/squashfs-tools/unsquashfs.c
index 57e15d5..d40a214 100644
--- a/src/others/squashfs-3.3-lzma/squashfs3.3/squashfs-tools/unsquashfs.c
+++ b/src/others/squashfs-3.3-lzma/squashfs3.3/squashfs-tools/unsquashfs.c
@@ -41,6 +41,7 @@
 #include <time.h>
 #include <regex.h>
 #include <fnmatch.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/others/squashfs-3.3/mksquashfs.c b/src/others/squashfs-3.3/mksquashfs.c
index 1916134..ec2e56e 100644
--- a/src/others/squashfs-3.3/mksquashfs.c
+++ b/src/others/squashfs-3.3/mksquashfs.c
@@ -47,6 +47,7 @@
 #include <math.h>
 #include <regex.h>
 #include <fnmatch.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/others/squashfs-3.3/unsquashfs.c b/src/others/squashfs-3.3/unsquashfs.c
index d657ad9..26b036c 100644
--- a/src/others/squashfs-3.3/unsquashfs.c
+++ b/src/others/squashfs-3.3/unsquashfs.c
@@ -41,6 +41,7 @@
 #include <time.h>
 #include <regex.h>
 #include <fnmatch.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/others/squashfs-3.4-cisco/squashfs-tools/mksquashfs.c b/src/others/squashfs-3.4-cisco/squashfs-tools/mksquashfs.c
index 4eebcc6..2a7eb0a 100644
--- a/src/others/squashfs-3.4-cisco/squashfs-tools/mksquashfs.c
+++ b/src/others/squashfs-3.4-cisco/squashfs-tools/mksquashfs.c
@@ -48,6 +48,7 @@
 #include <math.h>
 #include <regex.h>
 #include <fnmatch.h>
+#include <sys/sysmacros.h>
 
 #include "LzmaEnc.h"
 #include "Alloc.h"
diff --git a/src/others/squashfs-3.4-cisco/squashfs-tools/unsquashfs.c b/src/others/squashfs-3.4-cisco/squashfs-tools/unsquashfs.c
index 2a73b6f..7d117c4 100644
--- a/src/others/squashfs-3.4-cisco/squashfs-tools/unsquashfs.c
+++ b/src/others/squashfs-3.4-cisco/squashfs-tools/unsquashfs.c
@@ -48,6 +48,7 @@
 #include <math.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/others/squashfs-3.4-nb4/squashfs3.4/squashfs-tools/mksquashfs.c b/src/others/squashfs-3.4-nb4/squashfs3.4/squashfs-tools/mksquashfs.c
index b05d2b6..536daf4 100644
--- a/src/others/squashfs-3.4-nb4/squashfs3.4/squashfs-tools/mksquashfs.c
+++ b/src/others/squashfs-3.4-nb4/squashfs3.4/squashfs-tools/mksquashfs.c
@@ -47,6 +47,7 @@
 #include <math.h>
 #include <regex.h>
 #include <fnmatch.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/others/squashfs-3.4-nb4/squashfs3.4/squashfs-tools/unsquashfs.c b/src/others/squashfs-3.4-nb4/squashfs3.4/squashfs-tools/unsquashfs.c
index 5ec6ddc..65b920b 100644
--- a/src/others/squashfs-3.4-nb4/squashfs3.4/squashfs-tools/unsquashfs.c
+++ b/src/others/squashfs-3.4-nb4/squashfs3.4/squashfs-tools/unsquashfs.c
@@ -47,6 +47,7 @@
 #include <math.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
+#include <sys/sysmacros.h>
 
 #include <sys/sysctl.h>
 
diff --git a/src/others/squashfs-4.0-lzma/mksquashfs.c b/src/others/squashfs-4.0-lzma/mksquashfs.c
index da4ea5d..c2d7460 100644
--- a/src/others/squashfs-4.0-lzma/mksquashfs.c
+++ b/src/others/squashfs-4.0-lzma/mksquashfs.c
@@ -47,6 +47,7 @@
 #include <math.h>
 #include <regex.h>
 #include <fnmatch.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/others/squashfs-4.0-lzma/unsquashfs.c b/src/others/squashfs-4.0-lzma/unsquashfs.c
index 50527d7..bf102f6 100644
--- a/src/others/squashfs-4.0-lzma/unsquashfs.c
+++ b/src/others/squashfs-4.0-lzma/unsquashfs.c
@@ -21,6 +21,7 @@
  * unsquashfs.c
  */
 
+#include <sys/sysmacros.h>
 #include "unsquashfs.h"
 #include "squashfs_swap.h"
 #include "squashfs_compat.h"
diff --git a/src/others/squashfs-4.0-realtek/mksquashfs.c b/src/others/squashfs-4.0-realtek/mksquashfs.c
index afc1b29..15d3d14 100644
--- a/src/others/squashfs-4.0-realtek/mksquashfs.c
+++ b/src/others/squashfs-4.0-realtek/mksquashfs.c
@@ -47,6 +47,7 @@
 #include <regex.h>
 #include <fnmatch.h>
 #include <sys/wait.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/others/squashfs-4.0-realtek/unsquashfs.c b/src/others/squashfs-4.0-realtek/unsquashfs.c
index 82277ba..c2fbbb6 100644
--- a/src/others/squashfs-4.0-realtek/unsquashfs.c
+++ b/src/others/squashfs-4.0-realtek/unsquashfs.c
@@ -21,6 +21,7 @@
  * unsquashfs.c
  */
 
+#include <sys/sysmacros.h>
 #include "unsquashfs.h"
 #include "squashfs_swap.h"
 #include "squashfs_compat.h"
diff --git a/src/others/squashfs-4.2-official/mksquashfs.c b/src/others/squashfs-4.2-official/mksquashfs.c
index 58168f3..a5b3c97 100644
--- a/src/others/squashfs-4.2-official/mksquashfs.c
+++ b/src/others/squashfs-4.2-official/mksquashfs.c
@@ -49,6 +49,7 @@
 #include <regex.h>
 #include <fnmatch.h>
 #include <sys/wait.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/others/squashfs-4.2-official/unsquashfs.c b/src/others/squashfs-4.2-official/unsquashfs.c
index 529dfac..f5b6651 100644
--- a/src/others/squashfs-4.2-official/unsquashfs.c
+++ b/src/others/squashfs-4.2-official/unsquashfs.c
@@ -22,6 +22,7 @@
  * unsquashfs.c
  */
 
+#include <sys/sysmacros.h>
 #include "unsquashfs.h"
 #include "squashfs_swap.h"
 #include "squashfs_compat.h"
diff --git a/src/others/squashfs-4.2/squashfs-tools/mksquashfs.c b/src/others/squashfs-4.2/squashfs-tools/mksquashfs.c
index 27ad514..88851dc 100644
--- a/src/others/squashfs-4.2/squashfs-tools/mksquashfs.c
+++ b/src/others/squashfs-4.2/squashfs-tools/mksquashfs.c
@@ -49,6 +49,7 @@
 #include <regex.h>
 #include <fnmatch.h>
 #include <sys/wait.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #ifndef __CYGWIN__
diff --git a/src/others/squashfs-4.2/squashfs-tools/unsquashfs.c b/src/others/squashfs-4.2/squashfs-tools/unsquashfs.c
index 9a12651..6256c06 100644
--- a/src/others/squashfs-4.2/squashfs-tools/unsquashfs.c
+++ b/src/others/squashfs-4.2/squashfs-tools/unsquashfs.c
@@ -22,6 +22,7 @@
  * unsquashfs.c
  */
 
+#include <sys/sysmacros.h>
 #include "unsquashfs.h"
 #include "squashfs_swap.h"
 #include "squashfs_compat.h"
diff --git a/src/squashfs-2.1-r2/mksquashfs.c b/src/squashfs-2.1-r2/mksquashfs.c
index 6e34852..7af5d49 100644
--- a/src/squashfs-2.1-r2/mksquashfs.c
+++ b/src/squashfs-2.1-r2/mksquashfs.c
@@ -38,6 +38,7 @@
 #include <signal.h>
 #include <setjmp.h>
 #include <sys/mman.h>
+#include <sys/sysmacros.h>
 
 #include "mksquashfs.h"
 #include <squashfs_fs.h>
diff --git a/src/squashfs-2.1-r2/unsquashfs.c b/src/squashfs-2.1-r2/unsquashfs.c
index d9fbe70..902810e 100644
--- a/src/squashfs-2.1-r2/unsquashfs.c
+++ b/src/squashfs-2.1-r2/unsquashfs.c
@@ -35,6 +35,8 @@
 #include <zlib.h>
 #include <sys/mman.h>
 #include <utime.h>
+#include <sys/sysmacros.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/squashfs-3.0-lzma-damn-small-variant/mksquashfs.c b/src/squashfs-3.0-lzma-damn-small-variant/mksquashfs.c
index efa2e35..aaab0d3 100644
--- a/src/squashfs-3.0-lzma-damn-small-variant/mksquashfs.c
+++ b/src/squashfs-3.0-lzma-damn-small-variant/mksquashfs.c
@@ -46,6 +46,7 @@
 #include <signal.h>
 #include <setjmp.h>
 #include <sys/mman.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/squashfs-3.0-lzma-damn-small-variant/unsquashfs.c b/src/squashfs-3.0-lzma-damn-small-variant/unsquashfs.c
index dae8fd6..3f93983 100644
--- a/src/squashfs-3.0-lzma-damn-small-variant/unsquashfs.c
+++ b/src/squashfs-3.0-lzma-damn-small-variant/unsquashfs.c
@@ -31,7 +31,9 @@
 #include <string.h>
 #include <zlib.h>
 #include <sys/mman.h>
+#include <sys/sysmacros.h>
 #include <utime.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/squashfs-3.0/mksquashfs.c b/src/squashfs-3.0/mksquashfs.c
index b34fd22..09163f5 100644
--- a/src/squashfs-3.0/mksquashfs.c
+++ b/src/squashfs-3.0/mksquashfs.c
@@ -46,6 +46,7 @@
 #include <signal.h>
 #include <setjmp.h>
 #include <sys/mman.h>
+#include <sys/sysmacros.h>
 
 /* jc */
 //#define SQUASHFS_TRACE
diff --git a/src/squashfs-3.0/unsquashfs.c b/src/squashfs-3.0/unsquashfs.c
index e4e13f0..40dbfb9 100644
--- a/src/squashfs-3.0/unsquashfs.c
+++ b/src/squashfs-3.0/unsquashfs.c
@@ -35,6 +35,7 @@
 #include <zlib.h>
 #include <sys/mman.h>
 #include <utime.h>
+#include <sys/sysmacros.h>
 
 #ifndef linux
 #define __BYTE_ORDER BYTE_ORDER
diff --git a/src/uncramfs-lzma/lzma-uncramfs.c b/src/uncramfs-lzma/lzma-uncramfs.c
index d3bc122..75e1ab6 100755
--- a/src/uncramfs-lzma/lzma-uncramfs.c
+++ b/src/uncramfs-lzma/lzma-uncramfs.c
@@ -21,6 +21,7 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <sys/fcntl.h>
+#include <sys/sysmacros.h>
 #include <stdlib.h>
 
 // Application libraries
diff --git a/src/uncramfs/uncramfs.c b/src/uncramfs/uncramfs.c
index 94daf7c..510f2d4 100755
--- a/src/uncramfs/uncramfs.c
+++ b/src/uncramfs/uncramfs.c
@@ -9,7 +9,7 @@
 
 // C things
 #include <stdio.h>
-//#include <stdlib.h>
+#include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 
@@ -21,6 +21,7 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <sys/fcntl.h>
+#include <sys/sysmacros.h>
 
 // Application libraries
 #include <zlib.h>