diff --git a/gen/com/google/gbmc/Hoth/meson.build b/gen/com/google/gbmc/Hoth/meson.build
index 7fc6c8b..b95da64 100644
--- a/gen/com/google/gbmc/Hoth/meson.build
+++ b/gen/com/google/gbmc/Hoth/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/google/gbmc/Hoth__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/google/gbmc/Hoth.interface.yaml',  ],
-    output: [ 'error.cpp', 'error.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'error.cpp', 'error.hpp', 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/com/ibm/Dump/Create/meson.build b/gen/com/ibm/Dump/Create/meson.build
index f9b138d..16d6677 100644
--- a/gen/com/ibm/Dump/Create/meson.build
+++ b/gen/com/ibm/Dump/Create/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/Dump/Create__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/Dump/Create.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/com/ibm/Dump/Entry/Hardware/meson.build b/gen/com/ibm/Dump/Entry/Hardware/meson.build
index b998c91..e0685e2 100644
--- a/gen/com/ibm/Dump/Entry/Hardware/meson.build
+++ b/gen/com/ibm/Dump/Entry/Hardware/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/Dump/Entry/Hardware__cpp'.underscorify(),
     input: [ '../../../../../../yaml/com/ibm/Dump/Entry/Hardware.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/com/ibm/Dump/Entry/Hostboot/meson.build b/gen/com/ibm/Dump/Entry/Hostboot/meson.build
index c7cccf1..1d8a4c1 100644
--- a/gen/com/ibm/Dump/Entry/Hostboot/meson.build
+++ b/gen/com/ibm/Dump/Entry/Hostboot/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/Dump/Entry/Hostboot__cpp'.underscorify(),
     input: [ '../../../../../../yaml/com/ibm/Dump/Entry/Hostboot.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/com/ibm/Dump/Entry/Resource/meson.build b/gen/com/ibm/Dump/Entry/Resource/meson.build
index 806bcaa..97bcc62 100644
--- a/gen/com/ibm/Dump/Entry/Resource/meson.build
+++ b/gen/com/ibm/Dump/Entry/Resource/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/Dump/Entry/Resource__cpp'.underscorify(),
     input: [ '../../../../../../yaml/com/ibm/Dump/Entry/Resource.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/com/ibm/Logging/Policy/meson.build b/gen/com/ibm/Logging/Policy/meson.build
index f34fdfe..fd4c6c3 100644
--- a/gen/com/ibm/Logging/Policy/meson.build
+++ b/gen/com/ibm/Logging/Policy/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/Logging/Policy__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/Logging/Policy.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/com/ibm/VPD/Manager/meson.build b/gen/com/ibm/VPD/Manager/meson.build
index 7f13943..10abff4 100644
--- a/gen/com/ibm/VPD/Manager/meson.build
+++ b/gen/com/ibm/VPD/Manager/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/VPD/Manager__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/VPD/Manager.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/com/ibm/ipzvpd/CP00/meson.build b/gen/com/ibm/ipzvpd/CP00/meson.build
index 1493642..cf99bcd 100644
--- a/gen/com/ibm/ipzvpd/CP00/meson.build
+++ b/gen/com/ibm/ipzvpd/CP00/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/CP00__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/CP00.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/com/ibm/ipzvpd/CRP0/meson.build b/gen/com/ibm/ipzvpd/CRP0/meson.build
index d202e5a..99ffcd5 100644
--- a/gen/com/ibm/ipzvpd/CRP0/meson.build
+++ b/gen/com/ibm/ipzvpd/CRP0/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/CRP0__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/CRP0.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/com/ibm/ipzvpd/DINF/meson.build b/gen/com/ibm/ipzvpd/DINF/meson.build
index 23f9467..355300a 100644
--- a/gen/com/ibm/ipzvpd/DINF/meson.build
+++ b/gen/com/ibm/ipzvpd/DINF/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/DINF__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/DINF.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/com/ibm/ipzvpd/LRP0/meson.build b/gen/com/ibm/ipzvpd/LRP0/meson.build
index 724f88f..6251119 100644
--- a/gen/com/ibm/ipzvpd/LRP0/meson.build
+++ b/gen/com/ibm/ipzvpd/LRP0/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LRP0__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/LRP0.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/com/ibm/ipzvpd/LRP1/meson.build b/gen/com/ibm/ipzvpd/LRP1/meson.build
index b476efb..0055b78 100644
--- a/gen/com/ibm/ipzvpd/LRP1/meson.build
+++ b/gen/com/ibm/ipzvpd/LRP1/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LRP1__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/LRP1.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/com/ibm/ipzvpd/LRP2/meson.build b/gen/com/ibm/ipzvpd/LRP2/meson.build
index fb70e1a..d0f68d0 100644
--- a/gen/com/ibm/ipzvpd/LRP2/meson.build
+++ b/gen/com/ibm/ipzvpd/LRP2/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LRP2__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/LRP2.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/com/ibm/ipzvpd/LRP3/meson.build b/gen/com/ibm/ipzvpd/LRP3/meson.build
index eda53d2..fa4fb66 100644
--- a/gen/com/ibm/ipzvpd/LRP3/meson.build
+++ b/gen/com/ibm/ipzvpd/LRP3/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LRP3__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/LRP3.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/com/ibm/ipzvpd/LRP4/meson.build b/gen/com/ibm/ipzvpd/LRP4/meson.build
index 2da9713..45c5026 100644
--- a/gen/com/ibm/ipzvpd/LRP4/meson.build
+++ b/gen/com/ibm/ipzvpd/LRP4/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LRP4__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/LRP4.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/com/ibm/ipzvpd/LRP5/meson.build b/gen/com/ibm/ipzvpd/LRP5/meson.build
index a9f3130..1692403 100644
--- a/gen/com/ibm/ipzvpd/LRP5/meson.build
+++ b/gen/com/ibm/ipzvpd/LRP5/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LRP5__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/LRP5.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/com/ibm/ipzvpd/LRP6/meson.build b/gen/com/ibm/ipzvpd/LRP6/meson.build
index b6f2133..802d022 100644
--- a/gen/com/ibm/ipzvpd/LRP6/meson.build
+++ b/gen/com/ibm/ipzvpd/LRP6/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LRP6__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/LRP6.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/com/ibm/ipzvpd/LRP7/meson.build b/gen/com/ibm/ipzvpd/LRP7/meson.build
index 04ab038..6d1ec5a 100644
--- a/gen/com/ibm/ipzvpd/LRP7/meson.build
+++ b/gen/com/ibm/ipzvpd/LRP7/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LRP7__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/LRP7.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/com/ibm/ipzvpd/LWP0/meson.build b/gen/com/ibm/ipzvpd/LWP0/meson.build
index 2f8d850..874ea3f 100644
--- a/gen/com/ibm/ipzvpd/LWP0/meson.build
+++ b/gen/com/ibm/ipzvpd/LWP0/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LWP0__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/LWP0.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/com/ibm/ipzvpd/LWP1/meson.build b/gen/com/ibm/ipzvpd/LWP1/meson.build
index 972548a..0a7582f 100644
--- a/gen/com/ibm/ipzvpd/LWP1/meson.build
+++ b/gen/com/ibm/ipzvpd/LWP1/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LWP1__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/LWP1.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/com/ibm/ipzvpd/LWP2/meson.build b/gen/com/ibm/ipzvpd/LWP2/meson.build
index 3fa6016..4649a08 100644
--- a/gen/com/ibm/ipzvpd/LWP2/meson.build
+++ b/gen/com/ibm/ipzvpd/LWP2/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LWP2__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/LWP2.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/com/ibm/ipzvpd/LWP3/meson.build b/gen/com/ibm/ipzvpd/LWP3/meson.build
index 73e627d..2c4eb3d 100644
--- a/gen/com/ibm/ipzvpd/LWP3/meson.build
+++ b/gen/com/ibm/ipzvpd/LWP3/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LWP3__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/LWP3.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/com/ibm/ipzvpd/LWP4/meson.build b/gen/com/ibm/ipzvpd/LWP4/meson.build
index ee6754b..0b04941 100644
--- a/gen/com/ibm/ipzvpd/LWP4/meson.build
+++ b/gen/com/ibm/ipzvpd/LWP4/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LWP4__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/LWP4.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/com/ibm/ipzvpd/LWP5/meson.build b/gen/com/ibm/ipzvpd/LWP5/meson.build
index e926ba0..be2d7c3 100644
--- a/gen/com/ibm/ipzvpd/LWP5/meson.build
+++ b/gen/com/ibm/ipzvpd/LWP5/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LWP5__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/LWP5.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/com/ibm/ipzvpd/LWP6/meson.build b/gen/com/ibm/ipzvpd/LWP6/meson.build
index b0defd8..e05e03d 100644
--- a/gen/com/ibm/ipzvpd/LWP6/meson.build
+++ b/gen/com/ibm/ipzvpd/LWP6/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LWP6__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/LWP6.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/com/ibm/ipzvpd/LWP7/meson.build b/gen/com/ibm/ipzvpd/LWP7/meson.build
index eef39ba..260d4d4 100644
--- a/gen/com/ibm/ipzvpd/LWP7/meson.build
+++ b/gen/com/ibm/ipzvpd/LWP7/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LWP7__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/LWP7.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/com/ibm/ipzvpd/LXR0/meson.build b/gen/com/ibm/ipzvpd/LXR0/meson.build
index c102c04..891fa2c 100644
--- a/gen/com/ibm/ipzvpd/LXR0/meson.build
+++ b/gen/com/ibm/ipzvpd/LXR0/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LXR0__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/LXR0.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/com/ibm/ipzvpd/Location/meson.build b/gen/com/ibm/ipzvpd/Location/meson.build
index f5e824e..d0efb27 100644
--- a/gen/com/ibm/ipzvpd/Location/meson.build
+++ b/gen/com/ibm/ipzvpd/Location/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/Location__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/Location.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/com/ibm/ipzvpd/MER0/meson.build b/gen/com/ibm/ipzvpd/MER0/meson.build
index 47a46c1..be9fd71 100644
--- a/gen/com/ibm/ipzvpd/MER0/meson.build
+++ b/gen/com/ibm/ipzvpd/MER0/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/MER0__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/MER0.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/com/ibm/ipzvpd/PSPD/meson.build b/gen/com/ibm/ipzvpd/PSPD/meson.build
index 2ebfbd4..c846549 100644
--- a/gen/com/ibm/ipzvpd/PSPD/meson.build
+++ b/gen/com/ibm/ipzvpd/PSPD/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/PSPD__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/PSPD.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/com/ibm/ipzvpd/UTIL/meson.build b/gen/com/ibm/ipzvpd/UTIL/meson.build
index b7c3850..beef83a 100644
--- a/gen/com/ibm/ipzvpd/UTIL/meson.build
+++ b/gen/com/ibm/ipzvpd/UTIL/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/UTIL__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/UTIL.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/com/ibm/ipzvpd/VCEN/meson.build b/gen/com/ibm/ipzvpd/VCEN/meson.build
index 6d7d6f1..5af41fe 100644
--- a/gen/com/ibm/ipzvpd/VCEN/meson.build
+++ b/gen/com/ibm/ipzvpd/VCEN/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VCEN__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/VCEN.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/com/ibm/ipzvpd/VCFG/meson.build b/gen/com/ibm/ipzvpd/VCFG/meson.build
index a96a431..2cd2c44 100644
--- a/gen/com/ibm/ipzvpd/VCFG/meson.build
+++ b/gen/com/ibm/ipzvpd/VCFG/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VCFG__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/VCFG.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/com/ibm/ipzvpd/VEIR/meson.build b/gen/com/ibm/ipzvpd/VEIR/meson.build
index f2de7ff..068b551 100644
--- a/gen/com/ibm/ipzvpd/VEIR/meson.build
+++ b/gen/com/ibm/ipzvpd/VEIR/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VEIR__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/VEIR.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/com/ibm/ipzvpd/VER0/meson.build b/gen/com/ibm/ipzvpd/VER0/meson.build
index c55f96f..248fe35 100644
--- a/gen/com/ibm/ipzvpd/VER0/meson.build
+++ b/gen/com/ibm/ipzvpd/VER0/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VER0__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/VER0.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/com/ibm/ipzvpd/VINI/meson.build b/gen/com/ibm/ipzvpd/VINI/meson.build
index 803ba7b..79d2809 100644
--- a/gen/com/ibm/ipzvpd/VINI/meson.build
+++ b/gen/com/ibm/ipzvpd/VINI/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VINI__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/VINI.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/com/ibm/ipzvpd/VMPU/meson.build b/gen/com/ibm/ipzvpd/VMPU/meson.build
index f0bf6d2..3f170f1 100644
--- a/gen/com/ibm/ipzvpd/VMPU/meson.build
+++ b/gen/com/ibm/ipzvpd/VMPU/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VMPU__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/VMPU.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/com/ibm/ipzvpd/VMSC/meson.build b/gen/com/ibm/ipzvpd/VMSC/meson.build
index 1522d45..887cb52 100644
--- a/gen/com/ibm/ipzvpd/VMSC/meson.build
+++ b/gen/com/ibm/ipzvpd/VMSC/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VMSC__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/VMSC.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/com/ibm/ipzvpd/VPRI/meson.build b/gen/com/ibm/ipzvpd/VPRI/meson.build
index 7e7327a..dec49e2 100644
--- a/gen/com/ibm/ipzvpd/VPRI/meson.build
+++ b/gen/com/ibm/ipzvpd/VPRI/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VPRI__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/VPRI.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/com/ibm/ipzvpd/VR10/meson.build b/gen/com/ibm/ipzvpd/VR10/meson.build
index eda3f82..d98adeb 100644
--- a/gen/com/ibm/ipzvpd/VR10/meson.build
+++ b/gen/com/ibm/ipzvpd/VR10/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VR10__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/VR10.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/com/ibm/ipzvpd/VRML/meson.build b/gen/com/ibm/ipzvpd/VRML/meson.build
index dc3921d..5db7dc9 100644
--- a/gen/com/ibm/ipzvpd/VRML/meson.build
+++ b/gen/com/ibm/ipzvpd/VRML/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VRML__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/VRML.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/com/ibm/ipzvpd/VRTN/meson.build b/gen/com/ibm/ipzvpd/VRTN/meson.build
index 244aa0c..9b5473b 100644
--- a/gen/com/ibm/ipzvpd/VRTN/meson.build
+++ b/gen/com/ibm/ipzvpd/VRTN/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VRTN__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/VRTN.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/com/ibm/ipzvpd/VSBP/meson.build b/gen/com/ibm/ipzvpd/VSBP/meson.build
index a1165a0..db8b5ca 100644
--- a/gen/com/ibm/ipzvpd/VSBP/meson.build
+++ b/gen/com/ibm/ipzvpd/VSBP/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VSBP__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/VSBP.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/com/ibm/ipzvpd/VSRC/meson.build b/gen/com/ibm/ipzvpd/VSRC/meson.build
index 4a90410..962937e 100644
--- a/gen/com/ibm/ipzvpd/VSRC/meson.build
+++ b/gen/com/ibm/ipzvpd/VSRC/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VSRC__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/VSRC.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/com/ibm/ipzvpd/VSYS/meson.build b/gen/com/ibm/ipzvpd/VSYS/meson.build
index 2a60729..9415517 100644
--- a/gen/com/ibm/ipzvpd/VSYS/meson.build
+++ b/gen/com/ibm/ipzvpd/VSYS/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VSYS__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/VSYS.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/com/ibm/ipzvpd/VW10/meson.build b/gen/com/ibm/ipzvpd/VW10/meson.build
index 97b2ade..de752c1 100644
--- a/gen/com/ibm/ipzvpd/VW10/meson.build
+++ b/gen/com/ibm/ipzvpd/VW10/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VW10__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/VW10.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/com/ibm/ipzvpd/VWML/meson.build b/gen/com/ibm/ipzvpd/VWML/meson.build
index 81f6b82..fb9407b 100644
--- a/gen/com/ibm/ipzvpd/VWML/meson.build
+++ b/gen/com/ibm/ipzvpd/VWML/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VWML__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/ibm/ipzvpd/VWML.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/com/intel/Control/NMISource/meson.build b/gen/com/intel/Control/NMISource/meson.build
index 68f7c77..8c3a83c 100644
--- a/gen/com/intel/Control/NMISource/meson.build
+++ b/gen/com/intel/Control/NMISource/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/intel/Control/NMISource__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/intel/Control/NMISource.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/com/intel/Control/OCOTShutdownPolicy/meson.build b/gen/com/intel/Control/OCOTShutdownPolicy/meson.build
index ff50a9b..0ffcf67 100644
--- a/gen/com/intel/Control/OCOTShutdownPolicy/meson.build
+++ b/gen/com/intel/Control/OCOTShutdownPolicy/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/intel/Control/OCOTShutdownPolicy__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/intel/Control/OCOTShutdownPolicy.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/com/intel/Protocol/PECI/Raw/meson.build b/gen/com/intel/Protocol/PECI/Raw/meson.build
index 1d37091..3e1d4dd 100644
--- a/gen/com/intel/Protocol/PECI/Raw/meson.build
+++ b/gen/com/intel/Protocol/PECI/Raw/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/intel/Protocol/PECI/Raw__cpp'.underscorify(),
     input: [ '../../../../../../yaml/com/intel/Protocol/PECI/Raw.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/com/meta/Hardware/BMC/meson.build b/gen/com/meta/Hardware/BMC/meson.build
index b11b263..1d8d316 100644
--- a/gen/com/meta/Hardware/BMC/meson.build
+++ b/gen/com/meta/Hardware/BMC/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'com/meta/Hardware/BMC__cpp'.underscorify(),
     input: [ '../../../../../yaml/com/meta/Hardware/BMC.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/meson.build b/gen/meson.build
index a7da0a7..23394ac 100644
--- a/gen/meson.build
+++ b/gen/meson.build
@@ -5,10 +5,10 @@
     check: true,
 ).stdout().strip().split('\n')[0]
 
-if sdbuspp_gen_meson_ver != 'sdbus++-gen-meson version 5'
+if sdbuspp_gen_meson_ver != 'sdbus++-gen-meson version 6'
     warning('Generated meson files from wrong version of sdbus++-gen-meson.')
     warning(
-        'Expected "sdbus++-gen-meson version 5", got:',
+        'Expected "sdbus++-gen-meson version 6", got:',
         sdbuspp_gen_meson_ver
     )
 endif
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',
diff --git a/gen/xyz/openbmc_project/Association/Definitions/meson.build b/gen/xyz/openbmc_project/Association/Definitions/meson.build
index e4ab2d1..7c27d14 100644
--- a/gen/xyz/openbmc_project/Association/Definitions/meson.build
+++ b/gen/xyz/openbmc_project/Association/Definitions/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Association/Definitions__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Association/Definitions.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/xyz/openbmc_project/Association/meson.build b/gen/xyz/openbmc_project/Association/meson.build
index 5b79ae4..8dc1a1a 100644
--- a/gen/xyz/openbmc_project/Association/meson.build
+++ b/gen/xyz/openbmc_project/Association/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Association__cpp'.underscorify(),
     input: [ '../../../../yaml/xyz/openbmc_project/Association.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/xyz/openbmc_project/BIOSConfig/Manager/meson.build b/gen/xyz/openbmc_project/BIOSConfig/Manager/meson.build
index a10a9f4..450ed0d 100644
--- a/gen/xyz/openbmc_project/BIOSConfig/Manager/meson.build
+++ b/gen/xyz/openbmc_project/BIOSConfig/Manager/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/BIOSConfig/Manager__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/BIOSConfig/Manager.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/xyz/openbmc_project/BIOSConfig/Password/meson.build b/gen/xyz/openbmc_project/BIOSConfig/Password/meson.build
index 4885364..0ee530c 100644
--- a/gen/xyz/openbmc_project/BIOSConfig/Password/meson.build
+++ b/gen/xyz/openbmc_project/BIOSConfig/Password/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/BIOSConfig/Password__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/BIOSConfig/Password.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/xyz/openbmc_project/Certs/Authority/meson.build b/gen/xyz/openbmc_project/Certs/Authority/meson.build
index 88f62cb..4cc67e5 100644
--- a/gen/xyz/openbmc_project/Certs/Authority/meson.build
+++ b/gen/xyz/openbmc_project/Certs/Authority/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Certs/Authority__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Certs/Authority.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/xyz/openbmc_project/Certs/CSR/Create/meson.build b/gen/xyz/openbmc_project/Certs/CSR/Create/meson.build
index 231c2d3..9a724b8 100644
--- a/gen/xyz/openbmc_project/Certs/CSR/Create/meson.build
+++ b/gen/xyz/openbmc_project/Certs/CSR/Create/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Certs/CSR/Create__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Certs/CSR/Create.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/xyz/openbmc_project/Certs/CSR/meson.build b/gen/xyz/openbmc_project/Certs/CSR/meson.build
index 1aab3e6..0066491 100644
--- a/gen/xyz/openbmc_project/Certs/CSR/meson.build
+++ b/gen/xyz/openbmc_project/Certs/CSR/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Certs/CSR__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Certs/CSR.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/xyz/openbmc_project/Certs/Certificate/meson.build b/gen/xyz/openbmc_project/Certs/Certificate/meson.build
index 55c4f08..b404ecd 100644
--- a/gen/xyz/openbmc_project/Certs/Certificate/meson.build
+++ b/gen/xyz/openbmc_project/Certs/Certificate/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Certs/Certificate__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Certs/Certificate.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/xyz/openbmc_project/Certs/Entry/meson.build b/gen/xyz/openbmc_project/Certs/Entry/meson.build
index 231851e..16c1a56 100644
--- a/gen/xyz/openbmc_project/Certs/Entry/meson.build
+++ b/gen/xyz/openbmc_project/Certs/Entry/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Certs/Entry__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Certs/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/xyz/openbmc_project/Certs/Install/meson.build b/gen/xyz/openbmc_project/Certs/Install/meson.build
index acfb130..91b400e 100644
--- a/gen/xyz/openbmc_project/Certs/Install/meson.build
+++ b/gen/xyz/openbmc_project/Certs/Install/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Certs/Install__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Certs/Install.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/xyz/openbmc_project/Certs/InstallAll/meson.build b/gen/xyz/openbmc_project/Certs/InstallAll/meson.build
index 39c141a..7840289 100644
--- a/gen/xyz/openbmc_project/Certs/InstallAll/meson.build
+++ b/gen/xyz/openbmc_project/Certs/InstallAll/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Certs/InstallAll__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Certs/InstallAll.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/xyz/openbmc_project/Certs/Replace/meson.build b/gen/xyz/openbmc_project/Certs/Replace/meson.build
index 7cda1be..f753174 100644
--- a/gen/xyz/openbmc_project/Certs/Replace/meson.build
+++ b/gen/xyz/openbmc_project/Certs/Replace/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Certs/Replace__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Certs/Replace.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/xyz/openbmc_project/Certs/ReplaceAll/meson.build b/gen/xyz/openbmc_project/Certs/ReplaceAll/meson.build
index 7870e7f..8f9e3bf 100644
--- a/gen/xyz/openbmc_project/Certs/ReplaceAll/meson.build
+++ b/gen/xyz/openbmc_project/Certs/ReplaceAll/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Certs/ReplaceAll__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Certs/ReplaceAll.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/xyz/openbmc_project/Channel/ChannelAccess/meson.build b/gen/xyz/openbmc_project/Channel/ChannelAccess/meson.build
index d8ba98a..0f5461e 100644
--- a/gen/xyz/openbmc_project/Channel/ChannelAccess/meson.build
+++ b/gen/xyz/openbmc_project/Channel/ChannelAccess/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Channel/ChannelAccess__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Channel/ChannelAccess.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/xyz/openbmc_project/Chassis/Buttons/Button/meson.build b/gen/xyz/openbmc_project/Chassis/Buttons/Button/meson.build
index 10a42ce..ea582c5 100644
--- a/gen/xyz/openbmc_project/Chassis/Buttons/Button/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Buttons/Button/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Chassis/Buttons/Button__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Chassis/Buttons/Button.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/xyz/openbmc_project/Chassis/Buttons/HostSelector/meson.build b/gen/xyz/openbmc_project/Chassis/Buttons/HostSelector/meson.build
index 6f2ebde..7f6ba72 100644
--- a/gen/xyz/openbmc_project/Chassis/Buttons/HostSelector/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Buttons/HostSelector/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Chassis/Buttons/HostSelector__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Chassis/Buttons/HostSelector.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/xyz/openbmc_project/Chassis/Buttons/ID/meson.build b/gen/xyz/openbmc_project/Chassis/Buttons/ID/meson.build
index 89ed00e..8bf93e6 100644
--- a/gen/xyz/openbmc_project/Chassis/Buttons/ID/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Buttons/ID/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Chassis/Buttons/ID__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Chassis/Buttons/ID.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/xyz/openbmc_project/Chassis/Buttons/NMI/meson.build b/gen/xyz/openbmc_project/Chassis/Buttons/NMI/meson.build
index 5472fcc..465d9d3 100644
--- a/gen/xyz/openbmc_project/Chassis/Buttons/NMI/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Buttons/NMI/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Chassis/Buttons/NMI__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Chassis/Buttons/NMI.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/xyz/openbmc_project/Chassis/Buttons/Power/meson.build b/gen/xyz/openbmc_project/Chassis/Buttons/Power/meson.build
index 9b8fdeb..aeacd96 100644
--- a/gen/xyz/openbmc_project/Chassis/Buttons/Power/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Buttons/Power/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Chassis/Buttons/Power__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Chassis/Buttons/Power.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/xyz/openbmc_project/Chassis/Buttons/Reset/meson.build b/gen/xyz/openbmc_project/Chassis/Buttons/Reset/meson.build
index a861b24..f937a09 100644
--- a/gen/xyz/openbmc_project/Chassis/Buttons/Reset/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Buttons/Reset/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Chassis/Buttons/Reset__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Chassis/Buttons/Reset.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/xyz/openbmc_project/Chassis/Control/NMISource/meson.build b/gen/xyz/openbmc_project/Chassis/Control/NMISource/meson.build
index b05d032..5d6e824 100644
--- a/gen/xyz/openbmc_project/Chassis/Control/NMISource/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Control/NMISource/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Chassis/Control/NMISource__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Chassis/Control/NMISource.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/xyz/openbmc_project/Chassis/Control/Power/meson.build b/gen/xyz/openbmc_project/Chassis/Control/Power/meson.build
index 4369e80..d3b6190 100644
--- a/gen/xyz/openbmc_project/Chassis/Control/Power/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Control/Power/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Chassis/Control/Power__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Chassis/Control/Power.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/xyz/openbmc_project/Chassis/Intrusion/meson.build b/gen/xyz/openbmc_project/Chassis/Intrusion/meson.build
index fdf13c4..92deb78 100644
--- a/gen/xyz/openbmc_project/Chassis/Intrusion/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Intrusion/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Chassis/Intrusion__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Chassis/Intrusion.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/xyz/openbmc_project/Collection/DeleteAll/meson.build b/gen/xyz/openbmc_project/Collection/DeleteAll/meson.build
index b234b1c..f7a52f6 100644
--- a/gen/xyz/openbmc_project/Collection/DeleteAll/meson.build
+++ b/gen/xyz/openbmc_project/Collection/DeleteAll/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Collection/DeleteAll__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Collection/DeleteAll.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/xyz/openbmc_project/Common/FactoryReset/meson.build b/gen/xyz/openbmc_project/Common/FactoryReset/meson.build
index e521156..9d349c3 100644
--- a/gen/xyz/openbmc_project/Common/FactoryReset/meson.build
+++ b/gen/xyz/openbmc_project/Common/FactoryReset/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Common/FactoryReset__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Common/FactoryReset.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/xyz/openbmc_project/Common/FilePath/meson.build b/gen/xyz/openbmc_project/Common/FilePath/meson.build
index 98733b9..da2ffe1 100644
--- a/gen/xyz/openbmc_project/Common/FilePath/meson.build
+++ b/gen/xyz/openbmc_project/Common/FilePath/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Common/FilePath__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Common/FilePath.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/xyz/openbmc_project/Common/ObjectPath/meson.build b/gen/xyz/openbmc_project/Common/ObjectPath/meson.build
index dcbcf72..41ebfb8 100644
--- a/gen/xyz/openbmc_project/Common/ObjectPath/meson.build
+++ b/gen/xyz/openbmc_project/Common/ObjectPath/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Common/ObjectPath__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Common/ObjectPath.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/xyz/openbmc_project/Common/OriginatedBy/meson.build b/gen/xyz/openbmc_project/Common/OriginatedBy/meson.build
index 8eb9508..b8e1e3b 100644
--- a/gen/xyz/openbmc_project/Common/OriginatedBy/meson.build
+++ b/gen/xyz/openbmc_project/Common/OriginatedBy/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Common/OriginatedBy__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Common/OriginatedBy.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/xyz/openbmc_project/Common/Progress/meson.build b/gen/xyz/openbmc_project/Common/Progress/meson.build
index 2a8d026..cf94b0e 100644
--- a/gen/xyz/openbmc_project/Common/Progress/meson.build
+++ b/gen/xyz/openbmc_project/Common/Progress/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Common/Progress__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Common/Progress.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/xyz/openbmc_project/Common/TFTP/meson.build b/gen/xyz/openbmc_project/Common/TFTP/meson.build
index c76f664..28a1119 100644
--- a/gen/xyz/openbmc_project/Common/TFTP/meson.build
+++ b/gen/xyz/openbmc_project/Common/TFTP/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Common/TFTP__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Common/TFTP.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/xyz/openbmc_project/Common/UUID/meson.build b/gen/xyz/openbmc_project/Common/UUID/meson.build
index 45ad04d..ae82649 100644
--- a/gen/xyz/openbmc_project/Common/UUID/meson.build
+++ b/gen/xyz/openbmc_project/Common/UUID/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Common/UUID__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Common/UUID.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/xyz/openbmc_project/Condition/HostFirmware/meson.build b/gen/xyz/openbmc_project/Condition/HostFirmware/meson.build
index f02d19d..0ca2341 100644
--- a/gen/xyz/openbmc_project/Condition/HostFirmware/meson.build
+++ b/gen/xyz/openbmc_project/Condition/HostFirmware/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Condition/HostFirmware__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Condition/HostFirmware.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/xyz/openbmc_project/Control/Boot/Mode/meson.build b/gen/xyz/openbmc_project/Control/Boot/Mode/meson.build
index eef55a2..5883f24 100644
--- a/gen/xyz/openbmc_project/Control/Boot/Mode/meson.build
+++ b/gen/xyz/openbmc_project/Control/Boot/Mode/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Boot/Mode__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Boot/Mode.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/xyz/openbmc_project/Control/Boot/RebootAttempts/meson.build b/gen/xyz/openbmc_project/Control/Boot/RebootAttempts/meson.build
index e29b1b3..85b92c1 100644
--- a/gen/xyz/openbmc_project/Control/Boot/RebootAttempts/meson.build
+++ b/gen/xyz/openbmc_project/Control/Boot/RebootAttempts/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Boot/RebootAttempts__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Boot/RebootAttempts.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/xyz/openbmc_project/Control/Boot/RebootPolicy/meson.build b/gen/xyz/openbmc_project/Control/Boot/RebootPolicy/meson.build
index ac202aa..4ae3368 100644
--- a/gen/xyz/openbmc_project/Control/Boot/RebootPolicy/meson.build
+++ b/gen/xyz/openbmc_project/Control/Boot/RebootPolicy/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Boot/RebootPolicy__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Boot/RebootPolicy.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/xyz/openbmc_project/Control/Boot/Source/meson.build b/gen/xyz/openbmc_project/Control/Boot/Source/meson.build
index 885f8c5..982dd58 100644
--- a/gen/xyz/openbmc_project/Control/Boot/Source/meson.build
+++ b/gen/xyz/openbmc_project/Control/Boot/Source/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Boot/Source__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Boot/Source.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/xyz/openbmc_project/Control/Boot/Type/meson.build b/gen/xyz/openbmc_project/Control/Boot/Type/meson.build
index 545873a..8589253 100644
--- a/gen/xyz/openbmc_project/Control/Boot/Type/meson.build
+++ b/gen/xyz/openbmc_project/Control/Boot/Type/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Boot/Type__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Boot/Type.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/xyz/openbmc_project/Control/CFMLimit/meson.build b/gen/xyz/openbmc_project/Control/CFMLimit/meson.build
index 82ae344..11f8058 100644
--- a/gen/xyz/openbmc_project/Control/CFMLimit/meson.build
+++ b/gen/xyz/openbmc_project/Control/CFMLimit/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/CFMLimit__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Control/CFMLimit.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/xyz/openbmc_project/Control/ChassisCapabilities/meson.build b/gen/xyz/openbmc_project/Control/ChassisCapabilities/meson.build
index 42eb0dd..77d7288 100644
--- a/gen/xyz/openbmc_project/Control/ChassisCapabilities/meson.build
+++ b/gen/xyz/openbmc_project/Control/ChassisCapabilities/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/ChassisCapabilities__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Control/ChassisCapabilities.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/xyz/openbmc_project/Control/FanPwm/meson.build b/gen/xyz/openbmc_project/Control/FanPwm/meson.build
index 6c7d56e..81f9974 100644
--- a/gen/xyz/openbmc_project/Control/FanPwm/meson.build
+++ b/gen/xyz/openbmc_project/Control/FanPwm/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/FanPwm__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Control/FanPwm.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/xyz/openbmc_project/Control/FanRedundancy/meson.build b/gen/xyz/openbmc_project/Control/FanRedundancy/meson.build
index 052249b..0a76698 100644
--- a/gen/xyz/openbmc_project/Control/FanRedundancy/meson.build
+++ b/gen/xyz/openbmc_project/Control/FanRedundancy/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/FanRedundancy__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Control/FanRedundancy.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/xyz/openbmc_project/Control/FanSpeed/meson.build b/gen/xyz/openbmc_project/Control/FanSpeed/meson.build
index 237c964..7b54afc 100644
--- a/gen/xyz/openbmc_project/Control/FanSpeed/meson.build
+++ b/gen/xyz/openbmc_project/Control/FanSpeed/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/FanSpeed__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Control/FanSpeed.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/xyz/openbmc_project/Control/FieldMode/meson.build b/gen/xyz/openbmc_project/Control/FieldMode/meson.build
index 7c9672f..d89526e 100644
--- a/gen/xyz/openbmc_project/Control/FieldMode/meson.build
+++ b/gen/xyz/openbmc_project/Control/FieldMode/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/FieldMode__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Control/FieldMode.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/xyz/openbmc_project/Control/Host/NMI/meson.build b/gen/xyz/openbmc_project/Control/Host/NMI/meson.build
index 64a21db..1d31914 100644
--- a/gen/xyz/openbmc_project/Control/Host/NMI/meson.build
+++ b/gen/xyz/openbmc_project/Control/Host/NMI/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Host/NMI__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Host/NMI.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/xyz/openbmc_project/Control/Host/TurboAllowed/meson.build b/gen/xyz/openbmc_project/Control/Host/TurboAllowed/meson.build
index fe54b3d..8fc8860 100644
--- a/gen/xyz/openbmc_project/Control/Host/TurboAllowed/meson.build
+++ b/gen/xyz/openbmc_project/Control/Host/TurboAllowed/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Host/TurboAllowed__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Host/TurboAllowed.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/xyz/openbmc_project/Control/Host/meson.build b/gen/xyz/openbmc_project/Control/Host/meson.build
index 2c4b442..1112c03 100644
--- a/gen/xyz/openbmc_project/Control/Host/meson.build
+++ b/gen/xyz/openbmc_project/Control/Host/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Host__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Control/Host.interface.yaml',  ],
-    output: [ 'error.cpp', 'error.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'error.cpp', 'error.hpp', 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Control/MinimumShipLevel/meson.build b/gen/xyz/openbmc_project/Control/MinimumShipLevel/meson.build
index a9cb818..74b2b8d 100644
--- a/gen/xyz/openbmc_project/Control/MinimumShipLevel/meson.build
+++ b/gen/xyz/openbmc_project/Control/MinimumShipLevel/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/MinimumShipLevel__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Control/MinimumShipLevel.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/xyz/openbmc_project/Control/Mode/meson.build b/gen/xyz/openbmc_project/Control/Mode/meson.build
index 59155cd..ee0f95e 100644
--- a/gen/xyz/openbmc_project/Control/Mode/meson.build
+++ b/gen/xyz/openbmc_project/Control/Mode/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Mode__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Control/Mode.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/xyz/openbmc_project/Control/Power/ACPIPowerState/meson.build b/gen/xyz/openbmc_project/Control/Power/ACPIPowerState/meson.build
index 7d8b3e2..38ed110 100644
--- a/gen/xyz/openbmc_project/Control/Power/ACPIPowerState/meson.build
+++ b/gen/xyz/openbmc_project/Control/Power/ACPIPowerState/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Power/ACPIPowerState__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Power/ACPIPowerState.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/xyz/openbmc_project/Control/Power/Cap/meson.build b/gen/xyz/openbmc_project/Control/Power/Cap/meson.build
index 59bd136..78d1884 100644
--- a/gen/xyz/openbmc_project/Control/Power/Cap/meson.build
+++ b/gen/xyz/openbmc_project/Control/Power/Cap/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Power/Cap__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Power/Cap.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/xyz/openbmc_project/Control/Power/CapLimits/meson.build b/gen/xyz/openbmc_project/Control/Power/CapLimits/meson.build
index fc181d3..06500ec 100644
--- a/gen/xyz/openbmc_project/Control/Power/CapLimits/meson.build
+++ b/gen/xyz/openbmc_project/Control/Power/CapLimits/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Power/CapLimits__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Power/CapLimits.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/xyz/openbmc_project/Control/Power/IdlePowerSaver/meson.build b/gen/xyz/openbmc_project/Control/Power/IdlePowerSaver/meson.build
index d3af9ba..c8e9796 100644
--- a/gen/xyz/openbmc_project/Control/Power/IdlePowerSaver/meson.build
+++ b/gen/xyz/openbmc_project/Control/Power/IdlePowerSaver/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Power/IdlePowerSaver__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Power/IdlePowerSaver.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/xyz/openbmc_project/Control/Power/Mode/meson.build b/gen/xyz/openbmc_project/Control/Power/Mode/meson.build
index 14705cd..9012681 100644
--- a/gen/xyz/openbmc_project/Control/Power/Mode/meson.build
+++ b/gen/xyz/openbmc_project/Control/Power/Mode/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Power/Mode__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Power/Mode.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/xyz/openbmc_project/Control/Power/RestorePolicy/meson.build b/gen/xyz/openbmc_project/Control/Power/RestorePolicy/meson.build
index 4ba9b49..97caa35 100644
--- a/gen/xyz/openbmc_project/Control/Power/RestorePolicy/meson.build
+++ b/gen/xyz/openbmc_project/Control/Power/RestorePolicy/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Power/RestorePolicy__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Power/RestorePolicy.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/xyz/openbmc_project/Control/PowerSupplyAttributes/meson.build b/gen/xyz/openbmc_project/Control/PowerSupplyAttributes/meson.build
index 9e97fa3..c6a69eb 100644
--- a/gen/xyz/openbmc_project/Control/PowerSupplyAttributes/meson.build
+++ b/gen/xyz/openbmc_project/Control/PowerSupplyAttributes/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/PowerSupplyAttributes__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Control/PowerSupplyAttributes.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/xyz/openbmc_project/Control/PowerSupplyRedundancy/meson.build b/gen/xyz/openbmc_project/Control/PowerSupplyRedundancy/meson.build
index 680a988..7cc907e 100644
--- a/gen/xyz/openbmc_project/Control/PowerSupplyRedundancy/meson.build
+++ b/gen/xyz/openbmc_project/Control/PowerSupplyRedundancy/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/PowerSupplyRedundancy__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Control/PowerSupplyRedundancy.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/xyz/openbmc_project/Control/Processor/CurrentOperatingConfig/meson.build b/gen/xyz/openbmc_project/Control/Processor/CurrentOperatingConfig/meson.build
index b499312..56e974a 100644
--- a/gen/xyz/openbmc_project/Control/Processor/CurrentOperatingConfig/meson.build
+++ b/gen/xyz/openbmc_project/Control/Processor/CurrentOperatingConfig/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Processor/CurrentOperatingConfig__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Processor/CurrentOperatingConfig.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/xyz/openbmc_project/Control/Security/RestrictionMode/meson.build b/gen/xyz/openbmc_project/Control/Security/RestrictionMode/meson.build
index aaab5ec..df420f7 100644
--- a/gen/xyz/openbmc_project/Control/Security/RestrictionMode/meson.build
+++ b/gen/xyz/openbmc_project/Control/Security/RestrictionMode/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Security/RestrictionMode__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Security/RestrictionMode.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/xyz/openbmc_project/Control/Security/SpecialMode/meson.build b/gen/xyz/openbmc_project/Control/Security/SpecialMode/meson.build
index a345953..a167b51 100644
--- a/gen/xyz/openbmc_project/Control/Security/SpecialMode/meson.build
+++ b/gen/xyz/openbmc_project/Control/Security/SpecialMode/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Security/SpecialMode__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Security/SpecialMode.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/xyz/openbmc_project/Control/Service/Attributes/meson.build b/gen/xyz/openbmc_project/Control/Service/Attributes/meson.build
index b34df82..797aa09 100644
--- a/gen/xyz/openbmc_project/Control/Service/Attributes/meson.build
+++ b/gen/xyz/openbmc_project/Control/Service/Attributes/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Service/Attributes__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Service/Attributes.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/xyz/openbmc_project/Control/Service/SocketAttributes/meson.build b/gen/xyz/openbmc_project/Control/Service/SocketAttributes/meson.build
index ee7f6c6..667f1cd 100644
--- a/gen/xyz/openbmc_project/Control/Service/SocketAttributes/meson.build
+++ b/gen/xyz/openbmc_project/Control/Service/SocketAttributes/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Service/SocketAttributes__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Service/SocketAttributes.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/xyz/openbmc_project/Control/TPM/Policy/meson.build b/gen/xyz/openbmc_project/Control/TPM/Policy/meson.build
index 3116edb..924c6ee 100644
--- a/gen/xyz/openbmc_project/Control/TPM/Policy/meson.build
+++ b/gen/xyz/openbmc_project/Control/TPM/Policy/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/TPM/Policy__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Control/TPM/Policy.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/xyz/openbmc_project/Control/ThermalMode/meson.build b/gen/xyz/openbmc_project/Control/ThermalMode/meson.build
index 35b82ba..5d60acb 100644
--- a/gen/xyz/openbmc_project/Control/ThermalMode/meson.build
+++ b/gen/xyz/openbmc_project/Control/ThermalMode/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/ThermalMode__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Control/ThermalMode.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/xyz/openbmc_project/Control/VoltageRegulatorControl/meson.build b/gen/xyz/openbmc_project/Control/VoltageRegulatorControl/meson.build
index c7121b8..2eefc4a 100644
--- a/gen/xyz/openbmc_project/Control/VoltageRegulatorControl/meson.build
+++ b/gen/xyz/openbmc_project/Control/VoltageRegulatorControl/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/VoltageRegulatorControl__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Control/VoltageRegulatorControl.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/xyz/openbmc_project/Control/VoltageRegulatorMode/meson.build b/gen/xyz/openbmc_project/Control/VoltageRegulatorMode/meson.build
index 9134d9e..fe25b02 100644
--- a/gen/xyz/openbmc_project/Control/VoltageRegulatorMode/meson.build
+++ b/gen/xyz/openbmc_project/Control/VoltageRegulatorMode/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/VoltageRegulatorMode__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Control/VoltageRegulatorMode.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/xyz/openbmc_project/Dump/Create/meson.build b/gen/xyz/openbmc_project/Dump/Create/meson.build
index 0ccc2ce..9b75564 100644
--- a/gen/xyz/openbmc_project/Dump/Create/meson.build
+++ b/gen/xyz/openbmc_project/Dump/Create/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Dump/Create__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Dump/Create.interface.yaml',  ],
-    output: [ 'error.cpp', 'error.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'error.cpp', 'error.hpp', 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Dump/Entry/BMC/meson.build b/gen/xyz/openbmc_project/Dump/Entry/BMC/meson.build
index e4a3133..953cb0a 100644
--- a/gen/xyz/openbmc_project/Dump/Entry/BMC/meson.build
+++ b/gen/xyz/openbmc_project/Dump/Entry/BMC/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Dump/Entry/BMC__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Dump/Entry/BMC.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/xyz/openbmc_project/Dump/Entry/FaultLog/meson.build b/gen/xyz/openbmc_project/Dump/Entry/FaultLog/meson.build
index 4a87b84..88f4f8e 100644
--- a/gen/xyz/openbmc_project/Dump/Entry/FaultLog/meson.build
+++ b/gen/xyz/openbmc_project/Dump/Entry/FaultLog/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Dump/Entry/FaultLog__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Dump/Entry/FaultLog.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/xyz/openbmc_project/Dump/Entry/System/meson.build b/gen/xyz/openbmc_project/Dump/Entry/System/meson.build
index 8abc930..c9feae9 100644
--- a/gen/xyz/openbmc_project/Dump/Entry/System/meson.build
+++ b/gen/xyz/openbmc_project/Dump/Entry/System/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Dump/Entry/System__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Dump/Entry/System.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/xyz/openbmc_project/Dump/Entry/meson.build b/gen/xyz/openbmc_project/Dump/Entry/meson.build
index 533bbaa..1ee8126 100644
--- a/gen/xyz/openbmc_project/Dump/Entry/meson.build
+++ b/gen/xyz/openbmc_project/Dump/Entry/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Dump/Entry__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Dump/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/xyz/openbmc_project/Dump/NewDump/meson.build b/gen/xyz/openbmc_project/Dump/NewDump/meson.build
index 701c220..8fd5ef3 100644
--- a/gen/xyz/openbmc_project/Dump/NewDump/meson.build
+++ b/gen/xyz/openbmc_project/Dump/NewDump/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Dump/NewDump__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Dump/NewDump.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/xyz/openbmc_project/HardwareIsolation/Create/meson.build b/gen/xyz/openbmc_project/HardwareIsolation/Create/meson.build
index 6aa4ab3..3efe71c 100644
--- a/gen/xyz/openbmc_project/HardwareIsolation/Create/meson.build
+++ b/gen/xyz/openbmc_project/HardwareIsolation/Create/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/HardwareIsolation/Create__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/HardwareIsolation/Create.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/xyz/openbmc_project/HardwareIsolation/Entry/meson.build b/gen/xyz/openbmc_project/HardwareIsolation/Entry/meson.build
index 915770c..e1acb5e 100644
--- a/gen/xyz/openbmc_project/HardwareIsolation/Entry/meson.build
+++ b/gen/xyz/openbmc_project/HardwareIsolation/Entry/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/HardwareIsolation/Entry__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/HardwareIsolation/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/xyz/openbmc_project/Inventory/Connector/Embedded/meson.build b/gen/xyz/openbmc_project/Inventory/Connector/Embedded/meson.build
index efe8e26..cf2e4ab 100644
--- a/gen/xyz/openbmc_project/Inventory/Connector/Embedded/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Connector/Embedded/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Connector/Embedded__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Connector/Embedded.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/xyz/openbmc_project/Inventory/Connector/Slot/meson.build b/gen/xyz/openbmc_project/Inventory/Connector/Slot/meson.build
index 5b6b495..6e08031 100644
--- a/gen/xyz/openbmc_project/Inventory/Connector/Slot/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Connector/Slot/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Connector/Slot__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Connector/Slot.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/xyz/openbmc_project/Inventory/Decorator/Asset/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/Asset/meson.build
index 18be374..0043305 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/Asset/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/Asset/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/Asset__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/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/xyz/openbmc_project/Inventory/Decorator/AssetTag/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/AssetTag/meson.build
index e441d66..66cf310 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/AssetTag/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/AssetTag/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/AssetTag__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/AssetTag.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/xyz/openbmc_project/Inventory/Decorator/CLEI/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/CLEI/meson.build
index 254244e..967c894 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/CLEI/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/CLEI/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/CLEI__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/CLEI.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/xyz/openbmc_project/Inventory/Decorator/Cacheable/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/Cacheable/meson.build
index 1feb333..5679fce 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/Cacheable/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/Cacheable/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/Cacheable__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/Cacheable.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/xyz/openbmc_project/Inventory/Decorator/Compatible/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/Compatible/meson.build
index 7a2829d..e88631f 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/Compatible/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/Compatible/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/Compatible__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/Compatible.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/xyz/openbmc_project/Inventory/Decorator/CoolingType/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/CoolingType/meson.build
index a664173..e0c766d 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/CoolingType/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/CoolingType/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/CoolingType__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/CoolingType.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/xyz/openbmc_project/Inventory/Decorator/Dimension/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/Dimension/meson.build
index 4ae222b..e9348bd 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/Dimension/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/Dimension/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/Dimension__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/Dimension.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/xyz/openbmc_project/Inventory/Decorator/I2CDevice/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/I2CDevice/meson.build
index c3ae2e0..13c0840 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/I2CDevice/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/I2CDevice/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/I2CDevice__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/I2CDevice.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/xyz/openbmc_project/Inventory/Decorator/LocationCode/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/LocationCode/meson.build
index 05a6d44..9212321 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/LocationCode/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/LocationCode/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/LocationCode__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/LocationCode.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/xyz/openbmc_project/Inventory/Decorator/ManufacturerExt/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/ManufacturerExt/meson.build
index b3f1dce..9922c79 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/ManufacturerExt/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/ManufacturerExt/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/ManufacturerExt__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/ManufacturerExt.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/xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel/meson.build
index 3c21788..9461ab8 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel.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/xyz/openbmc_project/Inventory/Decorator/Replaceable/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/Replaceable/meson.build
index f638e0b..c13b00e 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/Replaceable/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/Replaceable/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/Replaceable__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/Replaceable.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/xyz/openbmc_project/Inventory/Decorator/Revision/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/Revision/meson.build
index b58f393..fd5c16d 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/Revision/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/Revision/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/Revision__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/Revision.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/xyz/openbmc_project/Inventory/Decorator/Slot/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/Slot/meson.build
index 571ca6d..3480841 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/Slot/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/Slot/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/Slot__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/Slot.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/xyz/openbmc_project/Inventory/Decorator/ThermalDirection/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/ThermalDirection/meson.build
index 59c94d6..776b30a 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/ThermalDirection/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/ThermalDirection/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/ThermalDirection__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/ThermalDirection.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/xyz/openbmc_project/Inventory/Decorator/UniqueIdentifier/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/UniqueIdentifier/meson.build
index c2d1d55..486a62c 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/UniqueIdentifier/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/UniqueIdentifier/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/UniqueIdentifier__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/UniqueIdentifier.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/xyz/openbmc_project/Inventory/Decorator/VendorInformation/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/VendorInformation/meson.build
index bcce5bf..0356ff7 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/VendorInformation/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/VendorInformation/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/VendorInformation__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/VendorInformation.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/xyz/openbmc_project/Inventory/Decorator/VoltageControl/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/VoltageControl/meson.build
index c815152..1b0d938 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/VoltageControl/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/VoltageControl/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/VoltageControl__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/VoltageControl.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/xyz/openbmc_project/Inventory/Item/Accelerator/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Accelerator/meson.build
index 465c693..b059067 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Accelerator/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Accelerator/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Accelerator__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Accelerator.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/xyz/openbmc_project/Inventory/Item/Battery/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Battery/meson.build
index 44ac8d9..dc67d71 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Battery/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Battery/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Battery__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Battery.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/xyz/openbmc_project/Inventory/Item/Bmc/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Bmc/meson.build
index 1a31f3a..45abd95 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Bmc/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Bmc/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Bmc__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Bmc.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/xyz/openbmc_project/Inventory/Item/Board/IOBoard/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Board/IOBoard/meson.build
index 4372f22..5b288d2 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Board/IOBoard/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Board/IOBoard/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Board/IOBoard__cpp'.underscorify(),
     input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Board/IOBoard.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/xyz/openbmc_project/Inventory/Item/Board/Motherboard/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Board/Motherboard/meson.build
index b6e87c0..22e76f1 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Board/Motherboard/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Board/Motherboard/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Board/Motherboard__cpp'.underscorify(),
     input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Board/Motherboard.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/xyz/openbmc_project/Inventory/Item/Board/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Board/meson.build
index a491720..f5227d2 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Board/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Board/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Board__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Board.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/xyz/openbmc_project/Inventory/Item/Cable/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Cable/meson.build
index 6a83cbf..44fd1c2 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Cable/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Cable/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Cable__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Cable.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/xyz/openbmc_project/Inventory/Item/Chassis/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Chassis/meson.build
index 35458af..11ae92b 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Chassis/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Chassis/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Chassis__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Chassis.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/xyz/openbmc_project/Inventory/Item/Connector/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Connector/meson.build
index 0775db4..aaf8678 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Connector/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Connector/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Connector__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Connector.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/xyz/openbmc_project/Inventory/Item/Cpu/OperatingConfig/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Cpu/OperatingConfig/meson.build
index 84179f4..e9a6cf3 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Cpu/OperatingConfig/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Cpu/OperatingConfig/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Cpu/OperatingConfig__cpp'.underscorify(),
     input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Cpu/OperatingConfig.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/xyz/openbmc_project/Inventory/Item/Cpu/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Cpu/meson.build
index c094d27..978a66b 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Cpu/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Cpu/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Cpu__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Cpu.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/xyz/openbmc_project/Inventory/Item/CpuCore/meson.build b/gen/xyz/openbmc_project/Inventory/Item/CpuCore/meson.build
index f96e352..a8047d1 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/CpuCore/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/CpuCore/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/CpuCore__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/CpuCore.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/xyz/openbmc_project/Inventory/Item/Dimm/MemoryLocation/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Dimm/MemoryLocation/meson.build
index 376c55e..ec60754 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Dimm/MemoryLocation/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Dimm/MemoryLocation/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Dimm/MemoryLocation__cpp'.underscorify(),
     input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Dimm/MemoryLocation.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/xyz/openbmc_project/Inventory/Item/Dimm/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Dimm/meson.build
index ffb43c1..892ca1c 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Dimm/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Dimm/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Dimm__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Dimm.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/xyz/openbmc_project/Inventory/Item/DiskBackplane/meson.build b/gen/xyz/openbmc_project/Inventory/Item/DiskBackplane/meson.build
index dbed4d6..3ec573c 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/DiskBackplane/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/DiskBackplane/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/DiskBackplane__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/DiskBackplane.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/xyz/openbmc_project/Inventory/Item/Drive/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Drive/meson.build
index d10a03d..8c284ba 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Drive/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Drive/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Drive__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Drive.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/xyz/openbmc_project/Inventory/Item/Ethernet/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Ethernet/meson.build
index 380c0af..be187e5 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Ethernet/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Ethernet/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Ethernet__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Ethernet.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/xyz/openbmc_project/Inventory/Item/FabricAdapter/meson.build b/gen/xyz/openbmc_project/Inventory/Item/FabricAdapter/meson.build
index 41b1b81..9d47455 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/FabricAdapter/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/FabricAdapter/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/FabricAdapter__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/FabricAdapter.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/xyz/openbmc_project/Inventory/Item/Fan/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Fan/meson.build
index cd90323..0e0b70e 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Fan/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Fan/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Fan__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Fan.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/xyz/openbmc_project/Inventory/Item/Global/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Global/meson.build
index 6da5685..935712e 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Global/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Global/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Global__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Global.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/xyz/openbmc_project/Inventory/Item/MemoryBuffer/meson.build b/gen/xyz/openbmc_project/Inventory/Item/MemoryBuffer/meson.build
index 98431d6..12431b7 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/MemoryBuffer/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/MemoryBuffer/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/MemoryBuffer__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/MemoryBuffer.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/xyz/openbmc_project/Inventory/Item/NetworkInterface/meson.build b/gen/xyz/openbmc_project/Inventory/Item/NetworkInterface/meson.build
index e78ac31..5ab263b 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/NetworkInterface/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/NetworkInterface/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/NetworkInterface__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/NetworkInterface.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/xyz/openbmc_project/Inventory/Item/PCIeDevice/meson.build b/gen/xyz/openbmc_project/Inventory/Item/PCIeDevice/meson.build
index 84a6918..a4f6646 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/PCIeDevice/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/PCIeDevice/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/PCIeDevice__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/PCIeDevice.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/xyz/openbmc_project/Inventory/Item/PCIeSlot/meson.build b/gen/xyz/openbmc_project/Inventory/Item/PCIeSlot/meson.build
index 7268461..76dcbac 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/PCIeSlot/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/PCIeSlot/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/PCIeSlot__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/PCIeSlot.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/xyz/openbmc_project/Inventory/Item/Panel/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Panel/meson.build
index 84e47bb..d2336b2 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Panel/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Panel/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Panel__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Panel.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/xyz/openbmc_project/Inventory/Item/PersistentMemory/Partition/meson.build b/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/Partition/meson.build
index 9ebc081..21ad852 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/Partition/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/Partition/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/PersistentMemory/Partition__cpp'.underscorify(),
     input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Item/PersistentMemory/Partition.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/xyz/openbmc_project/Inventory/Item/PersistentMemory/PowerManagementPolicy/meson.build b/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/PowerManagementPolicy/meson.build
index 5486bea..5fede1c 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/PowerManagementPolicy/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/PowerManagementPolicy/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/PersistentMemory/PowerManagementPolicy__cpp'.underscorify(),
     input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Item/PersistentMemory/PowerManagementPolicy.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/xyz/openbmc_project/Inventory/Item/PersistentMemory/SecurityCapabilities/meson.build b/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/SecurityCapabilities/meson.build
index 9b0da7a..4835225 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/SecurityCapabilities/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/SecurityCapabilities/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/PersistentMemory/SecurityCapabilities__cpp'.underscorify(),
     input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Item/PersistentMemory/SecurityCapabilities.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/xyz/openbmc_project/Inventory/Item/PersistentMemory/meson.build b/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/meson.build
index 84c9dd4..4c596d2 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/PersistentMemory__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/PersistentMemory.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/xyz/openbmc_project/Inventory/Item/PowerSupply/meson.build b/gen/xyz/openbmc_project/Inventory/Item/PowerSupply/meson.build
index 8518d46..19c0961 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/PowerSupply/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/PowerSupply/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/PowerSupply__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/PowerSupply.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/xyz/openbmc_project/Inventory/Item/Rotor/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Rotor/meson.build
index 117866e..4d1472a 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Rotor/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Rotor/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Rotor__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Rotor.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/xyz/openbmc_project/Inventory/Item/Storage/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Storage/meson.build
index e0e0513..494d805 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Storage/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Storage/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Storage__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Storage.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/xyz/openbmc_project/Inventory/Item/StorageController/meson.build b/gen/xyz/openbmc_project/Inventory/Item/StorageController/meson.build
index 28a6f16..846a54e 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/StorageController/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/StorageController/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/StorageController__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/StorageController.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/xyz/openbmc_project/Inventory/Item/System/meson.build b/gen/xyz/openbmc_project/Inventory/Item/System/meson.build
index a86395a..59ba629 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/System/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/System/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/System__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/System.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/xyz/openbmc_project/Inventory/Item/Tpm/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Tpm/meson.build
index 0b38b94..e8a364d 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Tpm/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Tpm/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Tpm__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Tpm.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/xyz/openbmc_project/Inventory/Item/Volume/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Volume/meson.build
index 58109f2..afe5246 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Volume/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Volume/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Volume__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Volume.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/xyz/openbmc_project/Inventory/Item/Vrm/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Vrm/meson.build
index d2e3ef7..82b3de2 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Vrm/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Vrm/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Vrm__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Vrm.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/xyz/openbmc_project/Inventory/Item/meson.build b/gen/xyz/openbmc_project/Inventory/Item/meson.build
index 6e2237e..602be81 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item.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/xyz/openbmc_project/Inventory/Manager/meson.build b/gen/xyz/openbmc_project/Inventory/Manager/meson.build
index 8d65f08..2d4e11e 100644
--- a/gen/xyz/openbmc_project/Inventory/Manager/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Manager/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Manager__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Manager.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/xyz/openbmc_project/Inventory/Source/PLDM/Entity/meson.build b/gen/xyz/openbmc_project/Inventory/Source/PLDM/Entity/meson.build
index 188282d..51a29ac 100644
--- a/gen/xyz/openbmc_project/Inventory/Source/PLDM/Entity/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Source/PLDM/Entity/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Source/PLDM/Entity__cpp'.underscorify(),
     input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Source/PLDM/Entity.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/xyz/openbmc_project/Inventory/Source/PLDM/FRU/meson.build b/gen/xyz/openbmc_project/Inventory/Source/PLDM/FRU/meson.build
index 7750598..9e301d4 100644
--- a/gen/xyz/openbmc_project/Inventory/Source/PLDM/FRU/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Source/PLDM/FRU/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Source/PLDM/FRU__cpp'.underscorify(),
     input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Source/PLDM/FRU.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/xyz/openbmc_project/Ipmi/SOL/meson.build b/gen/xyz/openbmc_project/Ipmi/SOL/meson.build
index e939b4a..8f73dc1 100644
--- a/gen/xyz/openbmc_project/Ipmi/SOL/meson.build
+++ b/gen/xyz/openbmc_project/Ipmi/SOL/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Ipmi/SOL__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Ipmi/SOL.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/xyz/openbmc_project/Ipmi/SessionInfo/meson.build b/gen/xyz/openbmc_project/Ipmi/SessionInfo/meson.build
index 3d5ab9d..cb56a5c 100644
--- a/gen/xyz/openbmc_project/Ipmi/SessionInfo/meson.build
+++ b/gen/xyz/openbmc_project/Ipmi/SessionInfo/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Ipmi/SessionInfo__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Ipmi/SessionInfo.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/xyz/openbmc_project/Led/Group/meson.build b/gen/xyz/openbmc_project/Led/Group/meson.build
index e25d5e1..f30ae0e 100644
--- a/gen/xyz/openbmc_project/Led/Group/meson.build
+++ b/gen/xyz/openbmc_project/Led/Group/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Led/Group__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Led/Group.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/xyz/openbmc_project/Led/Physical/meson.build b/gen/xyz/openbmc_project/Led/Physical/meson.build
index 524486e..3fd9753 100644
--- a/gen/xyz/openbmc_project/Led/Physical/meson.build
+++ b/gen/xyz/openbmc_project/Led/Physical/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Led/Physical__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Led/Physical.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/xyz/openbmc_project/Logging/Create/meson.build b/gen/xyz/openbmc_project/Logging/Create/meson.build
index 0accb61..2679b21 100644
--- a/gen/xyz/openbmc_project/Logging/Create/meson.build
+++ b/gen/xyz/openbmc_project/Logging/Create/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Logging/Create__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Logging/Create.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/xyz/openbmc_project/Logging/Entry/meson.build b/gen/xyz/openbmc_project/Logging/Entry/meson.build
index 2eefc96..03166ab 100644
--- a/gen/xyz/openbmc_project/Logging/Entry/meson.build
+++ b/gen/xyz/openbmc_project/Logging/Entry/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Logging/Entry__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Logging/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/xyz/openbmc_project/Logging/ErrorBlocksTransition/meson.build b/gen/xyz/openbmc_project/Logging/ErrorBlocksTransition/meson.build
index a3a394e..54f9d12 100644
--- a/gen/xyz/openbmc_project/Logging/ErrorBlocksTransition/meson.build
+++ b/gen/xyz/openbmc_project/Logging/ErrorBlocksTransition/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Logging/ErrorBlocksTransition__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Logging/ErrorBlocksTransition.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/xyz/openbmc_project/Logging/Event/meson.build b/gen/xyz/openbmc_project/Logging/Event/meson.build
index f4a07d5..b7ddaac 100644
--- a/gen/xyz/openbmc_project/Logging/Event/meson.build
+++ b/gen/xyz/openbmc_project/Logging/Event/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Logging/Event__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Logging/Event.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/xyz/openbmc_project/Logging/IPMI/meson.build b/gen/xyz/openbmc_project/Logging/IPMI/meson.build
index 03fc0cb..ecb29ed 100644
--- a/gen/xyz/openbmc_project/Logging/IPMI/meson.build
+++ b/gen/xyz/openbmc_project/Logging/IPMI/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Logging/IPMI__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Logging/IPMI.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/xyz/openbmc_project/Logging/Settings/meson.build b/gen/xyz/openbmc_project/Logging/Settings/meson.build
index 12393c8..3b38099 100644
--- a/gen/xyz/openbmc_project/Logging/Settings/meson.build
+++ b/gen/xyz/openbmc_project/Logging/Settings/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Logging/Settings__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Logging/Settings.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/xyz/openbmc_project/Logging/Syslog/Destination/Mail/Create/meson.build b/gen/xyz/openbmc_project/Logging/Syslog/Destination/Mail/Create/meson.build
index 5197cef..b783add 100644
--- a/gen/xyz/openbmc_project/Logging/Syslog/Destination/Mail/Create/meson.build
+++ b/gen/xyz/openbmc_project/Logging/Syslog/Destination/Mail/Create/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Logging/Syslog/Destination/Mail/Create__cpp'.underscorify(),
     input: [ '../../../../../../../../yaml/xyz/openbmc_project/Logging/Syslog/Destination/Mail/Create.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/xyz/openbmc_project/Logging/Syslog/Destination/Mail/Entry/meson.build b/gen/xyz/openbmc_project/Logging/Syslog/Destination/Mail/Entry/meson.build
index fce01da..c717ddc 100644
--- a/gen/xyz/openbmc_project/Logging/Syslog/Destination/Mail/Entry/meson.build
+++ b/gen/xyz/openbmc_project/Logging/Syslog/Destination/Mail/Entry/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Logging/Syslog/Destination/Mail/Entry__cpp'.underscorify(),
     input: [ '../../../../../../../../yaml/xyz/openbmc_project/Logging/Syslog/Destination/Mail/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/xyz/openbmc_project/Logging/Syslog/Destination/Mail/meson.build b/gen/xyz/openbmc_project/Logging/Syslog/Destination/Mail/meson.build
index 5fd6c0d..aad56e6 100644
--- a/gen/xyz/openbmc_project/Logging/Syslog/Destination/Mail/meson.build
+++ b/gen/xyz/openbmc_project/Logging/Syslog/Destination/Mail/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Logging/Syslog/Destination/Mail__cpp'.underscorify(),
     input: [ '../../../../../../../yaml/xyz/openbmc_project/Logging/Syslog/Destination/Mail.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/xyz/openbmc_project/MCTP/Endpoint/meson.build b/gen/xyz/openbmc_project/MCTP/Endpoint/meson.build
index 9334a1e..c631c95 100644
--- a/gen/xyz/openbmc_project/MCTP/Endpoint/meson.build
+++ b/gen/xyz/openbmc_project/MCTP/Endpoint/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/MCTP/Endpoint__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/MCTP/Endpoint.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/xyz/openbmc_project/Memory/MemoryECC/meson.build b/gen/xyz/openbmc_project/Memory/MemoryECC/meson.build
index a86a18a..c1f57ea 100644
--- a/gen/xyz/openbmc_project/Memory/MemoryECC/meson.build
+++ b/gen/xyz/openbmc_project/Memory/MemoryECC/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Memory/MemoryECC__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Memory/MemoryECC.interface.yaml',  ],
-    output: [ 'error.cpp', 'error.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'error.cpp', 'error.hpp', 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Network/Client/Create/meson.build b/gen/xyz/openbmc_project/Network/Client/Create/meson.build
index 06ad969..dd219d6 100644
--- a/gen/xyz/openbmc_project/Network/Client/Create/meson.build
+++ b/gen/xyz/openbmc_project/Network/Client/Create/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Network/Client/Create__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Network/Client/Create.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/xyz/openbmc_project/Network/Client/meson.build b/gen/xyz/openbmc_project/Network/Client/meson.build
index 0b0954f..c5a6b01 100644
--- a/gen/xyz/openbmc_project/Network/Client/meson.build
+++ b/gen/xyz/openbmc_project/Network/Client/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Network/Client__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Network/Client.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/xyz/openbmc_project/Network/DHCPConfiguration/meson.build b/gen/xyz/openbmc_project/Network/DHCPConfiguration/meson.build
index 1d74724..26066fc 100644
--- a/gen/xyz/openbmc_project/Network/DHCPConfiguration/meson.build
+++ b/gen/xyz/openbmc_project/Network/DHCPConfiguration/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Network/DHCPConfiguration__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Network/DHCPConfiguration.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/xyz/openbmc_project/Network/EthernetInterface/meson.build b/gen/xyz/openbmc_project/Network/EthernetInterface/meson.build
index a4cb8fd..c24f236 100644
--- a/gen/xyz/openbmc_project/Network/EthernetInterface/meson.build
+++ b/gen/xyz/openbmc_project/Network/EthernetInterface/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Network/EthernetInterface__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Network/EthernetInterface.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/xyz/openbmc_project/Network/Experimental/Bond/meson.build b/gen/xyz/openbmc_project/Network/Experimental/Bond/meson.build
index 484aec6..950ee16 100644
--- a/gen/xyz/openbmc_project/Network/Experimental/Bond/meson.build
+++ b/gen/xyz/openbmc_project/Network/Experimental/Bond/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Network/Experimental/Bond__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Network/Experimental/Bond.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/xyz/openbmc_project/Network/Experimental/Tunnel/meson.build b/gen/xyz/openbmc_project/Network/Experimental/Tunnel/meson.build
index ff75ee8..d937fdc 100644
--- a/gen/xyz/openbmc_project/Network/Experimental/Tunnel/meson.build
+++ b/gen/xyz/openbmc_project/Network/Experimental/Tunnel/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Network/Experimental/Tunnel__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Network/Experimental/Tunnel.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/xyz/openbmc_project/Network/IP/meson.build b/gen/xyz/openbmc_project/Network/IP/meson.build
index 5bfa9ae..1ead184 100644
--- a/gen/xyz/openbmc_project/Network/IP/meson.build
+++ b/gen/xyz/openbmc_project/Network/IP/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Network/IP__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Network/IP.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/xyz/openbmc_project/Network/MACAddress/meson.build b/gen/xyz/openbmc_project/Network/MACAddress/meson.build
index c09d516..f4d3a82 100644
--- a/gen/xyz/openbmc_project/Network/MACAddress/meson.build
+++ b/gen/xyz/openbmc_project/Network/MACAddress/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Network/MACAddress__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Network/MACAddress.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/xyz/openbmc_project/Network/Neighbor/meson.build b/gen/xyz/openbmc_project/Network/Neighbor/meson.build
index d021561..15951ff 100644
--- a/gen/xyz/openbmc_project/Network/Neighbor/meson.build
+++ b/gen/xyz/openbmc_project/Network/Neighbor/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Network/Neighbor__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Network/Neighbor.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/xyz/openbmc_project/Network/SystemConfiguration/meson.build b/gen/xyz/openbmc_project/Network/SystemConfiguration/meson.build
index 0fa4183..204e2b2 100644
--- a/gen/xyz/openbmc_project/Network/SystemConfiguration/meson.build
+++ b/gen/xyz/openbmc_project/Network/SystemConfiguration/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Network/SystemConfiguration__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Network/SystemConfiguration.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/xyz/openbmc_project/Network/VLAN/meson.build b/gen/xyz/openbmc_project/Network/VLAN/meson.build
index bc4866f..ff48694 100644
--- a/gen/xyz/openbmc_project/Network/VLAN/meson.build
+++ b/gen/xyz/openbmc_project/Network/VLAN/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Network/VLAN__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Network/VLAN.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/xyz/openbmc_project/Nvme/Status/meson.build b/gen/xyz/openbmc_project/Nvme/Status/meson.build
index a77f4ab..9d7e7a8 100644
--- a/gen/xyz/openbmc_project/Nvme/Status/meson.build
+++ b/gen/xyz/openbmc_project/Nvme/Status/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Nvme/Status__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Nvme/Status.interface.yaml',  ],
-    output: [ 'error.cpp', 'error.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'error.cpp', 'error.hpp', 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Object/Delete/meson.build b/gen/xyz/openbmc_project/Object/Delete/meson.build
index b8a607b..d9f2cf3 100644
--- a/gen/xyz/openbmc_project/Object/Delete/meson.build
+++ b/gen/xyz/openbmc_project/Object/Delete/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Object/Delete__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Object/Delete.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/xyz/openbmc_project/Object/Enable/meson.build b/gen/xyz/openbmc_project/Object/Enable/meson.build
index 05f8fe6..71ab238 100644
--- a/gen/xyz/openbmc_project/Object/Enable/meson.build
+++ b/gen/xyz/openbmc_project/Object/Enable/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Object/Enable__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Object/Enable.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/xyz/openbmc_project/ObjectMapper/meson.build b/gen/xyz/openbmc_project/ObjectMapper/meson.build
index a03d924..dbf2cd9 100644
--- a/gen/xyz/openbmc_project/ObjectMapper/meson.build
+++ b/gen/xyz/openbmc_project/ObjectMapper/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/ObjectMapper__cpp'.underscorify(),
     input: [ '../../../../yaml/xyz/openbmc_project/ObjectMapper.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/xyz/openbmc_project/PFR/Attributes/meson.build b/gen/xyz/openbmc_project/PFR/Attributes/meson.build
index 0515588..d90b9d1 100644
--- a/gen/xyz/openbmc_project/PFR/Attributes/meson.build
+++ b/gen/xyz/openbmc_project/PFR/Attributes/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/PFR/Attributes__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/PFR/Attributes.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/xyz/openbmc_project/PLDM/Event/meson.build b/gen/xyz/openbmc_project/PLDM/Event/meson.build
index c44ca43..eba621c 100644
--- a/gen/xyz/openbmc_project/PLDM/Event/meson.build
+++ b/gen/xyz/openbmc_project/PLDM/Event/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/PLDM/Event__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/Event.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/xyz/openbmc_project/PLDM/PDR/meson.build b/gen/xyz/openbmc_project/PLDM/PDR/meson.build
index dad6f19..36d2415 100644
--- a/gen/xyz/openbmc_project/PLDM/PDR/meson.build
+++ b/gen/xyz/openbmc_project/PLDM/PDR/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/PLDM/PDR__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/PDR.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/xyz/openbmc_project/PLDM/Provider/Certs/Authority/CSR/meson.build b/gen/xyz/openbmc_project/PLDM/Provider/Certs/Authority/CSR/meson.build
index 4d2d782..39d3d7c 100644
--- a/gen/xyz/openbmc_project/PLDM/Provider/Certs/Authority/CSR/meson.build
+++ b/gen/xyz/openbmc_project/PLDM/Provider/Certs/Authority/CSR/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/PLDM/Provider/Certs/Authority/CSR__cpp'.underscorify(),
     input: [ '../../../../../../../../yaml/xyz/openbmc_project/PLDM/Provider/Certs/Authority/CSR.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/xyz/openbmc_project/PLDM/Requester/meson.build b/gen/xyz/openbmc_project/PLDM/Requester/meson.build
index 82ebaac..1756bcd 100644
--- a/gen/xyz/openbmc_project/PLDM/Requester/meson.build
+++ b/gen/xyz/openbmc_project/PLDM/Requester/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/PLDM/Requester__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/Requester.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/xyz/openbmc_project/Sensor/Accuracy/meson.build b/gen/xyz/openbmc_project/Sensor/Accuracy/meson.build
index c9e5088..1e92cda 100644
--- a/gen/xyz/openbmc_project/Sensor/Accuracy/meson.build
+++ b/gen/xyz/openbmc_project/Sensor/Accuracy/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Sensor/Accuracy__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Sensor/Accuracy.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/xyz/openbmc_project/Sensor/Threshold/Critical/meson.build b/gen/xyz/openbmc_project/Sensor/Threshold/Critical/meson.build
index 808b091..1f6ffef 100644
--- a/gen/xyz/openbmc_project/Sensor/Threshold/Critical/meson.build
+++ b/gen/xyz/openbmc_project/Sensor/Threshold/Critical/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Sensor/Threshold/Critical__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Sensor/Threshold/Critical.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/xyz/openbmc_project/Sensor/Threshold/HardShutdown/meson.build b/gen/xyz/openbmc_project/Sensor/Threshold/HardShutdown/meson.build
index 3f83e6b..85a07ce 100644
--- a/gen/xyz/openbmc_project/Sensor/Threshold/HardShutdown/meson.build
+++ b/gen/xyz/openbmc_project/Sensor/Threshold/HardShutdown/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Sensor/Threshold/HardShutdown__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Sensor/Threshold/HardShutdown.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/xyz/openbmc_project/Sensor/Threshold/PerformanceLoss/meson.build b/gen/xyz/openbmc_project/Sensor/Threshold/PerformanceLoss/meson.build
index 3eb69fc..63f236f 100644
--- a/gen/xyz/openbmc_project/Sensor/Threshold/PerformanceLoss/meson.build
+++ b/gen/xyz/openbmc_project/Sensor/Threshold/PerformanceLoss/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Sensor/Threshold/PerformanceLoss__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Sensor/Threshold/PerformanceLoss.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/xyz/openbmc_project/Sensor/Threshold/SoftShutdown/meson.build b/gen/xyz/openbmc_project/Sensor/Threshold/SoftShutdown/meson.build
index 65c97ab..0b87168 100644
--- a/gen/xyz/openbmc_project/Sensor/Threshold/SoftShutdown/meson.build
+++ b/gen/xyz/openbmc_project/Sensor/Threshold/SoftShutdown/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Sensor/Threshold/SoftShutdown__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Sensor/Threshold/SoftShutdown.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/xyz/openbmc_project/Sensor/Threshold/Warning/meson.build b/gen/xyz/openbmc_project/Sensor/Threshold/Warning/meson.build
index 4511887..d9b314f 100644
--- a/gen/xyz/openbmc_project/Sensor/Threshold/Warning/meson.build
+++ b/gen/xyz/openbmc_project/Sensor/Threshold/Warning/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Sensor/Threshold/Warning__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Sensor/Threshold/Warning.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/xyz/openbmc_project/Sensor/Value/meson.build b/gen/xyz/openbmc_project/Sensor/Value/meson.build
index 2979dc9..b71a24e 100644
--- a/gen/xyz/openbmc_project/Sensor/Value/meson.build
+++ b/gen/xyz/openbmc_project/Sensor/Value/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Sensor/Value__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Sensor/Value.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/xyz/openbmc_project/Sensor/ValueMutability/meson.build b/gen/xyz/openbmc_project/Sensor/ValueMutability/meson.build
index a6066e0..9db0b0c 100644
--- a/gen/xyz/openbmc_project/Sensor/ValueMutability/meson.build
+++ b/gen/xyz/openbmc_project/Sensor/ValueMutability/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Sensor/ValueMutability__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Sensor/ValueMutability.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/xyz/openbmc_project/Smbios/MDR_V2/meson.build b/gen/xyz/openbmc_project/Smbios/MDR_V2/meson.build
index b6edc92..b933da3 100644
--- a/gen/xyz/openbmc_project/Smbios/MDR_V2/meson.build
+++ b/gen/xyz/openbmc_project/Smbios/MDR_V2/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Smbios/MDR_V2__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Smbios/MDR_V2.interface.yaml',  ],
-    output: [ 'error.cpp', 'error.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'error.cpp', 'error.hpp', 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Software/Activation/meson.build b/gen/xyz/openbmc_project/Software/Activation/meson.build
index 2e3b545..0b75582 100644
--- a/gen/xyz/openbmc_project/Software/Activation/meson.build
+++ b/gen/xyz/openbmc_project/Software/Activation/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/Activation__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Software/Activation.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/xyz/openbmc_project/Software/ActivationBlocksTransition/meson.build b/gen/xyz/openbmc_project/Software/ActivationBlocksTransition/meson.build
index ee21bac..e4d6c13 100644
--- a/gen/xyz/openbmc_project/Software/ActivationBlocksTransition/meson.build
+++ b/gen/xyz/openbmc_project/Software/ActivationBlocksTransition/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/ActivationBlocksTransition__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Software/ActivationBlocksTransition.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/xyz/openbmc_project/Software/ActivationProgress/meson.build b/gen/xyz/openbmc_project/Software/ActivationProgress/meson.build
index 5a1b137..1116222 100644
--- a/gen/xyz/openbmc_project/Software/ActivationProgress/meson.build
+++ b/gen/xyz/openbmc_project/Software/ActivationProgress/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/ActivationProgress__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Software/ActivationProgress.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/xyz/openbmc_project/Software/ApplyOptions/meson.build b/gen/xyz/openbmc_project/Software/ApplyOptions/meson.build
index a0c5685..ce13a00 100644
--- a/gen/xyz/openbmc_project/Software/ApplyOptions/meson.build
+++ b/gen/xyz/openbmc_project/Software/ApplyOptions/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/ApplyOptions__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Software/ApplyOptions.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/xyz/openbmc_project/Software/ApplyTime/meson.build b/gen/xyz/openbmc_project/Software/ApplyTime/meson.build
index ea08285..57bb8b5 100644
--- a/gen/xyz/openbmc_project/Software/ApplyTime/meson.build
+++ b/gen/xyz/openbmc_project/Software/ApplyTime/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/ApplyTime__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Software/ApplyTime.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/xyz/openbmc_project/Software/ExtendedVersion/meson.build b/gen/xyz/openbmc_project/Software/ExtendedVersion/meson.build
index b39b1c3..7e13f8a 100644
--- a/gen/xyz/openbmc_project/Software/ExtendedVersion/meson.build
+++ b/gen/xyz/openbmc_project/Software/ExtendedVersion/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/ExtendedVersion__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Software/ExtendedVersion.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/xyz/openbmc_project/Software/RedundancyPriority/meson.build b/gen/xyz/openbmc_project/Software/RedundancyPriority/meson.build
index b8ee26b..8f9e068 100644
--- a/gen/xyz/openbmc_project/Software/RedundancyPriority/meson.build
+++ b/gen/xyz/openbmc_project/Software/RedundancyPriority/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/RedundancyPriority__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Software/RedundancyPriority.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/xyz/openbmc_project/Software/RequestedRedundancyPriority/meson.build b/gen/xyz/openbmc_project/Software/RequestedRedundancyPriority/meson.build
index 2378da9..e241619 100644
--- a/gen/xyz/openbmc_project/Software/RequestedRedundancyPriority/meson.build
+++ b/gen/xyz/openbmc_project/Software/RequestedRedundancyPriority/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/RequestedRedundancyPriority__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Software/RequestedRedundancyPriority.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/xyz/openbmc_project/Software/Settings/meson.build b/gen/xyz/openbmc_project/Software/Settings/meson.build
index a9b228b..28d3093 100644
--- a/gen/xyz/openbmc_project/Software/Settings/meson.build
+++ b/gen/xyz/openbmc_project/Software/Settings/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/Settings__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Software/Settings.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/xyz/openbmc_project/Software/Version/meson.build b/gen/xyz/openbmc_project/Software/Version/meson.build
index 929e604..1a55445 100644
--- a/gen/xyz/openbmc_project/Software/Version/meson.build
+++ b/gen/xyz/openbmc_project/Software/Version/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/Version__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Software/Version.interface.yaml',  ],
-    output: [ 'error.cpp', 'error.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'error.cpp', 'error.hpp', 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/State/BMC/meson.build b/gen/xyz/openbmc_project/State/BMC/meson.build
index 049354c..c3dc487 100644
--- a/gen/xyz/openbmc_project/State/BMC/meson.build
+++ b/gen/xyz/openbmc_project/State/BMC/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/State/BMC__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/State/BMC.interface.yaml',  ],
-    output: [ 'error.cpp', 'error.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'error.cpp', 'error.hpp', 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/State/BMCRedundancy/meson.build b/gen/xyz/openbmc_project/State/BMCRedundancy/meson.build
index 54e489f..aa45a07 100644
--- a/gen/xyz/openbmc_project/State/BMCRedundancy/meson.build
+++ b/gen/xyz/openbmc_project/State/BMCRedundancy/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/State/BMCRedundancy__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/State/BMCRedundancy.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/xyz/openbmc_project/State/Boot/PostCode/meson.build b/gen/xyz/openbmc_project/State/Boot/PostCode/meson.build
index f4ab826..774aafa 100644
--- a/gen/xyz/openbmc_project/State/Boot/PostCode/meson.build
+++ b/gen/xyz/openbmc_project/State/Boot/PostCode/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Boot/PostCode__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/State/Boot/PostCode.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/xyz/openbmc_project/State/Boot/Progress/meson.build b/gen/xyz/openbmc_project/State/Boot/Progress/meson.build
index 077ac2c..8966e2f 100644
--- a/gen/xyz/openbmc_project/State/Boot/Progress/meson.build
+++ b/gen/xyz/openbmc_project/State/Boot/Progress/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Boot/Progress__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/State/Boot/Progress.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/xyz/openbmc_project/State/Boot/Raw/meson.build b/gen/xyz/openbmc_project/State/Boot/Raw/meson.build
index b8fb932..74ceed8 100644
--- a/gen/xyz/openbmc_project/State/Boot/Raw/meson.build
+++ b/gen/xyz/openbmc_project/State/Boot/Raw/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Boot/Raw__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/State/Boot/Raw.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/xyz/openbmc_project/State/Chassis/meson.build b/gen/xyz/openbmc_project/State/Chassis/meson.build
index b921ff7..ebd9423 100644
--- a/gen/xyz/openbmc_project/State/Chassis/meson.build
+++ b/gen/xyz/openbmc_project/State/Chassis/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Chassis__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/State/Chassis.interface.yaml',  ],
-    output: [ 'error.cpp', 'error.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'error.cpp', 'error.hpp', 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/State/Decorator/Availability/meson.build b/gen/xyz/openbmc_project/State/Decorator/Availability/meson.build
index 56b10c9..cf312bd 100644
--- a/gen/xyz/openbmc_project/State/Decorator/Availability/meson.build
+++ b/gen/xyz/openbmc_project/State/Decorator/Availability/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Decorator/Availability__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/State/Decorator/Availability.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/xyz/openbmc_project/State/Decorator/OperationalStatus/meson.build b/gen/xyz/openbmc_project/State/Decorator/OperationalStatus/meson.build
index 53ffe04..50c7bd7 100644
--- a/gen/xyz/openbmc_project/State/Decorator/OperationalStatus/meson.build
+++ b/gen/xyz/openbmc_project/State/Decorator/OperationalStatus/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Decorator/OperationalStatus__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/State/Decorator/OperationalStatus.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/xyz/openbmc_project/State/Decorator/PowerState/meson.build b/gen/xyz/openbmc_project/State/Decorator/PowerState/meson.build
index b2f845c..12b99d9 100644
--- a/gen/xyz/openbmc_project/State/Decorator/PowerState/meson.build
+++ b/gen/xyz/openbmc_project/State/Decorator/PowerState/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Decorator/PowerState__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/State/Decorator/PowerState.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/xyz/openbmc_project/State/Decorator/PowerSystemInputs/meson.build b/gen/xyz/openbmc_project/State/Decorator/PowerSystemInputs/meson.build
index f7fda65..a7d5adf 100644
--- a/gen/xyz/openbmc_project/State/Decorator/PowerSystemInputs/meson.build
+++ b/gen/xyz/openbmc_project/State/Decorator/PowerSystemInputs/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Decorator/PowerSystemInputs__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/State/Decorator/PowerSystemInputs.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/xyz/openbmc_project/State/Drive/meson.build b/gen/xyz/openbmc_project/State/Drive/meson.build
index cccf28f..4a1c263 100644
--- a/gen/xyz/openbmc_project/State/Drive/meson.build
+++ b/gen/xyz/openbmc_project/State/Drive/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Drive__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/State/Drive.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/xyz/openbmc_project/State/Host/meson.build b/gen/xyz/openbmc_project/State/Host/meson.build
index 9d9302a..39aa6ad 100644
--- a/gen/xyz/openbmc_project/State/Host/meson.build
+++ b/gen/xyz/openbmc_project/State/Host/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Host__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/State/Host.interface.yaml',  ],
-    output: [ 'error.cpp', 'error.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'error.cpp', 'error.hpp', 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/State/OperatingSystem/Status/meson.build b/gen/xyz/openbmc_project/State/OperatingSystem/Status/meson.build
index ba3f82c..3af9bc2 100644
--- a/gen/xyz/openbmc_project/State/OperatingSystem/Status/meson.build
+++ b/gen/xyz/openbmc_project/State/OperatingSystem/Status/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/State/OperatingSystem/Status__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/State/OperatingSystem/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/xyz/openbmc_project/State/PowerOnHours/meson.build b/gen/xyz/openbmc_project/State/PowerOnHours/meson.build
index 0c30742..a351974 100644
--- a/gen/xyz/openbmc_project/State/PowerOnHours/meson.build
+++ b/gen/xyz/openbmc_project/State/PowerOnHours/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/State/PowerOnHours__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/State/PowerOnHours.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/xyz/openbmc_project/State/ScheduledHostTransition/meson.build b/gen/xyz/openbmc_project/State/ScheduledHostTransition/meson.build
index b3c8d06..f609ad8 100644
--- a/gen/xyz/openbmc_project/State/ScheduledHostTransition/meson.build
+++ b/gen/xyz/openbmc_project/State/ScheduledHostTransition/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/State/ScheduledHostTransition__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/State/ScheduledHostTransition.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/xyz/openbmc_project/State/Watchdog/meson.build b/gen/xyz/openbmc_project/State/Watchdog/meson.build
index 233b26e..ba83989 100644
--- a/gen/xyz/openbmc_project/State/Watchdog/meson.build
+++ b/gen/xyz/openbmc_project/State/Watchdog/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Watchdog__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/State/Watchdog.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/xyz/openbmc_project/Telemetry/Report/meson.build b/gen/xyz/openbmc_project/Telemetry/Report/meson.build
index d1d687f..1779c03 100644
--- a/gen/xyz/openbmc_project/Telemetry/Report/meson.build
+++ b/gen/xyz/openbmc_project/Telemetry/Report/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Telemetry/Report__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Telemetry/Report.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/xyz/openbmc_project/Telemetry/ReportManager/meson.build b/gen/xyz/openbmc_project/Telemetry/ReportManager/meson.build
index 6635d4c..15e168c 100644
--- a/gen/xyz/openbmc_project/Telemetry/ReportManager/meson.build
+++ b/gen/xyz/openbmc_project/Telemetry/ReportManager/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Telemetry/ReportManager__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Telemetry/ReportManager.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/xyz/openbmc_project/Telemetry/Trigger/meson.build b/gen/xyz/openbmc_project/Telemetry/Trigger/meson.build
index d30f87b..d2cef7f 100644
--- a/gen/xyz/openbmc_project/Telemetry/Trigger/meson.build
+++ b/gen/xyz/openbmc_project/Telemetry/Trigger/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Telemetry/Trigger__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Telemetry/Trigger.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/xyz/openbmc_project/Telemetry/TriggerManager/meson.build b/gen/xyz/openbmc_project/Telemetry/TriggerManager/meson.build
index 7047028..bbad7c7 100644
--- a/gen/xyz/openbmc_project/Telemetry/TriggerManager/meson.build
+++ b/gen/xyz/openbmc_project/Telemetry/TriggerManager/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Telemetry/TriggerManager__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Telemetry/TriggerManager.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/xyz/openbmc_project/Time/EpochTime/meson.build b/gen/xyz/openbmc_project/Time/EpochTime/meson.build
index 1a2ee4e..7a4aa09 100644
--- a/gen/xyz/openbmc_project/Time/EpochTime/meson.build
+++ b/gen/xyz/openbmc_project/Time/EpochTime/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Time/EpochTime__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Time/EpochTime.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/xyz/openbmc_project/Time/Synchronization/meson.build b/gen/xyz/openbmc_project/Time/Synchronization/meson.build
index 16e638f..4bcad9d 100644
--- a/gen/xyz/openbmc_project/Time/Synchronization/meson.build
+++ b/gen/xyz/openbmc_project/Time/Synchronization/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Time/Synchronization__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Time/Synchronization.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/xyz/openbmc_project/User/AccountPolicy/meson.build b/gen/xyz/openbmc_project/User/AccountPolicy/meson.build
index 55d7dd6..565d126 100644
--- a/gen/xyz/openbmc_project/User/AccountPolicy/meson.build
+++ b/gen/xyz/openbmc_project/User/AccountPolicy/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/User/AccountPolicy__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/User/AccountPolicy.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/xyz/openbmc_project/User/Attributes/meson.build b/gen/xyz/openbmc_project/User/Attributes/meson.build
index 3681323..9717101 100644
--- a/gen/xyz/openbmc_project/User/Attributes/meson.build
+++ b/gen/xyz/openbmc_project/User/Attributes/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/User/Attributes__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/User/Attributes.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/xyz/openbmc_project/User/Ldap/Config/meson.build b/gen/xyz/openbmc_project/User/Ldap/Config/meson.build
index 4c606c3..cd33382 100644
--- a/gen/xyz/openbmc_project/User/Ldap/Config/meson.build
+++ b/gen/xyz/openbmc_project/User/Ldap/Config/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/User/Ldap/Config__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/User/Ldap/Config.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/xyz/openbmc_project/User/Ldap/Create/meson.build b/gen/xyz/openbmc_project/User/Ldap/Create/meson.build
index 4e543bc..a738459 100644
--- a/gen/xyz/openbmc_project/User/Ldap/Create/meson.build
+++ b/gen/xyz/openbmc_project/User/Ldap/Create/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/User/Ldap/Create__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/User/Ldap/Create.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/xyz/openbmc_project/User/Manager/meson.build b/gen/xyz/openbmc_project/User/Manager/meson.build
index b987f2f..9a6ea45 100644
--- a/gen/xyz/openbmc_project/User/Manager/meson.build
+++ b/gen/xyz/openbmc_project/User/Manager/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/User/Manager__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/User/Manager.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/xyz/openbmc_project/User/PrivilegeMapper/meson.build b/gen/xyz/openbmc_project/User/PrivilegeMapper/meson.build
index 1211c40..d48f45e 100644
--- a/gen/xyz/openbmc_project/User/PrivilegeMapper/meson.build
+++ b/gen/xyz/openbmc_project/User/PrivilegeMapper/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/User/PrivilegeMapper__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/User/PrivilegeMapper.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/xyz/openbmc_project/User/PrivilegeMapperEntry/meson.build b/gen/xyz/openbmc_project/User/PrivilegeMapperEntry/meson.build
index 0d97573..5a4e02b 100644
--- a/gen/xyz/openbmc_project/User/PrivilegeMapperEntry/meson.build
+++ b/gen/xyz/openbmc_project/User/PrivilegeMapperEntry/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/User/PrivilegeMapperEntry__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/User/PrivilegeMapperEntry.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/xyz/openbmc_project/VirtualMedia/Legacy/meson.build b/gen/xyz/openbmc_project/VirtualMedia/Legacy/meson.build
index 3c67d57..e6b8e92 100644
--- a/gen/xyz/openbmc_project/VirtualMedia/Legacy/meson.build
+++ b/gen/xyz/openbmc_project/VirtualMedia/Legacy/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/VirtualMedia/Legacy__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/VirtualMedia/Legacy.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/xyz/openbmc_project/VirtualMedia/MountPoint/meson.build b/gen/xyz/openbmc_project/VirtualMedia/MountPoint/meson.build
index 6b54012..2241ca0 100644
--- a/gen/xyz/openbmc_project/VirtualMedia/MountPoint/meson.build
+++ b/gen/xyz/openbmc_project/VirtualMedia/MountPoint/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/VirtualMedia/MountPoint__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/VirtualMedia/MountPoint.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/xyz/openbmc_project/VirtualMedia/Process/meson.build b/gen/xyz/openbmc_project/VirtualMedia/Process/meson.build
index 7bfbd1c..bb8cb96 100644
--- a/gen/xyz/openbmc_project/VirtualMedia/Process/meson.build
+++ b/gen/xyz/openbmc_project/VirtualMedia/Process/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/VirtualMedia/Process__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/VirtualMedia/Process.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/xyz/openbmc_project/VirtualMedia/Proxy/meson.build b/gen/xyz/openbmc_project/VirtualMedia/Proxy/meson.build
index 1013d00..28c986b 100644
--- a/gen/xyz/openbmc_project/VirtualMedia/Proxy/meson.build
+++ b/gen/xyz/openbmc_project/VirtualMedia/Proxy/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/VirtualMedia/Proxy__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/VirtualMedia/Proxy.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/xyz/openbmc_project/VirtualMedia/Stats/meson.build b/gen/xyz/openbmc_project/VirtualMedia/Stats/meson.build
index f927294..0cb154a 100644
--- a/gen/xyz/openbmc_project/VirtualMedia/Stats/meson.build
+++ b/gen/xyz/openbmc_project/VirtualMedia/Stats/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/VirtualMedia/Stats__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/VirtualMedia/Stats.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',