Remove gd prefix from include files

Bug: 301661850
Test: mma -j32
Flag: EXEMPT, inclusion path changes
Change-Id: Ibc58a0e8af5f3828caa69b82118051b14b417e43

70 files changed, 151 insertions, 156 deletions

diff --git a/system/bta/av/bta_av_main.cc b/system/bta/av/bta_av_main.cc
index ece2b83a78..b9fb850234 100644
--- a/system/bta/av/bta_av_main.cc
+++ b/system/bta/av/bta_av_main.cc
@@ -37,8 +37,8 @@
 #include "btif/include/btif_av.h"
 #include "btif/include/btif_av_co.h"
 #include "btif/include/btif_config.h"
-#include "gd/os/log.h"
 #include "internal_include/bt_target.h"
+#include "os/log.h"
 #include "osi/include/allocator.h"
 #include "osi/include/osi.h"  // UNUSED_ATTR
 #include "osi/include/properties.h"
diff --git a/system/bta/dm/bta_dm_gatt_client.cc b/system/bta/dm/bta_dm_gatt_client.cc
index 29656ea0e0..46462053c0 100644
--- a/system/bta/dm/bta_dm_gatt_client.cc
+++ b/system/bta/dm/bta_dm_gatt_client.cc
@@ -23,7 +23,7 @@
 #include <vector>
 
 #include "bta/include/bta_gatt_api.h"
-#include "gd/common/strings.h"
+#include "common/strings.h"
 #include "main/shim/dumpsys.h"
 #include "stack/btm/btm_int_types.h"
 #include "types/bluetooth/uuid.h"
diff --git a/system/bta/le_audio/audio_hal_client/audio_source_hal_asrc.cc b/system/bta/le_audio/audio_hal_client/audio_source_hal_asrc.cc
index 43b5e8f4df..014fc3b236 100644
--- a/system/bta/le_audio/audio_hal_client/audio_source_hal_asrc.cc
+++ b/system/bta/le_audio/audio_hal_client/audio_source_hal_asrc.cc
@@ -23,7 +23,7 @@
 #include <utility>
 
 #include "asrc_tables.h"
