Index: leahi_dialin/common/__init__.py
===================================================================
diff -u -r126c206228086fbd13e820980c2fbb2fb58131bb -r9ac39d94327325e5b882318bc0e5126668eec66e
--- leahi_dialin/common/__init__.py	(.../__init__.py)	(revision 126c206228086fbd13e820980c2fbb2fb58131bb)
+++ leahi_dialin/common/__init__.py	(.../__init__.py)	(revision 9ac39d94327325e5b882318bc0e5126668eec66e)
@@ -23,4 +23,5 @@
     from .alarm_priorities  import *
     from .td_defs           import *
     from .dd_defs           import *
+    from .fp_defs           import *
     from .ui_defs           import *
Index: leahi_dialin/fp/modules/levels.py
===================================================================
diff -u -rfe37f0a0f2c683696f41f6a349cf2756ed09d5d7 -r9ac39d94327325e5b882318bc0e5126668eec66e
--- leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision fe37f0a0f2c683696f41f6a349cf2756ed09d5d7)
+++ leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision 9ac39d94327325e5b882318bc0e5126668eec66e)
@@ -25,14 +25,7 @@
 from leahi_dialin.utils.checks import check_broadcast_interval_override_ms
 from leahi_dialin.utils.conversions import integer_to_bytearray
 
-@unique
-class FPFloaterLevels(DialinEnum):
-    LEVEL_STATE_LOW = 0
-    LEVEL_STATE_MEDIUM = 1
-    LEVEL_STATE_HIGH = 2
-    LEVEL_STATE_ILLEGAL = 3
 
-
 class FPLevels(AbstractSubSystem):
     """
 
Index: leahi_dialin/fp/modules/valves.py
===================================================================
diff -u -rfbfcdaf15d99c9cfd088a9073c1c8b670fe08fce -r9ac39d94327325e5b882318bc0e5126668eec66e
--- leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision fbfcdaf15d99c9cfd088a9073c1c8b670fe08fce)
+++ leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision 9ac39d94327325e5b882318bc0e5126668eec66e)
@@ -20,37 +20,19 @@
 from collections import OrderedDict
 
 from .constants import NO_RESET
+from leahi_dialin.common.fp_defs import FPValveStates, FPValveNames
 from leahi_dialin.common.msg_defs import MsgIds
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum
 from leahi_dialin.utils.checks import check_broadcast_interval_override_ms
 from leahi_dialin.utils.conversions import integer_to_bytearray
 
+
 # Valve states
 ENERGIZED = True
 DEENERGIZED = False
 
 
-@unique
-class FPValveStates(DialinEnum):
-    VALVE_STATE_CLOSED = 0
-    VALVE_STATE_OPEN = 1
-
-
-@unique
-class FPValveNames(DialinEnum):
-    M4_VALV = 0                             # Valve (M4 VWi)
-    P39_VALV = 1                            # Valve (P39 VROd)
-    P6_VALV = 2                             # Valve (P6 VFF)
-    P11_VALV = 3                            # Valve (P11 VPi)
-    P33_VALV = 4                            # Valve (P33 VCr)
-    P34_VALV = 5                            # Valve (P34 VCb)
-    P37_VALV = 6                            # Valve (P37 VCd)
-    M7_VALV = 7                             # Valve (M7)
-    P20_VALV = 8                            # Valve (P20)
-    P43_VALV = 9                            # Valve (P43)
-    NUM_OF_VALVES = 10                      # Number of valves
-
 class FPValves(AbstractSubSystem):
     """
         Dialin API sub-class for FP valve related commands.
Index: leahi_dialin/fp/modules/water_pumps.py
===================================================================
diff -u -r6a52211a23690bbac89018520763d210c1aaf5c0 -r9ac39d94327325e5b882318bc0e5126668eec66e
--- leahi_dialin/fp/modules/water_pumps.py	(.../water_pumps.py)	(revision 6a52211a23690bbac89018520763d210c1aaf5c0)
+++ leahi_dialin/fp/modules/water_pumps.py	(.../water_pumps.py)	(revision 9ac39d94327325e5b882318bc0e5126668eec66e)
@@ -26,12 +26,7 @@
 from leahi_dialin.utils.checks import check_broadcast_interval_override_ms
 from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
 
-@unique
-class FPPumpNames(DialinEnum):
-    P12_PUMP_RO = 0
-    P40_PUMP_BOOSTER = 1
 
-
 class FPPumps(AbstractSubSystem):
     """
         Dialin API sub-class for FP water pump driver related commands.