diff --git a/libisoburn/trunk/libisoburn/isoburn.h b/libisoburn/trunk/libisoburn/isoburn.h
index 572a384d..cc9951c9 100644
--- a/libisoburn/trunk/libisoburn/isoburn.h
+++ b/libisoburn/trunk/libisoburn/isoburn.h
@@ -12,7 +12,13 @@
 
 
 /* for uint8_t */
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#else
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+#endif
 
 /* For emulated TOC of overwriteable media.
    Provides minimal info for faking a struct burn_toc_entry.
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index e3efd768..8e01fdb0 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2011.01.17.092111"
+#define Xorriso_timestamP "2011.01.18.154443"