Index: firmware/App/Services/Messaging.h
===================================================================
diff -u -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 -r8e7d30d231de616b58a765d98495ba34010781c8
--- firmware/App/Services/Messaging.h	(.../Messaging.h)	(revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98)
+++ firmware/App/Services/Messaging.h	(.../Messaging.h)	(revision 8e7d30d231de616b58a765d98495ba34010781c8)
@@ -33,22 +33,15 @@
 
 // Serialize message
 U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq );
+BOOL sendACKMsg( MESSAGE_T *message );
+void handleIncomingMessage( 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 );
 
-void handleIncomingMessage( MESSAGE_T *message );
-
-// ACK MSG
-BOOL sendACKMsg( MESSAGE_T *message );
-
 void handleUITDResetInServiceModeRequest( MESSAGE_T* message );
-
 BOOL handleSetROOperationMode( MESSAGE_T *message );
 
 // Test Support Messaging Functions **************************