diff --git a/idl/IGCObject_DPrimitive_gco_2_gco_gco.json5 b/idl/IGCObject_DPrimitive_gco_2_gco_gco.json5
index 79ee61d4..cd17ae4f 100644
--- a/idl/IGCObject_DPrimitive_gco_2_gco_gco.json5
+++ b/idl/IGCObject_DPrimitive_gco_2_gco_gco.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/procedure2",
+    output_hpp_dir: "include/xo/procedure2",
+    output_impl_subdir: "detail",
     includes: [
         //<xo/procedure2/GCObjectConversion_DPrimitive_gco_2_gco_gco.hpp>
         "<xo/gc/GCObject.hpp>",
diff --git a/idl/IPrintable_DPrimitive_gco_2_gco_gco.json5 b/idl/IPrintable_DPrimitive_gco_2_gco_gco.json5
index 5eb7bf34..ee3a1951 100644
--- a/idl/IPrintable_DPrimitive_gco_2_gco_gco.json5
+++ b/idl/IPrintable_DPrimitive_gco_2_gco_gco.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/procedure2",
+    output_hpp_dir: "include/xo/procedure2",
+    output_impl_subdir: "detail",
     includes: [
         "<xo/printable2/Printable.hpp>",
         "<xo/printable2/detail/IPrintable_Xfer.hpp>",
diff --git a/idl/IProcedure_DPrimitive_gco_2_gco_gco.json5 b/idl/IProcedure_DPrimitive_gco_2_gco_gco.json5
index b0a770fd..b50a8634 100644
--- a/idl/IProcedure_DPrimitive_gco_2_gco_gco.json5
+++ b/idl/IProcedure_DPrimitive_gco_2_gco_gco.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/procedure2",
+    output_hpp_dir: "include/xo/procedure2",
+    output_impl_subdir: "detail",
     includes: [
         "<xo/procedure2/RuntimeContext.hpp>",
         "<xo/procedure2/detail/IRuntimeContext_Xfer.hpp>",
diff --git a/idl/IRuntimeContext_DSimpleRcx.json5 b/idl/IRuntimeContext_DSimpleRcx.json5
index 4765285d..324526f7 100644
--- a/idl/IRuntimeContext_DSimpleRcx.json5
+++ b/idl/IRuntimeContext_DSimpleRcx.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/procedure2",
+    output_hpp_dir: "include/xo/procedure2",
+    output_impl_subdir: "detail",
     includes: [
         //"<xo/procedure2/RuntimeContext.hpp>",
         //"<xo/procedure2/detail/IRuntimeContext_Xfer.hpp>",
diff --git a/idl/Procedure.json5 b/idl/Procedure.json5
index 7933c3a2..b45227d0 100644
--- a/idl/Procedure.json5
+++ b/idl/Procedure.json5
@@ -5,6 +5,8 @@
 {
     mode: "facet",
     output_cpp_dir: "src/procedure2",
+    output_hpp_dir: "include/xo/procedure2",
+    output_impl_subdir: "detail",
     // includes in ASyntaxStateMachine.hpp
     includes: [
         "\"RuntimeContext.hpp\"",
diff --git a/idl/RuntimeContext.json5 b/idl/RuntimeContext.json5
index c896cc64..07ed5b00 100644
--- a/idl/RuntimeContext.json5
+++ b/idl/RuntimeContext.json5
@@ -1,6 +1,8 @@
 {
     mode: "facet",
     output_cpp_dir: "src/procedure2",
+    output_hpp_dir: "include/xo/procedure2",
+    output_impl_subdir: "detail",
     // includes in ARuntimeContext.hpp
     includes: [
         "<xo/alloc2/Allocator.hpp>"