diff --git a/src/libeinfo/einfo.h b/src/libeinfo/einfo.h
index 8fe56497..c0325c27 100644
--- a/src/libeinfo/einfo.h
+++ b/src/libeinfo/einfo.h
@@ -48,18 +48,11 @@
 # endif
 #endif
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+/* __BEGIN_DECLS */
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
-#else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+extern "C" {
 #endif
 
-__BEGIN_DECLS
-
 /*! @brief Color types to use */
 typedef enum
 {
@@ -150,5 +143,9 @@ void eoutdentv(void);
 /*! @brief Prefix each einfo line with something */
 void eprefix(const char * EINFO_RESTRICT);
 
-__END_DECLS
+/* __END_DECLS */
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/src/librc/rc.h.in b/src/librc/rc.h.in
index 5cd584f0..5ef8d7fd 100644
--- a/src/librc/rc.h.in
+++ b/src/librc/rc.h.in
@@ -31,18 +31,11 @@
 #include <stdbool.h>
 #include <stdio.h>
 
-#undef __BEGIN_DECLS
-#undef __END_DECLS
+/* __BEGIN_DECLS */
 #ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
-#else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
+extern "C" {
 #endif
 
-__BEGIN_DECLS
-
 #define RC_PREFIX "@PREFIX@"
 #define RC_SYSCONFDIR		"@SYSCONFDIR@"
 #define RC_LIBDIR               "@PREFIX@/@LIB@/rc"
@@ -573,5 +566,9 @@ bool rc_getfile(const char *, char **, size_t *);
  * we have our own */
 ssize_t rc_getline(char **, size_t *, FILE *);
 
-__END_DECLS
+/* __END_DECLS */
+#ifdef __cplusplus
+}
+#endif
+
 #endif