Index: firmware/App/Services/SystemCommTD.c
===================================================================
diff -u -rf8a6d0d2b55d834e1e25ec98370e538ff547e148 -r9fcd1ad071bcce7a592833367c103e235e49654f
--- firmware/App/Services/SystemCommTD.c	(.../SystemCommTD.c)	(revision f8a6d0d2b55d834e1e25ec98370e538ff547e148)
+++ firmware/App/Services/SystemCommTD.c	(.../SystemCommTD.c)	(revision 9fcd1ad071bcce7a592833367c103e235e49654f)
@@ -16,15 +16,16 @@
 ***************************************************************************/
 
 #include <string.h>     // For memcpy()
-
+
+#include "Buttons.h"
 #include "can.h"
 #include "sci.h"
 #include "sys_dma.h"
 
 #include "Comm.h"
 #include "Interrupts.h"
-#include "Messaging.h"
-#include "OperationModes.h"
+#include "Messaging.h"
+#include "MessageSupport.h"
 #include "SystemCommTD.h"
 #include "Timers.h"
 #include "Utilities.h"
@@ -364,7 +365,7 @@
  * @return none
  *************************************************************************/
 void processReceivedMessage( MESSAGE_T *message )
-{
+{
     // Handle any messages from other sub-systems
     handleIncomingMessage( message );
 }