diff --git a/libisofs/aaip_0_2.h b/libisofs/aaip_0_2.h
index d73cb0b..c46da64 100644
--- a/libisofs/aaip_0_2.h
+++ b/libisofs/aaip_0_2.h
@@ -23,6 +23,7 @@
 
 /* For ssize_t */
 #include <unistd.h>
+#include <sys/types.h>
 
 
 /* --------------------------------- Encoder ---------------------------- */
diff --git a/libisofs/ecma119.c b/libisofs/ecma119.c
index 1539733..b93d620 100644
--- a/libisofs/ecma119.c
+++ b/libisofs/ecma119.c
@@ -42,6 +42,7 @@
 #include <langinfo.h>
 #include <stdio.h>
 #include <unistd.h>
+#include <sys/types.h>
 
 #ifdef Xorriso_standalonE
 
diff --git a/libisofs/fs_image.c b/libisofs/fs_image.c
index f394392..0f67f89 100644
--- a/libisofs/fs_image.c
+++ b/libisofs/fs_image.c
@@ -37,6 +37,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <unistd.h>
+#include <sys/types.h>
 
 
 /* Enable this and write the correct absolute path into the include statement
diff --git a/libisofs/node.c b/libisofs/node.c
index 4a5b61a..9d7037b 100644
--- a/libisofs/node.c
+++ b/libisofs/node.c
@@ -27,6 +27,8 @@
 #include <time.h>
 #include <limits.h>
 #include <stdio.h>
+#include <unistd.h>
+#include <sys/types.h>
 
 
 struct dir_iter_data
diff --git a/libisofs/rockridge.c b/libisofs/rockridge.c
index 10835f5..e485203 100644
--- a/libisofs/rockridge.c
+++ b/libisofs/rockridge.c
@@ -16,6 +16,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
+#include <sys/types.h>
 
 #include "rockridge.h"
 #include "node.h"
diff --git a/libisofs/rockridge.h b/libisofs/rockridge.h
index aade747..4a78323 100644
--- a/libisofs/rockridge.h
+++ b/libisofs/rockridge.h
@@ -42,6 +42,9 @@
 #include "ecma119.h"
 
 /* For ssize_t */
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 #include <unistd.h>
 
 
diff --git a/libisofs/stream.c b/libisofs/stream.c
index f46b4cc..6362b95 100644
--- a/libisofs/stream.c
+++ b/libisofs/stream.c
@@ -23,6 +23,7 @@
 #include <limits.h>
 #include <stdio.h>
 #include <unistd.h>
+#include <sys/types.h>
 
 
 #ifndef PATH_MAX