Index: source/ariba/communication/messages/AribaBaseMsg.h
===================================================================
--- source/ariba/communication/messages/AribaBaseMsg.h	(revision 10700)
+++ source/ariba/communication/messages/AribaBaseMsg.h	(revision 12060)
@@ -42,5 +42,6 @@
 #include <string>
 #include <boost/cstdint.hpp>
-#include "ariba/utility/messages.h"
+//#include "ariba/utility/messages.h"
+#include "ariba/utility/messages/Message.h"
 #include "ariba/utility/serialization.h"
 #include "ariba/utility/types/LinkID.h"
@@ -61,4 +62,5 @@
 using_serialization;
 
+// XXX This whole message is DEPRECATED
 class AribaBaseMsg : public Message {
 	VSERIALIZEABLE;
@@ -69,5 +71,6 @@
 		typeLinkReply = 2,
 		typeLinkClose = 3,
-		typeLinkUpdate = 4
+		typeLinkUpdate = 4,
+		typeDirectData = 5
 	};
 
@@ -115,8 +118,8 @@
 
 sznBeginDefault( ariba::communication::AribaBaseMsg, X ) {
-	X && type && &localLink && &remoteLink;
+	X && type && &remoteLink;
 	if (type == typeLinkReply || type == typeLinkRequest)
-		X && localDescriptor && remoteDescriptor;
-	X && Payload();
+		X && &localLink && localDescriptor && remoteDescriptor;
+//	X && Payload();
 } sznEnd();
 
Index: source/ariba/communication/messages/CMakeLists.txt
===================================================================
--- source/ariba/communication/messages/CMakeLists.txt	(revision 10700)
+++ source/ariba/communication/messages/CMakeLists.txt	(revision 12060)
@@ -37,5 +37,5 @@
 # [License]
 
-add_headers(AribaBaseMsg.h)
+#add_headers(AribaBaseMsg.h)
 
-add_sources(AribaBaseMsg.cpp)
+#add_sources(AribaBaseMsg.cpp)