diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index a6f70e4d39..a8af297f4e 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -156,7 +156,7 @@ void init_menu(void)
 
    find_menu_driver();
 
-   if (!menu_display_check_compatibility(driver->menu_ctx->type))
+   if (!menu_display_check_compatibility((enum menu_display_driver_type)driver->menu_ctx->type))
       init_menu_fallback();
 
    if (!(driver->menu = (menu_handle_t*)menu_init(driver->menu_ctx)))
diff --git a/menu/menu_entries.c b/menu/menu_entries.c
index c29547b140..b86b7cdaec 100644
--- a/menu/menu_entries.c
+++ b/menu/menu_entries.c
@@ -103,10 +103,10 @@ static menu_list_t *menu_list_new(void)
    list->selection_buf_size   = 1;
 
    for (i = 0; i < list->menu_stack_size; i++)
-      list->menu_stack[i]    = calloc(1, sizeof(*list->menu_stack[i]));
+      list->menu_stack[i]    = (file_list_t*)calloc(1, sizeof(*list->menu_stack[i]));
 
    for (i = 0; i < list->selection_buf_size; i++)
-      list->selection_buf[i] = calloc(1, sizeof(*list->selection_buf[i]));
+      list->selection_buf[i] = (file_list_t*)calloc(1, sizeof(*list->selection_buf[i]));
 
    return list;
 
diff --git a/tools/retroarch-joyconfig-griffin.c b/tools/retroarch-joyconfig-griffin.c
index 354c1ef7e8..af72ce0b51 100644
--- a/tools/retroarch-joyconfig-griffin.c
+++ b/tools/retroarch-joyconfig-griffin.c
@@ -22,8 +22,17 @@
 
 #include "../libretro-common/dynamic/dylib.c"
 #include "../libretro-common/file/retro_file.c"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "../libretro-common/file/retro_stat.c"
 
+#ifdef __cplusplus
+}
+#endif
+
 #if defined(__linux) && !defined(ANDROID)
 #include "../input/drivers/linuxraw_input.c"
 #include "../input/drivers_joypad/linuxraw_joypad.c"