diff --git a/gen/org/freedesktop/UPower/Device/meson.build b/gen/org/freedesktop/UPower/Device/meson.build
index 49ffb89..89bb213 100644
--- a/gen/org/freedesktop/UPower/Device/meson.build
+++ b/gen/org/freedesktop/UPower/Device/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'org/freedesktop/UPower/Device__cpp'.underscorify(),
     input: [ '../../../../../yaml/org/freedesktop/UPower/Device.interface.yaml',  ],
-    output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/org/open_power/Control/Host/meson.build b/gen/org/open_power/Control/Host/meson.build
index 17e1ec5..1fc1e6b 100644
--- a/gen/org/open_power/Control/Host/meson.build
+++ b/gen/org/open_power/Control/Host/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'org/open_power/Control/Host__cpp'.underscorify(),
     input: [ '../../../../../yaml/org/open_power/Control/Host.interface.yaml',  ],
-    output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/org/open_power/Control/TPM/SecurityKeys/meson.build b/gen/org/open_power/Control/TPM/SecurityKeys/meson.build
index 0fc15db..1b36bda 100644
--- a/gen/org/open_power/Control/TPM/SecurityKeys/meson.build
+++ b/gen/org/open_power/Control/TPM/SecurityKeys/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'org/open_power/Control/TPM/SecurityKeys__cpp'.underscorify(),
     input: [ '../../../../../../yaml/org/open_power/Control/TPM/SecurityKeys.interface.yaml',  ],
-    output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/org/open_power/Inventory/Decorator/Asset/meson.build b/gen/org/open_power/Inventory/Decorator/Asset/meson.build
index 6c9d1cf..7d7a09e 100644
--- a/gen/org/open_power/Inventory/Decorator/Asset/meson.build
+++ b/gen/org/open_power/Inventory/Decorator/Asset/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'org/open_power/Inventory/Decorator/Asset__cpp'.underscorify(),
     input: [ '../../../../../../yaml/org/open_power/Inventory/Decorator/Asset.interface.yaml',  ],
-    output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/org/open_power/Logging/PEL/Entry/meson.build b/gen/org/open_power/Logging/PEL/Entry/meson.build
index 6df4842..b6d6abe 100644
--- a/gen/org/open_power/Logging/PEL/Entry/meson.build
+++ b/gen/org/open_power/Logging/PEL/Entry/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'org/open_power/Logging/PEL/Entry__cpp'.underscorify(),
     input: [ '../../../../../../yaml/org/open_power/Logging/PEL/Entry.interface.yaml',  ],
-    output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/org/open_power/Logging/PEL/meson.build b/gen/org/open_power/Logging/PEL/meson.build
index 9edd7d1..1ce6c21 100644
--- a/gen/org/open_power/Logging/PEL/meson.build
+++ b/gen/org/open_power/Logging/PEL/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'org/open_power/Logging/PEL__cpp'.underscorify(),
     input: [ '../../../../../yaml/org/open_power/Logging/PEL.interface.yaml',  ],
-    output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/org/open_power/OCC/PassThrough/meson.build b/gen/org/open_power/OCC/PassThrough/meson.build
index 3c22e15..77f5d62 100644
--- a/gen/org/open_power/OCC/PassThrough/meson.build
+++ b/gen/org/open_power/OCC/PassThrough/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'org/open_power/OCC/PassThrough__cpp'.underscorify(),
     input: [ '../../../../../yaml/org/open_power/OCC/PassThrough.interface.yaml',  ],
-    output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/org/open_power/OCC/Status/meson.build b/gen/org/open_power/OCC/Status/meson.build
index 3b9c23b..3b982ca 100644
--- a/gen/org/open_power/OCC/Status/meson.build
+++ b/gen/org/open_power/OCC/Status/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'org/open_power/OCC/Status__cpp'.underscorify(),
     input: [ '../../../../../yaml/org/open_power/OCC/Status.interface.yaml',  ],
-    output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
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 dc331f1..a398332 100644
--- a/gen/org/open_power/Sensor/Aggregation/History/Average/meson.build
+++ b/gen/org/open_power/Sensor/Aggregation/History/Average/meson.build
@@ -2,7 +2,7 @@
 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: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', '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 c40e83d..4e17abc 100644
--- a/gen/org/open_power/Sensor/Aggregation/History/Maximum/meson.build
+++ b/gen/org/open_power/Sensor/Aggregation/History/Maximum/meson.build
@@ -2,7 +2,7 @@
 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: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',