diff --git a/commands/automount.c b/commands/automount.c
index b491d203f..a71430c9e 100644
--- a/commands/automount.c
+++ b/commands/automount.c
@@ -20,6 +20,7 @@
 #include <fs.h>
 #include <errno.h>
 #include <getopt.h>
+#include <libfile.h>
 
 static int do_automount(int argc, char *argv[])
 {
diff --git a/commands/mkdir.c b/commands/mkdir.c
index 1f978869a..7d024c871 100644
--- a/commands/mkdir.c
+++ b/commands/mkdir.c
@@ -22,6 +22,7 @@
 #include <fs.h>
 #include <errno.h>
 #include <getopt.h>
+#include <libfile.h>
 
 static int do_mkdir(int argc, char *argv[])
 {
diff --git a/fs/efi.c b/fs/efi.c
index 5ae796bdd..26f2f669b 100644
--- a/fs/efi.c
+++ b/fs/efi.c
@@ -30,6 +30,7 @@
 #include <fcntl.h>
 #include <wchar.h>
 #include <efi.h>
+#include <libfile.h>
 #include <mach/efi.h>
 #include <mach/efi-device.h>
 
diff --git a/fs/fs.c b/fs/fs.c
index ad8d99b8d..1711a0c6a 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -34,6 +34,7 @@
 #include <environment.h>
 #include <libgen.h>
 #include <block.h>
+#include <libfile.h>
 
 char *mkmodestr(unsigned long mode, char *str)
 {
diff --git a/include/fs.h b/include/fs.h
index b9d1e6e09..21490db7b 100644
--- a/include/fs.h
+++ b/include/fs.h
@@ -126,9 +126,6 @@ ssize_t pwrite(int fd, const void *buf, size_t count, loff_t offset);
 
 loff_t lseek(int fildes, loff_t offset, int whence);
 int mkdir (const char *pathname, mode_t mode);
-
-/* Create a directory and its parents */
-int make_directory(const char *pathname);
 int rmdir (const char *pathname);
 
 const char *getcwd(void);
diff --git a/include/libfile.h b/include/libfile.h
index 51fa06008..3f81718bb 100644
--- a/include/libfile.h
+++ b/include/libfile.h
@@ -21,4 +21,7 @@ int compare_file(const char *f1, const char *f2);
 
 int open_and_lseek(const char *filename, int mode, loff_t pos);
 
+/* Create a directory and its parents */
+int make_directory(const char *pathname);
+
 #endif /* __LIBFILE_H */
diff --git a/lib/make_directory.c b/lib/make_directory.c
index 7432efc19..29d08cf53 100644
--- a/lib/make_directory.c
+++ b/lib/make_directory.c
@@ -3,6 +3,7 @@
 #include <errno.h>
 #ifdef __BAREBOX__
 #include <fs.h>
+#include <libfile.h>
 #include <malloc.h>
 #include <common.h>
 #define STATIC