Index: MessagePayloads.h
===================================================================
diff -u -r91cff0134623a852aeb37b497b2263cf4a9ba6cb -re62c7bc87df7aa4d6afb5885f3cf33078c9112a3
--- MessagePayloads.h	(.../MessagePayloads.h)	(revision 91cff0134623a852aeb37b497b2263cf4a9ba6cb)
+++ MessagePayloads.h	(.../MessagePayloads.h)	(revision e62c7bc87df7aa4d6afb5885f3cf33078c9112a3)
@@ -18,7 +18,15 @@
 #ifndef __MESSAGE_PAYLOADS_H__
 #define __MESSAGE_PAYLOADS_H__
 
+#ifdef _TD_
 #include "TDCommon.h"
+#endif
+#ifdef _DD_
+#include "DDCommon.h"
+#endif
+#ifdef _RO_
+#include "ROCommon.h"
+#endif
 
 /**
  *  @addtogroup Messaging