diff --git a/command_event.h b/command_event.h
index 968211756f..ecf5506b1c 100644
--- a/command_event.h
+++ b/command_event.h
@@ -195,7 +195,7 @@ enum event_command
    EVENT_CMD_REMAPPING_DEINIT,
    EVENT_CMD_VOLUME_UP,
    EVENT_CMD_VOLUME_DOWN,
-   EVENT_CMD_DATA_RUNLOOP_FREE,
+   EVENT_CMD_DATA_RUNLOOP_FREE
 };
 
 typedef struct event_cmd_state
diff --git a/dynamic.h b/dynamic.h
index c5fac7fe7a..6f12a3af59 100644
--- a/dynamic.h
+++ b/dynamic.h
@@ -29,9 +29,9 @@
 enum rarch_core_type 
 {
    CORE_TYPE_PLAIN = 0,
-   CORE_TYPE_DUMMY,
+   CORE_TYPE_DUMMY
 #ifdef HAVE_FFMPEG
-   CORE_TYPE_FFMPEG,
+   ,CORE_TYPE_FFMPEG
 #endif
 };
 
diff --git a/frontend/frontend_driver.h b/frontend/frontend_driver.h
index 0c7c173356..5ae9c9de6e 100644
--- a/frontend/frontend_driver.h
+++ b/frontend/frontend_driver.h
@@ -34,7 +34,7 @@ enum frontend_powerstate
    FRONTEND_POWERSTATE_NO_SOURCE,
    FRONTEND_POWERSTATE_CHARGING,
    FRONTEND_POWERSTATE_CHARGED,
-   FRONTEND_POWERSTATE_ON_POWER_SOURCE,
+   FRONTEND_POWERSTATE_ON_POWER_SOURCE
 };
 
 enum frontend_architecture
@@ -45,7 +45,7 @@ enum frontend_architecture
    FRONTEND_ARCH_PPC,
    FRONTEND_ARCH_ARM,
    FRONTEND_ARCH_MIPS,
-   FRONTEND_ARCH_TILE,
+   FRONTEND_ARCH_TILE
 };
 
 typedef void (*environment_get_t)(int *argc, char *argv[], void *args,
diff --git a/gfx/video_driver.h b/gfx/video_driver.h
index a49893f92d..74997c0e0b 100644
--- a/gfx/video_driver.h
+++ b/gfx/video_driver.h
@@ -85,7 +85,7 @@ enum texture_filter_type
    TEXTURE_FILTER_LINEAR = 0,
    TEXTURE_FILTER_NEAREST,
    TEXTURE_FILTER_MIPMAP_LINEAR,
-   TEXTURE_FILTER_MIPMAP_NEAREST,
+   TEXTURE_FILTER_MIPMAP_NEAREST
 };
 
 #define FONT_COLOR_RGBA(r, g, b, a) (((r) << 24) | ((g) << 16) | ((b) << 8) | ((a) << 0))
diff --git a/input/drivers/linuxraw_input.c b/input/drivers/linuxraw_input.c
index 750ada1dc6..21496e1b76 100644
--- a/input/drivers/linuxraw_input.c
+++ b/input/drivers/linuxraw_input.c
@@ -252,7 +252,7 @@ static void linuxraw_input_poll(void *data)
       pressed = !(c & 0x80);
       c &= ~0x80;
 
-      // ignore extended scancodes
+      /* ignore extended scancodes */
       if (!c)
          read(STDIN_FILENO, &t, 2);
       else
diff --git a/input/input_overlay.h b/input/input_overlay.h
index 54d4b87418..065b2b9d12 100644
--- a/input/input_overlay.h
+++ b/input/input_overlay.h
@@ -79,7 +79,7 @@ enum overlay_status
    OVERLAY_STATUS_DEFERRED_LOADING_RESOLVE,
    OVERLAY_STATUS_DEFERRED_DONE,
    OVERLAY_STATUS_DEFERRED_ERROR,
-   OVERLAY_STATUS_ALIVE,
+   OVERLAY_STATUS_ALIVE
 };
 
 enum overlay_image_transfer_status
@@ -90,7 +90,7 @@ enum overlay_image_transfer_status
    OVERLAY_IMAGE_TRANSFER_DESC_IMAGE_ITERATE,
    OVERLAY_IMAGE_TRANSFER_DESC_ITERATE,
    OVERLAY_IMAGE_TRANSFER_DESC_DONE,
-   OVERLAY_IMAGE_TRANSFER_ERROR,
+   OVERLAY_IMAGE_TRANSFER_ERROR
 };
 
 struct overlay_desc
