Index: firmware/App/Services/NVRecordsDD.c
===================================================================
diff -u -r1ce98afa73e6c88addb3a01643c791c15e7a147c -rc0643d8a573c1b8bfe177a5aad35f59e2cc6935d
--- firmware/App/Services/NVRecordsDD.c	(.../NVRecordsDD.c)	(revision 1ce98afa73e6c88addb3a01643c791c15e7a147c)
+++ firmware/App/Services/NVRecordsDD.c	(.../NVRecordsDD.c)	(revision c0643d8a573c1b8bfe177a5aad35f59e2cc6935d)
@@ -13,8 +13,8 @@
 ***************************************************************************/
 
 #include <string.h>      // For memcpy
-#include "Common.h"
 #include "DDDefs.h"
+#include "Messaging.h"
 #include "NVJobQ.h"
 #include "NVMessagingDD.h"
 #include "NVRecordsDD.h"
Index: firmware/App/Services/NVRecordsDD.h
===================================================================
diff -u -r1ce98afa73e6c88addb3a01643c791c15e7a147c -rc0643d8a573c1b8bfe177a5aad35f59e2cc6935d
--- firmware/App/Services/NVRecordsDD.h	(.../NVRecordsDD.h)	(revision 1ce98afa73e6c88addb3a01643c791c15e7a147c)
+++ firmware/App/Services/NVRecordsDD.h	(.../NVRecordsDD.h)	(revision c0643d8a573c1b8bfe177a5aad35f59e2cc6935d)
@@ -48,27 +48,7 @@
 #define FLOW_SENSROS_RESERVED_SPACE_COUNT         2                             ///< Flow sensors reserved space count.
 #define TEMP_SENSORS_RESERVED_SPACE_COUNT         2                             ///< Temperature sensors reserved space count.
 #define GENERIC_VOL_RESERVED_SPACE_COUNT          4                             ///< Generic volumes reserved space count.
-#define MAX_EEPROM_WRITE_BUFFER_BYTES             16U                           ///< Max allowed bytes for an EEPROM write (16 bytes).
 
-/// NVM self-test states enumeration.
-typedef enum NVM_Self_Test_States
-{
-    NVM_SELF_TEST_STATE_READ_RECORDS = 0,                                       ///< Self test read records.
-    NVM_SELF_TEST_STATE_CHECK_CRC,                                              ///< Self test check CRC.
-    NVM_SELF_TEST_STATE_COMPLETE,                                               ///< Self test complete.
-    NUM_OF_NVM_SELF_TEST_STATES                                                 ///< Total number of self-test states.
-} NVM_SELF_TEST_STATE_T;
-
-/// Process records specifications structure
-typedef struct
-{
-    U32 recordFlashAddress;                                                     ///< Jobs spec start address.
-    U32 sizeofRecord;                                                           ///< Jobs spec size of job.
-    U08* structAddressPtr;                                                      ///< Jobs structure address pointer.
-    U08* structCRCPtr;                                                          ///< Jobs structure CRC pointer.
-    DD_EVENT_ID_T nvEvent;                                                      ///< Jobs non-volatile DD event (i.e calibration, system).
-} PROCESS_RECORD_SPECS_T;
-
 /// Enum for all the subcomponents for the DD calibration record
 typedef enum DD_Cal_Records_Type
 {
@@ -116,25 +96,6 @@
     NUM_OF_DD_INSTIT_RECORD_TYPE                                                ///< Total number of components in institutional record
 }DD_INSTIT_REC_TYPE;
 
-/// DD available NV data to get
-typedef enum DD_nv_commands
-{
-    GET_CAL_PRESSURE_SENOSRS = 0,                                               ///< Get pressure sensors calibration data.
-    GET_CAL_TEMP_SENSORS,                                                       ///< Get temperature sensors calibration data.
-    GET_CAL_CONCENTRATE_PUMPS_RECORD,                                           ///< Get concentrate pumps calibration record.
-    GET_CAL_D12_PUMP_RECORD,                                                    ///< Get D12 dialysate pump calibration record.
-    GET_CAL_D48_PUMP_RECORD,                                                    ///< Get D48 dialysate pump calibration record.
-    GET_CAL_ACID_CONCENTREATES,                                                 ///< Get acid concentrates calibration data.
-    GET_CAL_BICARB_CONCENTRATES,                                                ///< Get bicarb concentrates calibration data.
-    GET_CAL_ACCEL_SENSORS,                                                      ///< Get accelerometers calibration data.
-    GET_CAL_BLOOD_LEAK_SENSOR,                                                  ///< Get blood leak sensor calibration data.
-    GET_SYSTEM_RECORD,                                                          ///< Get system record.
-    GET_SERVICE_RECORD,                                                         ///< Get service record.
-    GET_INSTITUTIONAL_RECORD,                                                   ///< Get institutional record.
-    GET_USAGE_RECORD,                                                           ///< Get usage record.
-    NUM_OF_NV_DD_DATA                                                           ///< Number of non-volatile data.
-} NV_DATA_T;
-
 /// DD scheduled runs enumeration.
 typedef enum DD_scheduled_runs
 {