diff --git a/codegen/genfacet b/codegen/genfacet
index 4d4f3fe..ddea77e 100755
--- a/codegen/genfacet
+++ b/codegen/genfacet
@@ -504,7 +504,6 @@ def main():
                   idl_fname=idl_fname,
                   idl=idl,
                   output_hpp_dir=output_hpp_dir,
-                  #output_impl_hpp_dir=output_impl_hpp_dir,
                   output_cpp_dir=output_cpp_dir)
     elif idl['mode'] == 'implementation':
         # idl:   json5 for (iface, data) combination
@@ -517,7 +516,7 @@ def main():
                        idl_fname=idl_fname,
                        idl=idl,
                        facet_idl=facet_idl,
-                       output_hpp_dir=output_hpp_dir,
+                       output_hpp_dir=output_impl_hpp_dir,
                        output_impl_hpp_subdir=output_impl_hpp_subdir,
                        output_cpp_dir=output_cpp_dir)
 
diff --git a/codegen/iface_facet_repr.cpp.j2 b/codegen/iface_facet_repr.cpp.j2
index 5249929..4815d04 100644
--- a/codegen/iface_facet_repr.cpp.j2
+++ b/codegen/iface_facet_repr.cpp.j2
@@ -11,7 +11,7 @@
  *       [{{ idl_fname }}]
 **/
 
-#include "{{iface_facet_repr_hpp_fname}}"
+#include "{{impl_hpp_subdir}}/{{iface_facet_repr_hpp_fname}}"
 
 namespace {{repr_ns1}} {
     namespace {{repr_ns2}} {
diff --git a/codegen/iface_facet_repr.hpp.j2 b/codegen/iface_facet_repr.hpp.j2
index 221d679..f97ff84 100644
--- a/codegen/iface_facet_repr.hpp.j2
+++ b/codegen/iface_facet_repr.hpp.j2
@@ -6,13 +6,14 @@
  *     arguments:
  *       --input [{{genfacet_input}}]
  *  2. jinja2 template for abstract facet .hpp file:
- *       [{{ iface_facet_any_hpp_j2 }}]
+ *       [{{ iface_facet_repr_hpp_j2 }}]
  *  3. idl for facet methods
  *       [{{ idl_fname }}]
  **/
 
 #pragma once
 
+#include "{{facet_hpp_fname}}"
 {% for include_fname in facet_includes %}
 #include {{include_fname}}
 {% endfor %}