Index: NVDataMgmt.h
===================================================================
diff -u -r1ba84c9eec58aca4e7b5ce35ba249e9434d74ca4 -r7c9f9588d709e4b394b05499224bfafe5abefdf9
--- NVDataMgmt.h	(.../NVDataMgmt.h)	(revision 1ba84c9eec58aca4e7b5ce35ba249e9434d74ca4)
+++ NVDataMgmt.h	(.../NVDataMgmt.h)	(revision 7c9f9588d709e4b394b05499224bfafe5abefdf9)
@@ -22,6 +22,8 @@
 
 #ifdef _HD_
     #include "NVDataMgmtHDRecords.h"
+    #include "OperationModes.h"
+    #include "HDDefs.h"
 #endif
 #ifdef _DG_
     #include "NVDataMgmtDGRecords.h"
@@ -38,6 +40,9 @@
 
 // ********** public definitions **********
 
+#define SW_CONFIG_ENABLE_VALUE    1                             ///< Software configuration enable.
+#define SW_CONFIG_DISABLE_VALUE   0                             ///< Software configuration disable.
+
 /// Log event enumeration.
 typedef enum log_event
 {
@@ -126,13 +131,10 @@
 #ifdef _HD_
 HD_PUMPS_CAL_RECORD_T                getHDPumpsCalibrationRecord( void );
 HD_VALVES_CAL_RECORD_T               getHDValvesCalibrationRecord( void );
-HD_OCCLUSION_SENSORS_CAL_RECORD_T    getHDOcclusionSensrosCalibrationRecord( void );
-HD_FLOW_SENSORS_CAL_RECORD_T         getHDFlowSensorsCalibrationRecord( void );
+HD_OCCLUSION_SENSORS_CAL_RECORD_T    getHDOcclusionSensrosCalibrationRecord( void ); // TODO is this going away? Blood stays
+HD_FLOW_SENSORS_CAL_RECORD_T         getHDFlowSensorsCalibrationRecord( void );      // TODO is this going away? Yes
 HD_PRESSURE_SENSORS_CAL_RECORD_T     getHDPressureSensorsCalibrationRecord( void );
 HD_TEMP_SENSORS_CAL_RECORD_T         getHDTemperatureSensorsCalibrationRecord( void );
-HD_HEPARIN_FORCE_SENSOR_CAL_RECORD_T getHDHeparinForceSensorCalibrationRecord( void );
-HD_SYSTEM_RECORD_T                   getHDSystemRecord( void );
-HD_SERVICE_RECORD_T                  getHDServiceRecord( void );
 BOOL                                 setTreatmentTime ( U32 hours );
 U32                                  getTreatmentTime ( void );
 #endif