diff --git a/cheevos.h b/cheevos.h
index 02f2df55ac..91fbfb2996 100644
--- a/cheevos.h
+++ b/cheevos.h
@@ -19,6 +19,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct cheevos_ctx_desc
 {
    unsigned idx;
@@ -44,4 +48,8 @@ bool cheevos_set_cheats(void);
 
 void cheevos_set_support_cheevos(bool state);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __RARCH_CHEEVOS_H */
diff --git a/msg_hash.h b/msg_hash.h
index 5767f2ed0d..eee52ab551 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -157,6 +157,10 @@
 #define MSG_DOWNLOADING                               0x465305dbU
 #define MSG_EXTRACTING                                0x25a4c19eU
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 const char *msg_hash_to_str(uint32_t hash);
 
 const char *msg_hash_to_str_fr(uint32_t hash);
@@ -183,5 +187,10 @@ const char *msg_hash_to_str_us(uint32_t hash);
 
 uint32_t msg_hash_calculate(const char *s);
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif