Index: NVDataMgmt.h
===================================================================
diff -u -r3ef35af7d1ce059845d1dc682638dec735eea831 -r7d3731085a0c0a51daf7733236461f4f56a1126a
--- NVDataMgmt.h	(.../NVDataMgmt.h)	(revision 3ef35af7d1ce059845d1dc682638dec735eea831)
+++ NVDataMgmt.h	(.../NVDataMgmt.h)	(revision 7d3731085a0c0a51daf7733236461f4f56a1126a)
@@ -40,8 +40,10 @@
 
 // ********** public definitions **********
 
+#ifndef _RELEASE_
 #define SW_CONFIG_ENABLE_VALUE    1                             ///< Software configuration enable.
 #define SW_CONFIG_DISABLE_VALUE   0                             ///< Software configuration disable.
+#endif
 
 /// Log event enumeration.
 typedef enum log_event
Index: NVDataMgmtDGRecords.h
===================================================================
diff -u -r3ef35af7d1ce059845d1dc682638dec735eea831 -r7d3731085a0c0a51daf7733236461f4f56a1126a
--- NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision 3ef35af7d1ce059845d1dc682638dec735eea831)
+++ NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision 7d3731085a0c0a51daf7733236461f4f56a1126a)
@@ -34,6 +34,7 @@
 #define MAX_TOP_LEVEL_PN_CHARS 10U                                                                             ///< Max number of characters for top level part number.
 #define MAX_TOP_LEVEL_SN_CHARS 15U                                                                             ///< Max number of characters for top level serial number.
 
+#ifndef _RELEASE_
 /// Software configuration enums
 typedef enum software_configurations
 {
@@ -46,6 +47,7 @@
     SW_CONFIG_DISABLE_COND_SENSOR_CHECK,                                                                       ///< Software configuration disable conductivity sensor check.
     NUM_OF_SW_CONFIGS                                                                                          ///< Number of software configurations.
 } SOFTWARE_CONFIG_T;
+#endif
 
 /// DG available NV data to get
 typedef enum dg_nv_commands
@@ -460,11 +462,13 @@
     F32 averageFillFlow;                                                                                        ///< Average fill flow rate.
 } DG_HEATERS_RECORD_T;
 
+#ifndef _RELEASE_
 /// DG software configurations
 typedef struct
 {
     U08 swConfigs[ NUM_OF_SW_CONFIGS ];                                                                         ///< Software configurations.
 } DG_SW_CONFIG_RECORD_T;
+#endif
 
 #pragma pack(pop)
 
Index: NVDataMgmtHDRecords.h
===================================================================
diff -u -r3ef35af7d1ce059845d1dc682638dec735eea831 -r7d3731085a0c0a51daf7733236461f4f56a1126a
--- NVDataMgmtHDRecords.h	(.../NVDataMgmtHDRecords.h)	(revision 3ef35af7d1ce059845d1dc682638dec735eea831)
+++ NVDataMgmtHDRecords.h	(.../NVDataMgmtHDRecords.h)	(revision 7d3731085a0c0a51daf7733236461f4f56a1126a)
@@ -35,6 +35,7 @@
 #define MAX_TOP_LEVEL_PN_CHARS 10U                                                                             ///< Max number of characters for top level part number.
 #define MAX_TOP_LEVEL_SN_CHARS 15U                                                                             ///< Max number of characters for top level serial number.
 
+#ifndef _RELEASE_
 /// Software configuration enums
 typedef enum software_configurations
 {
@@ -80,6 +81,7 @@
     SW_CONFIG_ENABLE_DIALYSATE_INLET_PUMP_OPEN_LOOP,
     NUM_OF_SW_CONFIGS                                                                                          ///< Number of software configurations.
 } SOFTWARE_CONFIG_T;
+#endif
 
 /// HD available NV data to get
 typedef enum hd_nv_commands
@@ -254,11 +256,13 @@
     U16 crc;                                                                                                    ///< CRC for the HD usage info structure.
 } HD_USAGE_INFO_RECORD_T;
 
+#ifndef _RELEASE_
 /// HD software configurations
 typedef struct
 {
     U08 swConfigs[ NUM_OF_SW_CONFIGS ];                                                                         ///< Software configurations.
 } HD_SW_CONFIG_RECORD_T;
+#endif
 
 #pragma pack(pop)