diff --git a/libisofs/buffer.h b/libisofs/buffer.h
index b5afa39..095c570 100644
--- a/libisofs/buffer.h
+++ b/libisofs/buffer.h
@@ -11,7 +11,14 @@
 #define LIBISO_BUFFER_H_
 
 #include <stdlib.h>
+
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#else
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+#endif
 
 #define BLOCK_SIZE          2048
 
diff --git a/libisofs/ecma119.h b/libisofs/ecma119.h
index 76ffa05..b9844a4 100644
--- a/libisofs/ecma119.h
+++ b/libisofs/ecma119.h
@@ -15,7 +15,14 @@
 #include "util.h"
 #include "buffer.h"
 
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#else
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+#endif
+
 #include <pthread.h>
 
 #define BLOCK_SIZE      2048
diff --git a/libisofs/filesrc.h b/libisofs/filesrc.h
index 49311cc..f0c8cdd 100644
--- a/libisofs/filesrc.h
+++ b/libisofs/filesrc.h
@@ -13,7 +13,13 @@
 #include "stream.h"
 #include "ecma119.h"
 
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#else
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+#endif
 
 struct Iso_File_Src
 {
diff --git a/libisofs/libisofs.h b/libisofs/libisofs.h
index d07dc7c..563127c 100644
--- a/libisofs/libisofs.h
+++ b/libisofs/libisofs.h
@@ -28,7 +28,15 @@
 #define LIBISO_LIBISOFS_H_
 
 #include <sys/stat.h>
+
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#else
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+#endif
+
 #include <stdlib.h>
 
 struct burn_source;
diff --git a/libisofs/make_isohybrid_mbr.c b/libisofs/make_isohybrid_mbr.c
index ac87cbd..a26d809 100644
--- a/libisofs/make_isohybrid_mbr.c
+++ b/libisofs/make_isohybrid_mbr.c
@@ -4,7 +4,15 @@
 #endif
 
 #include <ctype.h>
+
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#else
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+#endif
+
 #include <sys/types.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/libisofs/md5.c b/libisofs/md5.c
index 4db8c42..f100a6b 100644
--- a/libisofs/md5.c
+++ b/libisofs/md5.c
@@ -12,7 +12,14 @@
 #include "../config.h"
 #endif
 
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#else
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/libisofs/node.h b/libisofs/node.h
index c5317cd..431ae3d 100644
--- a/libisofs/node.h
+++ b/libisofs/node.h
@@ -20,7 +20,15 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#else
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+#endif
+
 
 /**
  * The extended information is a way to attach additional information to each
diff --git a/libisofs/util.h b/libisofs/util.h
index e8f3c45..948aa0a 100644
--- a/libisofs/util.h
+++ b/libisofs/util.h
@@ -11,7 +11,14 @@
 #ifndef LIBISO_UTIL_H_
 #define LIBISO_UTIL_H_
 
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#else
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+#endif
+
 #include <time.h>
 
 #ifndef MAX