diff --git a/connections/implementation/endpoint_manager.h b/connections/implementation/endpoint_manager.h
index 416e0699..6f76eec3 100644
--- a/connections/implementation/endpoint_manager.h
+++ b/connections/implementation/endpoint_manager.h
@@ -25,12 +25,13 @@
 #include "connections/implementation/client_proxy.h"
 #include "connections/implementation/endpoint_channel.h"
 #include "connections/implementation/endpoint_channel_manager.h"
+#include "connections/implementation/proto/offline_wire_formats.pb.h"
 #include "connections/listeners.h"
 #include "internal/platform/byte_array.h"
-#include "internal/platform/runnable.h"
 #include "internal/platform/condition_variable.h"
 #include "internal/platform/count_down_latch.h"
 #include "internal/platform/multi_thread_executor.h"
+#include "internal/platform/runnable.h"
 #include "internal/platform/single_thread_executor.h"
 #include "internal/platform/system_clock.h"
 
diff --git a/connections/implementation/internal_payload.h b/connections/implementation/internal_payload.h
index 694e853f..ced64eff 100644
--- a/connections/implementation/internal_payload.h
+++ b/connections/implementation/internal_payload.h
@@ -17,6 +17,7 @@
 
 #include <cstdint>
 
+#include "connections/implementation/proto/offline_wire_formats.pb.h"
 #include "connections/payload.h"
 #include "internal/platform/byte_array.h"
 #include "internal/platform/exception.h"
diff --git a/internal/platform/BUILD b/internal/platform/BUILD
index a8ab755b..27d802e0 100644
--- a/internal/platform/BUILD
+++ b/internal/platform/BUILD
@@ -294,6 +294,7 @@ cc_library(
         "//internal/platform/implementation:types",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/time",
+        "@com_google_glog//:glog",
     ],
 )
 
diff --git a/internal/platform/logging.h b/internal/platform/logging.h
index 794cd49c..954352ab 100644
--- a/internal/platform/logging.h
+++ b/internal/platform/logging.h
@@ -15,12 +15,12 @@
 #ifndef PLATFORM_BASE_LOGGING_H_
 #define PLATFORM_BASE_LOGGING_H_
 
-// logging.h is only included to allow logging clients to include CHECK's.
+// base/logging.h is only included to allow logging clients to include CHECK's.
 // In Chrome this is base/check.h. See crbug/1212611.
 #ifdef NEARBY_CHROMIUM
 #include "base/check.h"
 #else
-#include "logging.h"
+#include "glog/logging.h"
 #endif
 #include "internal/platform/implementation/log_message.h"
 #include "internal/platform/implementation/platform.h"