diff --git a/src/libiso8601/000_TopHeader.h b/src/libiso8601/000_TopHeader.h
index e8badd1..b22a556 100644
--- a/src/libiso8601/000_TopHeader.h
+++ b/src/libiso8601/000_TopHeader.h
@@ -8,6 +8,10 @@
 #ifndef HEADER_libiso8601
 #define HEADER_libiso8601
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* standard includes, or includes needed for type declarations */
 #include <time.h>
 #include <stdint.h>
diff --git a/src/libiso8601/999_BottomHeader.h b/src/libiso8601/999_BottomHeader.h
index 8a738c5..6923ccb 100644
--- a/src/libiso8601/999_BottomHeader.h
+++ b/src/libiso8601/999_BottomHeader.h
@@ -5,6 +5,10 @@
  *  http://www.gnu.org/copyleft/gpl.html for details.
 */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
 /* options for text editors