Index: AlarmMgmt.h
===================================================================
diff -u -r2801d97e877dd78189aa891e80a2f7cf60a6a2b7 -r2223ae0cb2b668d78037b39ba0e082333be0f914
--- AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 2801d97e877dd78189aa891e80a2f7cf60a6a2b7)
+++ AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 2223ae0cb2b668d78037b39ba0e082333be0f914)
@@ -25,10 +25,11 @@
 #include "DDCommon.h"
 #endif
 #ifdef _RO_
-#include "ROCommon.h"
+#include "FPCommon.h"
 #endif
 #include "AlarmDefs.h"
 #include "AlarmMgmtSWFaults.h"
+#include "MessageSupport.h"
 
 /**
  *  @defgroup AlarmManagement AlarmManagement
@@ -106,9 +107,11 @@
 // ********** public function prototypes **********
 
 void initAlarmMgmt( void );
-
+
+#if defined (__ALARM_MGMT_C__) || defined(__ALARM_MGMT_DD_C__) || defined(__ALARM_MGMT_TD_C__) || defined(__ALARM_MGMT_FP_C__)
 ALARM_T getAlarmProperties( ALARM_ID_T alarm );
 ALARM_RANK_T getAlarmRank( U32 index );
+#endif
 
 void activateAlarm( ALARM_ID_T alarm );
 void clearAlarm( ALARM_ID_T alarm );
@@ -120,8 +123,7 @@
 BOOL isAlarmConditionDetected( ALARM_ID_T alarm );
 BOOL isAlarmRecoverable( ALARM_ID_T alarm );
 
-BOOL testSetAlarmStateOverride( U32 alarmID, BOOL value );
-BOOL testResetAlarmStateOverride( U32 alarmID );
+BOOL testAlarmStateOverride( MESSAGE_T *message );
 
 /**@}*/