Index: firmware/App/Services/Messaging.h
===================================================================
diff -u -r99498a5bab0a1f4c706376feceadc66df6d1c22e -r8940f67c485a23e20e14e4dc24e79339f80cc584
--- firmware/App/Services/Messaging.h	(.../Messaging.h)	(revision 99498a5bab0a1f4c706376feceadc66df6d1c22e)
+++ firmware/App/Services/Messaging.h	(.../Messaging.h)	(revision 8940f67c485a23e20e14e4dc24e79339f80cc584)
@@ -3,7 +3,7 @@
 #define __MESSAGING_H__
 
 #include "FPCommon.h"
-#include "RODefs.h"
+#include "FPDefs.h"
 #include "MessageSupport.h"
 #include "MsgQueues.h"
 
@@ -36,12 +36,13 @@
 BOOL sendACKMsg( MESSAGE_T *message );
 void handleIncomingMessage( MESSAGE_T *message );
 BOOL handleUnhandledMsg( MESSAGE_T *message );
+BOOL handleVersionRequestMessage( MESSAGE_T *message );
 
 BOOL broadcastAlarmTriggered( U32 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 );
 BOOL broadcastAlarmCleared( U32 alarm );
 BOOL broadcastAlarmConditionCleared( U32 alarm );
 
-BOOL sendEvent( RO_EVENT_ID_T event, EVENT_DATA_T dat1, EVENT_DATA_T dat2 );
+BOOL sendEvent( FP_EVENT_ID_T event, EVENT_DATA_T dat1, EVENT_DATA_T dat2 );
 
 void handleUITDResetInServiceModeRequest( MESSAGE_T* message );
 BOOL handleSetROOperationMode( MESSAGE_T *message );