Index: firmware/App/Services/MsgQueues.h
===================================================================
diff -u -r73d8423edc56daed591bc0b3f7baee5540aea423 -r1631728a0f2506fb4e29c5f6c6e1a5f55018caab
--- firmware/App/Services/MsgQueues.h	(.../MsgQueues.h)	(revision 73d8423edc56daed591bc0b3f7baee5540aea423)
+++ firmware/App/Services/MsgQueues.h	(.../MsgQueues.h)	(revision 1631728a0f2506fb4e29c5f6c6e1a5f55018caab)
@@ -18,7 +18,8 @@
 #ifndef __MSG_QUEUES_H__
 #define __MSG_QUEUES_H__
 
-#include "../TDCommon.h"
+#include "TDCommon.h"
+#include "CommBuffers.h"
 
 /**
  *  @defgroup MsgQueues MsgQueues
@@ -52,7 +53,8 @@
 
 /// Record structure for a message (header + payload).
 typedef struct
-{
+{
+    COMM_BUFFER_T    in_buffer;                         ///< Message received into this channel buffer
     MESSAGE_HEADER_T hdr;                               ///< Message header
     U08              payload[ MAX_MSG_PAYLOAD_SIZE ];   ///< Message payload
 } MESSAGE_T;