Index: Common.h
===================================================================
diff -u -r460f6f49ccbb27c6a230cc845282ba03180408a4 -r2085b78963ddd7ea13b38eeb8e8b0370c6ccdb80
--- Common.h	(.../Common.h)	(revision 460f6f49ccbb27c6a230cc845282ba03180408a4)
+++ Common.h	(.../Common.h)	(revision 2085b78963ddd7ea13b38eeb8e8b0370c6ccdb80)
@@ -296,8 +296,18 @@
     sendEvent( e, dat1, dat2 ); \
 }
 
-// **** Common Broadcast Data ****
+// **** Common Data ****
 
+#ifndef _RELEASE_
+/// Hardware configuration
+typedef enum Hardware_Configurations
+{
+    HW_CONFIG_BETA = 1,                         ///< Hardware configuration beta
+    HW_CONFIG_DVT,                              ///< Hardware configuration DVT
+    NUM_OF_HW_CONFIGS,                          ///< Number of hardware configurations
+} HARDWARE_CONFIG_T;
+#endif
+
 /// Heaters data structure.
 typedef struct
 {
Index: Utilities.h
===================================================================
diff -u -re4cd77b41689d481b62354171272e108e09b88b8 -r2085b78963ddd7ea13b38eeb8e8b0370c6ccdb80
--- Utilities.h	(.../Utilities.h)	(revision e4cd77b41689d481b62354171272e108e09b88b8)
+++ Utilities.h	(.../Utilities.h)	(revision 2085b78963ddd7ea13b38eeb8e8b0370c6ccdb80)
@@ -70,16 +70,6 @@
     NUM_OF_SEMAPHORES,                                      ///< Number of semaphores
 } SEMAPHORE_T;
 
-#ifndef _RELEASE_
-/// Hardware configuration
-typedef enum Hardware_Configurations
-{
-    HW_CONFIG_BETA = 1,                                     ///< Hardware configuration beta
-    HW_CONFIG_DVT,                                          ///< Hardware configuration DVT
-    NUM_OF_HW_CONFIGS,                                      ///< Number of hardware configurations
-} HARDWARE_CONFIG_T;
-#endif
-
 /// Record structure for alarm data of any supported type.
 typedef union
 {