Index: NVDataMgmt.c
===================================================================
diff -u -r7ff7e715f7a15da5f4055b33e186d58cf96fe909 -rd63bda74880d0c3ffdd235e3ae67e68a1dc5f36b
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 7ff7e715f7a15da5f4055b33e186d58cf96fe909)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision d63bda74880d0c3ffdd235e3ae67e68a1dc5f36b)
@@ -20,6 +20,8 @@
 #include <string.h>      // For memcpy
 
 #include "F021.h"
+
+#include "MsgQueues.h"
 #include "NVDataMgmt.h"
 #include "RTC.h"
 #include "system.h"
@@ -226,6 +228,9 @@
 static BOOL                         calRecordIsValid         = FALSE;                                           ///< Flag indicates whether stored calibration record was found to be valid
 static volatile BOOL                powerOffIsImminent       = FALSE;                                           ///< Power off warning has been signaled.  Non-volatile memory operations should be completed ASAP and then ceased
 
+// *** This declaration will cause a compiler error if CALIBRATION_DATA_T record size exceeds max message payload size.
+U08 calRecordSizeAssertion[ ( sizeof( CALIBRATION_DATA_T ) <= MAX_MSG_PAYLOAD_SIZE ? 1 : -1 ) ];
+
 // Private functions
 
 static NVDATAMGMT_SELF_TEST_STATE_T handleSelfTestStart ( void );