Index: firmware/App/Modes/TreatmentRecirc.c
===================================================================
diff -u -r89f4c7f0995e2094b3f26fc7e7e12371e847abac -r6b870cd0699bb3ee22b93981d51373a6c2d56162
--- firmware/App/Modes/TreatmentRecirc.c	(.../TreatmentRecirc.c)	(revision 89f4c7f0995e2094b3f26fc7e7e12371e847abac)
+++ firmware/App/Modes/TreatmentRecirc.c	(.../TreatmentRecirc.c)	(revision 6b870cd0699bb3ee22b93981d51373a6c2d56162)
@@ -35,9 +35,9 @@
 // ********** private definitions **********
 
 /// Alarm if re-circulation is running for this much time.  TODO - finalize these times w/ Systems
-#define RECIRC_TIMEOUT_MS               ( ( 15 * SEC_PER_MIN * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL )
+static const U32 RECIRC_TIMEOUT_MS            = ( ( 15 * SEC_PER_MIN * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL );
 /// Re-circulation status broadcast interval.
-#define RECIRC_DATA_PUBLISH_INTERVAL    ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )
+static const U32 RECIRC_DATA_PUBLISH_INTERVAL = ( MS_PER_SECOND / TASK_GENERAL_INTERVAL );
 /// Target flow rate for re-circulation of saline on blood-side circuit.
 #define RECIRC_BP_FLOW_RATE_ML_MIN         100