1 files changed, 10 insertions, 11 deletions
diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am
index 42b1b12ee1..5c75fc7ce6 100644
--- a/qpid/cpp/src/Makefile.am
+++ b/qpid/cpp/src/Makefile.am
@@ -27,12 +27,12 @@ include $(srcdir)/rubygen.mk
 DISTCLEANFILES=rubygen.mk
 
 # Code generated by C++
-noinst_PROGRAMS=generate_MethodHolderMaxSize_h
-generate_MethodHolderMaxSize_h_SOURCES=gen/generate_MethodHolderMaxSize_h.cpp
-qpid/framing/MethodHolderMaxSize.h: generate_MethodHolderMaxSize_h
-	./generate_MethodHolderMaxSize_h
-BUILT_SOURCES=qpid/framing/MethodHolderMaxSize.h
-DISTCLEANFILES+=qpid/framing/MethodHolderMaxSize.h
+noinst_PROGRAMS=generate_MaxMethodBodySize_h
+generate_MaxMethodBodySize_h_SOURCES=gen/generate_MaxMethodBodySize_h.cpp
+qpid/framing/MaxMethodBodySize.h: generate_MaxMethodBodySize_h
+	./generate_MaxMethodBodySize_h
+BUILT_SOURCES=qpid/framing/MaxMethodBodySize.h
+DISTCLEANFILES+=qpid/framing/MaxMethodBodySize.h
 
 
 ## Compiler flags
@@ -99,6 +99,7 @@ libqpidcommon_la_SOURCES = \
   qpid/framing/AMQHeaderBody.cpp \
   qpid/framing/AMQHeartbeatBody.cpp \
   qpid/framing/Array.cpp \
+  qpid/framing/BodyHolder.cpp \
   qpid/framing/BodyHandler.cpp \
   qpid/framing/ChannelAdapter.cpp \
   qpid/framing/Buffer.cpp \
@@ -117,8 +118,7 @@ libqpidcommon_la_SOURCES = \
   qpid/framing/Uuid.cpp \
   qpid/framing/AMQP_HighestVersion.h \
   qpid/framing/Blob.cpp \
-  qpid/framing/MethodHolder.cpp \
-  qpid/framing/MethodHolderMaxSize.h \
+  qpid/framing/MaxMethodBodySize.h \
   qpid/framing/TransferContent.cpp \
   qpid/assert.cpp qpid/assert.h \
   qpid/Exception.cpp \
@@ -226,7 +226,6 @@ nobase_include_HEADERS = \
   $(platform_hdr) \
   qpid/assert.h \
   qpid/Exception.h \
-  qpid/ExceptionHolder.h \
   qpid/Msg.h \
   qpid/Options.h \
   qpid/Plugin.h \
@@ -359,8 +358,8 @@ nobase_include_HEADERS = \
   qpid/framing/Invoker.h \
   qpid/framing/InputHandler.h \
   qpid/framing/MethodContent.h \
-  qpid/framing/MethodHolder.h \
-  qpid/framing/MethodHolderMaxSize.h \
+  qpid/framing/BodyHolder.h \
+  qpid/framing/MaxMethodBodySize.h \
   qpid/framing/ModelMethod.h \
   qpid/framing/OutputHandler.h \
   qpid/framing/ProtocolInitiation.h \