diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index c9861ed93c..57c458ae20 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-30	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* libchip/serial/sersupp.h: Remove termios_baud_to_index,
+	termios_baud_to_number (duplicate prototypes).
+	Add C++-guards.
+	Include rtems/termiostypes.h.
+
 2009-09-15	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* aclocal/bsp-configure.m4: Add RTEMS_BSP_BOOTCARD_OPTIONS.
diff --git a/c/src/libchip/serial/sersupp.h b/c/src/libchip/serial/sersupp.h
index 29db6b298b..ee078eabe2 100644
--- a/c/src/libchip/serial/sersupp.h
+++ b/c/src/libchip/serial/sersupp.h
@@ -5,18 +5,19 @@
 #ifndef __LIBCHIP_SERIAL_SUPPORT_h
 #define __LIBCHIP_SERIAL_SUPPORT_h
 
-int termios_baud_to_index(
-  int termios_baud
-);
+#include <rtems/termiostypes.h>
 
-int termios_baud_to_number(
-  int termios_baud
-);
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 bool libchip_serial_default_probe(
   int minor
 );
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif
 /* end of include file */