diff -urN openrc-0.9.8.4.orig//src/libeinfo/einfo.h openrc-0.9.8.4/src/libeinfo/einfo.h
--- openrc-0.9.8.4.orig//src/libeinfo/einfo.h	2012-08-16 12:10:45.164407735 +0200
+++ openrc-0.9.8.4/src/libeinfo/einfo.h	2012-08-16 12:11:12.779059479 +0200
@@ -48,8 +48,6 @@
 # endif
 #endif
 
-__BEGIN_DECLS
-
 /*! @brief Color types to use */
 typedef enum
 {
@@ -140,5 +138,4 @@
 /*! @brief Prefix each einfo line with something */
 void eprefix(const char * EINFO_RESTRICT);
 
-__END_DECLS
 #endif
diff -urN openrc-0.9.8.4.orig//src/librc/rc.h.in openrc-0.9.8.4/src/librc/rc.h.in
--- openrc-0.9.8.4.orig//src/librc/rc.h.in	2012-08-16 12:10:45.168407539 +0200
+++ openrc-0.9.8.4/src/librc/rc.h.in	2012-08-16 12:12:17.691890180 +0200
@@ -31,8 +31,6 @@
 #include <stdbool.h>
 #include <stdio.h>
 
-__BEGIN_DECLS
-
 #define RC_SYSCONFDIR		"@SYSCONFDIR@"
 #define RC_LIBDIR               "@PREFIX@/@LIB@/rc"
 #define RC_LIBEXECDIR           "@LIBEXECDIR@"
@@ -551,5 +549,4 @@
  * we have our own */
 ssize_t rc_getline(char **, size_t *, FILE *);
 
-__END_DECLS
 #endif