diff --git a/libretro-common/include/formats/image.h b/libretro-common/include/formats/image.h
index 6da0961c83..630957c06c 100644
--- a/libretro-common/include/formats/image.h
+++ b/libretro-common/include/formats/image.h
@@ -25,7 +25,7 @@ enum image_process_code
    IMAGE_PROCESS_ERROR     = -2,
    IMAGE_PROCESS_ERROR_END = -1,
    IMAGE_PROCESS_NEXT      =  0,
-   IMAGE_PROCESS_END       =  1,
+   IMAGE_PROCESS_END       =  1
 };
 
 struct texture_image
diff --git a/menu/menu_animation.h b/menu/menu_animation.h
index fe77e2fa09..8d337afccd 100644
--- a/menu/menu_animation.h
+++ b/menu/menu_animation.h
@@ -109,7 +109,7 @@ enum menu_animation_easing_type
    EASING_IN_BOUNCE,
    EASING_OUT_BOUNCE,
    EASING_IN_OUT_BOUNCE,
-   EASING_OUT_IN_BOUNCE,
+   EASING_OUT_IN_BOUNCE
 };
 
 void menu_animation_free(
diff --git a/menu/menu_displaylist.h b/menu/menu_displaylist.h
index df45630267..28fe212b54 100644
--- a/menu/menu_displaylist.h
+++ b/menu/menu_displaylist.h
@@ -79,7 +79,7 @@ enum
    DISPLAYLIST_OPTIONS_REMAPPINGS,
    DISPLAYLIST_OPTIONS_MANAGEMENT,
    DISPLAYLIST_OPTIONS_DISK,
-   DISPLAYLIST_OPTIONS_SHADERS,
+   DISPLAYLIST_OPTIONS_SHADERS
 };
 
 typedef struct menu_displaylist_info
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index 3bf5e2852d..0cac9228ec 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -40,7 +40,7 @@ typedef enum
 {
    MENU_IMAGE_NONE = 0,
    MENU_IMAGE_WALLPAPER,
-   MENU_IMAGE_BOXART,
+   MENU_IMAGE_BOXART
 } menu_image_type_t;
 
 typedef struct
diff --git a/menu/menu_input.h b/menu/menu_input.h
index 41ca2a9c4c..0f6e80993f 100644
--- a/menu/menu_input.h
+++ b/menu/menu_input.h
@@ -71,14 +71,14 @@ enum mouse_action
    MOUSE_ACTION_BUTTON_L_SET_NAVIGATION,
    MOUSE_ACTION_BUTTON_R,
    MOUSE_ACTION_WHEEL_UP,
-   MOUSE_ACTION_WHEEL_DOWN,
+   MOUSE_ACTION_WHEEL_DOWN
 };
 
 enum menu_input_bind_mode
 {
    MENU_INPUT_BIND_NONE,
    MENU_INPUT_BIND_SINGLE,
-   MENU_INPUT_BIND_ALL,
+   MENU_INPUT_BIND_ALL
 };
 
 struct menu_bind_state_port
diff --git a/menu/menu_list.h b/menu/menu_list.h
index fa9398aea4..724de34fad 100644
--- a/menu/menu_list.h
+++ b/menu/menu_list.h
@@ -33,7 +33,7 @@ typedef struct menu_list
 typedef enum
 {
    MENU_LIST_PLAIN = 0,
-   MENU_LIST_HORIZONTAL,
+   MENU_LIST_HORIZONTAL
 } menu_list_type_t;
 
 typedef struct menu_file_list_cbs
diff --git a/menu/menu_setting.h b/menu/menu_setting.h
index 2bd27f8881..e0486114ed 100644
--- a/menu/menu_setting.h
+++ b/menu/menu_setting.h
@@ -97,7 +97,7 @@ enum setting_list_flags
    SL_FLAG_LOGGING_OPTIONS       =  (1 << 26),
    SL_FLAG_SAVING_OPTIONS        =  (1 << 27),
    SL_FLAG_ALL                   =  (1 << 28),
-   SL_FLAG_ALLOW_EMPTY_LIST      =  (1 << 29),
+   SL_FLAG_ALLOW_EMPTY_LIST      =  (1 << 29)
 };
 
 #define SL_FLAG_ALL_SETTINGS (SL_FLAG_ALL - SL_FLAG_MAIN_MENU)
@@ -289,7 +289,7 @@ void setting_get_label(file_list_t *list, char *s,
       size_t len, unsigned *w, unsigned type, 
       const char *menu_label, const char *label, unsigned idx);
 
-void menu_setting_free(rarch_setting_t *list);;
+void menu_setting_free(rarch_setting_t *list);
 
 /**
  * setting_new: