diff --git a/frontend/frontend.h b/frontend/frontend.h
index a6974d2d78..f8d2a73461 100644
--- a/frontend/frontend.h
+++ b/frontend/frontend.h
@@ -29,7 +29,15 @@
 #define signature() int argc, char *argv[]
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int main_entry_iterate(signature(), args_type() args);
 void main_exit(args_type() args);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/input/input_common.h b/input/input_common.h
index 6fb0f5d55b..8bfa5425b4 100644
--- a/input/input_common.h
+++ b/input/input_common.h
@@ -20,6 +20,10 @@
 #include "../conf/config_file.h"
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 static inline void input_conv_analog_id_to_bind_id(unsigned index, unsigned id,
       unsigned *id_minus, unsigned *id_plus)
 {
@@ -160,5 +164,9 @@ void input_config_parse_joy_axis(config_file_t *conf, const char *prefix,
 
 void input_config_autoconfigure_joypad(unsigned index, const char *name, const char *driver);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif