Index: firmware/App/Modes/Dialysis.h
===================================================================
diff -u -r1017bbc5760a50e20357da1e4f705b3e6157375e -r2df21d2472a8d79d78af7e359518acf3614accc5
--- firmware/App/Modes/Dialysis.h	(.../Dialysis.h)	(revision 1017bbc5760a50e20357da1e4f705b3e6157375e)
+++ firmware/App/Modes/Dialysis.h	(.../Dialysis.h)	(revision 2df21d2472a8d79d78af7e359518acf3614accc5)
@@ -18,6 +18,7 @@
 #define __DIALYSIS_H__
 
 #include "HDCommon.h"
+#include "HDDefs.h"
 
 /**
  *  @defgroup Dialysis Dialysis
@@ -29,42 +30,6 @@
 
 // ********** public definitions **********
 
-/// Enumeration of dialysis sub-mode states.
-typedef enum Dialysis_States
-{
-    DIALYSIS_START_STATE = 0,                           ///< Start state of the dialysis sub-mode state machine.
-    DIALYSIS_UF_STATE,                                  ///< Ultrafiltration state of the dialysis sub-mode state machine.
-    DIALYSIS_SOLUTION_INFUSION_STATE,                   ///< Solution infusion state of the dialysis sub-mode state machine.
-    NUM_OF_DIALYSIS_STATES                              ///< Number of dialysis sub-mode states.
-} DIALYSIS_STATE_T;
-
-/// Enumeration of ultrafiltration states.
-typedef enum UF_States
-{
-    UF_START_STATE = 0,                                 ///< Start state of the ultrafiltration state machine.
-    UF_PAUSED_STATE,                                    ///< Paused state of the ultrafiltration state machine.
-    UF_RUNNING_STATE,                                   ///< Running state of the ultrafiltration state machine.
-    UF_OFF_STATE,                                       ///< Completed/off state of the ultrafiltration state machine.
-    UF_COMPLETED_STATE,                                 ///< Completed state of ultrafiltration state machine.
-    NUM_OF_UF_STATES                                    ///< Number of ultrafiltration states.
-} UF_STATE_T;
-
-/// Enumeration of system message IDs.
-typedef enum UF_Commands
-{
-    UF_CMD_PAUSE = 0,                                   ///< Pause UF command.
-    UF_CMD_RESUME,                                      ///< Resume UF command.
-    NUM_OF_UF_CMDS                                      ///< Number of UF commands.
-} UF_CMD_T;
-
-/// Enumeration of system message IDs.
-typedef enum UF_Adjustments
-{
-    UF_ADJ_TREATMENT_TIME = 0,                          ///< Adjust treatment time to achieve new ultrafiltration volume.
-    UF_ADJ_UF_RATE,                                     ///< Adjust UF rate to achieve new ultrafiltration volume.
-    NUM_OF_UF_ADJS                                      ///< Number of UF adjustments.
-} UF_ADJ_T;
-
 // ********** private function prototypes **********
 
 void initDialysis( void );