4 files changed, 8 insertions, 5 deletions
diff --git a/lib/fuse_kern_chan.c b/lib/fuse_kern_chan.c
index 45ff738..ed9d0c6 100644
--- a/lib/fuse_kern_chan.c
+++ b/lib/fuse_kern_chan.c
@@ -8,6 +8,7 @@
 
 #include "fuse_lowlevel.h"
 #include "fuse_kernel.h"
+#include "fuse_i.h"
 
 #include <stdio.h>
 #include <errno.h>
diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c
index 98738e4..682c503 100644
--- a/lib/fuse_lowlevel.c
+++ b/lib/fuse_lowlevel.c
@@ -11,6 +11,8 @@
 #include "fuse_opt.h"
 #include "fuse_i.h"
 #include "fuse_misc.h"
+#include "fuse_common_compat.h"
+#include "fuse_lowlevel_compat.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -970,7 +972,8 @@ static void do_init(fuse_req_t req, fuse_ino_t nodeid, const void *inarg)
     }
 
     if (bufsize < FUSE_MIN_READ_BUFFER) {
-        fprintf(stderr, "fuse: warning: buffer size too small: %i\n", bufsize);
+        fprintf(stderr, "fuse: warning: buffer size too small: %zu\n",
+                bufsize);
         bufsize = FUSE_MIN_READ_BUFFER;
     }
 
@@ -1110,7 +1113,7 @@ static void fuse_ll_process(void *data, const char *buf, size_t len,
     struct fuse_req *req;
 
     if (f->debug) {
-        printf("unique: %llu, opcode: %s (%i), nodeid: %lu, insize: %i\n",
+        printf("unique: %llu, opcode: %s (%i), nodeid: %lu, insize: %zu\n",
                (unsigned long long) in->unique,
                opname((enum fuse_opcode) in->opcode), in->opcode,
                (unsigned long) in->nodeid, len);
@@ -1294,9 +1297,6 @@ struct fuse_session *fuse_lowlevel_new(struct fuse_args *args,
 }
 
 
-#include "fuse_common_compat.h"
-#include "fuse_lowlevel_compat.h"
-
 #ifndef __FreeBSD__
 
 static void fill_open_compat(struct fuse_open_out *arg,
diff --git a/lib/helper.c b/lib/helper.c
index 63aefd5..a1e9eb0 100644
--- a/lib/helper.c
+++ b/lib/helper.c
@@ -331,6 +331,7 @@ int fuse_main_real(int argc, char *argv[], const struct fuse_operations *op,
 }
 
 #undef fuse_main
+int fuse_main(void);
 int fuse_main(void)
 {
     fprintf(stderr, "fuse_main(): This function does not exist\n");
diff --git a/lib/mount.c b/lib/mount.c
index 2ed0381..a72294b 100644
--- a/lib/mount.c
+++ b/lib/mount.c
@@ -9,6 +9,7 @@
 #include "config.h"
 #include "fuse_i.h"
 #include "fuse_opt.h"
+#include "fuse_common_compat.h"
 
 #include <stdio.h>
 #include <stdlib.h>