diff --git a/include/ChangeLog b/include/ChangeLog
index 8c5a1bf789c..386191088df 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-27  Tom Tromey  <tromey@redhat.com>
+
+	* dwarf2.h: Wrap function declarations in extern "C".
+
 2012-04-27  Tom Tromey  <tromey@redhat.com>
 
 	* dwarf2.h (enum dwarf_tag, enum dwarf_form, enum dwarf_attribute)
diff --git a/include/dwarf2.h b/include/dwarf2.h
index c86b022b6ea..0be7a99c856 100644
--- a/include/dwarf2.h
+++ b/include/dwarf2.h
@@ -361,6 +361,10 @@ enum dwarf_macro_record_type
 #define DW_EH_PE_indirect	0x80
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /* Return the name of a DW_TAG_ constant, or NULL if the value is not
    recognized.  */
 extern const char *get_DW_TAG_name (unsigned int tag);
@@ -385,4 +389,8 @@ extern const char *get_DW_ATE_name (unsigned int enc);
    recognized.  */
 extern const char *get_DW_CFA_name (unsigned int opc);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* _DWARF2_H */