diff --git a/xorriso/base_obj.c b/xorriso/base_obj.c
index f08c0b84..cee32ae7 100644
--- a/xorriso/base_obj.c
+++ b/xorriso/base_obj.c
@@ -25,7 +25,14 @@
 #include <sys/time.h>
 #include <time.h>
 #include <errno.h>
+
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#else
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+#endif
 
 #ifdef Xorriso_standalonE
 
diff --git a/xorriso/lib_mgt.c b/xorriso/lib_mgt.c
index 4a98813a..ce49f8bf 100644
--- a/xorriso/lib_mgt.c
+++ b/xorriso/lib_mgt.c
@@ -1,7 +1,7 @@
 
 /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
 
-   Copyright 2007-2010 Thomas Schmitt, <scdbackup@gmx.net>
+   Copyright 2007-2011 Thomas Schmitt, <scdbackup@gmx.net>
 
    Provided under GPL version 2 or later.
 
@@ -23,7 +23,14 @@
 #include <sys/time.h>
 #include <time.h>
 #include <errno.h>
+
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#else
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+#endif
 
 /* for -charset */
 #include <iconv.h>
diff --git a/xorriso/write_run.c b/xorriso/write_run.c
index 3f3aa42e..23839733 100644
--- a/xorriso/write_run.c
+++ b/xorriso/write_run.c
@@ -2,7 +2,7 @@
 
 /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
 
-   Copyright 2007-2010 Thomas Schmitt, <scdbackup@gmx.net>
+   Copyright 2007-2011 Thomas Schmitt, <scdbackup@gmx.net>
 
    Provided under GPL version 2 or later.
 
@@ -25,7 +25,14 @@
 #include <errno.h>
 
 #include <fcntl.h>
+
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#else
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+#endif
 
 #ifdef Xorriso_standalonE
 
diff --git a/xorriso/xorriso_private.h b/xorriso/xorriso_private.h
index 217cd03f..ff6c7805 100644
--- a/xorriso/xorriso_private.h
+++ b/xorriso/xorriso_private.h
@@ -20,7 +20,13 @@
 
 
 /* for uint32_t */
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#else
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+#endif
 
 
 /** The source code release timestamp */
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 8e01fdb0..dcb95de9 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2011.01.18.154443"
+#define Xorriso_timestamP "2011.01.18.154717"