diff --git a/src/libeinfo/einfo.h b/src/libeinfo/einfo.h
index 31a891f8..8fe56497 100644
--- a/src/libeinfo/einfo.h
+++ b/src/libeinfo/einfo.h
@@ -48,6 +48,16 @@
 # endif
 #endif
 
+#undef __BEGIN_DECLS
+#undef __END_DECLS
+#ifdef __cplusplus
+# define __BEGIN_DECLS extern "C" {
+# define __END_DECLS }
+#else
+# define __BEGIN_DECLS /* empty */
+# define __END_DECLS /* empty */
+#endif
+
 __BEGIN_DECLS
 
 /*! @brief Color types to use */
diff --git a/src/librc/rc.h.in b/src/librc/rc.h.in
index c2a919fc..5cd584f0 100644
--- a/src/librc/rc.h.in
+++ b/src/librc/rc.h.in
@@ -31,6 +31,16 @@
 #include <stdbool.h>
 #include <stdio.h>
 
+#undef __BEGIN_DECLS
+#undef __END_DECLS
+#ifdef __cplusplus
+# define __BEGIN_DECLS extern "C" {
+# define __END_DECLS }
+#else
+# define __BEGIN_DECLS /* empty */
+# define __END_DECLS /* empty */
+#endif
+
 __BEGIN_DECLS
 
 #define RC_PREFIX "@PREFIX@"