5 files changed, 14 insertions, 4 deletions

diff --git a/apps/codec_thread.c b/apps/codec_thread.c
index 8f9f5a3c74..f2039d10e6 100644
--- a/apps/codec_thread.c
+++ b/apps/codec_thread.c
@@ -20,6 +20,7 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+
 #include "config.h"
 #include "system.h"
 #include "kernel.h"
diff --git a/apps/rbcodecconfig.h b/apps/rbcodecconfig.h
index c92415979f..92584187ea 100644
--- a/apps/rbcodecconfig.h
+++ b/apps/rbcodecconfig.h
@@ -18,6 +18,9 @@
  * {,U}INT{8,16,32,64}_{MIN,MAX} */
 #include "system.h"
 
+/* HZ, TIME_AFTER */
+#include "kernel.h"
+
 /* Structure to record some info during processing call */
 struct dsp_loop_context
 {
diff --git a/apps/recorder/bmp.c b/apps/recorder/bmp.c
index e4eb588eb3..dfd6a0474e 100644
--- a/apps/recorder/bmp.c
+++ b/apps/recorder/bmp.c
@@ -38,6 +38,7 @@
    ahead by whole lines, or read the next chunk of the current line
 */
 
+#define ROCKBOX_DEBUG_BMP_LOADER
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -53,7 +54,7 @@
 #include "lcd-remote.h"
 #endif
 #ifdef ROCKBOX_DEBUG_BMP_LOADER
-#define BDEBUGF DEBUGF
+#define BDEBUGF printf
 #else
 #define BDEBUGF(...)
 #endif
@@ -774,6 +775,7 @@ int read_bmp_fd(int fd,
 #endif
         .alpha_detected = false, .first_alpha_byte = 0x80,
         .order = order,
+        .buf = NULL,
     };
 
 #if (LCD_DEPTH > 1 || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1)) && \
diff --git a/apps/recorder/resize.c b/apps/recorder/resize.c
index 1e45b66a24..32384537d4 100644
--- a/apps/recorder/resize.c
+++ b/apps/recorder/resize.c
@@ -31,12 +31,14 @@
  *
  ****************************************************************************/
 
-#include <system.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <general.h>
-#include "inttypes.h"
+#include <stdint.h>
+
+#include "general.h"
+#include "kernel.h"
+#include "system.h"
 #ifndef PLUGIN
 #include "debug.h"
 #endif
diff --git a/apps/voice_thread.c b/apps/voice_thread.c
index 7788f659b0..3b6fe5b3ba 100644
--- a/apps/voice_thread.c
+++ b/apps/voice_thread.c
@@ -18,8 +18,10 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+
 #include "config.h"
 #include "system.h"
+#include "kernel.h"
 #include "core_alloc.h"
 #include "thread.h"
 #include "appevents.h"