-#include "gd/hal/nocp_iso_clocker.h"
+#include "hal/nocp_iso_clocker.h"
 
 namespace le_audio {
 
diff --git a/system/bta/le_audio/client.cc b/system/bta/le_audio/client.cc
index e60554d801..f23ef78367 100644
--- a/system/bta/le_audio/client.cc
+++ b/system/bta/le_audio/client.cc
@@ -36,11 +36,11 @@
 #include "client_parser.h"
 #include "codec_interface.h"
 #include "codec_manager.h"
+#include "common/strings.h"
 #include "common/time_util.h"
 #include "content_control_id_keeper.h"
 #include "device/include/controller.h"
 #include "devices.h"
-#include "gd/common/strings.h"
 #include "include/check.h"
 #include "internal_include/bt_trace.h"
 #include "internal_include/stack_config.h"
diff --git a/system/bta/le_audio/codec_manager_test.cc b/system/bta/le_audio/codec_manager_test.cc
index d91338ad12..cca0010f99 100644
--- a/system/bta/le_audio/codec_manager_test.cc
+++ b/system/bta/le_audio/codec_manager_test.cc
@@ -19,7 +19,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "gd/common/init_flags.h"
+#include "common/init_flags.h"
 #include "le_audio_set_configuration_provider.h"
 #include "mock_controller.h"
 #include "test/mock/mock_legacy_hci_interface.h"
diff --git a/system/bta/le_audio/content_control_id_keeper.cc b/system/bta/le_audio/content_control_id_keeper.cc
index a1df761d8a..2ff0bad75c 100644
--- a/system/bta/le_audio/content_control_id_keeper.cc
+++ b/system/bta/le_audio/content_control_id_keeper.cc
@@ -21,7 +21,7 @@
 #include <bitset>
 #include <map>
 
-#include "gd/common/strings.h"
+#include "common/strings.h"
 #include "le_audio_types.h"
 #include "osi/include/log.h"
 
diff --git a/system/bta/le_audio/devices.h b/system/bta/le_audio/devices.h
index 7d3f6f118d..5738794826 100644
--- a/system/bta/le_audio/devices.h
+++ b/system/bta/le_audio/devices.h
@@ -33,8 +33,8 @@
 #include "audio_hal_client/audio_hal_client.h"
 #include "bta_groups.h"
 #include "btm_iso_api_types.h"
+#include "common/strings.h"
 #include "gatt_api.h"
-#include "gd/common/strings.h"
 #include "le_audio_log_history.h"
 #include "le_audio_types.h"
 #include "osi/include/alarm.h"
diff --git a/system/bta/le_audio/le_audio_health_status.cc b/system/bta/le_audio/le_audio_health_status.cc
index 233a80e7c5..3de70b559b 100644
--- a/system/bta/le_audio/le_audio_health_status.cc
+++ b/system/bta/le_audio/le_audio_health_status.cc
@@ -19,7 +19,7 @@
 #include <vector>
 
 #include "bta/include/bta_groups.h"
-#include "gd/common/strings.h"
+#include "common/strings.h"
 #include "main/shim/metrics_api.h"
 #include "osi/include/log.h"
 #include "osi/include/properties.h"
diff --git a/system/bta/le_audio/le_audio_log_history.cc b/system/bta/le_audio/le_audio_log_history.cc
index d4568cbaa0..fae625f945 100644
--- a/system/bta/le_audio/le_audio_log_history.cc
+++ b/system/bta/le_audio/le_audio_log_history.cc
@@ -23,8 +23,8 @@
 #include <memory>
 #include <string>
 
-#include "gd/common/circular_buffer.h"
-#include "gd/common/strings.h"
+#include "common/circular_buffer.h"
+#include "common/strings.h"
 #include "main/shim/dumpsys.h"
 #include "osi/include/log.h"
 #include "osi/include/osi.h"
diff --git a/system/bta/le_audio/le_audio_utils.cc b/system/bta/le_audio/le_audio_utils.cc
index 579945972f..d050681999 100644
--- a/system/bta/le_audio/le_audio_utils.cc
+++ b/system/bta/le_audio/le_audio_utils.cc
@@ -17,7 +17,7 @@
 #include "le_audio_utils.h"
 
 #include "bta/le_audio/content_control_id_keeper.h"
-#include "gd/common/strings.h"
+#include "common/strings.h"
 #include "le_audio_types.h"
 #include "osi/include/log.h"
 
diff --git a/system/bta/le_audio/state_machine.cc b/system/bta/le_audio/state_machine.cc
index 1fe6517cd2..ffad6eae25 100644
--- a/system/bta/le_audio/state_machine.cc
+++ b/system/bta/le_audio/state_machine.cc
@@ -26,8 +26,8 @@
 #include "btm_iso_api.h"
 #include "client_parser.h"
 #include "codec_manager.h"
+#include "common/strings.h"
 #include "devices.h"
-#include "gd/common/strings.h"
 #include "hci/hci_packets.h"
 #include "hcimsgs.h"
 #include "include/check.h"
diff --git a/system/bta/le_audio/storage_helper.cc b/system/bta/le_audio/storage_helper.cc
index ccb25998a4..8214eab7f1 100644
--- a/system/bta/le_audio/storage_helper.cc
+++ b/system/bta/le_audio/storage_helper.cc
@@ -19,7 +19,7 @@
 #include "storage_helper.h"
 
 #include "client_parser.h"
-#include "gd/common/strings.h"
+#include "common/strings.h"
 #include "le_audio_types.h"
 #include "osi/include/log.h"
 #include "stack/include/bt_types.h"
diff --git a/system/bta/test/bta_gatt_client_test.cc b/system/bta/test/bta_gatt_client_test.cc
index ef92ed7048..5e629cce78 100644
--- a/system/bta/test/bta_gatt_client_test.cc
+++ b/system/bta/test/bta_gatt_client_test.cc
@@ -22,8 +22,7 @@
 #include <string>
 
 #include "bta/dm/bta_dm_gatt_client.h"
-#include "gd/common/circular_buffer.h"
-#include "stack/btm/btm_int_types.h"
+#include "common/circular_buffer.h"
 
 using namespace bluetooth::common;
 
diff --git a/system/btcore/include/module.h b/system/btcore/include/module.h
index a6f5fd2724..6ea11c163b 100644
--- a/system/btcore/include/module.h
+++ b/system/btcore/include/module.h
@@ -20,9 +20,7 @@
 
 #include <stdbool.h>
 
-#include "common/message_loop_thread.h"
 #include "osi/include/future.h"
-#include "osi/include/thread.h"
 
 typedef future_t* (*module_lifecycle_fn)(void);
 
diff --git a/system/btif/src/bluetooth.cc b/system/btif/src/bluetooth.cc
index 3566816697..66de2ade92 100644
--- a/system/btif/src/bluetooth.cc
+++ b/system/btif/src/bluetooth.cc
@@ -88,11 +88,11 @@
 #include "device/include/device_iot_config.h"
 #include "device/include/interop.h"
 #include "device/include/interop_config.h"
-#include "gd/os/parameter_provider.h"
 #include "include/check.h"
 #include "internal_include/bt_target.h"
 #include "main/shim/dumpsys.h"
 #include "os/log.h"
+#include "os/parameter_provider.h"
 #include "osi/include/alarm.h"
 #include "osi/include/allocator.h"
 #include "osi/include/stack_power_telemetry.h"
diff --git a/system/btif/src/btif_dm.cc b/system/btif/src/btif_dm.cc
index b08d6b6641..60c23fdd20 100644
--- a/system/btif/src/btif_dm.cc
+++ b/system/btif/src/btif_dm.cc
@@ -62,10 +62,10 @@
 #include "btif_profile_storage.h"
 #include "btif_storage.h"
 #include "btif_util.h"
+#include "common/lru_cache.h"
 #include "common/metrics.h"
 #include "device/include/controller.h"
 #include "device/include/interop.h"
-#include "gd/common/lru_cache.h"
 #include "include/check.h"
 #include "internal_include/bt_target.h"
 #include "internal_include/stack_config.h"
diff --git a/system/btif/src/btif_gatt_util.cc b/system/btif/src/btif_gatt_util.cc
index ed333dc45b..e1e61c8334 100644
--- a/system/btif/src/btif_gatt_util.cc
+++ b/system/btif/src/btif_gatt_util.cc
@@ -30,8 +30,8 @@
 #include "bta/include/bta_sec_api.h"
 #include "btif_storage.h"
 #include "common/init_flags.h"
-#include "gd/os/system_properties.h"
 #include "os/log.h"
+#include "os/system_properties.h"
 #include "osi/include/allocator.h"
 #include "osi/include/osi.h"
 #include "stack/btm/btm_sec.h"
diff --git a/system/btif/src/btif_keystore.cc b/system/btif/src/btif_keystore.cc
index 022c78bdc1..8125f0a107 100644
--- a/system/btif/src/btif_keystore.cc
+++ b/system/btif/src/btif_keystore.cc
@@ -27,9 +27,9 @@
 
 #include "btif_common.h"
 #include "btif_storage.h"
-#include "gd/os/parameter_provider.h"
 #include "main/shim/config.h"
 #include "main/shim/shim.h"
+#include "os/parameter_provider.h"
 
 using base::Bind;
 using base::Unretained;
diff --git a/system/common/address_obfuscator.h b/system/common/address_obfuscator.h
index 9118b07af8..fef975321d 100644
--- a/system/common/address_obfuscator.h
+++ b/system/common/address_obfuscator.h
@@ -21,7 +21,7 @@
 #include <mutex>
 #include <string>
 
-#include "gd/hci/octets.h"
+#include "hci/octets.h"
 #include "raw_address.h"
 
 namespace bluetooth {
diff --git a/system/common/metrics.cc b/system/common/metrics.cc
index 257ad35a36..b9a1e2d180 100644
--- a/system/common/metrics.cc
+++ b/system/common/metrics.cc
@@ -35,12 +35,12 @@
 
 #include "address_obfuscator.h"
 #include "bluetooth/metrics/bluetooth.pb.h"
-#include "gd/hci/address.h"
-#include "gd/metrics/metrics_state.h"
-#include "gd/os/metrics.h"
+#include "hci/address.h"
 #include "internal_include/bt_trace.h"
 #include "leaky_bonded_queue.h"
 #include "metric_id_allocator.h"
+#include "metrics/metrics_state.h"
+#include "os/metrics.h"
 #include "osi/include/osi.h"
 #include "time_util.h"
 #include "types/raw_address.h"
diff --git a/system/common/metrics.h b/system/common/metrics.h
index 273cbdab19..182d0b0387 100644
--- a/system/common/metrics.h
+++ b/system/common/metrics.h
@@ -28,9 +28,9 @@
 #include <string>
 #include <vector>
 
-#include "gd/os/metrics.h"
-#include "types/raw_address.h"
 #include "hci/address.h"
+#include "os/metrics.h"
+#include "types/raw_address.h"
 
 namespace bluetooth {
 
diff --git a/system/gd/l2cap/fuzz/channel_fuzz_controller.h b/system/gd/l2cap/fuzz/channel_fuzz_controller.h
index 14fdcd3c71..a6128204d3 100644
--- a/system/gd/l2cap/fuzz/channel_fuzz_controller.h
+++ b/system/gd/l2cap/fuzz/channel_fuzz_controller.h
@@ -20,7 +20,7 @@
 
 #include <vector>
 
-#include "gd/fuzz/helpers.h"
+#include "fuzz/helpers.h"
 #include "l2cap/classic/internal/fixed_channel_impl.h"
 #include "l2cap/internal/dynamic_channel_impl.h"
 #include "l2cap/l2cap_packets.h"
diff --git a/system/gd/metrics/chromeos/metrics.cc b/system/gd/metrics/chromeos/metrics.cc
index 9ee8f05b2c..dea7fe88c6 100644
--- a/system/gd/metrics/chromeos/metrics.cc
+++ b/system/gd/metrics/chromeos/metrics.cc
@@ -15,15 +15,15 @@
  */
 #define LOG_TAG "BluetoothMetrics"
 
-#include "gd/metrics/metrics.h"
+#include "metrics/metrics.h"
 
 #include <metrics/structured_events.h>
 
 #include "common/time_util.h"
-#include "gd/metrics/chromeos/metrics_allowlist.h"
-#include "gd/metrics/chromeos/metrics_event.h"
-#include "gd/metrics/utils.h"
-#include "gd/os/log.h"
+#include "metrics/chromeos/metrics_allowlist.h"
+#include "metrics/chromeos/metrics_event.h"
+#include "metrics/utils.h"
+#include "os/log.h"
 
 namespace bluetooth {
 namespace metrics {
diff --git a/system/gd/metrics/chromeos/metrics_event.cc b/system/gd/metrics/chromeos/metrics_event.cc
index 293fa112e2..9db80975eb 100644
--- a/system/gd/metrics/chromeos/metrics_event.cc
+++ b/system/gd/metrics/chromeos/metrics_event.cc
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "gd/metrics/chromeos/metrics_event.h"
+#include "metrics/chromeos/metrics_event.h"
 
 #include <base/files/file_path.h>
 #include <base/files/file_util.h>
diff --git a/system/gd/metrics/linux/metrics.cc b/system/gd/metrics/linux/metrics.cc
index 601675b413..648329a453 100644
--- a/system/gd/metrics/linux/metrics.cc
+++ b/system/gd/metrics/linux/metrics.cc
@@ -15,7 +15,7 @@
  */
 #define LOG_TAG "BluetoothMetrics"
 
-#include "gd/metrics/metrics.h"
+#include "metrics/metrics.h"
 
 namespace bluetooth {
 namespace metrics {
diff --git a/system/gd/os/chromeos/metrics.cc b/system/gd/os/chromeos/metrics.cc
index 002a229199..b69a7f700c 100644
--- a/system/gd/os/chromeos/metrics.cc
+++ b/system/gd/os/chromeos/metrics.cc
@@ -20,7 +20,7 @@
 
 #include <metrics/structured_events.h>
 
-#include "gd/metrics/utils.h"
+#include "metrics/utils.h"
 #include "os/log.h"
 
 namespace bluetooth {
diff --git a/system/gd/os/log.h b/system/gd/os/log.h
index dc2a307764..e07ce1c434 100644
--- a/system/gd/os/log.h
+++ b/system/gd/os/log.h
@@ -103,7 +103,7 @@ static_assert(LOG_TAG != nullptr, "LOG_TAG should never be NULL");
   } while (false)
 #elif defined(TARGET_FLOSS) /* end of defined (ANDROID_EMULATOR) */
 #include "common/init_flags.h"
-#include "gd/os/syslog.h"
+#include "os/syslog.h"
 
 // Prefix the log with tag, file, line and function
 #define LOGWRAPPER(tag, fmt, args...) \
diff --git a/system/gd/os/syslog.cc b/system/gd/os/syslog.cc
index f117f64ffc..f0a4f74d34 100644
--- a/system/gd/os/syslog.cc
+++ b/system/gd/os/syslog.cc
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include "gd/os/syslog.h"
+#include "os/syslog.h"
 
 #include <syslog.h>
 
 #include <cstdarg>
 #include <memory>
 
-#include "gd/os/log_tags.h"
+#include "os/log_tags.h"
 
 namespace {
 #define SYSLOG_IDENT "btadapterd"
diff --git a/system/gd/rust/stack/src/hal/ffi/hidl.cc b/system/gd/rust/stack/src/hal/ffi/hidl.cc
index fd8e171009..60c7dbf62b 100644
--- a/system/gd/rust/stack/src/hal/ffi/hidl.cc
+++ b/system/gd/rust/stack/src/hal/ffi/hidl.cc
@@ -5,7 +5,7 @@
 #include <android/hardware/bluetooth/1.1/IBluetoothHciCallbacks.h>
 #include <stdlib.h>
 
-#include "gd/os/log.h"
+#include "os/log.h"
 
 using ::android::hardware::hidl_vec;
 using ::android::hardware::Return;
diff --git a/system/gd/rust/topshim/btav/btav_shim.cc b/system/gd/rust/topshim/btav/btav_shim.cc
index 87da81764a..2ebed73deb 100644
--- a/system/gd/rust/topshim/btav/btav_shim.cc
+++ b/system/gd/rust/topshim/btav/btav_shim.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "gd/rust/topshim/btav/btav_shim.h"
+#include "rust/topshim/btav/btav_shim.h"
 
 #include <cstdio>
 #include <memory>
diff --git a/system/gd/rust/topshim/btav_sink/btav_sink_shim.cc b/system/gd/rust/topshim/btav_sink/btav_sink_shim.cc
index d2a42a8056..9bcb338936 100644
--- a/system/gd/rust/topshim/btav_sink/btav_sink_shim.cc
+++ b/system/gd/rust/topshim/btav_sink/btav_sink_shim.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "gd/rust/topshim/btav_sink/btav_sink_shim.h"
+#include "rust/topshim/btav_sink/btav_sink_shim.h"
 
 #include <memory>
 
diff --git a/system/gd/rust/topshim/btav_sink/btav_sink_shim.h b/system/gd/rust/topshim/btav_sink/btav_sink_shim.h
index 1aa2f53d89..900fdf0b36 100644
--- a/system/gd/rust/topshim/btav_sink/btav_sink_shim.h
+++ b/system/gd/rust/topshim/btav_sink/btav_sink_shim.h
@@ -18,9 +18,9 @@
 
 #include <memory>
 
-#include "gd/rust/topshim/btav_sink/btav_sink_shim.h"
 #include "include/hardware/bt_av.h"
 #include "rust/cxx.h"
+#include "rust/topshim/btav_sink/btav_sink_shim.h"
 #include "types/raw_address.h"
 
 namespace bluetooth {
diff --git a/system/gd/rust/topshim/btif/btif_shim.cc b/system/gd/rust/topshim/btif/btif_shim.cc
index 8529605bac..82cb32ea19 100644
--- a/system/gd/rust/topshim/btif/btif_shim.cc
+++ b/system/gd/rust/topshim/btif/btif_shim.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "gd/rust/topshim/btif/btif_shim.h"
+#include "rust/topshim/btif/btif_shim.h"
 
 #include <algorithm>
 #include <cstdlib>
diff --git a/system/gd/rust/topshim/controller/controller_shim.cc b/system/gd/rust/topshim/controller/controller_shim.cc
index b20d97c0e8..a9594c306a 100644
--- a/system/gd/rust/topshim/controller/controller_shim.cc
+++ b/system/gd/rust/topshim/controller/controller_shim.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "gd/rust/topshim/controller/controller_shim.h"
+#include "rust/topshim/controller/controller_shim.h"
 
 #include <memory>
 
diff --git a/system/gd/rust/topshim/gatt/gatt_ble_advertiser_shim.cc b/system/gd/rust/topshim/gatt/gatt_ble_advertiser_shim.cc
index cb5b6d5849..73649a74ec 100644
--- a/system/gd/rust/topshim/gatt/gatt_ble_advertiser_shim.cc
+++ b/system/gd/rust/topshim/gatt/gatt_ble_advertiser_shim.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "gd/rust/topshim/gatt/gatt_ble_advertiser_shim.h"
+#include "rust/topshim/gatt/gatt_ble_advertiser_shim.h"
 
 #include <base/functional/bind.h>
 #include <base/functional/callback.h>
diff --git a/system/gd/rust/topshim/gatt/gatt_ble_scanner_shim.cc b/system/gd/rust/topshim/gatt/gatt_ble_scanner_shim.cc
index bc4f311fb4..72b9bfcd81 100644
--- a/system/gd/rust/topshim/gatt/gatt_ble_scanner_shim.cc
+++ b/system/gd/rust/topshim/gatt/gatt_ble_scanner_shim.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "gd/rust/topshim/gatt/gatt_ble_scanner_shim.h"
+#include "rust/topshim/gatt/gatt_ble_scanner_shim.h"
 
 #include <base/functional/bind.h>
 #include <base/functional/callback.h>
diff --git a/system/gd/rust/topshim/gatt/gatt_shim.cc b/system/gd/rust/topshim/gatt/gatt_shim.cc
index 1439e8241d..1fcf175c5c 100644
--- a/system/gd/rust/topshim/gatt/gatt_shim.cc
+++ b/system/gd/rust/topshim/gatt/gatt_shim.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "gd/rust/topshim/gatt/gatt_shim.h"
+#include "rust/topshim/gatt/gatt_shim.h"
 
 #include "base/functional/bind.h"
 #include "base/functional/callback.h"
diff --git a/system/gd/rust/topshim/hfp/hfp_shim.cc b/system/gd/rust/topshim/hfp/hfp_shim.cc
index a98d794962..30cb6232da 100644
--- a/system/gd/rust/topshim/hfp/hfp_shim.cc
+++ b/system/gd/rust/topshim/hfp/hfp_shim.cc
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include "gd/rust/topshim/hfp/hfp_shim.h"
+#include "rust/topshim/hfp/hfp_shim.h"
 
 #include "btif/include/btif_hf.h"
+#include "common/strings.h"
 #include "device/include/interop.h"
-#include "gd/common/strings.h"
-#include "gd/os/log.h"
 #include "include/hardware/bt_hf.h"
+#include "os/log.h"
 #include "src/profiles/hfp.rs.h"
 #include "types/raw_address.h"
 
diff --git a/system/gd/rust/topshim/metrics/metrics_shim.cc b/system/gd/rust/topshim/metrics/metrics_shim.cc
index ffc746a171..a513a56dbc 100644
--- a/system/gd/rust/topshim/metrics/metrics_shim.cc
+++ b/system/gd/rust/topshim/metrics/metrics_shim.cc
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "gd/rust/topshim/metrics/metrics_shim.h"
+#include "rust/topshim/metrics/metrics_shim.h"
 
-#include "gd/metrics/metrics.h"
+#include "metrics/metrics.h"
 #include "src/metrics.rs.h"
 #include "types/raw_address.h"
 
diff --git a/system/main/shim/acl.cc b/system/main/shim/acl.cc
index aaea9d5cd1..e3dfc071f4 100644
--- a/system/main/shim/acl.cc
+++ b/system/main/shim/acl.cc
@@ -30,27 +30,27 @@
 #include <string>
 #include <unordered_set>
 
+#include "common/bind.h"
 #include "common/interfaces/ILoggable.h"
+#include "common/strings.h"
+#include "common/sync_map_count.h"
 #include "device/include/controller.h"
-#include "gd/common/bind.h"
-#include "gd/common/strings.h"
-#include "gd/common/sync_map_count.h"
-#include "gd/hci/acl_manager.h"
-#include "gd/hci/acl_manager/acl_connection.h"
-#include "gd/hci/acl_manager/classic_acl_connection.h"
-#include "gd/hci/acl_manager/connection_management_callbacks.h"
-#include "gd/hci/acl_manager/le_acl_connection.h"
-#include "gd/hci/acl_manager/le_connection_management_callbacks.h"
-#include "gd/hci/address.h"
-#include "gd/hci/address_with_type.h"
-#include "gd/hci/class_of_device.h"
-#include "gd/hci/controller.h"
-#include "gd/os/handler.h"
+#include "hci/acl_manager.h"
+#include "hci/acl_manager/acl_connection.h"
+#include "hci/acl_manager/classic_acl_connection.h"
+#include "hci/acl_manager/connection_management_callbacks.h"
+#include "hci/acl_manager/le_acl_connection.h"
+#include "hci/acl_manager/le_connection_management_callbacks.h"
+#include "hci/address.h"
+#include "hci/address_with_type.h"
+#include "hci/class_of_device.h"
+#include "hci/controller.h"
 #include "internal_include/bt_target.h"
 #include "main/shim/dumpsys.h"
 #include "main/shim/entry.h"
 #include "main/shim/helpers.h"
 #include "main/shim/stack.h"
+#include "os/handler.h"
 #include "osi/include/allocator.h"
 #include "stack/acl/acl.h"
 #include "stack/btm/btm_int_types.h"
diff --git a/system/main/shim/acl.h b/system/main/shim/acl.h
index 80daeac6a6..749c012e1d 100644
--- a/system/main/shim/acl.h
+++ b/system/main/shim/acl.h
@@ -19,16 +19,16 @@
 #include <future>
 #include <memory>
 
-#include "gd/hci/acl_manager/connection_callbacks.h"
-#include "gd/hci/acl_manager/le_connection_callbacks.h"
-#include "gd/hci/address.h"
-#include "gd/hci/address_with_type.h"
-#include "gd/hci/class_of_device.h"
-#include "gd/os/handler.h"
-#include "gd/packet/raw_builder.h"
+#include "hci/acl_manager/connection_callbacks.h"
+#include "hci/acl_manager/le_connection_callbacks.h"
+#include "hci/address.h"
+#include "hci/address_with_type.h"
+#include "hci/class_of_device.h"
 #include "main/shim/acl_legacy_interface.h"
 #include "main/shim/link_connection_interface.h"
 #include "main/shim/link_policy_interface.h"
+#include "os/handler.h"
+#include "packet/raw_builder.h"
 #include "types/raw_address.h"
 
 using LeRandCallback = base::OnceCallback<void(uint64_t)>;
diff --git a/system/main/shim/acl_api.cc b/system/main/shim/acl_api.cc
index e2db8dd463..e8d8b4c701 100644
--- a/system/main/shim/acl_api.cc
+++ b/system/main/shim/acl_api.cc
@@ -22,8 +22,8 @@
 #include <future>
 #include <optional>
 
-#include "gd/hci/acl_manager.h"
-#include "gd/hci/remote_name_request.h"
+#include "hci/acl_manager.h"
+#include "hci/remote_name_request.h"
 #include "main/shim/entry.h"
 #include "main/shim/helpers.h"
 #include "main/shim/stack.h"
diff --git a/system/main/shim/btm.cc b/system/main/shim/btm.cc
index 7c43a7791d..aec23909c0 100644
--- a/system/main/shim/btm.cc
+++ b/system/main/shim/btm.cc
@@ -26,16 +26,16 @@
 #include <cstring>
 #include <mutex>
 
-#include "gd/hci/le_advertising_manager.h"
-#include "gd/hci/le_scanning_manager.h"
-#include "gd/neighbor/connectability.h"
-#include "gd/neighbor/discoverability.h"
-#include "gd/neighbor/inquiry.h"
-#include "gd/neighbor/page.h"
-#include "gd/security/security_module.h"
+#include "hci/le_advertising_manager.h"
+#include "hci/le_scanning_manager.h"
 #include "main/shim/controller.h"
 #include "main/shim/entry.h"
 #include "main/shim/helpers.h"
+#include "neighbor/connectability.h"
+#include "neighbor/discoverability.h"
+#include "neighbor/inquiry.h"
+#include "neighbor/page.h"
+#include "security/security_module.h"
 #include "stack/btm/btm_dev.h"
 #include "stack/btm/btm_int_types.h"
 #include "types/ble_address_with_type.h"
diff --git a/system/main/shim/btm.h b/system/main/shim/btm.h
index 8d764bddcb..f14569a53a 100644
--- a/system/main/shim/btm.h
+++ b/system/main/shim/btm.h
@@ -23,12 +23,12 @@
 #include <vector>
 
 #include "bt_transport.h"
-#include "gd/common/callback.h"
-#include "gd/hci/le_advertising_manager.h"
-#include "gd/hci/le_scanning_callback.h"
-#include "gd/neighbor/inquiry.h"
-#include "gd/os/alarm.h"
+#include "common/callback.h"
 #include "hci/hci_packets.h"
+#include "hci/le_advertising_manager.h"
+#include "hci/le_scanning_callback.h"
+#include "neighbor/inquiry.h"
+#include "os/alarm.h"
 #include "stack/btm/neighbor_inquiry.h"
 #include "types/raw_address.h"
 
diff --git a/system/main/shim/config.cc b/system/main/shim/config.cc
index bc16ef84a4..97efb9325a 100644
--- a/system/main/shim/config.cc
+++ b/system/main/shim/config.cc
@@ -22,9 +22,9 @@
 #include <cstdint>
 #include <cstring>
 
-#include "gd/os/log.h"
-#include "gd/storage/storage_module.h"
 #include "main/shim/entry.h"
+#include "os/log.h"
+#include "storage/storage_module.h"
 
 using ::bluetooth::shim::GetStorage;
 using ::bluetooth::storage::ConfigCacheHelper;
diff --git a/system/main/shim/controller.cc b/system/main/shim/controller.cc
index 45000f96c4..591196a18d 100644
--- a/system/main/shim/controller.cc
+++ b/system/main/shim/controller.cc
@@ -19,7 +19,6 @@
 #include "main/shim/controller.h"
 
 #include "btcore/include/module.h"
-#include "gd/hci/controller.h"
 #include "hci/controller.h"
 #include "include/check.h"
 #include "main/shim/entry.h"
diff --git a/system/main/shim/distance_measurement_manager.cc b/system/main/shim/distance_measurement_manager.cc
index 3f333a0f43..fec2a18a88 100644
--- a/system/main/shim/distance_measurement_manager.cc
+++ b/system/main/shim/distance_measurement_manager.cc
@@ -17,7 +17,7 @@
 #include "distance_measurement_manager.h"
 
 #include "btif/include/btif_common.h"
-#include "gd/hci/distance_measurement_manager.h"
+#include "hci/distance_measurement_manager.h"
 #include "main/shim/entry.h"
 #include "main/shim/helpers.h"
 
diff --git a/system/main/shim/entry.cc b/system/main/shim/entry.cc
index c369d813d0..9d48e340a8 100644
--- a/system/main/shim/entry.cc
+++ b/system/main/shim/entry.cc
@@ -16,26 +16,25 @@
 
 #include "main/shim/entry.h"
 
-#include "gd/hal/snoop_logger.h"
-#include "gd/hci/controller.h"
-#include "gd/hci/distance_measurement_manager.h"
-#include "gd/hci/hci_layer.h"
-#include "gd/hci/le_advertising_manager.h"
-#include "gd/hci/le_scanning_manager.h"
-#include "gd/hci/msft.h"
-#include "gd/hci/remote_name_request.h"
-#include "gd/hci/vendor_specific_event_manager.h"
-#include "gd/l2cap/classic/l2cap_classic_module.h"
-#include "gd/metrics/counter_metrics.h"
-#include "gd/neighbor/connectability.h"
-#include "gd/neighbor/discoverability.h"
-#include "gd/neighbor/inquiry.h"
-#include "gd/neighbor/page.h"
-#include "gd/os/handler.h"
-#include "gd/shim/dumpsys.h"
-#include "gd/storage/storage_module.h"
+#include "hal/snoop_logger.h"
 #include "hci/acl_manager.h"
+#include "hci/controller.h"
+#include "hci/distance_measurement_manager.h"
+#include "hci/hci_layer.h"
+#include "hci/le_advertising_manager.h"
+#include "hci/le_scanning_manager.h"
+#include "hci/msft.h"
+#include "hci/remote_name_request.h"
+#include "hci/vendor_specific_event_manager.h"
 #include "main/shim/stack.h"
+#include "metrics/counter_metrics.h"
+#include "neighbor/connectability.h"
+#include "neighbor/discoverability.h"
+#include "neighbor/inquiry.h"
+#include "neighbor/page.h"
+#include "os/handler.h"
+#include "shim/dumpsys.h"
+#include "storage/storage_module.h"
 
 namespace bluetooth {
 namespace shim {
diff --git a/system/main/shim/helpers.h b/system/main/shim/helpers.h
index 9edb7b9c1a..63bb85f987 100644
--- a/system/main/shim/helpers.h
+++ b/system/main/shim/helpers.h
@@ -18,9 +18,9 @@
 #include <vector>
 
 #include "common/init_flags.h"
-#include "gd/packet/raw_builder.h"
 #include "hci/address_with_type.h"
 #include "osi/include/allocator.h"
+#include "packet/raw_builder.h"
 #include "stack/include/bt_hdr.h"
 #include "stack/include/hci_error_code.h"
 #include "stack/include/hci_mode.h"
diff --git a/system/main/shim/le_advertising_manager.cc b/system/main/shim/le_advertising_manager.cc
index 28492b6c6e..b19f99de86 100644
--- a/system/main/shim/le_advertising_manager.cc
+++ b/system/main/shim/le_advertising_manager.cc
@@ -26,7 +26,7 @@
 
 #include "btif/include/btif_common.h"
 #include "common/init_flags.h"
-#include "gd/hci/le_advertising_manager.h"
+#include "hci/le_advertising_manager.h"
 #include "main/shim/entry.h"
 #include "main/shim/helpers.h"
 #include "stack/include/btm_log_history.h"
diff --git a/system/main/shim/link_connection_interface.h b/system/main/shim/link_connection_interface.h
index 2fc88a1769..7788ae4cbe 100644
--- a/system/main/shim/link_connection_interface.h
+++ b/system/main/shim/link_connection_interface.h
@@ -19,8 +19,8 @@
 #include <cstdint>
 #include <future>
 
-#include "gd/hci/address.h"
-#include "gd/hci/address_with_type.h"
+#include "hci/address.h"
+#include "hci/address_with_type.h"
 #include "stack/include/hci_error_code.h"
 
 namespace bluetooth {
diff --git a/system/main/shim/metric_id_api.cc b/system/main/shim/metric_id_api.cc
index 0573e6e1da..cce6b05003 100644
--- a/system/main/shim/metric_id_api.cc
+++ b/system/main/shim/metric_id_api.cc
@@ -15,8 +15,8 @@
  */
 #include "main/shim/metric_id_api.h"
 
-#include "gd/common/metric_id_manager.h"
-#include "gd/hci/address.h"
+#include "common/metric_id_manager.h"
+#include "hci/address.h"
 #include "main/shim/helpers.h"
 #include "types/raw_address.h"
 
diff --git a/system/main/shim/metrics_api.cc b/system/main/shim/metrics_api.cc
index 73ceca5656..2796976010 100644
--- a/system/main/shim/metrics_api.cc
+++ b/system/main/shim/metrics_api.cc
@@ -16,11 +16,11 @@
 
 #include "main/shim/metrics_api.h"
 
-#include "gd/hci/address.h"
-#include "gd/metrics/counter_metrics.h"
-#include "gd/os/metrics.h"
+#include "hci/address.h"
 #include "main/shim/entry.h"
 #include "main/shim/helpers.h"
+#include "metrics/counter_metrics.h"
+#include "os/metrics.h"
 #include "types/raw_address.h"
 
 using bluetooth::hci::Address;
diff --git a/system/main/shim/shim.cc b/system/main/shim/shim.cc
index 1db3c940f3..c3fa6a58d6 100644
--- a/system/main/shim/shim.cc
+++ b/system/main/shim/shim.cc
@@ -19,10 +19,10 @@
 #include "main/shim/shim.h"
 
 #include "common/init_flags.h"
-#include "gd/os/log.h"
 #include "main/shim/entry.h"
 #include "main/shim/hci_layer.h"
 #include "main/shim/stack.h"
+#include "os/log.h"
 #include "stack/include/main_thread.h"
 
 static const hci_t* hci;
diff --git a/system/main/shim/stack.cc b/system/main/shim/stack.cc
index 196e11ad2d..031c7dd3f6 100644
--- a/system/main/shim/stack.cc
+++ b/system/main/shim/stack.cc
@@ -25,29 +25,29 @@
 #include <string>
 
 #include "common/init_flags.h"
+#include "common/strings.h"
 #include "device/include/controller.h"
-#include "gd/common/strings.h"
-#include "gd/hal/hci_hal.h"
-#include "gd/hci/acl_manager.h"
-#include "gd/hci/acl_manager/acl_scheduler.h"
-#include "gd/hci/controller.h"
-#include "gd/hci/distance_measurement_manager.h"
-#include "gd/hci/hci_layer.h"
-#include "gd/hci/le_advertising_manager.h"
-#include "gd/hci/le_scanning_manager.h"
-#include "gd/hci/msft.h"
-#include "gd/hci/remote_name_request.h"
-#include "gd/hci/vendor_specific_event_manager.h"
-#include "gd/metrics/counter_metrics.h"
-#include "gd/os/log.h"
-#include "gd/shim/dumpsys.h"
-#include "gd/storage/storage_module.h"
-#include "gd/sysprops/sysprops_module.h"
+#include "hal/hci_hal.h"
+#include "hci/acl_manager.h"
+#include "hci/acl_manager/acl_scheduler.h"
+#include "hci/controller.h"
+#include "hci/distance_measurement_manager.h"
+#include "hci/hci_layer.h"
+#include "hci/le_advertising_manager.h"
+#include "hci/le_scanning_manager.h"
+#include "hci/msft.h"
+#include "hci/remote_name_request.h"
+#include "hci/vendor_specific_event_manager.h"
 #include "main/shim/acl_legacy_interface.h"
 #include "main/shim/distance_measurement_manager.h"
 #include "main/shim/hci_layer.h"
 #include "main/shim/le_advertising_manager.h"
 #include "main/shim/le_scanning_manager.h"
+#include "metrics/counter_metrics.h"
+#include "os/log.h"
+#include "shim/dumpsys.h"
+#include "storage/storage_module.h"
+#include "sysprops/sysprops_module.h"
 
 namespace bluetooth {
 namespace shim {
diff --git a/system/main/shim/stack.h b/system/main/shim/stack.h
index 8b04d84c6e..f02b997e01 100644
--- a/system/main/shim/stack.h
+++ b/system/main/shim/stack.h
@@ -19,13 +19,13 @@
 #include <functional>
 #include <mutex>
 
-#include "gd/module.h"
-#include "gd/os/handler.h"
-#include "gd/os/thread.h"
-#include "gd/stack_manager.h"
 #include "main/shim/acl.h"
 #include "main/shim/btm.h"
 #include "main/shim/link_policy_interface.h"
+#include "module.h"
+#include "os/handler.h"
+#include "os/thread.h"
+#include "stack_manager.h"
 
 // The shim layer implementation on the Gd stack side.
 namespace bluetooth {
diff --git a/system/osi/include/log.h b/system/osi/include/log.h
index 5fb671b370..e2fe11f82b 100644
--- a/system/osi/include/log.h
+++ b/system/osi/include/log.h
@@ -24,6 +24,6 @@
 #define OSI_INCLUDE_LOG_H
 #endif
 
-#include "gd/os/log.h"
+#include "os/log.h"
 
 #undef OSI_INCLUDE_LOG_H
\ No newline at end of file
diff --git a/system/osi/src/properties.cc b/system/osi/src/properties.cc
index 5bdddf9743..000cccd0c6 100644
--- a/system/osi/src/properties.cc
+++ b/system/osi/src/properties.cc
@@ -24,7 +24,7 @@
 #include <optional>
 #include <string>
 
-#include "gd/os/system_properties.h"
+#include "os/system_properties.h"
 
 #ifdef __ANDROID__
 #undef PROPERTY_VALUE_MAX
diff --git a/system/stack/btm/btm_int_types.h b/system/stack/btm/btm_int_types.h
index b3a99b75db..0f8c881e71 100644
--- a/system/stack/btm/btm_int_types.h
+++ b/system/stack/btm/btm_int_types.h
@@ -24,7 +24,7 @@
 #include <memory>
 #include <string>
 
-#include "gd/common/circular_buffer.h"
+#include "common/circular_buffer.h"
 #include "internal_include/bt_target.h"
 #include "osi/include/fixed_queue.h"
 #include "stack/acl/acl.h"
diff --git a/system/stack/fuzzers/l2cap_fuzzer.cc b/system/stack/fuzzers/l2cap_fuzzer.cc
index 8141a2d418..ec74ad47c7 100644
--- a/system/stack/fuzzers/l2cap_fuzzer.cc
+++ b/system/stack/fuzzers/l2cap_fuzzer.cc
@@ -22,7 +22,7 @@
 #include <vector>
 
 #include "btif/include/stack_manager_t.h"
-#include "gd/hal/snoop_logger.h"
+#include "hal/snoop_logger.h"
 #include "include/check.h"
 #include "osi/include/allocator.h"
 #include "stack/btm/btm_int_types.h"
diff --git a/system/stack/gatt/gatt_api.cc b/system/stack/gatt/gatt_api.cc
index bbe6875f62..3afb65f14f 100644
--- a/system/stack/gatt/gatt_api.cc
+++ b/system/stack/gatt/gatt_api.cc
@@ -30,12 +30,12 @@
 #include <string>
 
 #include "device/include/controller.h"
-#include "gd/os/system_properties.h"
 #include "internal_include/bt_target.h"
 #include "internal_include/bt_trace.h"
 #include "internal_include/stack_config.h"
 #include "l2c_api.h"
 #include "os/log.h"
+#include "os/system_properties.h"
 #include "osi/include/allocator.h"
 #include "rust/src/connection/ffi/connection_shim.h"
 #include "stack/arbiter/acl_arbiter.h"
diff --git a/system/stack/include/bt_octets.h b/system/stack/include/bt_octets.h
index 3a90164e1d..11a48a84ef 100644
--- a/system/stack/include/bt_octets.h
+++ b/system/stack/include/bt_octets.h
@@ -18,7 +18,7 @@
 
 #include <cstdint>
 
-#include "gd/hci/octets.h"
+#include "hci/octets.h"
 
 using Octet16 = bluetooth::hci::Octet16;
 using LinkKey = bluetooth::hci::Octet16; /* Link Key */
diff --git a/system/stack/l2cap/l2c_api.cc b/system/stack/l2cap/l2c_api.cc
index d2599aa64e..c4d8913b40 100644
--- a/system/stack/l2cap/l2c_api.cc
+++ b/system/stack/l2cap/l2c_api.cc
@@ -35,13 +35,13 @@
 
 #include "common/init_flags.h"
 #include "device/include/controller.h"  // TODO Remove
-#include "gd/hal/snoop_logger.h"
-#include "gd/os/system_properties.h"
+#include "hal/snoop_logger.h"
 #include "include/check.h"
 #include "internal_include/bt_target.h"
 #include "internal_include/bt_trace.h"
 #include "main/shim/entry.h"
 #include "os/log.h"
+#include "os/system_properties.h"
 #include "osi/include/allocator.h"
 #include "stack/btm/btm_sec.h"
 #include "stack/include/bt_hdr.h"
diff --git a/system/stack/l2cap/l2c_main.cc b/system/stack/l2cap/l2c_main.cc
index 588ba3989d..c1fcd6c45a 100644
--- a/system/stack/l2cap/l2c_main.cc
+++ b/system/stack/l2cap/l2c_main.cc
@@ -27,7 +27,7 @@
 #include <string.h>
 
 #include "common/init_flags.h"
-#include "gd/hal/snoop_logger.h"
+#include "hal/snoop_logger.h"
 #include "hcimsgs.h"  // HCID_GET_
 #include "internal_include/bt_target.h"
 #include "main/shim/entry.h"
diff --git a/system/stack/l2cap/l2c_utils.cc b/system/stack/l2cap/l2c_utils.cc
index 4a1864e6ab..9601803386 100644
--- a/system/stack/l2cap/l2c_utils.cc
+++ b/system/stack/l2cap/l2c_utils.cc
@@ -28,7 +28,7 @@
 #include <string.h>
 
 #include "device/include/controller.h"
-#include "gd/hal/snoop_logger.h"
+#include "hal/snoop_logger.h"
 #include "internal_include/bt_target.h"
 #include "main/shim/entry.h"
 #include "os/log.h"
diff --git a/system/stack/rfcomm/port_rfc.cc b/system/stack/rfcomm/port_rfc.cc
index 793c7b3255..5ceffd9b8c 100644
--- a/system/stack/rfcomm/port_rfc.cc
+++ b/system/stack/rfcomm/port_rfc.cc
@@ -32,7 +32,7 @@
 #include <cstdint>
 #include <string>
 
-#include "gd/hal/snoop_logger.h"
+#include "hal/snoop_logger.h"
 #include "internal_include/bt_target.h"
 #include "internal_include/bt_trace.h"
 #include "main/shim/entry.h"
diff --git a/system/stack/test/a2dp/wav_reader.cc b/system/stack/test/a2dp/wav_reader.cc
index 4eb0ac46f4..bf535c06b1 100644
--- a/system/stack/test/a2dp/wav_reader.cc
+++ b/system/stack/test/a2dp/wav_reader.cc
@@ -19,7 +19,7 @@
 #include <iostream>
 #include <iterator>
 
-#include "gd/os/files.h"
+#include "os/files.h"
 #include "os/log.h"
 
 namespace bluetooth {
diff --git a/system/test/headless/get_options.cc b/system/test/headless/get_options.cc
index 5ae291833a..213564bc48 100644
--- a/system/test/headless/get_options.cc
+++ b/system/test/headless/get_options.cc
@@ -24,8 +24,8 @@
 #include <list>
 #include <string>
 
-#include "gd/os/log.h"
 #include "include/check.h"
+#include "os/log.h"
 #include "types/bluetooth/uuid.h"
 #include "types/raw_address.h"
 
diff --git a/system/test/headless/log.cc b/system/test/headless/log.cc
index 3bab572737..f192e0dbd6 100644
--- a/system/test/headless/log.cc
+++ b/system/test/headless/log.cc
@@ -20,7 +20,7 @@
 #include <ctime>
 #include <string>
 
-#include "gd/common/circular_buffer.h"  // TimestamperInMilliseconds
+#include "common/circular_buffer.h"  // TimestamperInMilliseconds
 #include "internal_include/bt_trace.h"
 #include "stack/btm/btm_int_types.h"
 
diff --git a/system/test/mock/mock_main_shim_metrics_api.h b/system/test/mock/mock_main_shim_metrics_api.h
index 94a97e81a8..c23b2bce09 100644
--- a/system/test/mock/mock_main_shim_metrics_api.h
+++ b/system/test/mock/mock_main_shim_metrics_api.h
@@ -28,7 +28,7 @@
 // Original included files, if any
 #include <frameworks/proto_logging/stats/enums/bluetooth/le/enums.pb.h>
 
-#include "gd/os/metrics.h"
+#include "os/metrics.h"
 #include "types/raw_address.h"
 
 // Mocked compile conditionals, if any