diff --git a/apps/credits.c b/apps/credits.c
index 31662b0755..2d5ca5a0a8 100644
--- a/apps/credits.c
+++ b/apps/credits.c
@@ -20,6 +20,7 @@
 #include "credits.h"
 #include "lcd.h"
 #include "kernel.h"
+#include "button.h"
 
 struct credit {
     char *name;
diff --git a/apps/main_menu.c b/apps/main_menu.c
index b03d3ffc90..85cc3be8b6 100644
--- a/apps/main_menu.c
+++ b/apps/main_menu.c
@@ -26,6 +26,8 @@
 #include "main_menu.h"
 #include "sound_menu.h"
 #include "version.h"
+#include "debug.h"
+#include "bmp.h"
 
 #ifdef HAVE_LCD_BITMAP
 #include "screensaver.h"
diff --git a/apps/play.c b/apps/play.c
index 80c1019e13..0479eb590b 100644
--- a/apps/play.c
+++ b/apps/play.c
@@ -27,6 +27,7 @@
 #include "kernel.h"
 #include "tree.h"
 #include "debug.h"
+#include "sprintf.h"
 
 #include "id3.h"
 #include "mpeg.h"
diff --git a/apps/sound_menu.c b/apps/sound_menu.c
index c00b5cc431..7e5ae01e43 100644
--- a/apps/sound_menu.c
+++ b/apps/sound_menu.c
@@ -25,6 +25,7 @@
 #include "mpeg.h"
 #include "button.h"
 #include "kernel.h"
+#include "sprintf.h"
 
 typedef void (*settingfunc)(int);
 enum { Volume, Bass, Treble, numsettings };
diff --git a/apps/tree.c b/apps/tree.c
index 27be52bbec..f81d784e04 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -30,6 +30,7 @@
 #include "tree.h"
 #include "play.h"
 #include "main_menu.h"
+#include "sprintf.h"
 
 #ifdef HAVE_LCD_BITMAP
 #include "icons.h"
diff --git a/firmware/playlist.c b/firmware/playlist.c
index 16eab01cfe..8c46286fec 100644
--- a/firmware/playlist.c
+++ b/firmware/playlist.c
@@ -25,6 +25,7 @@
 #include "playlist.h"
 #include "debug.h"
 #include <file.h>
+#include "sprintf.h"
 
 /*
  * load playlist info from disk