Index: MessagePayloads.h
===================================================================
diff -u -re8b9318e9440d9ec7bb391cae32e54444461b087 -re8dab6f6027e0e1d8deec121b609c15c2c331d12
--- MessagePayloads.h	(.../MessagePayloads.h)	(revision e8b9318e9440d9ec7bb391cae32e54444461b087)
+++ MessagePayloads.h	(.../MessagePayloads.h)	(revision e8dab6f6027e0e1d8deec121b609c15c2c331d12)
@@ -24,9 +24,6 @@
 #ifdef _DD_
 #include "DDCommon.h"
 #endif
-#ifdef _RO_
-#include "FPCommon.h"
-#endif
 
 /**
  *  @addtogroup Messaging
@@ -76,25 +73,26 @@
     U32  roRate;                                        ///< Set RO water rate (mL/min).
 } FP_WATER_REQ_PAYLOAD_T;
 
-/// Pressure data struct.
+/// DD Pressure data struct.
 typedef struct
 {
-    F32 m1Pressure;                        ///< Water Inlet Input pressure
-    F32 m3Pressure;                        ///< Water Inlet Output pressure
     F32 d9Pressure;                        ///< Hydraulics outlet pressure
     F32 d66Pressure;                       ///< Bicarb bag pressure
     F32 d51Pressure;                       ///< Spent Dialysate pressure
     F32 d18Pressure;                       ///< Fresh Dialysate pressure
     F32 d41Pressure;                       ///< Transmembrane pressure
-    F32 m1PresTemp;                        ///< Water Inlet Input temperature
-    F32 m3PresTemp;                        ///< Water Inlet Output temperature
-    F32 d9PresTemp;                        ///< Hydraulics outlet pressure temperature
-    F32 d66PresTemp;                       ///< Bicarb bag temperature
-    F32 d51PresTemp;                       ///< Spent Dialysate temperature
-    F32 d18PresTemp;                       ///< Fresh Dialysate temperature
-    F32 d41PresTemp;                       ///< Transmembrane temperature
-} DD_PRESSURE_TEMP_DATA_T;
+} DD_PRESSURE_DATA_T;
 
+/// FP Pressure data struct.
+typedef struct
+{
+    F32 m1Pressure;                        ///< Water Inlet Input pressure
+    F32 m3Pressure;                        ///< Water Inlet Output pressure
+    F32 p8Pressure;                        ///< Pressure before inlet conductivity sensor (P8)
+    F32 p13Pressure;                       ///< Pressure before RO filter (P13)
+    F32 p17Pressure;                       ///< Pressure after RO filter (P17)
+} FP_PRESSURE_DATA_T;
+
 #pragma pack(pop)
 
 /**@}*/