diff --git a/Makefile b/Makefile
index 5faaf34d0b..8a80052140 100644
--- a/Makefile
+++ b/Makefile
@@ -411,7 +411,6 @@ uninstall:
 clean:
 	rm -f *.o 
 	rm -f frontend/menu/*.o
-	rm -f frontend/menu/utils/*.o
 	rm -f audio/*.o
 	rm -f conf/*.o
 	rm -f gfx/*.o
diff --git a/frontend/menu/history.h b/frontend/menu/history.h
index 94e719b67f..b0c6ea7a70 100644
--- a/frontend/menu/history.h
+++ b/frontend/menu/history.h
@@ -18,6 +18,10 @@
 
 #include <stddef.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct rom_history rom_history_t;
 
 rom_history_t *rom_history_init(const char *path, size_t size);
@@ -34,5 +38,9 @@ void rom_history_push(rom_history_t *hist,
       const char *path, const char *core_path,
       const char *core_name);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif