Index: Accel.h
===================================================================
diff -u -r7ff7e715f7a15da5f4055b33e186d58cf96fe909 -rd6f53ebf6c481cb909720a2c6910ae89addc6801
--- Accel.h	(.../Accel.h)	(revision 7ff7e715f7a15da5f4055b33e186d58cf96fe909)
+++ Accel.h	(.../Accel.h)	(revision d6f53ebf6c481cb909720a2c6910ae89addc6801)
@@ -53,6 +53,14 @@
     F32 zTilt;                                      ///< Z axis tilt (in degrees)
 } ACCEL_DATA_PAYLOAD_T;
 
+/// Payload record structure for an accelerometer calibration message.
+typedef struct
+{
+    F32 xOffset;
+    F32 yOffset;
+    F32 zOffset;
+} ACCEL_CAL_PAYLOAD_T;
+
 // ********** public function prototypes **********
 
 void initAccel( void );
Index: NVDataMgmt.c
===================================================================
diff -u -r9e272cee788f7b0558d19973457856279f3605ea -rd6f53ebf6c481cb909720a2c6910ae89addc6801
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 9e272cee788f7b0558d19973457856279f3605ea)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision d6f53ebf6c481cb909720a2c6910ae89addc6801)
@@ -19,12 +19,13 @@
 
 #include <string.h>      // For memcpy
 
+#include "system.h"
 #include "F021.h"
 
 #include "MsgQueues.h"
 #include "NVDataMgmt.h"
 #include "RTC.h"
-#include "system.h"
+#include "SystemCommMessages.h"
 #include "Timers.h"
 #include "Utilities.h"
 
Index: NVDataMgmt.h
===================================================================
diff -u -r9e272cee788f7b0558d19973457856279f3605ea -rd6f53ebf6c481cb909720a2c6910ae89addc6801
--- NVDataMgmt.h	(.../NVDataMgmt.h)	(revision 9e272cee788f7b0558d19973457856279f3605ea)
+++ NVDataMgmt.h	(.../NVDataMgmt.h)	(revision d6f53ebf6c481cb909720a2c6910ae89addc6801)
@@ -114,6 +114,14 @@
 {
     char disinfectionDate [ MAX_DATE_CHARACTERS ];              ///< Disinfection Date
 } DISINFECTION_DATE_T;
+
+/// Payload record structure for a linear calibration message.
+typedef struct
+{
+    F32 gain;
+    F32 offset;
+} LINEAR_F32_CAL_PAYLOAD_T;
+
 #pragma pack(pop)
 
 void initNVDataMgmt ( void );