diff --git a/include/ChangeLog b/include/ChangeLog
index 0efe559c4936..7cd23728a940 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-21  Ian Lance Taylor  <iant@google.com>
+
+	* filenames.h: Add extern "C" when compiled with C++.
+
 2008-02-11  Bob Wilson  <bob.wilson@acm.org>
 
 	* xtensa-config.h (XCHAL_HAVE_THREADPTR): Redefine to zero.
diff --git a/include/filenames.h b/include/filenames.h
index 5338208e0242..0d411cc12649 100644
--- a/include/filenames.h
+++ b/include/filenames.h
@@ -26,6 +26,10 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 #ifndef FILENAMES_H
 #define FILENAMES_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if defined(__MSDOS__) || defined(_WIN32) || defined(__OS2__) || defined (__CYGWIN__)
 
 #ifndef HAVE_DOS_BASED_FILE_SYSTEM
@@ -49,4 +53,8 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 extern int filename_cmp (const char *s1, const char *s2);
 #define FILENAME_CMP(s1, s2)	filename_cmp(s1, s2)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FILENAMES_H */