diff --git a/database_info.h b/database_info.h
index d7d0d26fe82..7b9d843930f 100644
--- a/database_info.h
+++ b/database_info.h
@@ -36,7 +36,7 @@ enum database_status
    DATABASE_STATUS_ITERATE_BEGIN,
    DATABASE_STATUS_ITERATE_START,
    DATABASE_STATUS_ITERATE_NEXT,
-   DATABASE_STATUS_FREE,
+   DATABASE_STATUS_FREE
 };
 
 enum database_type
@@ -44,7 +44,7 @@ enum database_type
    DATABASE_TYPE_NONE = 0,
    DATABASE_TYPE_ITERATE,
    DATABASE_TYPE_ITERATE_ZIP,
-   DATABASE_TYPE_CRC_LOOKUP,
+   DATABASE_TYPE_CRC_LOOKUP
 };
 
 typedef struct
diff --git a/menu/menu.h b/menu/menu.h
index 69fe7651112..f895a7eec11 100644
--- a/menu/menu.h
+++ b/menu/menu.h
@@ -109,7 +109,7 @@ typedef enum
    MENU_SETTING_GROUP,
    MENU_SETTING_SUBGROUP,
    MENU_SETTING_HORIZONTAL_MENU,
-   MENU_FILE_TYPE_T_LAST,
+   MENU_FILE_TYPE_T_LAST
 } menu_file_type_t;
 
 typedef enum
@@ -146,6 +146,7 @@ typedef enum
    MENU_SETTINGS_CHEAT_END = MENU_SETTINGS_CHEAT_BEGIN + (MAX_CHEAT_COUNTERS - 1),
    MENU_SETTINGS_INPUT_DESC_BEGIN,
    MENU_SETTINGS_INPUT_DESC_END = MENU_SETTINGS_INPUT_DESC_BEGIN + (MAX_USERS * (RARCH_FIRST_CUSTOM_BIND + 4)),
+   MENU_SETTINGS_LAST
 } menu_settings_t;
 
 /**
diff --git a/retroarch.c b/retroarch.c
index 1602a0f5079..37b505f18b3 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -341,7 +341,8 @@ void set_paths_redirect(const char *path)
                info->info.library_name,
                sizeof(global->savefile_dir));
 
-         // if path doesn't exist try to create it, if everything fails revert to the original path
+         /* If path doesn't exist, try to create it,
+          * if everything fails revert to the original path. */
          if(!path_is_directory(global->savefile_dir))
             if(!path_mkdir(global->savefile_dir))
                strlcpy(global->savefile_dir,
diff --git a/retroarch.h b/retroarch.h
index 235aa2b14ac..596d08d6948 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -37,21 +37,21 @@ enum action_state
    RARCH_ACTION_STATE_MENU_RUNNING,
    RARCH_ACTION_STATE_MENU_RUNNING_FINISHED,
    RARCH_ACTION_STATE_QUIT,
-   RARCH_ACTION_STATE_FORCE_QUIT,
+   RARCH_ACTION_STATE_FORCE_QUIT
 };
 
 enum rarch_content_type
 {
    RARCH_CONTENT_NONE = 0,
    RARCH_CONTENT_MOVIE,
-   RARCH_CONTENT_MUSIC,
+   RARCH_CONTENT_MUSIC
 };
 
 enum rarch_capabilities
 {
    RARCH_CAPABILITIES_NONE = 0,
    RARCH_CAPABILITIES_CPU,
-   RARCH_CAPABILITIES_COMPILER,
+   RARCH_CAPABILITIES_COMPILER
 };
 
 struct rarch_main_wrap
diff --git a/runloop_data.h b/runloop_data.h
index 4374ca9b360..c08e56314f1 100644
--- a/runloop_data.h
+++ b/runloop_data.h
@@ -42,7 +42,7 @@ enum runloop_data_type
    DATA_TYPE_IMAGE,
    DATA_TYPE_HTTP,
    DATA_TYPE_OVERLAY,
-   DATA_TYPE_DB,
+   DATA_TYPE_DB
 };
 
 #ifdef HAVE_NETWORKING
@@ -53,7 +53,7 @@ enum http_status_enum
    HTTP_STATUS_CONNECTION_TRANSFER_PARSE,
    HTTP_STATUS_TRANSFER,
    HTTP_STATUS_TRANSFER_PARSE,
-   HTTP_STATUS_TRANSFER_PARSE_FREE,
+   HTTP_STATUS_TRANSFER_PARSE_FREE
 };
 
 typedef struct http_handle
@@ -97,7 +97,7 @@ enum nbio_image_status_enum
    NBIO_IMAGE_STATUS_TRANSFER_PARSE,
    NBIO_IMAGE_STATUS_PROCESS_TRANSFER,
    NBIO_IMAGE_STATUS_PROCESS_TRANSFER_PARSE,
-   NBIO_IMAGE_STATUS_TRANSFER_PARSE_FREE,
+   NBIO_IMAGE_STATUS_TRANSFER_PARSE_FREE
 };
 
 enum nbio_status_enum
@@ -105,7 +105,7 @@ enum nbio_status_enum
    NBIO_STATUS_POLL = 0,
    NBIO_STATUS_TRANSFER,
    NBIO_STATUS_TRANSFER_PARSE,
-   NBIO_STATUS_TRANSFER_PARSE_FREE,
+   NBIO_STATUS_TRANSFER_PARSE_FREE
 };
 
 typedef struct nbio_handle