diff --git a/cores/libretro-gong/gong.c b/cores/libretro-gong/gong.c
index 7c4931ec36..07ff168050 100644
--- a/cores/libretro-gong/gong.c
+++ b/cores/libretro-gong/gong.c
@@ -159,7 +159,7 @@ static void check_variables(void)
       int i;
       g_state->refresh = atoi(var.value);
 
-      for (i = 0; i < sizeof(g_state->g_input) / sizeof(g_state->g_input[0]); i++)
+      for (i = 0; i < (int)(sizeof(g_state->g_input) / sizeof(g_state->g_input[0])); i++)
          g_state->g_input[i].last_dt = 1.0f / g_state->refresh;
    }
 
diff --git a/libretro-common/cdrom/cdrom.c b/libretro-common/cdrom/cdrom.c
index 940e05c738..31597ece12 100644
--- a/libretro-common/cdrom/cdrom.c
+++ b/libretro-common/cdrom/cdrom.c
@@ -1268,7 +1268,7 @@ struct string_list* cdrom_get_available_drives(void)
    if (!dir_list)
       return list;
 
-   for (i = 0; i < dir_list->size; i++)
+   for (i = 0; i < (int)dir_list->size; i++)
    {
       if (strstr(dir_list->elems[i].data, "/dev/sg"))
       {
diff --git a/libretro-common/include/vfs/vfs_implementation.h b/libretro-common/include/vfs/vfs_implementation.h
index be34feb43c..0bf4a5cbe0 100644
--- a/libretro-common/include/vfs/vfs_implementation.h
+++ b/libretro-common/include/vfs/vfs_implementation.h
@@ -33,9 +33,7 @@
 #include <vfs/vfs_implementation_cdrom.h>
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+RETRO_BEGIN_DECLS
 
 libretro_vfs_implementation_file *retro_vfs_file_open_impl(const char *path, unsigned mode, unsigned hints);
 
@@ -77,8 +75,6 @@ bool retro_vfs_dirent_is_dir_impl(libretro_vfs_implementation_dir *dirstream);
 
 int retro_vfs_closedir_impl(libretro_vfs_implementation_dir *dirstream);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif