aboutsummaryrefslogtreecommitdiff
path: root/cast
diff options
context:
space:
mode:
Diffstat (limited to 'cast')
-rw-r--r--cast/common/certificate/cast_cert_validator.cc2
-rw-r--r--cast/common/certificate/cast_cert_validator_internal.cc2
-rw-r--r--cast/common/certificate/cast_crl.cc2
-rw-r--r--cast/common/certificate/cast_crl_unittest.cc2
-rw-r--r--cast/common/certificate/cast_trust_store.cc2
-rw-r--r--cast/common/certificate/testing/test_helpers.cc2
-rw-r--r--cast/common/certificate/types.cc2
-rw-r--r--cast/common/channel/cast_socket.cc2
-rw-r--r--cast/common/channel/connection_namespace_handler.cc2
-rw-r--r--cast/common/channel/connection_namespace_handler_unittest.cc2
-rw-r--r--cast/common/channel/message_framer.cc2
-rw-r--r--cast/common/channel/message_util.cc2
-rw-r--r--cast/common/channel/virtual_connection_router.cc2
-rw-r--r--cast/common/public/service_info.cc2
-rw-r--r--cast/receiver/channel/message_util.cc2
-rw-r--r--cast/receiver/channel/receiver_socket_factory.cc2
-rw-r--r--cast/sender/cast_app_availability_tracker.cc2
-rw-r--r--cast/sender/cast_app_discovery_service_impl.cc2
-rw-r--r--cast/sender/cast_app_discovery_service_impl_unittest.cc2
-rw-r--r--cast/sender/cast_platform_client.cc2
-rw-r--r--cast/sender/channel/cast_auth_util.cc2
-rw-r--r--cast/sender/channel/cast_auth_util_unittest.cc2
-rw-r--r--cast/sender/channel/sender_socket_factory.cc2
-rw-r--r--cast/sender/public/cast_media_source.cc2
-rw-r--r--cast/sender/testing/test_helpers.cc2
-rw-r--r--cast/standalone_receiver/cast_agent.cc2
-rw-r--r--cast/standalone_receiver/decoder.cc2
-rw-r--r--cast/standalone_receiver/dummy_player.cc2
-rw-r--r--cast/standalone_receiver/sdl_audio_player.cc2
-rw-r--r--cast/standalone_receiver/sdl_glue.cc2
-rw-r--r--cast/standalone_receiver/sdl_player_base.cc2
-rw-r--r--cast/standalone_receiver/sdl_video_player.cc2
-rw-r--r--cast/standalone_sender/ffmpeg_glue.cc2
-rw-r--r--cast/standalone_sender/simulated_capturer.cc2
-rw-r--r--cast/standalone_sender/streaming_vp8_encoder.cc2
-rw-r--r--cast/streaming/answer_messages.cc2
-rw-r--r--cast/streaming/bandwidth_estimator.cc2
-rw-r--r--cast/streaming/clock_drift_smoother.cc2
-rw-r--r--cast/streaming/compound_rtcp_builder.cc2
-rw-r--r--cast/streaming/compound_rtcp_parser.cc2
-rw-r--r--cast/streaming/environment.cc2
-rw-r--r--cast/streaming/expanded_value_base.h2
-rw-r--r--cast/streaming/frame_collector.cc2
-rw-r--r--cast/streaming/ntp_time.cc2
-rw-r--r--cast/streaming/offer_messages.cc2
-rw-r--r--cast/streaming/receiver.cc2
-rw-r--r--cast/streaming/receiver_packet_router.cc2
-rw-r--r--cast/streaming/receiver_session.cc2
-rw-r--r--cast/streaming/receiver_unittest.cc2
-rw-r--r--cast/streaming/rtcp_session.cc2
-rw-r--r--cast/streaming/rtp_packet_parser.cc2
-rw-r--r--cast/streaming/rtp_packetizer.cc2
-rw-r--r--cast/streaming/sender.cc2
-rw-r--r--cast/streaming/sender_packet_router.cc2
-rw-r--r--cast/streaming/sender_packet_router_unittest.cc2
-rw-r--r--cast/streaming/sender_report_builder.cc2
-rw-r--r--cast/streaming/sender_report_parser.cc2
-rw-r--r--cast/test/cast_socket_e2e_test.cc2
-rw-r--r--cast/test/make_crl_tests.cc2
59 files changed, 59 insertions, 59 deletions
diff --git a/cast/common/certificate/cast_cert_validator.cc b/cast/common/certificate/cast_cert_validator.cc
index 6d2a12e7..b66f8859 100644
--- a/cast/common/certificate/cast_cert_validator.cc
+++ b/cast/common/certificate/cast_cert_validator.cc
@@ -18,7 +18,7 @@
#include "cast/common/certificate/cast_cert_validator_internal.h"
#include "cast/common/certificate/cast_crl.h"
#include "cast/common/certificate/cast_trust_store.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/common/certificate/cast_cert_validator_internal.cc b/cast/common/certificate/cast_cert_validator_internal.cc
index 7e43e02c..63457298 100644
--- a/cast/common/certificate/cast_cert_validator_internal.cc
+++ b/cast/common/certificate/cast_cert_validator_internal.cc
@@ -13,7 +13,7 @@
#include <vector>
#include "cast/common/certificate/types.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/common/certificate/cast_crl.cc b/cast/common/certificate/cast_crl.cc
index 41f05cad..c7635a4f 100644
--- a/cast/common/certificate/cast_crl.cc
+++ b/cast/common/certificate/cast_crl.cc
@@ -14,7 +14,7 @@
#include "platform/base/macros.h"
#include "util/crypto/certificate_utils.h"
#include "util/crypto/sha2.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/common/certificate/cast_crl_unittest.cc b/cast/common/certificate/cast_crl_unittest.cc
index 39e72724..fe65cce3 100644
--- a/cast/common/certificate/cast_crl_unittest.cc
+++ b/cast/common/certificate/cast_crl_unittest.cc
@@ -11,7 +11,7 @@
#include "gtest/gtest.h"
#include "platform/test/paths.h"
#include "testing/util/read_file.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/common/certificate/cast_trust_store.cc b/cast/common/certificate/cast_trust_store.cc
index 8c9e5e24..93db49ba 100644
--- a/cast/common/certificate/cast_trust_store.cc
+++ b/cast/common/certificate/cast_trust_store.cc
@@ -4,7 +4,7 @@
#include "cast/common/certificate/cast_trust_store.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/common/certificate/testing/test_helpers.cc b/cast/common/certificate/testing/test_helpers.cc
index eb9bac2f..113a4bc4 100644
--- a/cast/common/certificate/testing/test_helpers.cc
+++ b/cast/common/certificate/testing/test_helpers.cc
@@ -11,7 +11,7 @@
#include <string.h>
#include "absl/strings/match.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/common/certificate/types.cc b/cast/common/certificate/types.cc
index 57557508..937e1908 100644
--- a/cast/common/certificate/types.cc
+++ b/cast/common/certificate/types.cc
@@ -4,7 +4,7 @@
#include "cast/common/certificate/types.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/common/channel/cast_socket.cc b/cast/common/channel/cast_socket.cc
index 18f03b87..0479c997 100644
--- a/cast/common/channel/cast_socket.cc
+++ b/cast/common/channel/cast_socket.cc
@@ -6,7 +6,7 @@
#include "cast/common/channel/message_framer.h"
#include "cast/common/channel/proto/cast_channel.pb.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/common/channel/connection_namespace_handler.cc b/cast/common/channel/connection_namespace_handler.cc
index 6ddcfd5f..396b5d53 100644
--- a/cast/common/channel/connection_namespace_handler.cc
+++ b/cast/common/channel/connection_namespace_handler.cc
@@ -15,7 +15,7 @@
#include "cast/common/public/cast_socket.h"
#include "util/json/json_serialization.h"
#include "util/json/json_value.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/common/channel/connection_namespace_handler_unittest.cc b/cast/common/channel/connection_namespace_handler_unittest.cc
index 8ff54839..f57a4253 100644
--- a/cast/common/channel/connection_namespace_handler_unittest.cc
+++ b/cast/common/channel/connection_namespace_handler_unittest.cc
@@ -15,7 +15,7 @@
#include "gtest/gtest.h"
#include "util/json/json_serialization.h"
#include "util/json/json_value.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/common/channel/message_framer.cc b/cast/common/channel/message_framer.cc
index a8406539..b6b67ff5 100644
--- a/cast/common/channel/message_framer.cc
+++ b/cast/common/channel/message_framer.cc
@@ -11,7 +11,7 @@
#include "cast/common/channel/proto/cast_channel.pb.h"
#include "util/big_endian.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/common/channel/message_util.cc b/cast/common/channel/message_util.cc
index ee9a91f1..09609eea 100644
--- a/cast/common/channel/message_util.cc
+++ b/cast/common/channel/message_util.cc
@@ -4,7 +4,7 @@
#include "cast/common/channel/message_util.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/common/channel/virtual_connection_router.cc b/cast/common/channel/virtual_connection_router.cc
index d36dd33e..74efcd89 100644
--- a/cast/common/channel/virtual_connection_router.cc
+++ b/cast/common/channel/virtual_connection_router.cc
@@ -8,7 +8,7 @@
#include "cast/common/channel/message_util.h"
#include "cast/common/channel/proto/cast_channel.pb.h"
#include "cast/common/channel/virtual_connection_manager.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/common/public/service_info.cc b/cast/common/public/service_info.cc
index b7106999..852ecca9 100644
--- a/cast/common/public/service_info.cc
+++ b/cast/common/public/service_info.cc
@@ -11,7 +11,7 @@
#include "absl/strings/numbers.h"
#include "absl/strings/str_replace.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/receiver/channel/message_util.cc b/cast/receiver/channel/message_util.cc
index f011c211..5b5da5d4 100644
--- a/cast/receiver/channel/message_util.cc
+++ b/cast/receiver/channel/message_util.cc
@@ -6,7 +6,7 @@
#include "util/json/json_serialization.h"
#include "util/json/json_value.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/receiver/channel/receiver_socket_factory.cc b/cast/receiver/channel/receiver_socket_factory.cc
index b63a527d..5ad7246a 100644
--- a/cast/receiver/channel/receiver_socket_factory.cc
+++ b/cast/receiver/channel/receiver_socket_factory.cc
@@ -4,7 +4,7 @@
#include "cast/receiver/public/receiver_socket_factory.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/sender/cast_app_availability_tracker.cc b/cast/sender/cast_app_availability_tracker.cc
index 6c21c799..0a018d19 100644
--- a/cast/sender/cast_app_availability_tracker.cc
+++ b/cast/sender/cast_app_availability_tracker.cc
@@ -4,7 +4,7 @@
#include "cast/sender/cast_app_availability_tracker.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/sender/cast_app_discovery_service_impl.cc b/cast/sender/cast_app_discovery_service_impl.cc
index 69028aac..955ab0e4 100644
--- a/cast/sender/cast_app_discovery_service_impl.cc
+++ b/cast/sender/cast_app_discovery_service_impl.cc
@@ -8,7 +8,7 @@
#include <chrono>
#include "cast/sender/public/cast_media_source.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/sender/cast_app_discovery_service_impl_unittest.cc b/cast/sender/cast_app_discovery_service_impl_unittest.cc
index 008b1a74..9f2f8793 100644
--- a/cast/sender/cast_app_discovery_service_impl_unittest.cc
+++ b/cast/sender/cast_app_discovery_service_impl_unittest.cc
@@ -13,7 +13,7 @@
#include "gtest/gtest.h"
#include "platform/test/fake_clock.h"
#include "platform/test/fake_task_runner.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/sender/cast_platform_client.cc b/cast/sender/cast_platform_client.cc
index 41b657fd..4d59c65b 100644
--- a/cast/sender/cast_platform_client.cc
+++ b/cast/sender/cast_platform_client.cc
@@ -12,7 +12,7 @@
#include "cast/common/public/cast_socket.h"
#include "cast/common/public/service_info.h"
#include "util/json/json_serialization.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
#include "util/stringprintf.h"
namespace openscreen {
diff --git a/cast/sender/channel/cast_auth_util.cc b/cast/sender/channel/cast_auth_util.cc
index fc103e9b..10cbdc45 100644
--- a/cast/sender/channel/cast_auth_util.cc
+++ b/cast/sender/channel/cast_auth_util.cc
@@ -14,7 +14,7 @@
#include "cast/common/channel/proto/cast_channel.pb.h"
#include "platform/api/time.h"
#include "platform/base/error.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/sender/channel/cast_auth_util_unittest.cc b/cast/sender/channel/cast_auth_util_unittest.cc
index 51e4e338..03655419 100644
--- a/cast/sender/channel/cast_auth_util_unittest.cc
+++ b/cast/sender/channel/cast_auth_util_unittest.cc
@@ -15,7 +15,7 @@
#include "platform/api/time.h"
#include "platform/test/paths.h"
#include "testing/util/read_file.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/sender/channel/sender_socket_factory.cc b/cast/sender/channel/sender_socket_factory.cc
index cf8d445c..a1f24ef0 100644
--- a/cast/sender/channel/sender_socket_factory.cc
+++ b/cast/sender/channel/sender_socket_factory.cc
@@ -9,7 +9,7 @@
#include "cast/sender/channel/message_util.h"
#include "platform/base/tls_connect_options.h"
#include "util/crypto/certificate_utils.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
using ::cast::channel::CastMessage;
diff --git a/cast/sender/public/cast_media_source.cc b/cast/sender/public/cast_media_source.cc
index ebc9a3fe..987d455d 100644
--- a/cast/sender/public/cast_media_source.cc
+++ b/cast/sender/public/cast_media_source.cc
@@ -6,7 +6,7 @@
#include <algorithm>
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/sender/testing/test_helpers.cc b/cast/sender/testing/test_helpers.cc
index ff9a4575..a4b29fc2 100644
--- a/cast/sender/testing/test_helpers.cc
+++ b/cast/sender/testing/test_helpers.cc
@@ -10,7 +10,7 @@
#include "gtest/gtest.h"
#include "util/json/json_serialization.h"
#include "util/json/json_value.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/standalone_receiver/cast_agent.cc b/cast/standalone_receiver/cast_agent.cc
index b614fa80..dfccd351 100644
--- a/cast/standalone_receiver/cast_agent.cc
+++ b/cast/standalone_receiver/cast_agent.cc
@@ -19,7 +19,7 @@
#include "platform/base/tls_listen_options.h"
#include "util/crypto/certificate_utils.h"
#include "util/json/json_serialization.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/standalone_receiver/decoder.cc b/cast/standalone_receiver/decoder.cc
index 5d84d6a7..edb5d282 100644
--- a/cast/standalone_receiver/decoder.cc
+++ b/cast/standalone_receiver/decoder.cc
@@ -8,7 +8,7 @@
#include <sstream>
#include <thread> // NOLINT
-#include "util/logging.h"
+#include "util/osp_logging.h"
#include "util/trace_logging.h"
namespace openscreen {
diff --git a/cast/standalone_receiver/dummy_player.cc b/cast/standalone_receiver/dummy_player.cc
index cce96ee8..bd667c3a 100644
--- a/cast/standalone_receiver/dummy_player.cc
+++ b/cast/standalone_receiver/dummy_player.cc
@@ -8,7 +8,7 @@
#include "absl/types/span.h"
#include "cast/streaming/encoded_frame.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
using std::chrono::microseconds;
diff --git a/cast/standalone_receiver/sdl_audio_player.cc b/cast/standalone_receiver/sdl_audio_player.cc
index d87bbdf3..5e517d80 100644
--- a/cast/standalone_receiver/sdl_audio_player.cc
+++ b/cast/standalone_receiver/sdl_audio_player.cc
@@ -10,7 +10,7 @@
#include "absl/types/span.h"
#include "cast/standalone_receiver/avcodec_glue.h"
#include "util/big_endian.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
#include "util/trace_logging.h"
using std::chrono::duration_cast;
diff --git a/cast/standalone_receiver/sdl_glue.cc b/cast/standalone_receiver/sdl_glue.cc
index a77c1bf2..7c2c94da 100644
--- a/cast/standalone_receiver/sdl_glue.cc
+++ b/cast/standalone_receiver/sdl_glue.cc
@@ -6,7 +6,7 @@
#include "platform/api/task_runner.h"
#include "platform/api/time.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/standalone_receiver/sdl_player_base.cc b/cast/standalone_receiver/sdl_player_base.cc
index 2d2f7b61..6f793f8a 100644
--- a/cast/standalone_receiver/sdl_player_base.cc
+++ b/cast/standalone_receiver/sdl_player_base.cc
@@ -11,7 +11,7 @@
#include "cast/standalone_receiver/avcodec_glue.h"
#include "cast/streaming/encoded_frame.h"
#include "util/big_endian.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
#include "util/trace_logging.h"
using std::chrono::duration_cast;
diff --git a/cast/standalone_receiver/sdl_video_player.cc b/cast/standalone_receiver/sdl_video_player.cc
index f0fff9fa..dc540e50 100644
--- a/cast/standalone_receiver/sdl_video_player.cc
+++ b/cast/standalone_receiver/sdl_video_player.cc
@@ -7,7 +7,7 @@
#include <sstream>
#include "cast/standalone_receiver/avcodec_glue.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
#include "util/trace_logging.h"
namespace openscreen {
diff --git a/cast/standalone_sender/ffmpeg_glue.cc b/cast/standalone_sender/ffmpeg_glue.cc
index c271f80b..a6645886 100644
--- a/cast/standalone_sender/ffmpeg_glue.cc
+++ b/cast/standalone_sender/ffmpeg_glue.cc
@@ -4,7 +4,7 @@
#include "cast/standalone_sender/ffmpeg_glue.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/standalone_sender/simulated_capturer.cc b/cast/standalone_sender/simulated_capturer.cc
index 327c76f8..405922be 100644
--- a/cast/standalone_sender/simulated_capturer.cc
+++ b/cast/standalone_sender/simulated_capturer.cc
@@ -11,7 +11,7 @@
#include <thread> // NOLINT
#include "cast/streaming/environment.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/standalone_sender/streaming_vp8_encoder.cc b/cast/standalone_sender/streaming_vp8_encoder.cc
index 178564d6..d5aafc94 100644
--- a/cast/standalone_sender/streaming_vp8_encoder.cc
+++ b/cast/standalone_sender/streaming_vp8_encoder.cc
@@ -14,7 +14,7 @@
#include "cast/streaming/encoded_frame.h"
#include "cast/streaming/environment.h"
#include "cast/streaming/sender.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
#include "util/saturate_cast.h"
namespace openscreen {
diff --git a/cast/streaming/answer_messages.cc b/cast/streaming/answer_messages.cc
index bd60a58c..e62f5a1f 100644
--- a/cast/streaming/answer_messages.cc
+++ b/cast/streaming/answer_messages.cc
@@ -9,7 +9,7 @@
#include "absl/strings/str_cat.h"
#include "cast/streaming/message_util.h"
#include "platform/base/error.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/streaming/bandwidth_estimator.cc b/cast/streaming/bandwidth_estimator.cc
index e3386b00..5c42aa4a 100644
--- a/cast/streaming/bandwidth_estimator.cc
+++ b/cast/streaming/bandwidth_estimator.cc
@@ -6,7 +6,7 @@
#include <algorithm>
-#include "util/logging.h"
+#include "util/osp_logging.h"
#include "util/saturate_cast.h"
namespace openscreen {
diff --git a/cast/streaming/clock_drift_smoother.cc b/cast/streaming/clock_drift_smoother.cc
index 92072733..6e528387 100644
--- a/cast/streaming/clock_drift_smoother.cc
+++ b/cast/streaming/clock_drift_smoother.cc
@@ -6,7 +6,7 @@
#include <cmath>
-#include "util/logging.h"
+#include "util/osp_logging.h"
#include "util/saturate_cast.h"
namespace openscreen {
diff --git a/cast/streaming/compound_rtcp_builder.cc b/cast/streaming/compound_rtcp_builder.cc
index 37625d05..fed38a32 100644
--- a/cast/streaming/compound_rtcp_builder.cc
+++ b/cast/streaming/compound_rtcp_builder.cc
@@ -11,7 +11,7 @@
#include "cast/streaming/packet_util.h"
#include "cast/streaming/rtcp_session.h"
#include "util/integer_division.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
#include "util/std_util.h"
namespace openscreen {
diff --git a/cast/streaming/compound_rtcp_parser.cc b/cast/streaming/compound_rtcp_parser.cc
index 260989b0..90e2d546 100644
--- a/cast/streaming/compound_rtcp_parser.cc
+++ b/cast/streaming/compound_rtcp_parser.cc
@@ -8,7 +8,7 @@
#include "cast/streaming/packet_util.h"
#include "cast/streaming/rtcp_session.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
#include "util/std_util.h"
namespace openscreen {
diff --git a/cast/streaming/environment.cc b/cast/streaming/environment.cc
index b3a6c7b1..dec44c8b 100644
--- a/cast/streaming/environment.cc
+++ b/cast/streaming/environment.cc
@@ -6,7 +6,7 @@
#include "cast/streaming/rtp_defines.h"
#include "platform/api/task_runner.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/streaming/expanded_value_base.h b/cast/streaming/expanded_value_base.h
index d418df64..d7d32636 100644
--- a/cast/streaming/expanded_value_base.h
+++ b/cast/streaming/expanded_value_base.h
@@ -9,7 +9,7 @@
#include <limits>
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/streaming/frame_collector.cc b/cast/streaming/frame_collector.cc
index dbd6fb4d..4e0dcd9a 100644
--- a/cast/streaming/frame_collector.cc
+++ b/cast/streaming/frame_collector.cc
@@ -10,7 +10,7 @@
#include "cast/streaming/frame_id.h"
#include "cast/streaming/rtp_defines.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/streaming/ntp_time.cc b/cast/streaming/ntp_time.cc
index 0d59c0a8..51a232dd 100644
--- a/cast/streaming/ntp_time.cc
+++ b/cast/streaming/ntp_time.cc
@@ -4,7 +4,7 @@
#include "cast/streaming/ntp_time.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
using std::chrono::duration_cast;
diff --git a/cast/streaming/offer_messages.cc b/cast/streaming/offer_messages.cc
index f1da9c60..b19581f5 100644
--- a/cast/streaming/offer_messages.cc
+++ b/cast/streaming/offer_messages.cc
@@ -18,7 +18,7 @@
#include "platform/base/error.h"
#include "util/big_endian.h"
#include "util/json/json_serialization.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
#include "util/stringprintf.h"
namespace openscreen {
diff --git a/cast/streaming/receiver.cc b/cast/streaming/receiver.cc
index b24b61ee..280af794 100644
--- a/cast/streaming/receiver.cc
+++ b/cast/streaming/receiver.cc
@@ -10,7 +10,7 @@
#include "cast/streaming/constants.h"
#include "cast/streaming/receiver_packet_router.h"
#include "cast/streaming/session_config.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
#include "util/std_util.h"
using std::chrono::duration_cast;
diff --git a/cast/streaming/receiver_packet_router.cc b/cast/streaming/receiver_packet_router.cc
index 7a5c41aa..0ac79d3f 100644
--- a/cast/streaming/receiver_packet_router.cc
+++ b/cast/streaming/receiver_packet_router.cc
@@ -8,7 +8,7 @@
#include "cast/streaming/packet_util.h"
#include "cast/streaming/receiver.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
#include "util/stringprintf.h"
namespace openscreen {
diff --git a/cast/streaming/receiver_session.cc b/cast/streaming/receiver_session.cc
index 325a4450..83ac0cf6 100644
--- a/cast/streaming/receiver_session.cc
+++ b/cast/streaming/receiver_session.cc
@@ -15,7 +15,7 @@
#include "cast/streaming/message_util.h"
#include "cast/streaming/offer_messages.h"
#include "cast/streaming/receiver.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/streaming/receiver_unittest.cc b/cast/streaming/receiver_unittest.cc
index 826af0b0..b7a6187a 100644
--- a/cast/streaming/receiver_unittest.cc
+++ b/cast/streaming/receiver_unittest.cc
@@ -35,7 +35,7 @@
#include "platform/base/udp_packet.h"
#include "platform/test/fake_clock.h"
#include "platform/test/fake_task_runner.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
using std::chrono::duration_cast;
using std::chrono::microseconds;
diff --git a/cast/streaming/rtcp_session.cc b/cast/streaming/rtcp_session.cc
index c9bf34ff..c6c91da5 100644
--- a/cast/streaming/rtcp_session.cc
+++ b/cast/streaming/rtcp_session.cc
@@ -4,7 +4,7 @@
#include "cast/streaming/rtcp_session.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/streaming/rtp_packet_parser.cc b/cast/streaming/rtp_packet_parser.cc
index b7a838e3..79a42e98 100644
--- a/cast/streaming/rtp_packet_parser.cc
+++ b/cast/streaming/rtp_packet_parser.cc
@@ -8,7 +8,7 @@
#include <utility>
#include "cast/streaming/packet_util.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/streaming/rtp_packetizer.cc b/cast/streaming/rtp_packetizer.cc
index 610791fc..1ae60da1 100644
--- a/cast/streaming/rtp_packetizer.cc
+++ b/cast/streaming/rtp_packetizer.cc
@@ -12,7 +12,7 @@
#include "platform/api/time.h"
#include "util/big_endian.h"
#include "util/integer_division.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/streaming/sender.cc b/cast/streaming/sender.cc
index fa3268a9..a09b7367 100644
--- a/cast/streaming/sender.cc
+++ b/cast/streaming/sender.cc
@@ -8,7 +8,7 @@
#include <ratio> // NOLINT
#include "cast/streaming/session_config.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
#include "util/std_util.h"
namespace openscreen {
diff --git a/cast/streaming/sender_packet_router.cc b/cast/streaming/sender_packet_router.cc
index 870b085a..b505b996 100644
--- a/cast/streaming/sender_packet_router.cc
+++ b/cast/streaming/sender_packet_router.cc
@@ -9,7 +9,7 @@
#include "cast/streaming/constants.h"
#include "cast/streaming/packet_util.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
#include "util/saturate_cast.h"
#include "util/stringprintf.h"
diff --git a/cast/streaming/sender_packet_router_unittest.cc b/cast/streaming/sender_packet_router_unittest.cc
index 75196bdb..16cd6a93 100644
--- a/cast/streaming/sender_packet_router_unittest.cc
+++ b/cast/streaming/sender_packet_router_unittest.cc
@@ -11,7 +11,7 @@
#include "platform/test/fake_clock.h"
#include "platform/test/fake_task_runner.h"
#include "util/big_endian.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
using std::chrono::milliseconds;
using std::chrono::seconds;
diff --git a/cast/streaming/sender_report_builder.cc b/cast/streaming/sender_report_builder.cc
index 5e230da4..e3d7bd99 100644
--- a/cast/streaming/sender_report_builder.cc
+++ b/cast/streaming/sender_report_builder.cc
@@ -5,7 +5,7 @@
#include "cast/streaming/sender_report_builder.h"
#include "cast/streaming/packet_util.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/streaming/sender_report_parser.cc b/cast/streaming/sender_report_parser.cc
index d9174863..dad762ea 100644
--- a/cast/streaming/sender_report_parser.cc
+++ b/cast/streaming/sender_report_parser.cc
@@ -5,7 +5,7 @@
#include "cast/streaming/sender_report_parser.h"
#include "cast/streaming/packet_util.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {
diff --git a/cast/test/cast_socket_e2e_test.cc b/cast/test/cast_socket_e2e_test.cc
index a5c72a4f..522a0209 100644
--- a/cast/test/cast_socket_e2e_test.cc
+++ b/cast/test/cast_socket_e2e_test.cc
@@ -28,7 +28,7 @@
#include "platform/impl/network_interface.h"
#include "platform/impl/platform_client_posix.h"
#include "util/crypto/certificate_utils.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
#include "util/serial_delete_ptr.h"
namespace openscreen {
diff --git a/cast/test/make_crl_tests.cc b/cast/test/make_crl_tests.cc
index 2fddb883..106fe998 100644
--- a/cast/test/make_crl_tests.cc
+++ b/cast/test/make_crl_tests.cc
@@ -12,7 +12,7 @@
#include "util/crypto/certificate_utils.h"
#include "util/crypto/digest_sign.h"
#include "util/crypto/sha2.h"
-#include "util/logging.h"
+#include "util/osp_logging.h"
namespace openscreen {
namespace cast {