diff --git a/libisoburn/libisoburn.h b/libisoburn/libisoburn.h
index 96018b43..10c0f648 100644
--- a/libisoburn/libisoburn.h
+++ b/libisoburn/libisoburn.h
@@ -1,4 +1,7 @@
 
+#ifndef LIBISOBURN_LIBISOBURN_H_
+#define LIBISOBURN_LIBISOBURN_H_
+
 /*
   Lower level API definition of libisoburn.
 
@@ -7,6 +10,10 @@
   Provided under GPL version 2 or later.
 */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**                           Overview
 
 libisoburn is a frontend for libraries libburn and libisofs which enables
@@ -2583,3 +2590,9 @@ int isoburn_needs_emulation(struct burn_drive *d);
 
 /* no tests active, currently */
 
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* LIBISOBURN_LIBISOBURN_H_ */
+
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 7671f827..c0ba5240 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2016.03.10.200551"
+#define Xorriso_timestamP "2016.03.15.203403"