move marshaller out of template

tools/templates/proxy.cpp.j2

@@ -1,16 +1,15 @@
 #include "{{ cls.name }}.proxy.h"
-#include "proxy/ProxyMarshaller.h"
 
 class {{ cls.name }}Proxy::Impl {
 public:
-    explicit Impl(IpcChannel& ch)
-        : client(ch) {}
+    explicit Impl(ProxyMarshaller& m)
+        : client(m) {}
 
-    ProxyMarshaller client;
+    ProxyMarshaller& client;
 };
 
-{{ cls.name }}Proxy::{{ cls.name }}Proxy(IpcChannel& ch)
-    : impl(new Impl(ch)) {}
+{{ cls.name }}Proxy::{{ cls.name }}Proxy(ProxyMarshaller& marshaller)
+    : impl(new Impl(marshaller)) {}
 
 {% for m in cls.methods %}
 {{ m.return_type }} {{ cls.name }}Proxy::{{ m.name }}({% for a in m.args %}{{ a.type }} {{ a.name }}{% if not loop.last %}, {% endif %}{% endfor %}) {

tools/templates/proxy.h.j2

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "ipc/IpcChannel.h"
+#include "proxy/ProxyMarshaller.h"
 
 class {{ cls.name }}Proxy {
 public:
-    explicit {{ cls.name }}Proxy(IpcChannel& ch);
+    explicit {{ cls.name }}Proxy(ProxyMarshaller& marshaller);
     {% for m in cls.methods %}
     {{ m.return_type }} {{ m.name }}({% for a in m.args %}{{ a.type }} {{ a.name }}{% if not loop.last %}, {% endif %}{% endfor %});
     {% endfor %}