Index: firmware/App/Common.h
===================================================================
diff -u -r6b6b337c1c0e7dd7c1b7311a39596473d7214ee4 -r51c6a24b30643c8ce296ebfe1d703f289ffafe97
--- firmware/App/Common.h	(.../Common.h)	(revision 6b6b337c1c0e7dd7c1b7311a39596473d7214ee4)
+++ firmware/App/Common.h	(.../Common.h)	(revision 51c6a24b30643c8ce296ebfe1d703f289ffafe97)
@@ -92,6 +92,23 @@
 #define MAKE_LONG_OF_WORDS(h,l)         ((((U32)(h) << SHIFT_16_BITS_FOR_WORD_SHIFT) & MASK_OFF_LSW) | ((U32)(l) & MASK_OFF_MSW))
 #define SIGN_FROM_12_BIT_VALUE(v)       ((S16)(v) - 2048)
 
+#define SET_ALARM_WITH_1_U32_DATA(a,d1)   { \
+    ALARM_DATA_T dat1; \
+    dat1.dataType = ALARM_DATA_TYPE_U32; \
+    dat1.data.uInt.data = (U32)(d1); \
+    activateAlarm1Data( a, dat1 ); \
+}
+
+#define SET_ALARM_WITH_2_U32_DATA(a,d1,d2)   { \
+    ALARM_DATA_T dat1; \
+    ALARM_DATA_T dat2; \
+    dat1.dataType = ALARM_DATA_TYPE_U32; \
+    dat1.data.uInt.data = (U32)(d1); \
+    dat2.dataType = ALARM_DATA_TYPE_U32; \
+    dat2.data.uInt.data = (U32)(d2); \
+    activateAlarm2Data( a, dat1, dat2 ); \
+}
+
 // **** VectorCAST Definitions ****
 
 #ifdef _VECTORCAST_
@@ -108,6 +125,9 @@
 
 #endif
 
+// include alarm mgmt header
+#include "AlarmMgmt.h"
+
 // include test support definitions and macros
 #include "TestSupport.h"