diff --git a/xorriso/xorriso.h b/xorriso/xorriso.h
index f2d844ec..cf45431e 100644
--- a/xorriso/xorriso.h
+++ b/xorriso/xorriso.h
@@ -48,6 +48,11 @@
 #ifndef Xorriso_includeD
 #define Xorriso_includeD yes
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 /** Opaque handle of the xorriso runtime context */
 struct XorrisO; 
 
@@ -2158,6 +2163,9 @@ int Xorriso_option_xattr(struct XorrisO *xorriso, char *mode, int flag);
 /* @since 0.3.8 */
 int Xorriso_option_zisofs(struct XorrisO *xorriso, char *mode, int flag);
 
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
 
 #endif /* Xorriso_includeD */
 
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index c0ba5240..1adb32ee 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2016.03.15.203403"
+#define Xorriso_timestamP "2016.03.15.203626"