diff --git a/apps/filetree.c b/apps/filetree.c
index cac2c79034..dd541fe0a2 100644
--- a/apps/filetree.c
+++ b/apps/filetree.c
@@ -41,6 +41,7 @@
 #include "splash.h"
 #include "yesno.h"
 #include "cuesheet.h"
+#include "filetree.h"
 #ifdef HAVE_LCD_BITMAP
 #include "keyboard.h"
 #endif
diff --git a/apps/logfdisp.c b/apps/logfdisp.c
index aa84bf0f1b..4a5ab43089 100644
--- a/apps/logfdisp.c
+++ b/apps/logfdisp.c
@@ -30,6 +30,7 @@
 #include "menu.h"
 #include "logf.h"
 #include "settings.h"
+#include "logfdisp.h"
 
 #ifdef HAVE_LCD_BITMAP
 bool logfdisplay(void)
diff --git a/apps/metadata.c b/apps/metadata.c
index 3abbd74c35..7b3b314d74 100644
--- a/apps/metadata.c
+++ b/apps/metadata.c
@@ -27,6 +27,7 @@
 #include "debug.h"
 #include "logf.h"
 #include "cuesheet.h"
+#include "metadata.h"
 
 #if CONFIG_CODEC == SWCODEC
 
diff --git a/apps/playlist_catalog.c b/apps/playlist_catalog.c
index 2b5020f7f3..52210580ad 100644
--- a/apps/playlist_catalog.c
+++ b/apps/playlist_catalog.c
@@ -39,6 +39,7 @@
 #include "yesno.h"
 #include "filetypes.h"
 #include "debug.h"
+#include "playlist_catalog.h"
 
 #define MAX_PLAYLISTS 400
 #define PLAYLIST_DISPLAY_COUNT 10
diff --git a/firmware/drivers/fmradio.c b/firmware/drivers/fmradio.c
index c64d06e066..f231d47b89 100644
--- a/firmware/drivers/fmradio.c
+++ b/firmware/drivers/fmradio.c
@@ -22,6 +22,7 @@
 #include "thread.h"
 #include "debug.h"
 #include "system.h"
+#include "fmradio.h"
 
 #if CONFIG_TUNER
 
diff --git a/firmware/drivers/i2c.c b/firmware/drivers/i2c.c
index 5cfa3dca97..66b6340f2b 100644
--- a/firmware/drivers/i2c.c
+++ b/firmware/drivers/i2c.c
@@ -22,6 +22,7 @@
 #include "thread.h"
 #include "debug.h"
 #include "system.h"
+#include "i2c.h"
 
 /* cute little functions, atomic read-modify-write */
 
diff --git a/firmware/export/i2c.h b/firmware/export/i2c.h
index ed9a5e678d..ba694d0d3a 100644
--- a/firmware/export/i2c.h
+++ b/firmware/export/i2c.h
@@ -22,7 +22,7 @@
 extern void i2c_init(void);
 extern void i2c_begin(void);
 extern void i2c_end(void);
-extern int i2c_write(int device, unsigned char* buf, int count );
+extern int i2c_write(int device, const unsigned char* buf, int count );
 extern int i2c_read(int device, unsigned char* buf, int count );
 extern int i2c_readmem(int device, int address, unsigned char* buf, int count );
 extern void i2c_outb(unsigned char byte);
diff --git a/firmware/target/arm/i2s-pp.c b/firmware/target/arm/i2s-pp.c
index 750a2b8155..2215c93c6c 100644
--- a/firmware/target/arm/i2s-pp.c
+++ b/firmware/target/arm/i2s-pp.c
@@ -26,6 +26,7 @@
 
 #include "system.h"
 #include "cpu.h"
+#include "i2s.h"
 
 /* TODO: Add in PP5002 defs */
 #if CONFIG_CPU == PP5002
diff --git a/firmware/target/arm/pcm-pp.c b/firmware/target/arm/pcm-pp.c
index a0ab91e6ef..05757a2d31 100644
--- a/firmware/target/arm/pcm-pp.c
+++ b/firmware/target/arm/pcm-pp.c
@@ -22,6 +22,7 @@
 #include "logf.h"
 #include "audio.h"
 #include "sound.h"
+#include "pcm.h"
 
 #ifdef HAVE_WM8751
 #define MROBE100_44100HZ     (0x40|(0x11 << 1)|1)