4 files changed, 34 insertions, 0 deletions
diff --git a/libcpp/include/cpp-id-data.h b/libcpp/include/cpp-id-data.h
index a57edad..d2adbfa 100644
--- a/libcpp/include/cpp-id-data.h
+++ b/libcpp/include/cpp-id-data.h
@@ -18,6 +18,10 @@ along with this program; see the file COPYING3.  If not see
 
 #include "cpplib.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if !defined (HAVE_UCHAR) && !defined (IN_GCC)
 typedef unsigned char uchar;
 #endif
@@ -79,3 +83,7 @@ struct GTY(()) cpp_macro {
      tokens.  */
   unsigned int extra_tokens : 1;
 };
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/libcpp/include/line-map.h b/libcpp/include/line-map.h
index b556013a..962525f 100644
--- a/libcpp/include/line-map.h
+++ b/libcpp/include/line-map.h
@@ -23,6 +23,10 @@ along with this program; see the file COPYING3.  If not see
 #ifndef LIBCPP_LINE_MAP_H
 #define LIBCPP_LINE_MAP_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef GTY
 #define GTY(x) /* nothing */
 #endif
@@ -184,4 +188,9 @@ extern const struct line_map *linemap_lookup
 
 extern source_location
 linemap_position_for_column (struct line_maps *set, unsigned int to_column);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* !LIBCPP_LINE_MAP_H  */
diff --git a/libcpp/include/mkdeps.h b/libcpp/include/mkdeps.h
index 50bcee4..def7b56 100644
--- a/libcpp/include/mkdeps.h
+++ b/libcpp/include/mkdeps.h
@@ -23,6 +23,10 @@ along with this program; see the file COPYING3.  If not see
 #ifndef LIBCPP_MKDEPS_H
 #define LIBCPP_MKDEPS_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* This is the data structure used by all the functions in mkdeps.c.
    It's quite straightforward, but should be treated as opaque.  */
 
@@ -76,4 +80,8 @@ extern int deps_restore (struct deps *, FILE *, const char *);
    automatic dependency schemes.  */
 extern void deps_phony_targets (const struct deps *, FILE *);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* ! LIBCPP_MKDEPS_H */
diff --git a/libcpp/include/symtab.h b/libcpp/include/symtab.h
index e7c5937..e1bc00c 100644
--- a/libcpp/include/symtab.h
+++ b/libcpp/include/symtab.h
@@ -20,6 +20,11 @@ along with this program; see the file COPYING3.  If not see
 #define LIBCPP_SYMTAB_H
 
 #include "obstack.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef GTY
 #define GTY(x) /* nothing */
 #endif
@@ -99,4 +104,8 @@ extern void ht_load (hash_table *ht, hashnode *entries,
 /* Dump allocation statistics to stderr.  */
 extern void ht_dump_statistics (hash_table *);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* LIBCPP_SYMTAB_H */