diff --git a/driver_menu.h b/driver_menu.h
index 76b3000db8..db6fa44b55 100644
--- a/driver_menu.h
+++ b/driver_menu.h
@@ -17,9 +17,16 @@
 #ifndef DRIVER_MENU_H__
 #define DRIVER_MENU_H__
 
+#include <stddef.h>
+#include <stdint.h>
+#include "boolean.h"
 #include "frontend/menu/file_list.h"
 #include "frontend/menu/history.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct menu_ctx_driver_backend
 {
    void     (*entries_init)(void*, unsigned);
@@ -173,7 +180,9 @@ typedef struct
    retro_time_t sleep_msec;
 } menu_handle_t;
 
-
+#ifdef __cplusplus
+}
+#endif
 
 #endif