Index: FPDefs.h
===================================================================
diff -u -r193dbb4390b5cd6ab3adf0a9bd2f6e74c3a4b32c -r82801b7d10ba6178ca0c03f9377930c8f22b52f7
--- FPDefs.h	(.../FPDefs.h)	(revision 193dbb4390b5cd6ab3adf0a9bd2f6e74c3a4b32c)
+++ FPDefs.h	(.../FPDefs.h)	(revision 82801b7d10ba6178ca0c03f9377930c8f22b52f7)
@@ -210,48 +210,6 @@
 /**@}*/
 
 /**
- *  @addtogroup CommonHeader
- *  @{
- */
-
-/// Enumeration of FP event IDs.
-enum FP_Event_List
-{
-    FP_EVENT_STARTUP = 0,                                               ///< FP startup event
-    FP_EVENT_OP_MODE_CHANGE,                                            ///< FP Op mode change event
-    FP_EVENT_SUB_MODE_CHANGE,                                           ///< FP Op sub-mode change event
-    FP_EVENT_PRE_GEN_RO_SET_PWM,                                        ///< FP gen permeate ro set pwm event
-    FP_EVENT_GENP_BOOST_SET_PWM,                                        ///< FP gen permeate boost set pwm event
-    FP_EVENT_GENP_CHANGE,                                               ///< FP gen permeate state change
-    FP_EVENT_PRE_GEN_CHANGE,                                            ///< FP pre gen state change
-    FP_EVENT_PRE_GEN_DEF_CHANGE,                                        ///< FP defeatured pre gen state change
-    FP_EVENT_GENP_DEF_CHANGE,                                           ///< FP defeatured pre gen state change
-    FP_EVENT_FAULT_ALARM_TRIGGER,                                       ///< FP event for alarms that would trigger
-    NUM_OF_FP_EVENT_IDS                                                 ///< Total number of FP events
-};
-typedef enum FP_Event_List FP_EVENT_ID_T;                               ///< Type for FP event list enumeration
-
-/// Enumeration of valves.
-typedef enum FP_Valves
-{
-    M4_VALV = 0,                                  ///< Valve (M4)
-    FP_FIRST_VALVE = M4_VALV,                     ///< First valve
-    P39_VALV,                                     ///< Valve (P39)
-    P6_VALV,                                      ///< Valve (P6)
-    P11_VALV,                                     ///< Valve (P11)
-    P33_VALV,                                     ///< Valve (P33)
-    P34_VALV,                                     ///< Valve (P34)
-    P37_VALV,                                     ///< Valve (P37)
-    M7_VALV,                                      ///< Valve (M7)
-    P20_VALV,                                     ///< Valve (P20)
-    P43_VALV,                                     ///< Valve (P43)
-    FP_NUM_OF_VALVES                              ///< Number of valves
-} FP_VALVES_T;
-
-
-/**@}*/
-
-/**
 *  @addtogroup InletPressureCheck
 *  @{
 */