1 files changed, 8 insertions, 10 deletions
diff --git a/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl b/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
index c5c1e17bad..5575f3b1df 100644
--- a/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
+++ b/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
@@ -27,27 +27,25 @@
  */
 
 #include <sstream>
-
-#include <AMQP_ServerProxy.h>
-#include <AMQFrame.h>
+#include "AMQP_ServerProxy.h"
 #include "framing/ChannelAdapter.h"
+#include "framing/amqp_types_full.h"
 
 %{MLIST} ${spc_method_body_include}
 
 namespace qpid {
 namespace framing {
 
-AMQP_ServerProxy::AMQP_ServerProxy(OutputHandler* out, u_int8_t major, u_int8_t minor) :
-%{CLIST} ${spc_constructor_initializer}
-{}
+AMQP_ServerProxy::AMQP_ServerProxy(ChannelAdapter& ch) :
+    Proxy(ch)%{CLIST} ${spc_constructor_initializer}
+    {}
 
-	// Inner class instance get methods
+    // Inner class instance get methods
 	
 %{CLIST} ${spc_inner_class_get_method}
 
-	// Inner class implementation
+    // Inner class implementation
 
 %{CLIST} ${spc_inner_class_impl}
 
-} /* namespace framing */
-} /* namespace qpid */
+}} // namespae qpid::framing