2 files changed, 6 insertions, 5 deletions
diff --git a/qpid/cpp/include/qmf/Protocol.h b/qpid/cpp/include/qmf/Protocol.h
index e2ec287c00..64ba4b69ff 100644
--- a/qpid/cpp/include/qmf/Protocol.h
+++ b/qpid/cpp/include/qmf/Protocol.h
@@ -67,6 +67,8 @@ namespace qmf {
          * Application Header Keys
          */
         const static std::string APP_OPCODE;
+        const static std::string APP_PARTIAL;
+        const static std::string APP_CONTENT;
 
         /**
          * QMF Op Codes
@@ -88,6 +90,7 @@ namespace qmf {
         /**
          * Content type definitions
          */
+        const static std::string CONTENT_NONE;
         const static std::string CONTENT_PACKAGE;
         const static std::string CONTENT_SCHEMA_ID;
         const static std::string CONTENT_SCHEMA_CLASS;
diff --git a/qpid/cpp/include/qmf/engine/Data.h b/qpid/cpp/include/qmf/engine/Data.h
index 30f2093df7..33a0289ea5 100644
--- a/qpid/cpp/include/qmf/engine/Data.h
+++ b/qpid/cpp/include/qmf/engine/Data.h
@@ -20,12 +20,12 @@
  * under the License.
  */
 
-#include <qmf/engine/Schema.h>
 #include <qpid/messaging/Variant.h>
 
 namespace qmf {
 namespace engine {
 
+    class SchemaClass;
     struct DataImpl;
     class Data {
     public:
@@ -41,16 +41,14 @@ namespace engine {
         qpid::messaging::Variant::Map& getSubtypes();
 
         const SchemaClass* getSchema() const;
-        void setSchema(SchemaClass* schema);
 
         const char* getKey() const;
         void setKey(const char* key);
 
-        void touch();
+        void modifyStart();
+        void modifyDone();
         void destroy();
 
-        qpid::messaging::Variant::Map asMap() const;
-
     private:
         friend struct DataImpl;
         friend class  AgentImpl;