diff --git a/libisoburn/libisoburn.h b/libisoburn/libisoburn.h
index 2d24da55..0d8068a3 100644
--- a/libisoburn/libisoburn.h
+++ b/libisoburn/libisoburn.h
@@ -478,7 +478,11 @@ int isoburn_drive_set_msgs_submit(struct burn_drive *d,
     @return The status of the drive, or what kind of disc is in it.
             Note: BURN_DISC_UNGRABBED indicates wrong API usage
 */
+#ifdef __cplusplus
+enum burn::burn_disc_status isoburn_disc_get_status(struct burn_drive *drive);
+#else
 enum burn_disc_status isoburn_disc_get_status(struct burn_drive *drive);
+#endif
 
 
 /** Tells whether the media can be treated by isoburn_disc_erase().
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 9560be72..92f18198 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2011.07.04.121501"
+#define Xorriso_timestamP "2011.07.05.145103"