diff --git a/firmware/storage.c b/firmware/storage.c
index 372042564c..867c68cf6b 100644
--- a/firmware/storage.c
+++ b/firmware/storage.c
@@ -40,8 +40,8 @@ static unsigned int num_drives;
 #define STORAGE_MINIMUM_IDLE_TIME (HZ/10)
 #define STORAGE_DELAY_UNIT  (HZ/20)
 
-unsigned int storage_last_thread[NUM_DRIVES];
-unsigned int storage_last_activity[NUM_DRIVES];
+static unsigned int storage_last_thread[NUM_DRIVES];
+static unsigned int storage_last_activity[NUM_DRIVES];
 
 static bool storage_should_wait(int drive, int prio)
 {
diff --git a/firmware/target/arm/ipod/power-ipod.c b/firmware/target/arm/ipod/power-ipod.c
index a82a18f699..ef594173f0 100644
--- a/firmware/target/arm/ipod/power-ipod.c
+++ b/firmware/target/arm/ipod/power-ipod.c
@@ -29,6 +29,9 @@
 #include "usb.h"
 #include "lcd.h"
 #include "string.h"
+#ifdef HAVE_USB_CHARGING_ENABLE
+#include "usb_core.h"   /* for usb_charging_maxcurrent_change */
+#endif
 
 void power_init(void)
 {