diff --git a/apps/buffering.c b/apps/buffering.c
index 489a4500cc..95b2591b44 100644
--- a/apps/buffering.c
+++ b/apps/buffering.c
@@ -46,7 +46,6 @@
 #include "screens.h"
 #include "playlist.h"
 #include "pcmbuf.h"
-#include "bmp.h"
 #include "appevents.h"
 #include "metadata.h"
 #ifdef HAVE_ALBUMART
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c
index 9e07c0fe08..7d79e5f04a 100644
--- a/apps/gui/viewport.c
+++ b/apps/gui/viewport.c
@@ -57,7 +57,6 @@
 #endif
 #include "statusbar-skinned.h"
 #include "debug.h"
-#include "viewport.h"
 
 #define VPSTACK_DEPTH 16
 struct viewport_stack_item
diff --git a/apps/main.c b/apps/main.c
index 19249241bb..b3252d8bd8 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -48,7 +48,6 @@
 #include "backlight.h"
 #include "status.h"
 #include "debug_menu.h"
-#include "version.h"
 #include "font.h"
 #include "language.h"
 #include "wps.h"
diff --git a/apps/menus/time_menu.c b/apps/menus/time_menu.c
index a529837b07..b4ed207f5c 100644
--- a/apps/menus/time_menu.c
+++ b/apps/menus/time_menu.c
@@ -34,7 +34,6 @@
 #include "exported_menus.h"
 #include "keyboard.h"
 #include "talk.h"
-#include "version.h"
 #include "time.h"
 #include "viewport.h"
 #include "list.h"
diff --git a/apps/plugins/doom/d_main.c b/apps/plugins/doom/d_main.c
index f58d1aae4a..498d93cb62 100644
--- a/apps/plugins/doom/d_main.c
+++ b/apps/plugins/doom/d_main.c
@@ -63,7 +63,6 @@
 #include "r_main.h"
 #include "d_main.h"
 #include "d_deh.h"  // Ty 04/08/98 - Externalizations
-#include "am_map.h"
 #include "m_swap.h"
 
 // DEHacked support - Ty 03/09/97 // CPhipps - const char*'s
diff --git a/tools/mi4.c b/tools/mi4.c
index fe66355563..52f043469f 100644
--- a/tools/mi4.c
+++ b/tools/mi4.c
@@ -40,9 +40,6 @@
 
 /* based on implementation by Finn Yannick Jacobs */
 
-#include <stdio.h>
-#include <stdlib.h>
-
 /* crc_tab[] -- this crcTable is being build by chksum_crc32GenTab().
  *		so make sure, you call it before using the other
  *		functions!
diff --git a/utils/newparser/skin_render.c b/utils/newparser/skin_render.c
index d8facb03f6..1690455086 100644
--- a/utils/newparser/skin_render.c
+++ b/utils/newparser/skin_render.c
@@ -24,7 +24,6 @@
 #include <string.h>
 #include <stdbool.h>
 #include <ctype.h>
-#include <string.h>
 
 #include "skin_parser.h"
 #include "skin_debug.h"