Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r9f4c7b3eb733b5de7b1667d1b1f43ff3c1ca8b21 -rc03d077c365f228423523364f6b88d54c335478b
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 9f4c7b3eb733b5de7b1667d1b1f43ff3c1ca8b21)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision c03d077c365f228423523364f6b88d54c335478b)
@@ -100,17 +100,6 @@
     BOOL fillEmtyBicarbBottleDetected;                                                                       ///< Fill bicarb bottle empty detected.
 } FILL_CONDITION_STATUS_T;
 
-/// DG broadcast dialysate fill data structure.
-typedef struct
-{
-    F32 averageBicarbConductivity;              ///< The average bicarb conductivity calculated in one fill.
-    F32 averageAcidConductivity;                ///< The average acid conductivity calculated in one fill.
-    BOOL isThisTheFirstFill;                    ///< Indicate if this is the first fill.
-    F32 pctDiffInConductivity;                  ///< The percent difference between CD1 and CD2.
-    F32 usedAcidVolumeML;                       ///< The used acid volume in ML.
-    F32 usedBicarbVolumeML;                     ///< The used bicarb volume in ML.
-} DG_FILL_MODE_DATA_T;
-
 static U32 fillModeDataPublicationTimerCounter;                                                         ///< Used to schedule dialysate fill data publication to CAN bus.
 static DG_FILL_MODE_STATE_T fillState;                                                                       ///< Currently active fill state.
 static U32 dialysateFillStartTime;                                                                           ///< Current time when starting to fill dialysate.
Index: firmware/App/Modes/ModeFill.h
===================================================================
diff -u -r773bd9e1eebab013afa0b303231be73e8016c84c -rc03d077c365f228423523364f6b88d54c335478b
--- firmware/App/Modes/ModeFill.h	(.../ModeFill.h)	(revision 773bd9e1eebab013afa0b303231be73e8016c84c)
+++ firmware/App/Modes/ModeFill.h	(.../ModeFill.h)	(revision c03d077c365f228423523364f6b88d54c335478b)
@@ -31,6 +31,17 @@
 
 // ********** public definitions **********
 
+/// DG broadcast dialysate fill data structure.
+typedef struct
+{
+    F32 averageBicarbConductivity;              ///< The average bicarb conductivity calculated in one fill.
+    F32 averageAcidConductivity;                ///< The average acid conductivity calculated in one fill.
+    U32 isThisTheFirstFill;                     ///< Indicate if this is the first fill.
+    F32 pctDiffInConductivity;                  ///< The percent difference between CD1 and CD2.
+    F32 usedAcidVolumeML;                       ///< The used acid volume in ML.
+    F32 usedBicarbVolumeML;                     ///< The used bicarb volume in ML.
+} DG_FILL_MODE_DATA_T;
+
 // ********** public function prototypes **********
 
 void initFillMode( void );          // initialize this module