13 files changed, 18 insertions, 3 deletions

diff --git a/firmware/export/disk.h b/firmware/export/disk.h
index ece0e2644f..8d6b41b5bd 100644
--- a/firmware/export/disk.h
+++ b/firmware/export/disk.h
@@ -21,6 +21,7 @@
 #ifndef _DISK_H_
 #define _DISK_H_
 
+#include "config.h"
 #include "mv.h" /* for volume definitions */
 
 struct partinfo {
@@ -38,7 +39,7 @@ struct partinfo {
 struct partinfo* disk_init(IF_MD_NONVOID(int drive));
 struct partinfo* disk_partinfo(int partition);
 
-void disk_init_subsystem(void); /* Initialises mutexes */
+void disk_init_subsystem(void) INIT_ATTR; /* Initialises mutexes */
 int disk_mount_all(void); /* returns the # of successful mounts */
 int disk_mount(int drive);
 int disk_unmount_all(void);
diff --git a/firmware/export/mmc.h b/firmware/export/mmc.h
index 7e72cb0846..4c7e9c0926 100644
--- a/firmware/export/mmc.h
+++ b/firmware/export/mmc.h
@@ -23,6 +23,7 @@
 #define __MMC_H__
 
 #include <stdbool.h>
+#include "config.h"
 #include "mv.h" /* for HAVE_MULTIDRIVE or not */
 
 struct storage_info;
diff --git a/firmware/export/nand.h b/firmware/export/nand.h
index 13d559486c..58751ab298 100644
--- a/firmware/export/nand.h
+++ b/firmware/export/nand.h
@@ -23,6 +23,7 @@
 #define __NAND_H__
 
 #include <stdbool.h>
+#include "config.h"
 #include "mv.h" /* for HAVE_MULTIDRIVE or not */
 
 struct storage_info;
diff --git a/firmware/export/pcm-internal.h b/firmware/export/pcm-internal.h
index d881963ebd..89d895fe4b 100644
--- a/firmware/export/pcm-internal.h
+++ b/firmware/export/pcm-internal.h
@@ -22,6 +22,8 @@
 #ifndef PCM_INTERNAL_H
 #define PCM_INTERNAL_H
 
+#include "config.h"
+
 /* Cheapo buffer align macro to align to the 16-16 PCM size */
 #define ALIGN_AUDIOBUF(start, size) \
     ({ (start) = (void *)(((uintptr_t)(start) + 3) & ~3); \
diff --git a/firmware/export/pcm.h b/firmware/export/pcm.h
index 40d5afc0ba..4a7a5b3193 100644
--- a/firmware/export/pcm.h
+++ b/firmware/export/pcm.h
@@ -22,6 +22,7 @@
 #define PCM_PLAYBACK_H
 
 #include <string.h> /* size_t */
+#include "config.h"
 
 #define DMA_REC_ERROR_DMA       (-1)
 #ifdef HAVE_SPDIF_REC
diff --git a/firmware/export/power.h b/firmware/export/power.h
index 137f40cb01..d46b9ba924 100644
--- a/firmware/export/power.h
+++ b/firmware/export/power.h
@@ -21,6 +21,8 @@
 #ifndef _POWER_H_
 #define _POWER_H_
 
+#include "config.h"
+
 #if CONFIG_CHARGING
 enum power_input_flags {
     /* No external power source? Default. */
diff --git a/firmware/export/ramdisk.h b/firmware/export/ramdisk.h
index 5135e38301..c478c78882 100644
--- a/firmware/export/ramdisk.h
+++ b/firmware/export/ramdisk.h
@@ -23,6 +23,7 @@
 #define __RAMDISK_H__
 
 #include <stdbool.h>
+#include "config.h"
 #include "mv.h" /* for HAVE_MULTIDRIVE or not */
 
 struct storage_info;
diff --git a/firmware/export/scroll_engine.h b/firmware/export/scroll_engine.h
index 0fe6fe464a..55f4120893 100644
--- a/firmware/export/scroll_engine.h
+++ b/firmware/export/scroll_engine.h
@@ -25,6 +25,7 @@
 #ifndef __SCROLL_ENGINE_H__
 #define __SCROLL_ENGINE_H__
 
+#include "config.h"
 #include <lcd.h>
 #include "file.h"
 
diff --git a/firmware/export/sd.h b/firmware/export/sd.h
index 43c961efb3..1c3c429508 100644
--- a/firmware/export/sd.h
+++ b/firmware/export/sd.h
@@ -23,6 +23,7 @@
 #define __SD_H__
 
 #include <stdbool.h>
+#include "config.h"
 #include "mv.h" /* for HAVE_MULTIDRIVE or not */
 
 #ifdef HAVE_BOOTLOADER_USB_MODE
diff --git a/firmware/export/tuner.h b/firmware/export/tuner.h
index 6fedc0f785..694da7cc6c 100644
--- a/firmware/export/tuner.h
+++ b/firmware/export/tuner.h
@@ -22,6 +22,7 @@
 #ifndef __TUNER_H__
 #define __TUNER_H__
 
+#include "config.h"
 #include "hwcompat.h"
 
 /** Settings to the tuner layer **/
diff --git a/firmware/export/usb.h b/firmware/export/usb.h
index 3baacc5420..ae6d59b497 100644
--- a/firmware/export/usb.h
+++ b/firmware/export/usb.h
@@ -21,6 +21,7 @@
 #ifndef _USB_H_
 #define _USB_H_
 
+#include "config.h"
 #include "kernel.h"
 #include "button.h"
 
@@ -103,7 +104,7 @@ struct usb_transfer_completion_event_data
 void usb_init(void) INIT_ATTR;
 void usb_enable(bool on);
 void usb_attach(void);
-void usb_start_monitoring(void);
+void usb_start_monitoring(void) INIT_ATTR;
 void usb_close(void);
 void usb_acknowledge(long id);
 void usb_wait_for_disconnect(struct event_queue *q);
diff --git a/firmware/include/core_alloc.h b/firmware/include/core_alloc.h
index 0ac7e5b73d..d234947db1 100644
--- a/firmware/include/core_alloc.h
+++ b/firmware/include/core_alloc.h
@@ -3,12 +3,13 @@
 #define __CORE_ALLOC_H__
 #include <string.h>
 #include <stdbool.h>
+#include "config.h"
 #include "buflib.h"
 
 /* All functions below are wrappers for functions in buflib.h, except
  * they have a predefined context
  */
-void core_allocator_init(void);
+void core_allocator_init(void) INIT_ATTR;
 int core_alloc(const char* name, size_t size);
 int core_alloc_ex(const char* name, size_t size, struct buflib_callbacks *ops);
 int core_alloc_maximum(const char* name, size_t *size, struct buflib_callbacks *ops);
diff --git a/firmware/target/arm/as3525/ascodec-target.h b/firmware/target/arm/as3525/ascodec-target.h
index 7e1a3b7424..ece8c21dd0 100644
--- a/firmware/target/arm/as3525/ascodec-target.h
+++ b/firmware/target/arm/as3525/ascodec-target.h
@@ -27,6 +27,7 @@
 
 #ifndef SIMULATOR
 
+#include "config.h"
 #include "as3514.h"
 #include "kernel.h"       /* for struct semaphore */
 #include "clock-target.h" /* for AS3525_I2C_PRESCALER */