Index: firmware/App/Modes/ModeTreatment.h
===================================================================
diff -u -r61716bc97ecca8af1ec560333844a8cf602eccb0 -r61c6f9386e49c5f03792b82d3e6c9bacc98d384a
--- firmware/App/Modes/ModeTreatment.h	(.../ModeTreatment.h)	(revision 61716bc97ecca8af1ec560333844a8cf602eccb0)
+++ firmware/App/Modes/ModeTreatment.h	(.../ModeTreatment.h)	(revision 61c6f9386e49c5f03792b82d3e6c9bacc98d384a)
@@ -21,6 +21,7 @@
 #include "HDCommon.h"
 #include "HDDefs.h"
 #include "Dialysis.h"
+#include "TaskGeneral.h"
 
 /**
  *  @defgroup HDTreatmentMode HDTreatmentMode
@@ -92,6 +93,11 @@
     F32 avgVenousPressure;
 } TREATMENT_LOG_DATA_PERIODIC_T;
 
+/// Maximum time in this mode before blood sitting alarm given (in general task intervals).
+#define MAX_TIME_BLOOD_SITTING      ( ( 5 * SEC_PER_MIN * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL )
+/// Maximum time in this mode before blood sitting warning given (in general task intervals).
+#define WARN_TIME_BLOOD_SITTING     ( ( 4 * SEC_PER_MIN * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL )
+
 // ********** public function prototypes **********
 
 void initTreatmentMode( void );                                     // Initialize this module
Index: firmware/App/Modes/TreatmentEnd.c
===================================================================
diff -u -r69594ce29a9dbc2a1f72c79b18124c7b5ecc09ee -r61c6f9386e49c5f03792b82d3e6c9bacc98d384a
--- firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision 69594ce29a9dbc2a1f72c79b18124c7b5ecc09ee)
+++ firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision 61c6f9386e49c5f03792b82d3e6c9bacc98d384a)
@@ -39,11 +39,6 @@
 /// Max time to wait for user to initiate final rinseback.
 static const U32 TX_END_TIMEOUT_MS      = ( ( 15 * 60 * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL );  // TODO - get time from Systems
 
-/// Maximum time in this mode before blood sitting alarm given (in general task intervals).
-static const U32 MAX_TIME_BLOOD_SITTING = ( ( 5 * SEC_PER_MIN * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL );
-/// Maximum time in this mode before blood sitting warning given (in general task intervals).
-static const U32 WARN_TIME_BLOOD_SITTING = ( ( 4 * SEC_PER_MIN * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL );
-
 // ********** private data **********
 
 static TREATMENT_END_STATE_T treatmentEndState;                             ///< Current state of the treatment end sub-mode.
Index: firmware/App/Modes/TreatmentStop.c
===================================================================
diff -u -rd96d1805307c4e4586416629081b3314037392bf -r61c6f9386e49c5f03792b82d3e6c9bacc98d384a
--- firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision d96d1805307c4e4586416629081b3314037392bf)
+++ firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision 61c6f9386e49c5f03792b82d3e6c9bacc98d384a)
@@ -35,10 +35,6 @@
 
 // ********** private definitions **********
 
-/// Maximum time in this mode before blood sitting alarm given (in general task intervals).
-static const U32 MAX_TIME_BLOOD_SITTING = ( ( 5 * SEC_PER_MIN * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL );
-/// Maximum time in this mode before blood sitting warning given (in general task intervals).
-static const U32 WARN_TIME_BLOOD_SITTING = ( ( 4 * SEC_PER_MIN * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL );
 /// Treatment stop status broadcast interval.
 #define TREATMENT_STOP_DATA_PUBLISH_INTERVAL   ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )