diff --git a/internal/platform/implementation/linux/BUILD b/internal/platform/implementation/linux/BUILD
index d8ad0213..6d647607 100644
--- a/internal/platform/implementation/linux/BUILD
+++ b/internal/platform/implementation/linux/BUILD
@@ -33,10 +33,6 @@ cc_library(
         "timer.h",
         "thread_pool.h",
         "log_message.h",
-        "org_freedesktop_logcontrol_server_glue.h",
-        "hostname_client_glue.h",
-        "login_manager_client_glue.h",
-        "login_session_client_glue.h",
         "utils.h",
     ],
     srcs = [
@@ -59,9 +55,6 @@ cc_library(
     name = "comm",
     hdrs = [
         "avahi.h",
-        "avahi_entrygroup_client_glue.h",
-        "avahi_server_client_glue.h",
-        "avahi_servicebrowser_client_glue.h",
         "ble_medium.h",
         "ble_v2_medium.h",
         "bluetooth_adapter.h",
@@ -73,17 +66,7 @@ cc_library(
         "bluetooth_devices.h",
         "bluetooth_pairing.h",
         "bluez.h",
-        "bluez_adapter_client_glue.h",
-        "bluez_device_client_glue.h",
-        "bluez_profile_glue.h",
-        "bluez_profile_manager_client_glue.h",
         "dbus.h",
-        "networkmanager_accesspoint_client_glue.h",
-        "networkmanager_client_glue.h",
-        "networkmanager_connection_active_client_glue.h",
-        "networkmanager_device_wifip2p_client_glue.h",
-        "networkmanager_device_wireless_client_glue.h",
-        "networkmanager_ip4config_client_glue.h",
         "stream.h",
         "wifi_direct.h",
         "wifi_direct_server_socket.h",
@@ -104,6 +87,7 @@ cc_library(
         "//internal/platform:uuid",
         "//internal/platform/implementation:comm",
         "//internal/platform/implementation:types",
+        "//internal/platform/implementation/linux/generated:types",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/container:flat_hash_set",
@@ -188,6 +172,7 @@ cc_library(
         "//internal/platform/implementation:types",
         "//internal/platform/implementation/shared:count_down_latch",
         "//internal/platform/implementation/shared:file",
+        "//internal/platform/implementation/linux/generated:types",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/functional:any_invocable",
diff --git a/internal/platform/implementation/linux/avahi.h b/internal/platform/implementation/linux/avahi.h
index 121ac3c4..208eaa52 100644
--- a/internal/platform/implementation/linux/avahi.h
+++ b/internal/platform/implementation/linux/avahi.h
@@ -19,9 +19,9 @@
 #include <sdbus-c++/IConnection.h>
 #include <sdbus-c++/ProxyInterfaces.h>
 
-#include "internal/platform/implementation/linux/avahi_entrygroup_client_glue.h"
-#include "internal/platform/implementation/linux/avahi_server_client_glue.h"
-#include "internal/platform/implementation/linux/avahi_servicebrowser_client_glue.h"
+#include "internal/platform/implementation/linux/generated/dbus/avahi/entrygroup_client.h"
+#include "internal/platform/implementation/linux/generated/dbus/avahi/server2_client.h"
+#include "internal/platform/implementation/linux/generated/dbus/avahi/servicebrowser_client.h"
 #include "internal/platform/implementation/linux/dbus.h"
 #include "internal/platform/implementation/wifi_lan.h"
 
diff --git a/internal/platform/implementation/linux/bluetooth_adapter.cc b/internal/platform/implementation/linux/bluetooth_adapter.cc
index 21822efd..fb83b31c 100644
--- a/internal/platform/implementation/linux/bluetooth_adapter.cc
+++ b/internal/platform/implementation/linux/bluetooth_adapter.cc
@@ -18,7 +18,7 @@
 #include "internal/platform/implementation/bluetooth_adapter.h"
 #include "internal/platform/implementation/linux/bluetooth_adapter.h"
 #include "internal/platform/implementation/linux/bluez.h"
-#include "internal/platform/implementation/linux/bluez_adapter_client_glue.h"
+#include "internal/platform/implementation/linux/generated/dbus/bluez/adapter_client.h"
 #include "internal/platform/implementation/linux/dbus.h"
 #include "internal/platform/logging.h"
 
diff --git a/internal/platform/implementation/linux/bluetooth_adapter.h b/internal/platform/implementation/linux/bluetooth_adapter.h
index 405931bc..d03309e9 100644
--- a/internal/platform/implementation/linux/bluetooth_adapter.h
+++ b/internal/platform/implementation/linux/bluetooth_adapter.h
@@ -20,7 +20,7 @@
 #include "absl/strings/string_view.h"
 #include "internal/platform/implementation/bluetooth_adapter.h"
 #include "internal/platform/implementation/linux/bluez.h"
-#include "internal/platform/implementation/linux/bluez_adapter_client_glue.h"
+#include "internal/platform/implementation/linux/generated/dbus/bluez/adapter_client.h"
 #include "internal/platform/implementation/linux/dbus.h"
 
 namespace nearby {
diff --git a/internal/platform/implementation/linux/bluetooth_bluez_profile.h b/internal/platform/implementation/linux/bluetooth_bluez_profile.h
index 588322ed..ff447480 100644
--- a/internal/platform/implementation/linux/bluetooth_bluez_profile.h
+++ b/internal/platform/implementation/linux/bluetooth_bluez_profile.h
@@ -38,8 +38,8 @@
 #include "internal/platform/implementation/bluetooth_classic.h"
 #include "internal/platform/implementation/linux/bluetooth_devices.h"
 #include "internal/platform/implementation/linux/bluez.h"
-#include "internal/platform/implementation/linux/bluez_profile_glue.h"
-#include "internal/platform/implementation/linux/bluez_profile_manager_client_glue.h"
+#include "internal/platform/implementation/linux/generated/dbus/bluez/profile_server.h"
+#include "internal/platform/implementation/linux/generated/dbus/bluez/profile_manager_client.h"
 #include "internal/platform/logging.h"
 
 namespace nearby {
diff --git a/internal/platform/implementation/linux/bluetooth_classic_device.h b/internal/platform/implementation/linux/bluetooth_classic_device.h
index 35fc3d6c..c5d5073e 100644
--- a/internal/platform/implementation/linux/bluetooth_classic_device.h
+++ b/internal/platform/implementation/linux/bluetooth_classic_device.h
@@ -25,7 +25,7 @@
 #include "absl/strings/string_view.h"
 #include "internal/base/observer_list.h"
 #include "internal/platform/implementation/bluetooth_classic.h"
-#include "internal/platform/implementation/linux/bluez_device_client_glue.h"
+#include "internal/platform/implementation/linux/generated/dbus/bluez/device_client.h"
 
 namespace nearby {
 namespace linux {
diff --git a/internal/platform/implementation/linux/bluetooth_classic_medium.cc b/internal/platform/implementation/linux/bluetooth_classic_medium.cc
index 79ccfc80..91d7cb67 100644
--- a/internal/platform/implementation/linux/bluetooth_classic_medium.cc
+++ b/internal/platform/implementation/linux/bluetooth_classic_medium.cc
@@ -29,7 +29,7 @@
 #include "internal/platform/implementation/linux/bluetooth_classic_socket.h"
 #include "internal/platform/implementation/linux/bluetooth_pairing.h"
 #include "internal/platform/implementation/linux/bluez.h"
-#include "internal/platform/implementation/linux/bluez_device_client_glue.h"
+#include "internal/platform/implementation/linux/generated/dbus/bluez/device_client.h"
 #include "internal/platform/logging.h"
 
 namespace nearby {
diff --git a/internal/platform/implementation/linux/bluetooth_pairing.h b/internal/platform/implementation/linux/bluetooth_pairing.h
index 48558a4e..917a7278 100644
--- a/internal/platform/implementation/linux/bluetooth_pairing.h
+++ b/internal/platform/implementation/linux/bluetooth_pairing.h
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef PLATFORM_IMPL_LINUX_BLUETOOTH_PROFILE_H_
+#ifndef PLATFORM_IMPL_LINUX_BLUETOOTH_PAIRING_H_
 #define PLATFORM_IMPL_LINUX_BLUETOOTH_PAIRING_H_
 
 #include <memory>
diff --git a/internal/platform/implementation/linux/device_info.h b/internal/platform/implementation/linux/device_info.h
index edbefd4d..139885fe 100644
--- a/internal/platform/implementation/linux/device_info.h
+++ b/internal/platform/implementation/linux/device_info.h
@@ -16,20 +16,20 @@
 #define PLATFORM_IMPL_LINUX_DEVICE_INFO_H_
 
 #include <optional>
-#include <sdbus-c++/ProxyInterfaces.h>
-#include <sdbus-c++/Types.h>
 #include <string>
 
 #include <sdbus-c++/IConnection.h>
 #include <sdbus-c++/IProxy.h>
+#include <sdbus-c++/ProxyInterfaces.h>
+#include <sdbus-c++/Types.h>
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/strings/string_view.h"
 #include "absl/synchronization/mutex.h"
 #include "internal/platform/implementation/device_info.h"
-#include "internal/platform/implementation/linux/hostname_client_glue.h"
-#include "internal/platform/implementation/linux/login_manager_client_glue.h"
-#include "internal/platform/implementation/linux/login_session_client_glue.h"
+#include "internal/platform/implementation/linux/generated/dbus/hostname/hostname_client.h"
+#include "internal/platform/implementation/linux/generated/dbus/login/login_manager_client.h"
+#include "internal/platform/implementation/linux/generated/dbus/login/login_session_client.h"
 
 namespace nearby {
 namespace linux {
diff --git a/internal/platform/implementation/linux/generated/BUILD b/internal/platform/implementation/linux/generated/BUILD
new file mode 100644
index 00000000..7bb5ea35
--- /dev/null
+++ b/internal/platform/implementation/linux/generated/BUILD
@@ -0,0 +1,22 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+licenses(["notice"])
+
+cc_library(
+    name = "types",
+    textual_hdrs = glob(["**/*.h"]),
+    visibility = [
+        "//internal/platform/implementation/linux:__subpackages__",
+    ],
+)
diff --git a/internal/platform/implementation/linux/avahi_entrygroup_client_glue.h b/internal/platform/implementation/linux/generated/dbus/avahi/entrygroup_client.h
similarity index 100%
rename from internal/platform/implementation/linux/avahi_entrygroup_client_glue.h
rename to internal/platform/implementation/linux/generated/dbus/avahi/entrygroup_client.h
diff --git a/internal/platform/implementation/linux/org.freedesktop.Avahi.EntryGroup.xml b/internal/platform/implementation/linux/generated/dbus/avahi/org.freedesktop.Avahi.EntryGroup.xml
similarity index 100%
rename from internal/platform/implementation/linux/org.freedesktop.Avahi.EntryGroup.xml
rename to internal/platform/implementation/linux/generated/dbus/avahi/org.freedesktop.Avahi.EntryGroup.xml
diff --git a/internal/platform/implementation/linux/org.freedesktop.Avahi.Server.xml b/internal/platform/implementation/linux/generated/dbus/avahi/org.freedesktop.Avahi.Server.xml
similarity index 100%
rename from internal/platform/implementation/linux/org.freedesktop.Avahi.Server.xml
rename to internal/platform/implementation/linux/generated/dbus/avahi/org.freedesktop.Avahi.Server.xml
diff --git a/internal/platform/implementation/linux/org.freedesktop.Avahi.ServiceBrowser.xml b/internal/platform/implementation/linux/generated/dbus/avahi/org.freedesktop.Avahi.ServiceBrowser.xml
similarity index 100%
rename from internal/platform/implementation/linux/org.freedesktop.Avahi.ServiceBrowser.xml
rename to internal/platform/implementation/linux/generated/dbus/avahi/org.freedesktop.Avahi.ServiceBrowser.xml
diff --git a/internal/platform/implementation/linux/org.freedesktop.Avahi.ServiceResolver.xml b/internal/platform/implementation/linux/generated/dbus/avahi/org.freedesktop.Avahi.ServiceResolver.xml
similarity index 100%
rename from internal/platform/implementation/linux/org.freedesktop.Avahi.ServiceResolver.xml
rename to internal/platform/implementation/linux/generated/dbus/avahi/org.freedesktop.Avahi.ServiceResolver.xml
diff --git a/internal/platform/implementation/linux/avahi_server_client_glue.h b/internal/platform/implementation/linux/generated/dbus/avahi/server2_client.h
similarity index 100%
rename from internal/platform/implementation/linux/avahi_server_client_glue.h
rename to internal/platform/implementation/linux/generated/dbus/avahi/server2_client.h
diff --git a/internal/platform/implementation/linux/avahi_servicebrowser_client_glue.h b/internal/platform/implementation/linux/generated/dbus/avahi/servicebrowser_client.h
similarity index 100%
rename from internal/platform/implementation/linux/avahi_servicebrowser_client_glue.h
rename to internal/platform/implementation/linux/generated/dbus/avahi/servicebrowser_client.h
diff --git a/internal/platform/implementation/linux/bluez_adapter_client_glue.h b/internal/platform/implementation/linux/generated/dbus/bluez/adapter_client.h
similarity index 100%
rename from internal/platform/implementation/linux/bluez_adapter_client_glue.h
rename to internal/platform/implementation/linux/generated/dbus/bluez/adapter_client.h
diff --git a/internal/platform/implementation/linux/bluez_device_client_glue.h b/internal/platform/implementation/linux/generated/dbus/bluez/device_client.h
similarity index 100%
rename from internal/platform/implementation/linux/bluez_device_client_glue.h
rename to internal/platform/implementation/linux/generated/dbus/bluez/device_client.h
diff --git a/internal/platform/implementation/linux/org.bluez.Adapter1.xml b/internal/platform/implementation/linux/generated/dbus/bluez/org.bluez.Adapter1.xml
similarity index 100%
rename from internal/platform/implementation/linux/org.bluez.Adapter1.xml
rename to internal/platform/implementation/linux/generated/dbus/bluez/org.bluez.Adapter1.xml
diff --git a/internal/platform/implementation/linux/org.bluez.Device1.xml b/internal/platform/implementation/linux/generated/dbus/bluez/org.bluez.Device1.xml
similarity index 100%
rename from internal/platform/implementation/linux/org.bluez.Device1.xml
rename to internal/platform/implementation/linux/generated/dbus/bluez/org.bluez.Device1.xml
diff --git a/internal/platform/implementation/linux/org.bluez.Profile1.xml b/internal/platform/implementation/linux/generated/dbus/bluez/org.bluez.Profile1.xml
similarity index 100%
rename from internal/platform/implementation/linux/org.bluez.Profile1.xml
rename to internal/platform/implementation/linux/generated/dbus/bluez/org.bluez.Profile1.xml
diff --git a/internal/platform/implementation/linux/org.bluez.ProfileManager1.xml b/internal/platform/implementation/linux/generated/dbus/bluez/org.bluez.ProfileManager1.xml
similarity index 100%
rename from internal/platform/implementation/linux/org.bluez.ProfileManager1.xml
rename to internal/platform/implementation/linux/generated/dbus/bluez/org.bluez.ProfileManager1.xml
diff --git a/internal/platform/implementation/linux/bluez_profile_manager_client_glue.h b/internal/platform/implementation/linux/generated/dbus/bluez/profile_manager_client.h
similarity index 100%
rename from internal/platform/implementation/linux/bluez_profile_manager_client_glue.h
rename to internal/platform/implementation/linux/generated/dbus/bluez/profile_manager_client.h
diff --git a/internal/platform/implementation/linux/bluez_profile_glue.h b/internal/platform/implementation/linux/generated/dbus/bluez/profile_server.h
similarity index 100%
rename from internal/platform/implementation/linux/bluez_profile_glue.h
rename to internal/platform/implementation/linux/generated/dbus/bluez/profile_server.h
diff --git a/internal/platform/implementation/linux/hostname_client_glue.h b/internal/platform/implementation/linux/generated/dbus/hostname/hostname_client.h
similarity index 100%
rename from internal/platform/implementation/linux/hostname_client_glue.h
rename to internal/platform/implementation/linux/generated/dbus/hostname/hostname_client.h
diff --git a/internal/platform/implementation/linux/org.freedesktop.hostname1.xml b/internal/platform/implementation/linux/generated/dbus/hostname/org.freedesktop.hostname1.xml
similarity index 100%
rename from internal/platform/implementation/linux/org.freedesktop.hostname1.xml
rename to internal/platform/implementation/linux/generated/dbus/hostname/org.freedesktop.hostname1.xml
diff --git a/internal/platform/implementation/linux/org_freedesktop_logcontrol_server_glue.h b/internal/platform/implementation/linux/generated/dbus/logcontrol/logcontrol_server.h
similarity index 100%
rename from internal/platform/implementation/linux/org_freedesktop_logcontrol_server_glue.h
rename to internal/platform/implementation/linux/generated/dbus/logcontrol/logcontrol_server.h
diff --git a/internal/platform/implementation/linux/org.freedesktop.LogControl1.xml b/internal/platform/implementation/linux/generated/dbus/logcontrol/org.freedesktop.LogControl1.xml
similarity index 100%
rename from internal/platform/implementation/linux/org.freedesktop.LogControl1.xml
rename to internal/platform/implementation/linux/generated/dbus/logcontrol/org.freedesktop.LogControl1.xml
diff --git a/internal/platform/implementation/linux/login_manager_client_glue.h b/internal/platform/implementation/linux/generated/dbus/login/login_manager_client.h
similarity index 100%
rename from internal/platform/implementation/linux/login_manager_client_glue.h
rename to internal/platform/implementation/linux/generated/dbus/login/login_manager_client.h
diff --git a/internal/platform/implementation/linux/login_session_client_glue.h b/internal/platform/implementation/linux/generated/dbus/login/login_session_client.h
similarity index 100%
rename from internal/platform/implementation/linux/login_session_client_glue.h
rename to internal/platform/implementation/linux/generated/dbus/login/login_session_client.h
diff --git a/internal/platform/implementation/linux/org.freedesktop.login1.Manager.xml b/internal/platform/implementation/linux/generated/dbus/login/org.freedesktop.login1.Manager.xml
similarity index 100%
rename from internal/platform/implementation/linux/org.freedesktop.login1.Manager.xml
rename to internal/platform/implementation/linux/generated/dbus/login/org.freedesktop.login1.Manager.xml
diff --git a/internal/platform/implementation/linux/org.freedesktop.login1.Session.xml b/internal/platform/implementation/linux/generated/dbus/login/org.freedesktop.login1.Session.xml
similarity index 100%
rename from internal/platform/implementation/linux/org.freedesktop.login1.Session.xml
rename to internal/platform/implementation/linux/generated/dbus/login/org.freedesktop.login1.Session.xml
diff --git a/internal/platform/implementation/linux/networkmanager_accesspoint_client_glue.h b/internal/platform/implementation/linux/generated/dbus/networkmanager/access_point_client.h
similarity index 100%
rename from internal/platform/implementation/linux/networkmanager_accesspoint_client_glue.h
rename to internal/platform/implementation/linux/generated/dbus/networkmanager/access_point_client.h
diff --git a/internal/platform/implementation/linux/networkmanager_connection_active_client_glue.h b/internal/platform/implementation/linux/generated/dbus/networkmanager/connection_active_client.h
similarity index 100%
rename from internal/platform/implementation/linux/networkmanager_connection_active_client_glue.h
rename to internal/platform/implementation/linux/generated/dbus/networkmanager/connection_active_client.h
diff --git a/internal/platform/implementation/linux/networkmanager_device_wifip2p_client_glue.h b/internal/platform/implementation/linux/generated/dbus/networkmanager/device_wifip2p_client.h
similarity index 100%
rename from internal/platform/implementation/linux/networkmanager_device_wifip2p_client_glue.h
rename to internal/platform/implementation/linux/generated/dbus/networkmanager/device_wifip2p_client.h
diff --git a/internal/platform/implementation/linux/networkmanager_device_wireless_client_glue.h b/internal/platform/implementation/linux/generated/dbus/networkmanager/device_wireless_client.h
similarity index 100%
rename from internal/platform/implementation/linux/networkmanager_device_wireless_client_glue.h
rename to internal/platform/implementation/linux/generated/dbus/networkmanager/device_wireless_client.h
diff --git a/internal/platform/implementation/linux/networkmanager_ip4config_client_glue.h b/internal/platform/implementation/linux/generated/dbus/networkmanager/ip4config_client.h
similarity index 100%
rename from internal/platform/implementation/linux/networkmanager_ip4config_client_glue.h
rename to internal/platform/implementation/linux/generated/dbus/networkmanager/ip4config_client.h
diff --git a/internal/platform/implementation/linux/networkmanager_client_glue.h b/internal/platform/implementation/linux/generated/dbus/networkmanager/networkmanager_client.h
similarity index 100%
rename from internal/platform/implementation/linux/networkmanager_client_glue.h
rename to internal/platform/implementation/linux/generated/dbus/networkmanager/networkmanager_client.h
diff --git a/internal/platform/implementation/linux/org.freedesktop.NetworkManager.AccessPoint.xml b/internal/platform/implementation/linux/generated/dbus/networkmanager/org.freedesktop.NetworkManager.AccessPoint.xml
similarity index 100%
rename from internal/platform/implementation/linux/org.freedesktop.NetworkManager.AccessPoint.xml
rename to internal/platform/implementation/linux/generated/dbus/networkmanager/org.freedesktop.NetworkManager.AccessPoint.xml
diff --git a/internal/platform/implementation/linux/org.freedesktop.NetworkManager.Connection.Active.xml b/internal/platform/implementation/linux/generated/dbus/networkmanager/org.freedesktop.NetworkManager.Connection.Active.xml
similarity index 100%
rename from internal/platform/implementation/linux/org.freedesktop.NetworkManager.Connection.Active.xml
rename to internal/platform/implementation/linux/generated/dbus/networkmanager/org.freedesktop.NetworkManager.Connection.Active.xml
diff --git a/internal/platform/implementation/linux/org.freedesktop.NetworkManager.Device.WifiP2P.xml b/internal/platform/implementation/linux/generated/dbus/networkmanager/org.freedesktop.NetworkManager.Device.WifiP2P.xml
similarity index 100%
rename from internal/platform/implementation/linux/org.freedesktop.NetworkManager.Device.WifiP2P.xml
rename to internal/platform/implementation/linux/generated/dbus/networkmanager/org.freedesktop.NetworkManager.Device.WifiP2P.xml
diff --git a/internal/platform/implementation/linux/org.freedesktop.NetworkManager.Device.Wireless.xml b/internal/platform/implementation/linux/generated/dbus/networkmanager/org.freedesktop.NetworkManager.Device.Wireless.xml
similarity index 100%
rename from internal/platform/implementation/linux/org.freedesktop.NetworkManager.Device.Wireless.xml
rename to internal/platform/implementation/linux/generated/dbus/networkmanager/org.freedesktop.NetworkManager.Device.Wireless.xml
diff --git a/internal/platform/implementation/linux/org.freedesktop.NetworkManager.IP4Config.xml b/internal/platform/implementation/linux/generated/dbus/networkmanager/org.freedesktop.NetworkManager.IP4Config.xml
similarity index 100%
rename from internal/platform/implementation/linux/org.freedesktop.NetworkManager.IP4Config.xml
rename to internal/platform/implementation/linux/generated/dbus/networkmanager/org.freedesktop.NetworkManager.IP4Config.xml
diff --git a/internal/platform/implementation/linux/org.freedesktop.NetworkManager.xml b/internal/platform/implementation/linux/generated/dbus/networkmanager/org.freedesktop.NetworkManager.xml
similarity index 100%
rename from internal/platform/implementation/linux/org.freedesktop.NetworkManager.xml
rename to internal/platform/implementation/linux/generated/dbus/networkmanager/org.freedesktop.NetworkManager.xml
diff --git a/internal/platform/implementation/linux/log_message.h b/internal/platform/implementation/linux/log_message.h
index 46b1084c..13122565 100644
--- a/internal/platform/implementation/linux/log_message.h
+++ b/internal/platform/implementation/linux/log_message.h
@@ -19,7 +19,7 @@
 #include <sdbus-c++/IConnection.h>
 
 #include "glog/logging.h"
-#include "internal/platform/implementation/linux/org_freedesktop_logcontrol_server_glue.h"
+#include "internal/platform/implementation/linux/generated/dbus/logcontrol/logcontrol_server.h"
 #include "internal/platform/implementation/log_message.h"
 
 namespace nearby {
diff --git a/internal/platform/implementation/linux/platform.cc b/internal/platform/implementation/linux/platform.cc
index 53080360..2d97faa7 100644
--- a/internal/platform/implementation/linux/platform.cc
+++ b/internal/platform/implementation/linux/platform.cc
@@ -34,7 +34,7 @@
 #include "internal/platform/implementation/linux/bluetooth_adapter.h"
 #include "internal/platform/implementation/linux/bluetooth_classic_medium.h"
 #include "internal/platform/implementation/linux/bluez.h"
-#include "internal/platform/implementation/linux/bluez_adapter_client_glue.h"
+#include "internal/platform/implementation/linux/generated/dbus/bluez/adapter_client.h"
 #include "internal/platform/implementation/linux/condition_variable.h"
 #include "internal/platform/implementation/linux/dbus.h"
 #include "internal/platform/implementation/linux/mutex.h"
diff --git a/internal/platform/implementation/linux/wifi_medium.cc b/internal/platform/implementation/linux/wifi_medium.cc
index a5ee580b..4a96cf7c 100644
--- a/internal/platform/implementation/linux/wifi_medium.cc
+++ b/internal/platform/implementation/linux/wifi_medium.cc
@@ -25,8 +25,8 @@
 
 #include "absl/synchronization/mutex.h"
 #include "internal/platform/implementation/linux/dbus.h"
-#include "internal/platform/implementation/linux/networkmanager_connection_active_client_glue.h"
-#include "internal/platform/implementation/linux/networkmanager_device_wireless_client_glue.h"
+#include "internal/platform/implementation/linux/generated/dbus/networkmanager/connection_active_client.h"
+#include "internal/platform/implementation/linux/generated/dbus/networkmanager/device_wireless_client.h"
 #include "internal/platform/implementation/linux/wifi_medium.h"
 #include "internal/platform/implementation/wifi.h"
 
diff --git a/internal/platform/implementation/linux/wifi_medium.h b/internal/platform/implementation/linux/wifi_medium.h
index c06fe1bb..4b395310 100644
--- a/internal/platform/implementation/linux/wifi_medium.h
+++ b/internal/platform/implementation/linux/wifi_medium.h
@@ -29,11 +29,11 @@
 
 #include "absl/synchronization/mutex.h"
 #include "internal/platform/implementation/linux/dbus.h"
-#include "internal/platform/implementation/linux/networkmanager_accesspoint_client_glue.h"
-#include "internal/platform/implementation/linux/networkmanager_client_glue.h"
-#include "internal/platform/implementation/linux/networkmanager_connection_active_client_glue.h"
-#include "internal/platform/implementation/linux/networkmanager_device_wireless_client_glue.h"
-#include "internal/platform/implementation/linux/networkmanager_ip4config_client_glue.h"
+#include "internal/platform/implementation/linux/generated/dbus/networkmanager/access_point_client.h"
+#include "internal/platform/implementation/linux/generated/dbus/networkmanager/networkmanager_client.h"
+#include "internal/platform/implementation/linux/generated/dbus/networkmanager/connection_active_client.h"
+#include "internal/platform/implementation/linux/generated/dbus/networkmanager/device_wireless_client.h"
+#include "internal/platform/implementation/linux/generated/dbus/networkmanager/ip4config_client.h"
 #include "internal/platform/implementation/wifi.h"
 #include "internal/platform/logging.h"