Index: firmware/App/Services/Messaging.h
===================================================================
diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98
--- firmware/App/Services/Messaging.h	(.../Messaging.h)	(revision 533272e6ef2873fcfe7a41338a6c88c7a601605d)
+++ firmware/App/Services/Messaging.h	(.../Messaging.h)	(revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98)
@@ -1,6 +1,6 @@
 
-#ifndef APP_SERVICES_MESSAGING_H_
-#define APP_SERVICES_MESSAGING_H_
+#ifndef __MESSAGING_H__
+#define __MESSAGING_H__
 
 #include "ROCommon.h"
 #include "RODefs.h"
@@ -40,24 +40,22 @@
 
 BOOL broadcastAlarmConditionCleared( U32 alarm );
 
+BOOL sendEvent( RO_EVENT_ID_T event, EVENT_DATA_T dat1, EVENT_DATA_T dat2 );
+
 void handleIncomingMessage( MESSAGE_T *message );
 
 // ACK MSG
 BOOL sendACKMsg( MESSAGE_T *message );
 
 void handleUITDResetInServiceModeRequest( MESSAGE_T* message );
 
-// handler functions ****************************************
-
 BOOL handleSetROOperationMode( MESSAGE_T *message );
 
 // Test Support Messaging Functions **************************
 
 BOOL isTestingActivated( void );
 void setTesterStatusToLoggedOut( void );
 
-BOOL sendEvent( RO_EVENT_ID_T event, EVENT_DATA_T dat1, EVENT_DATA_T dat2 );
-
 BOOL handleTesterLogInRequest( MESSAGE_T *message );
 BOOL handleROSoftwareResetRequest( MESSAGE_T *message );