diff --git a/cpp/core/internal/base_bwu_handler.h b/cpp/core/internal/base_bwu_handler.h index 7bcde6f5..71e35123 100644 --- a/cpp/core/internal/base_bwu_handler.h +++ b/cpp/core/internal/base_bwu_handler.h @@ -22,12 +22,10 @@ #include "core/internal/bwu_handler.h" #include "core/internal/client_proxy.h" #include "core/internal/endpoint_channel_manager.h" -#include "proto/connections/offline_wire_formats.pb.h" #include "platform/public/cancelable_alarm.h" #include "platform/public/count_down_latch.h" #include "platform/public/scheduled_executor.h" #include "platform/public/single_thread_executor.h" -#include "proto/connections_enums.pb.h" #include "absl/container/flat_hash_map.h" #include "absl/time/clock.h" diff --git a/cpp/core/internal/base_endpoint_channel.h b/cpp/core/internal/base_endpoint_channel.h index 5b64170c..89688a5d 100644 --- a/cpp/core/internal/base_endpoint_channel.h +++ b/cpp/core/internal/base_endpoint_channel.h @@ -27,7 +27,6 @@ #include "platform/public/condition_variable.h" #include "platform/public/mutex.h" #include "platform/public/system_clock.h" -#include "proto/connections_enums.pb.h" #include "securegcm/d2d_connection_context_v1.h" #include "absl/base/thread_annotations.h" diff --git a/cpp/core/internal/base_endpoint_channel_test.cc b/cpp/core/internal/base_endpoint_channel_test.cc index e60ae1d3..3a667c33 100644 --- a/cpp/core/internal/base_endpoint_channel_test.cc +++ b/cpp/core/internal/base_endpoint_channel_test.cc @@ -28,7 +28,6 @@ #include "platform/public/pipe.h" #include "platform/public/single_thread_executor.h" #include "proto/connections_enums.pb.h" -#include "proto/connections_enums.pb.h" #include "securegcm/d2d_connection_context_v1.h" #include "securegcm/ukey2_handshake.h" #include "gmock/gmock.h" diff --git a/cpp/core/internal/base_pcp_handler.h b/cpp/core/internal/base_pcp_handler.h index 3cf834b5..c03da9aa 100644 --- a/cpp/core/internal/base_pcp_handler.h +++ b/cpp/core/internal/base_pcp_handler.h @@ -32,7 +32,6 @@ #include "core/listeners.h" #include "core/options.h" #include "core/status.h" -#include "proto/connections/offline_wire_formats.pb.h" #include "platform/base/byte_array.h" #include "platform/base/prng.h" #include "platform/public/atomic_boolean.h" @@ -43,7 +42,6 @@ #include "platform/public/scheduled_executor.h" #include "platform/public/single_thread_executor.h" #include "platform/public/system_clock.h" -#include "proto/connections_enums.pb.h" #include "securegcm/d2d_connection_context_v1.h" #include "securegcm/ukey2_handshake.h" #include "absl/container/btree_map.h" diff --git a/cpp/core/internal/ble_endpoint_channel.h b/cpp/core/internal/ble_endpoint_channel.h index 3d358903..18c6954e 100644 --- a/cpp/core/internal/ble_endpoint_channel.h +++ b/cpp/core/internal/ble_endpoint_channel.h @@ -17,7 +17,6 @@ #include "core/internal/base_endpoint_channel.h" #include "platform/public/ble.h" -#include "proto/connections_enums.pb.h" namespace location { namespace nearby { diff --git a/cpp/core/internal/bluetooth_bwu_handler.h b/cpp/core/internal/bluetooth_bwu_handler.h index 172d9f56..d39aa55d 100644 --- a/cpp/core/internal/bluetooth_bwu_handler.h +++ b/cpp/core/internal/bluetooth_bwu_handler.h @@ -21,10 +21,8 @@ #include "core/internal/client_proxy.h" #include "core/internal/mediums/mediums.h" #include "core/internal/mediums/utils.h" -#include "proto/connections/offline_wire_formats.pb.h" #include "platform/public/bluetooth_classic.h" #include "platform/public/count_down_latch.h" -#include "proto/connections_enums.pb.h" namespace location { namespace nearby { diff --git a/cpp/core/internal/bluetooth_endpoint_channel.h b/cpp/core/internal/bluetooth_endpoint_channel.h index 06b91957..f9059348 100644 --- a/cpp/core/internal/bluetooth_endpoint_channel.h +++ b/cpp/core/internal/bluetooth_endpoint_channel.h @@ -19,7 +19,6 @@ #include "core/internal/base_endpoint_channel.h" #include "platform/public/bluetooth_classic.h" -#include "proto/connections_enums.pb.h" namespace location { namespace nearby { diff --git a/cpp/core/internal/bwu_handler.h b/cpp/core/internal/bwu_handler.h index 1297c9b2..c31fa731 100644 --- a/cpp/core/internal/bwu_handler.h +++ b/cpp/core/internal/bwu_handler.h @@ -19,7 +19,6 @@ #include "core/internal/endpoint_channel.h" #include "core/internal/offline_frames.h" #include "platform/public/count_down_latch.h" -#include "proto/connections_enums.pb.h" namespace location { namespace nearby { diff --git a/cpp/core/internal/bwu_manager.h b/cpp/core/internal/bwu_manager.h index f219429e..f18ddebf 100644 --- a/cpp/core/internal/bwu_manager.h +++ b/cpp/core/internal/bwu_manager.h @@ -24,10 +24,8 @@ #include "core/internal/endpoint_manager.h" #include "core/internal/mediums/mediums.h" #include "core/options.h" -#include "proto/connections/offline_wire_formats.pb.h" #include "platform/base/byte_array.h" #include "platform/public/scheduled_executor.h" -#include "proto/connections_enums.pb.h" #include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_set.h" #include "absl/time/time.h" diff --git a/cpp/core/internal/client_proxy.h b/cpp/core/internal/client_proxy.h index 9ecb6b2c..92884e15 100644 --- a/cpp/core/internal/client_proxy.h +++ b/cpp/core/internal/client_proxy.h @@ -28,7 +28,6 @@ #include "platform/base/prng.h" #include "platform/public/cancelable_alarm.h" #include "platform/public/mutex.h" -#include "proto/connections_enums.pb.h" // Prefer using absl:: versions of a set and a map; they tend to be more // efficient: implementation is using open-addressing hash tables. #include "absl/container/flat_hash_map.h" diff --git a/cpp/core/internal/endpoint_manager.cc b/cpp/core/internal/endpoint_manager.cc index 3fa4b483..898538bd 100644 --- a/cpp/core/internal/endpoint_manager.cc +++ b/cpp/core/internal/endpoint_manager.cc @@ -24,7 +24,7 @@ #include "platform/public/count_down_latch.h" #include "platform/public/logging.h" #include "platform/public/mutex_lock.h" -#include "proto/connections_enums.pb.h" + namespace location { namespace nearby { namespace connections { diff --git a/cpp/core/internal/endpoint_manager.h b/cpp/core/internal/endpoint_manager.h index d28bf1b9..d3249ead 100644 --- a/cpp/core/internal/endpoint_manager.h +++ b/cpp/core/internal/endpoint_manager.h @@ -22,14 +22,12 @@ #include "core/internal/endpoint_channel.h" #include "core/internal/endpoint_channel_manager.h" #include "core/listeners.h" -#include "proto/connections/offline_wire_formats.pb.h" #include "platform/base/byte_array.h" #include "platform/base/runnable.h" #include "platform/public/count_down_latch.h" #include "platform/public/multi_thread_executor.h" #include "platform/public/single_thread_executor.h" #include "platform/public/system_clock.h" -#include "proto/connections_enums.pb.h" #include "absl/base/thread_annotations.h" #include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_set.h" diff --git a/cpp/core/internal/internal_payload.h b/cpp/core/internal/internal_payload.h index 8861f17e..9a36fa88 100644 --- a/cpp/core/internal/internal_payload.h +++ b/cpp/core/internal/internal_payload.h @@ -18,7 +18,6 @@ #include #include "core/payload.h" -#include "proto/connections/offline_wire_formats.pb.h" #include "platform/base/byte_array.h" #include "platform/base/exception.h" diff --git a/cpp/core/internal/internal_payload_factory.h b/cpp/core/internal/internal_payload_factory.h index cd7efc56..a0387b77 100644 --- a/cpp/core/internal/internal_payload_factory.h +++ b/cpp/core/internal/internal_payload_factory.h @@ -17,7 +17,6 @@ #include "core/internal/internal_payload.h" #include "core/payload.h" -#include "proto/connections/offline_wire_formats.pb.h" namespace location { namespace nearby { diff --git a/cpp/core/internal/mediums/utils.h b/cpp/core/internal/mediums/utils.h index 28f275ce..c8957c78 100644 --- a/cpp/core/internal/mediums/utils.h +++ b/cpp/core/internal/mediums/utils.h @@ -17,7 +17,6 @@ #include -#include "proto/connections/offline_wire_formats.pb.h" #include "proto/connections/offline_wire_formats.pb.h" #include "platform/base/byte_array.h" diff --git a/cpp/core/internal/mediums/webrtc.h b/cpp/core/internal/mediums/webrtc.h index 260b3d61..b22315e4 100644 --- a/cpp/core/internal/mediums/webrtc.h +++ b/cpp/core/internal/mediums/webrtc.h @@ -26,7 +26,6 @@ #include "core/internal/mediums/webrtc/webrtc_socket.h" #include "core/internal/mediums/webrtc/webrtc_socket_wrapper.h" #include "proto/connections/offline_wire_formats.pb.h" -#include "proto/connections/offline_wire_formats.pb.h" #include "platform/base/byte_array.h" #include "platform/base/cancellation_flag.h" #include "platform/base/listeners.h" diff --git a/cpp/core/internal/offline_frames.cc b/cpp/core/internal/offline_frames.cc index af83a034..99944540 100644 --- a/cpp/core/internal/offline_frames.cc +++ b/cpp/core/internal/offline_frames.cc @@ -20,7 +20,6 @@ #include "core/internal/message_lite.h" #include "core/internal/offline_frames_validator.h" #include "core/status.h" -#include "proto/connections/offline_wire_formats.pb.h" #include "platform/base/byte_array.h" namespace location { diff --git a/cpp/core/internal/offline_frames.h b/cpp/core/internal/offline_frames.h index b8694d74..d5b6be0b 100644 --- a/cpp/core/internal/offline_frames.h +++ b/cpp/core/internal/offline_frames.h @@ -22,7 +22,6 @@ #include "proto/connections/offline_wire_formats.pb.h" #include "platform/base/byte_array.h" #include "platform/base/exception.h" -#include "proto/connections_enums.pb.h" namespace location { namespace nearby { diff --git a/cpp/core/internal/p2p_cluster_pcp_handler.h b/cpp/core/internal/p2p_cluster_pcp_handler.h index 43b84f3e..fda43215 100644 --- a/cpp/core/internal/p2p_cluster_pcp_handler.h +++ b/cpp/core/internal/p2p_cluster_pcp_handler.h @@ -37,7 +37,6 @@ #include "platform/base/byte_array.h" #include "platform/public/bluetooth_classic.h" #include "platform/public/wifi_lan.h" -#include "proto/connections_enums.pb.h" namespace location { namespace nearby { diff --git a/cpp/core/internal/payload_manager.h b/cpp/core/internal/payload_manager.h index 9fb16303..c62ff3c0 100644 --- a/cpp/core/internal/payload_manager.h +++ b/cpp/core/internal/payload_manager.h @@ -26,13 +26,11 @@ #include "core/listeners.h" #include "core/payload.h" #include "core/status.h" -#include "proto/connections/offline_wire_formats.pb.h" #include "platform/base/byte_array.h" #include "platform/public/atomic_boolean.h" #include "platform/public/atomic_reference.h" #include "platform/public/count_down_latch.h" #include "platform/public/mutex.h" -#include "proto/connections_enums.pb.h" #include "absl/container/flat_hash_map.h" namespace location { diff --git a/cpp/core/internal/pcp_handler.h b/cpp/core/internal/pcp_handler.h index eaf8aabf..b7ad50c0 100644 --- a/cpp/core/internal/pcp_handler.h +++ b/cpp/core/internal/pcp_handler.h @@ -24,7 +24,6 @@ #include "core/params.h" #include "core/status.h" #include "core/strategy.h" -#include "proto/connections_enums.pb.h" namespace location { namespace nearby { diff --git a/cpp/core/internal/webrtc_endpoint_channel.h b/cpp/core/internal/webrtc_endpoint_channel.h index e15cc0c7..48d8d37f 100644 --- a/cpp/core/internal/webrtc_endpoint_channel.h +++ b/cpp/core/internal/webrtc_endpoint_channel.h @@ -17,7 +17,6 @@ #include "core/internal/base_endpoint_channel.h" #include "core/internal/mediums/webrtc/webrtc_socket_wrapper.h" -#include "proto/connections_enums.pb.h" namespace location { namespace nearby { diff --git a/cpp/core/internal/wifi_lan_endpoint_channel.h b/cpp/core/internal/wifi_lan_endpoint_channel.h index 87eb359e..38459c81 100644 --- a/cpp/core/internal/wifi_lan_endpoint_channel.h +++ b/cpp/core/internal/wifi_lan_endpoint_channel.h @@ -17,7 +17,6 @@ #include "core/internal/base_endpoint_channel.h" #include "platform/public/wifi_lan.h" -#include "proto/connections_enums.pb.h" namespace location { namespace nearby { diff --git a/cpp/core/options.h b/cpp/core/options.h index 07ace170..9a68f1e5 100644 --- a/cpp/core/options.h +++ b/cpp/core/options.h @@ -18,7 +18,6 @@ #include "core/strategy.h" #include "platform/base/byte_array.h" #include "proto/connections_enums.pb.h" -#include "proto/connections_enums.pb.h" namespace location { namespace nearby { diff --git a/cpp/platform/api/webrtc.h b/cpp/platform/api/webrtc.h index 16fc30e5..9d01f20e 100644 --- a/cpp/platform/api/webrtc.h +++ b/cpp/platform/api/webrtc.h @@ -17,7 +17,6 @@ #include -#include "proto/connections/offline_wire_formats.pb.h" #include "proto/connections/offline_wire_formats.pb.h" #include "platform/base/byte_array.h" #include "absl/strings/string_view.h"