diff --git a/gen/org/freedesktop/UPower/Device/meson.build b/gen/org/freedesktop/UPower/Device/meson.build
index fd8097c..3f9452b 100644
--- a/gen/org/freedesktop/UPower/Device/meson.build
+++ b/gen/org/freedesktop/UPower/Device/meson.build
@@ -1,8 +1,19 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'org/freedesktop/UPower/Device'
+
 generated_sources += custom_target(
     'org/freedesktop/UPower/Device__cpp'.underscorify(),
-    input: [ '../../../../../yaml/org/freedesktop/UPower/Device.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
+    input: [
+        '../../../../../yaml/org/freedesktop/UPower/Device.interface.yaml',
+    ],
+    output: [
+        'common.hpp',
+        'server.hpp',
+        'server.cpp',
+        'aserver.hpp',
+        'client.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +22,14 @@
         '--directory', meson.current_source_dir() / '../../../../../yaml',
         'org/freedesktop/UPower/Device',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/org/freedesktop/UPower/meson.build b/gen/org/freedesktop/UPower/meson.build
index f87d535..95c1c55 100644
--- a/gen/org/freedesktop/UPower/meson.build
+++ b/gen/org/freedesktop/UPower/meson.build
@@ -1,6 +1,9 @@
 # Generated file; do not modify.
 subdir('Device')
-generated_others += custom_target(
+
+sdbusplus_current_path = 'org/freedesktop/UPower'
+
+generated_markdown += custom_target(
     'org/freedesktop/UPower/Device__markdown'.underscorify(),
     input: [ '../../../../yaml/org/freedesktop/UPower/Device.interface.yaml',  ],
     output: [ 'Device.md' ],
@@ -12,5 +15,8 @@
         '--directory', meson.current_source_dir() / '../../../../yaml',
         'org/freedesktop/UPower/Device',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
diff --git a/gen/org/open_power/Common/Callout/meson.build b/gen/org/open_power/Common/Callout/meson.build
index 96d7dcf..0c1b57b 100644
--- a/gen/org/open_power/Common/Callout/meson.build
+++ b/gen/org/open_power/Common/Callout/meson.build
@@ -1,8 +1,16 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'org/open_power/Common/Callout'
+
 generated_sources += custom_target(
     'org/open_power/Common/Callout__cpp'.underscorify(),
-    input: [ '../../../../../yaml/org/open_power/Common/Callout.errors.yaml',  ],
-    output: [ 'error.cpp', 'error.hpp',  ],
+    input: [
+        '../../../../../yaml/org/open_power/Common/Callout.errors.yaml',
+    ],
+    output: [
+        'error.cpp',
+        'error.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +19,11 @@
         '--directory', meson.current_source_dir() / '../../../../../yaml',
         'org/open_power/Common/Callout',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/org/open_power/Common/meson.build b/gen/org/open_power/Common/meson.build
index c50edd7..6626a09 100644
--- a/gen/org/open_power/Common/meson.build
+++ b/gen/org/open_power/Common/meson.build
@@ -1,6 +1,9 @@
 # Generated file; do not modify.
 subdir('Callout')
-generated_others += custom_target(
+
+sdbusplus_current_path = 'org/open_power/Common'
+
+generated_markdown += custom_target(
     'org/open_power/Common/Callout__markdown'.underscorify(),
     input: [ '../../../../yaml/org/open_power/Common/Callout.errors.yaml',  ],
     output: [ 'Callout.md' ],
@@ -12,5 +15,8 @@
         '--directory', meson.current_source_dir() / '../../../../yaml',
         'org/open_power/Common/Callout',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
diff --git a/gen/org/open_power/Control/Host/meson.build b/gen/org/open_power/Control/Host/meson.build
index 78cd665..ece1221 100644
--- a/gen/org/open_power/Control/Host/meson.build
+++ b/gen/org/open_power/Control/Host/meson.build
@@ -1,8 +1,19 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'org/open_power/Control/Host'
+
 generated_sources += custom_target(
     'org/open_power/Control/Host__cpp'.underscorify(),
-    input: [ '../../../../../yaml/org/open_power/Control/Host.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
+    input: [
+        '../../../../../yaml/org/open_power/Control/Host.interface.yaml',
+    ],
+    output: [
+        'common.hpp',
+        'server.hpp',
+        'server.cpp',
+        'aserver.hpp',
+        'client.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +22,14 @@
         '--directory', meson.current_source_dir() / '../../../../../yaml',
         'org/open_power/Control/Host',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/org/open_power/Control/TPM/SecurityKeys/meson.build b/gen/org/open_power/Control/TPM/SecurityKeys/meson.build
index d89fa71..65f45e2 100644
--- a/gen/org/open_power/Control/TPM/SecurityKeys/meson.build
+++ b/gen/org/open_power/Control/TPM/SecurityKeys/meson.build
@@ -1,8 +1,19 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'org/open_power/Control/TPM/SecurityKeys'
+
 generated_sources += custom_target(
     'org/open_power/Control/TPM/SecurityKeys__cpp'.underscorify(),
-    input: [ '../../../../../../yaml/org/open_power/Control/TPM/SecurityKeys.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
+    input: [
+        '../../../../../../yaml/org/open_power/Control/TPM/SecurityKeys.interface.yaml',
+    ],
+    output: [
+        'common.hpp',
+        'server.hpp',
+        'server.cpp',
+        'aserver.hpp',
+        'client.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +22,14 @@
         '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'org/open_power/Control/TPM/SecurityKeys',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/org/open_power/Control/TPM/meson.build b/gen/org/open_power/Control/TPM/meson.build
index c5b3c6b..093ce18 100644
--- a/gen/org/open_power/Control/TPM/meson.build
+++ b/gen/org/open_power/Control/TPM/meson.build
@@ -1,6 +1,9 @@
 # Generated file; do not modify.
 subdir('SecurityKeys')
-generated_others += custom_target(
+
+sdbusplus_current_path = 'org/open_power/Control/TPM'
+
+generated_markdown += custom_target(
     'org/open_power/Control/TPM/SecurityKeys__markdown'.underscorify(),
     input: [ '../../../../../yaml/org/open_power/Control/TPM/SecurityKeys.interface.yaml',  ],
     output: [ 'SecurityKeys.md' ],
@@ -12,5 +15,8 @@
         '--directory', meson.current_source_dir() / '../../../../../yaml',
         'org/open_power/Control/TPM/SecurityKeys',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
diff --git a/gen/org/open_power/Control/meson.build b/gen/org/open_power/Control/meson.build
index 358e023..13b72c2 100644
--- a/gen/org/open_power/Control/meson.build
+++ b/gen/org/open_power/Control/meson.build
@@ -1,6 +1,10 @@
 # Generated file; do not modify.
 subdir('Host')
-generated_others += custom_target(
+subdir('TPM')
+
+sdbusplus_current_path = 'org/open_power/Control'
+
+generated_markdown += custom_target(
     'org/open_power/Control/Host__markdown'.underscorify(),
     input: [ '../../../../yaml/org/open_power/Control/Host.interface.yaml',  ],
     output: [ 'Host.md' ],
@@ -12,6 +16,8 @@
         '--directory', meson.current_source_dir() / '../../../../yaml',
         'org/open_power/Control/Host',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
-subdir('TPM')
diff --git a/gen/org/open_power/Host/Access/meson.build b/gen/org/open_power/Host/Access/meson.build
index e925d64..6a06209 100644
--- a/gen/org/open_power/Host/Access/meson.build
+++ b/gen/org/open_power/Host/Access/meson.build
@@ -1,8 +1,16 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'org/open_power/Host/Access'
+
 generated_sources += custom_target(
     'org/open_power/Host/Access__cpp'.underscorify(),
-    input: [ '../../../../../yaml/org/open_power/Host/Access.errors.yaml',  ],
-    output: [ 'error.cpp', 'error.hpp',  ],
+    input: [
+        '../../../../../yaml/org/open_power/Host/Access.errors.yaml',
+    ],
+    output: [
+        'error.cpp',
+        'error.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +19,11 @@
         '--directory', meson.current_source_dir() / '../../../../../yaml',
         'org/open_power/Host/Access',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/org/open_power/Host/Boot/meson.build b/gen/org/open_power/Host/Boot/meson.build
index 6a86ba3..04ead34 100644
--- a/gen/org/open_power/Host/Boot/meson.build
+++ b/gen/org/open_power/Host/Boot/meson.build
@@ -1,8 +1,16 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'org/open_power/Host/Boot'
+
 generated_sources += custom_target(
     'org/open_power/Host/Boot__cpp'.underscorify(),
-    input: [ '../../../../../yaml/org/open_power/Host/Boot.errors.yaml',  ],
-    output: [ 'error.cpp', 'error.hpp',  ],
+    input: [
+        '../../../../../yaml/org/open_power/Host/Boot.errors.yaml',
+    ],
+    output: [
+        'error.cpp',
+        'error.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +19,11 @@
         '--directory', meson.current_source_dir() / '../../../../../yaml',
         'org/open_power/Host/Boot',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/org/open_power/Host/meson.build b/gen/org/open_power/Host/meson.build
index 7e7e890..1717493 100644
--- a/gen/org/open_power/Host/meson.build
+++ b/gen/org/open_power/Host/meson.build
@@ -1,8 +1,18 @@
 # Generated file; do not modify.
+subdir('Access')
+subdir('Boot')
+
+sdbusplus_current_path = 'org/open_power/Host'
+
 generated_sources += custom_target(
     'org/open_power/Host__cpp'.underscorify(),
-    input: [ '../../../../yaml/org/open_power/Host.errors.yaml',  ],
-    output: [ 'error.cpp', 'error.hpp',  ],
+    input: [
+        '../../../../yaml/org/open_power/Host.errors.yaml',
+    ],
+    output: [
+        'error.cpp',
+        'error.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,10 +21,15 @@
         '--directory', meson.current_source_dir() / '../../../../yaml',
         'org/open_power/Host',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
-subdir('Access')
-generated_others += custom_target(
+generated_markdown += custom_target(
     'org/open_power/Host/Access__markdown'.underscorify(),
     input: [ '../../../../yaml/org/open_power/Host/Access.errors.yaml',  ],
     output: [ 'Access.md' ],
@@ -26,10 +41,12 @@
         '--directory', meson.current_source_dir() / '../../../../yaml',
         'org/open_power/Host/Access',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
-subdir('Boot')
-generated_others += custom_target(
+generated_markdown += custom_target(
     'org/open_power/Host/Boot__markdown'.underscorify(),
     input: [ '../../../../yaml/org/open_power/Host/Boot.errors.yaml',  ],
     output: [ 'Boot.md' ],
@@ -41,5 +58,8 @@
         '--directory', meson.current_source_dir() / '../../../../yaml',
         'org/open_power/Host/Boot',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
diff --git a/gen/org/open_power/Inventory/Decorator/Asset/meson.build b/gen/org/open_power/Inventory/Decorator/Asset/meson.build
index d06917b..d960cbf 100644
--- a/gen/org/open_power/Inventory/Decorator/Asset/meson.build
+++ b/gen/org/open_power/Inventory/Decorator/Asset/meson.build
@@ -1,8 +1,19 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'org/open_power/Inventory/Decorator/Asset'
+
 generated_sources += custom_target(
     'org/open_power/Inventory/Decorator/Asset__cpp'.underscorify(),
-    input: [ '../../../../../../yaml/org/open_power/Inventory/Decorator/Asset.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
+    input: [
+        '../../../../../../yaml/org/open_power/Inventory/Decorator/Asset.interface.yaml',
+    ],
+    output: [
+        'common.hpp',
+        'server.hpp',
+        'server.cpp',
+        'aserver.hpp',
+        'client.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +22,14 @@
         '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'org/open_power/Inventory/Decorator/Asset',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/org/open_power/Inventory/Decorator/meson.build b/gen/org/open_power/Inventory/Decorator/meson.build
index 5eaeaf5..509c85d 100644
--- a/gen/org/open_power/Inventory/Decorator/meson.build
+++ b/gen/org/open_power/Inventory/Decorator/meson.build
@@ -1,6 +1,9 @@
 # Generated file; do not modify.
 subdir('Asset')
-generated_others += custom_target(
+
+sdbusplus_current_path = 'org/open_power/Inventory/Decorator'
+
+generated_markdown += custom_target(
     'org/open_power/Inventory/Decorator/Asset__markdown'.underscorify(),
     input: [ '../../../../../yaml/org/open_power/Inventory/Decorator/Asset.interface.yaml',  ],
     output: [ 'Asset.md' ],
@@ -12,5 +15,8 @@
         '--directory', meson.current_source_dir() / '../../../../../yaml',
         'org/open_power/Inventory/Decorator/Asset',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
diff --git a/gen/org/open_power/Logging/PEL/Entry/meson.build b/gen/org/open_power/Logging/PEL/Entry/meson.build
index 843b5ca..b341640 100644
--- a/gen/org/open_power/Logging/PEL/Entry/meson.build
+++ b/gen/org/open_power/Logging/PEL/Entry/meson.build
@@ -1,8 +1,19 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'org/open_power/Logging/PEL/Entry'
+
 generated_sources += custom_target(
     'org/open_power/Logging/PEL/Entry__cpp'.underscorify(),
-    input: [ '../../../../../../yaml/org/open_power/Logging/PEL/Entry.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
+    input: [
+        '../../../../../../yaml/org/open_power/Logging/PEL/Entry.interface.yaml',
+    ],
+    output: [
+        'common.hpp',
+        'server.hpp',
+        'server.cpp',
+        'aserver.hpp',
+        'client.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +22,14 @@
         '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'org/open_power/Logging/PEL/Entry',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/org/open_power/Logging/PEL/meson.build b/gen/org/open_power/Logging/PEL/meson.build
index ea1a60e..f505838 100644
--- a/gen/org/open_power/Logging/PEL/meson.build
+++ b/gen/org/open_power/Logging/PEL/meson.build
@@ -1,8 +1,20 @@
 # Generated file; do not modify.
+subdir('Entry')
+
+sdbusplus_current_path = 'org/open_power/Logging/PEL'
+
 generated_sources += custom_target(
     'org/open_power/Logging/PEL__cpp'.underscorify(),
-    input: [ '../../../../../yaml/org/open_power/Logging/PEL.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
+    input: [
+        '../../../../../yaml/org/open_power/Logging/PEL.interface.yaml',
+    ],
+    output: [
+        'common.hpp',
+        'server.hpp',
+        'server.cpp',
+        'aserver.hpp',
+        'client.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,10 +23,18 @@
         '--directory', meson.current_source_dir() / '../../../../../yaml',
         'org/open_power/Logging/PEL',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
-subdir('Entry')
-generated_others += custom_target(
+generated_markdown += custom_target(
     'org/open_power/Logging/PEL/Entry__markdown'.underscorify(),
     input: [ '../../../../../yaml/org/open_power/Logging/PEL/Entry.interface.yaml',  ],
     output: [ 'Entry.md' ],
@@ -26,5 +46,8 @@
         '--directory', meson.current_source_dir() / '../../../../../yaml',
         'org/open_power/Logging/PEL/Entry',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
diff --git a/gen/org/open_power/Logging/meson.build b/gen/org/open_power/Logging/meson.build
index 63f4c55..0c8be45 100644
--- a/gen/org/open_power/Logging/meson.build
+++ b/gen/org/open_power/Logging/meson.build
@@ -1,6 +1,9 @@
 # Generated file; do not modify.
 subdir('PEL')
-generated_others += custom_target(
+
+sdbusplus_current_path = 'org/open_power/Logging'
+
+generated_markdown += custom_target(
     'org/open_power/Logging/PEL__markdown'.underscorify(),
     input: [ '../../../../yaml/org/open_power/Logging/PEL.interface.yaml',  ],
     output: [ 'PEL.md' ],
@@ -12,5 +15,8 @@
         '--directory', meson.current_source_dir() / '../../../../yaml',
         'org/open_power/Logging/PEL',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
diff --git a/gen/org/open_power/OCC/Device/meson.build b/gen/org/open_power/OCC/Device/meson.build
index 84af1ab..b9a8d62 100644
--- a/gen/org/open_power/OCC/Device/meson.build
+++ b/gen/org/open_power/OCC/Device/meson.build
@@ -1,8 +1,16 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'org/open_power/OCC/Device'
+
 generated_sources += custom_target(
     'org/open_power/OCC/Device__cpp'.underscorify(),
-    input: [ '../../../../../yaml/org/open_power/OCC/Device.errors.yaml',  ],
-    output: [ 'error.cpp', 'error.hpp',  ],
+    input: [
+        '../../../../../yaml/org/open_power/OCC/Device.errors.yaml',
+    ],
+    output: [
+        'error.cpp',
+        'error.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +19,11 @@
         '--directory', meson.current_source_dir() / '../../../../../yaml',
         'org/open_power/OCC/Device',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/org/open_power/OCC/PassThrough/meson.build b/gen/org/open_power/OCC/PassThrough/meson.build
index fee9fb3..3d11120 100644
--- a/gen/org/open_power/OCC/PassThrough/meson.build
+++ b/gen/org/open_power/OCC/PassThrough/meson.build
@@ -1,8 +1,19 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'org/open_power/OCC/PassThrough'
+
 generated_sources += custom_target(
     'org/open_power/OCC/PassThrough__cpp'.underscorify(),
-    input: [ '../../../../../yaml/org/open_power/OCC/PassThrough.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
+    input: [
+        '../../../../../yaml/org/open_power/OCC/PassThrough.interface.yaml',
+    ],
+    output: [
+        'common.hpp',
+        'server.hpp',
+        'server.cpp',
+        'aserver.hpp',
+        'client.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +22,14 @@
         '--directory', meson.current_source_dir() / '../../../../../yaml',
         'org/open_power/OCC/PassThrough',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/org/open_power/OCC/Status/meson.build b/gen/org/open_power/OCC/Status/meson.build
index bf03294..2aaf9d7 100644
--- a/gen/org/open_power/OCC/Status/meson.build
+++ b/gen/org/open_power/OCC/Status/meson.build
@@ -1,8 +1,19 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'org/open_power/OCC/Status'
+
 generated_sources += custom_target(
     'org/open_power/OCC/Status__cpp'.underscorify(),
-    input: [ '../../../../../yaml/org/open_power/OCC/Status.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
+    input: [
+        '../../../../../yaml/org/open_power/OCC/Status.interface.yaml',
+    ],
+    output: [
+        'common.hpp',
+        'server.hpp',
+        'server.cpp',
+        'aserver.hpp',
+        'client.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +22,14 @@
         '--directory', meson.current_source_dir() / '../../../../../yaml',
         'org/open_power/OCC/Status',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/org/open_power/OCC/meson.build b/gen/org/open_power/OCC/meson.build
index 6c00760..62dfb74 100644
--- a/gen/org/open_power/OCC/meson.build
+++ b/gen/org/open_power/OCC/meson.build
@@ -1,6 +1,11 @@
 # Generated file; do not modify.
 subdir('Device')
-generated_others += custom_target(
+subdir('PassThrough')
+subdir('Status')
+
+sdbusplus_current_path = 'org/open_power/OCC'
+
+generated_markdown += custom_target(
     'org/open_power/OCC/Device__markdown'.underscorify(),
     input: [ '../../../../yaml/org/open_power/OCC/Device.errors.yaml',  ],
     output: [ 'Device.md' ],
@@ -12,10 +17,12 @@
         '--directory', meson.current_source_dir() / '../../../../yaml',
         'org/open_power/OCC/Device',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
-subdir('PassThrough')
-generated_others += custom_target(
+generated_markdown += custom_target(
     'org/open_power/OCC/PassThrough__markdown'.underscorify(),
     input: [ '../../../../yaml/org/open_power/OCC/PassThrough.interface.yaml',  ],
     output: [ 'PassThrough.md' ],
@@ -27,10 +34,12 @@
         '--directory', meson.current_source_dir() / '../../../../yaml',
         'org/open_power/OCC/PassThrough',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
-subdir('Status')
-generated_others += custom_target(
+generated_markdown += custom_target(
     'org/open_power/OCC/Status__markdown'.underscorify(),
     input: [ '../../../../yaml/org/open_power/OCC/Status.interface.yaml',  ],
     output: [ 'Status.md' ],
@@ -42,5 +51,8 @@
         '--directory', meson.current_source_dir() / '../../../../yaml',
         'org/open_power/OCC/Status',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
diff --git a/gen/org/open_power/Proc/FSI/meson.build b/gen/org/open_power/Proc/FSI/meson.build
index 562bdce..59a0f9b 100644
--- a/gen/org/open_power/Proc/FSI/meson.build
+++ b/gen/org/open_power/Proc/FSI/meson.build
@@ -1,8 +1,16 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'org/open_power/Proc/FSI'
+
 generated_sources += custom_target(
     'org/open_power/Proc/FSI__cpp'.underscorify(),
-    input: [ '../../../../../yaml/org/open_power/Proc/FSI.errors.yaml',  ],
-    output: [ 'error.cpp', 'error.hpp',  ],
+    input: [
+        '../../../../../yaml/org/open_power/Proc/FSI.errors.yaml',
+    ],
+    output: [
+        'error.cpp',
+        'error.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +19,11 @@
         '--directory', meson.current_source_dir() / '../../../../../yaml',
         'org/open_power/Proc/FSI',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/org/open_power/Proc/meson.build b/gen/org/open_power/Proc/meson.build
index 2a4707e..90ad4a3 100644
--- a/gen/org/open_power/Proc/meson.build
+++ b/gen/org/open_power/Proc/meson.build
@@ -1,6 +1,9 @@
 # Generated file; do not modify.
 subdir('FSI')
-generated_others += custom_target(
+
+sdbusplus_current_path = 'org/open_power/Proc'
+
+generated_markdown += custom_target(
     'org/open_power/Proc/FSI__markdown'.underscorify(),
     input: [ '../../../../yaml/org/open_power/Proc/FSI.errors.yaml',  ],
     output: [ 'FSI.md' ],
@@ -12,5 +15,8 @@
         '--directory', meson.current_source_dir() / '../../../../yaml',
         'org/open_power/Proc/FSI',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
diff --git a/gen/org/open_power/Sensor/Aggregation/History/Average/meson.build b/gen/org/open_power/Sensor/Aggregation/History/Average/meson.build
index 08c3538..7864250 100644
--- a/gen/org/open_power/Sensor/Aggregation/History/Average/meson.build
+++ b/gen/org/open_power/Sensor/Aggregation/History/Average/meson.build
@@ -1,8 +1,19 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'org/open_power/Sensor/Aggregation/History/Average'
+
 generated_sources += custom_target(
     'org/open_power/Sensor/Aggregation/History/Average__cpp'.underscorify(),
-    input: [ '../../../../../../../yaml/org/open_power/Sensor/Aggregation/History/Average.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
+    input: [
+        '../../../../../../../yaml/org/open_power/Sensor/Aggregation/History/Average.interface.yaml',
+    ],
+    output: [
+        'common.hpp',
+        'server.hpp',
+        'server.cpp',
+        'aserver.hpp',
+        'client.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +22,14 @@
         '--directory', meson.current_source_dir() / '../../../../../../../yaml',
         'org/open_power/Sensor/Aggregation/History/Average',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/org/open_power/Sensor/Aggregation/History/Maximum/meson.build b/gen/org/open_power/Sensor/Aggregation/History/Maximum/meson.build
index eab95f6..e34abdb 100644
--- a/gen/org/open_power/Sensor/Aggregation/History/Maximum/meson.build
+++ b/gen/org/open_power/Sensor/Aggregation/History/Maximum/meson.build
@@ -1,8 +1,19 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'org/open_power/Sensor/Aggregation/History/Maximum'
+
 generated_sources += custom_target(
     'org/open_power/Sensor/Aggregation/History/Maximum__cpp'.underscorify(),
-    input: [ '../../../../../../../yaml/org/open_power/Sensor/Aggregation/History/Maximum.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
+    input: [
+        '../../../../../../../yaml/org/open_power/Sensor/Aggregation/History/Maximum.interface.yaml',
+    ],
+    output: [
+        'common.hpp',
+        'server.hpp',
+        'server.cpp',
+        'aserver.hpp',
+        'client.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +22,14 @@
         '--directory', meson.current_source_dir() / '../../../../../../../yaml',
         'org/open_power/Sensor/Aggregation/History/Maximum',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/org/open_power/Sensor/Aggregation/History/meson.build b/gen/org/open_power/Sensor/Aggregation/History/meson.build
index 12992a5..4c799a4 100644
--- a/gen/org/open_power/Sensor/Aggregation/History/meson.build
+++ b/gen/org/open_power/Sensor/Aggregation/History/meson.build
@@ -1,6 +1,10 @@
 # Generated file; do not modify.
 subdir('Average')
-generated_others += custom_target(
+subdir('Maximum')
+
+sdbusplus_current_path = 'org/open_power/Sensor/Aggregation/History'
+
+generated_markdown += custom_target(
     'org/open_power/Sensor/Aggregation/History/Average__markdown'.underscorify(),
     input: [ '../../../../../../yaml/org/open_power/Sensor/Aggregation/History/Average.interface.yaml',  ],
     output: [ 'Average.md' ],
@@ -12,10 +16,12 @@
         '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'org/open_power/Sensor/Aggregation/History/Average',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
-subdir('Maximum')
-generated_others += custom_target(
+generated_markdown += custom_target(
     'org/open_power/Sensor/Aggregation/History/Maximum__markdown'.underscorify(),
     input: [ '../../../../../../yaml/org/open_power/Sensor/Aggregation/History/Maximum.interface.yaml',  ],
     output: [ 'Maximum.md' ],
@@ -27,5 +33,8 @@
         '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'org/open_power/Sensor/Aggregation/History/Maximum',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
diff --git a/gen/org/open_power/meson.build b/gen/org/open_power/meson.build
index b24f5ea..84bf1e8 100644
--- a/gen/org/open_power/meson.build
+++ b/gen/org/open_power/meson.build
@@ -2,7 +2,15 @@
 subdir('Common')
 subdir('Control')
 subdir('Host')
-generated_others += custom_target(
+subdir('Inventory')
+subdir('Logging')
+subdir('OCC')
+subdir('Proc')
+subdir('Sensor')
+
+sdbusplus_current_path = 'org/open_power'
+
+generated_markdown += custom_target(
     'org/open_power/Host__markdown'.underscorify(),
     input: [ '../../../yaml/org/open_power/Host.errors.yaml',  ],
     output: [ 'Host.md' ],
@@ -14,10 +22,8 @@
         '--directory', meson.current_source_dir() / '../../../yaml',
         'org/open_power/Host',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
-subdir('Inventory')
-subdir('Logging')
-subdir('OCC')
-subdir('Proc')
-subdir('Sensor')