diff --git a/flight/Modules/System/systemmod.c b/flight/Modules/System/systemmod.c
index 73c669acc..890fe3c31 100644
--- a/flight/Modules/System/systemmod.c
+++ b/flight/Modules/System/systemmod.c
@@ -49,7 +49,8 @@
 #include "hwsettings.h"
 #include "watchdogstatus.h"
 #include "taskmonitor.h"
-#include "pios_config.h"
+//#include "pios_config.h" must not be included directly! - named differently on some platforms!
+#include "pios.h"
 
 
 // Private constants
diff --git a/flight/OpenPilot/System/inc/pios_config_posix.h b/flight/OpenPilot/System/inc/pios_config_posix.h
index e8701be90..ce68a07b9 100644
--- a/flight/OpenPilot/System/inc/pios_config_posix.h
+++ b/flight/OpenPilot/System/inc/pios_config_posix.h
@@ -59,6 +59,14 @@
 #define TELEM_QUEUE_SIZE                20
 #define PIOS_TELEM_STACK_SIZE           2048
 
+/* Alarm Thresholds */
+#define HEAP_LIMIT_WARNING		4000
+#define HEAP_LIMIT_CRITICAL		1000
+#define IRQSTACK_LIMIT_WARNING		150
+#define IRQSTACK_LIMIT_CRITICAL		80
+#define CPULOAD_LIMIT_WARNING		80
+#define CPULOAD_LIMIT_CRITICAL		95
+
 /* Stabilization options */
 #define PIOS_QUATERNION_STABILIZATION