Index: dyn-string.h
===================================================================
--- dyn-string.h	(revision 143118)
+++ dyn-string.h	(working copy)
@@ -19,6 +19,9 @@ along with GCC; see the file COPYING.  I
 the Free Software Foundation, 51 Franklin Street - Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 typedef struct dyn_string
 {
@@ -58,3 +61,7 @@ extern int dyn_string_append_cstr (dyn_s
 extern int dyn_string_append_char (dyn_string_t, int);
 extern int dyn_string_substring (dyn_string_t,  dyn_string_t, int, int);
 extern int dyn_string_eq (dyn_string_t, dyn_string_t);
+
+#ifdef __cplusplus
+}
+#endif
Index: fibheap.h
===================================================================
--- fibheap.h	(revision 143118)
+++ fibheap.h	(working copy)
@@ -42,6 +42,10 @@ Boston, MA 02110-1301, USA.  */
 
 #include "ansidecl.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef long fibheapkey_t;
 
 typedef struct fibheap
@@ -83,4 +87,8 @@ extern void *fibheap_delete_node (fibhea
 extern void fibheap_delete (fibheap_t);
 extern fibheap_t fibheap_union (fibheap_t, fibheap_t);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _FIBHEAP_H_ */