diff --git a/firmware/export/config.h b/firmware/export/config.h
index 4d7a3aecdf..6a5c881013 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -77,6 +77,7 @@
 #define BATT_LPCS355385 1550 /* iriver h10 20Gb - SKC LPCS355385 */
 #define BATT_BP009       820 /* iriver H10 5/6Gb - iriver BP009 */
 #define BATT_LIION830    830 /* Toshiba Gigabeat Fxx and Xxx series MK11-2740 */
+#define BATT_1AA         333 /* iRiver iFP: Alkaline, NiHM */
 
 /* CONFIG_CHARGING */
 #define CHARGING_SIMPLE  1 /* Simple, hardware controlled charging */
@@ -217,7 +218,7 @@
 
 /* Enable the directory cache and tagcache in RAM if we have
  * plenty of RAM. Both features can be enabled independently. */
-#if (MEMORYSIZE > 8 || MEM > 8) && !defined(BOOTLOADER)
+#if defined(MEMORYSIZE) && (MEMORYSIZE > 8 || MEM > 8) && !defined(BOOTLOADER)
 #define HAVE_DIRCACHE
 #ifdef HAVE_TAGCACHE
 #define HAVE_TC_RAMCACHE
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 37ad2b0cc2..fecf3f5426 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -151,7 +151,8 @@ typedef void lcd_fastpixelfunc_type(fb_data *address);
 
 #ifdef HAVE_LCD_BITMAP
 
-#if defined(HAVE_LCD_COLOR) && LCD_REMOTE_DEPTH > 1
+#if defined(HAVE_LCD_COLOR) && defined(LCD_REMOTE_DEPTH) && \
+ LCD_REMOTE_DEPTH > 1
 /* Just return color for screens use */
 static inline unsigned lcd_color_to_native(unsigned color)
     { return color; }
diff --git a/firmware/export/pcm_sampr.h b/firmware/export/pcm_sampr.h
index c4a399b62f..4f6d5ddf93 100644
--- a/firmware/export/pcm_sampr.h
+++ b/firmware/export/pcm_sampr.h
@@ -20,6 +20,10 @@
 #ifndef PCM_SAMPR_H
 #define PCM_SAMPR_H
 
+#ifndef HW_SAMPR_CAPS
+#define HW_SAMPR_CAPS 0 /* if not defined, we define to 0 */
+#endif
+
 /* These must be macros for comparison with SAMPR_CAP_* flags by the
    preprocessor. Add samplerate index in descending order renumbering
    the ones later in the list if any */
diff --git a/firmware/panic.c b/firmware/panic.c
index 736d4bbf24..aaac9ba87b 100644
--- a/firmware/panic.c
+++ b/firmware/panic.c
@@ -102,7 +102,7 @@ void panicf( const char *fmt, ...)
         /* try to restart firmware if ON is pressed */
 #ifdef IRIVER_H100_SERIES
         if ((GPIO1_READ & 0x22) == 0) /* check for ON button and !hold */
-#elif IRIVER_H300_SERIES
+#elif defined(IRIVER_H300_SERIES)
         if ((GPIO1_READ & 0x22) == 0) /* check for ON button and !hold */
 #elif CONFIG_CPU == SH7034
 #if CONFIG_KEYPAD == PLAYER_PAD