diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 9fa534013c..31d19a26d8 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-26	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* include/rtems/bspIo.h, include/rtems/pci.h:
+	Add extern "C" guards. Reported by
+	Robert S. Grimes <rsg@alum.mit.edu>.
+
 2007-07-24	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* libmisc/cpuuse/cpuusagereport.c, libmisc/cpuuse/cpuusagereset.c,
diff --git a/cpukit/include/rtems/bspIo.h b/cpukit/include/rtems/bspIo.h
index 775e8ce4be..d3eda5610a 100644
--- a/cpukit/include/rtems/bspIo.h
+++ b/cpukit/include/rtems/bspIo.h
@@ -14,6 +14,10 @@
 #ifndef _RTEMS_BSPIO_H
 #define _RTEMS_BSPIO_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * All the functions declared as extern after this comment
  * MUST be implemented in each BSP. Using this function,
@@ -36,4 +40,8 @@ extern 	BSP_polling_getchar_function_type 	BSP_poll_char;
 extern void vprintk(char *fmt, va_list ap);
 extern void printk(char *fmt, ...);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/cpukit/include/rtems/pci.h b/cpukit/include/rtems/pci.h
index 10ced83d8c..6a10633255 100644
--- a/cpukit/include/rtems/pci.h
+++ b/cpukit/include/rtems/pci.h
@@ -20,6 +20,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * Under PCI, each device has 256 bytes of configuration address space,
  * of which the first 64 bytes are standardized as follows:
@@ -1225,4 +1229,8 @@ pci_find_device(
  */
 extern unsigned char pci_bus_count();
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _RTEMS_PCI_H */