Move platform/api/internal/logging_macros.h → util/logging.h

Follow-up to commit b797903e40723dc41d7eefb438eb0ac0af648c27, which
"minified" platform/api/logging.h. This change moves the logging macros
to util/, changes the #include's everywhere to point to util/logging.h,
and removes the hack at the end of platform/api/logging.h.

Bug: openscreen:77
Change-Id: I5e721783e35530f13b1ae0f50128ef67d0522bff
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/1919717
Commit-Queue: Yuri Wiitala <miu@chromium.org>
Reviewed-by: mark a. foltz <mfoltz@chromium.org>

113 files changed, 114 insertions, 119 deletions

diff --git a/cast/common/certificate/cast_cert_validator_internal.cc b/cast/common/certificate/cast_cert_validator_internal.cc
index 39aff8a4..331e7125 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 "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace cast {
 namespace certificate {
diff --git a/cast/common/certificate/cast_crl.cc b/cast/common/certificate/cast_crl.cc
index aae95891..5935e1e8 100644
--- a/cast/common/certificate/cast_crl.cc
+++ b/cast/common/certificate/cast_crl.cc
@@ -12,9 +12,9 @@
 #include "absl/strings/string_view.h"
 #include "cast/common/certificate/cast_cert_validator_internal.h"
 #include "cast/common/certificate/proto/revocation.pb.h"
-#include "platform/api/logging.h"
 #include "platform/base/macros.h"
 #include "util/crypto/sha2.h"
+#include "util/logging.h"
 
 namespace cast {
 namespace certificate {
diff --git a/cast/common/certificate/cast_crl_unittest.cc b/cast/common/certificate/cast_crl_unittest.cc
index e514756c..4e3a94d8 100644
--- a/cast/common/certificate/cast_crl_unittest.cc
+++ b/cast/common/certificate/cast_crl_unittest.cc
@@ -9,7 +9,7 @@
 #include "cast/common/certificate/proto/test_suite.pb.h"
 #include "cast/common/certificate/test_helpers.h"
 #include "gtest/gtest.h"
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace cast {
 namespace certificate {
diff --git a/cast/common/certificate/test_helpers.cc b/cast/common/certificate/test_helpers.cc
index fa04a2e9..41aef74f 100644
--- a/cast/common/certificate/test_helpers.cc
+++ b/cast/common/certificate/test_helpers.cc
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace cast {
 namespace certificate {
diff --git a/cast/common/certificate/types.cc b/cast/common/certificate/types.cc
index 82d51358..297fbffc 100644
--- a/cast/common/certificate/types.cc
+++ b/cast/common/certificate/types.cc
@@ -4,7 +4,7 @@
 
 #include "cast/common/certificate/types.h"
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace cast {
 namespace certificate {
diff --git a/cast/common/channel/cast_socket.cc b/cast/common/channel/cast_socket.cc
index aa41bafe..5b1c9408 100644
--- a/cast/common/channel/cast_socket.cc
+++ b/cast/common/channel/cast_socket.cc
@@ -7,7 +7,7 @@
 #include <atomic>
 
 #include "cast/common/channel/message_framer.h"
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace cast {
 namespace channel {
diff --git a/cast/common/channel/message_framer.cc b/cast/common/channel/message_framer.cc
index 97a82466..2494a6ea 100644
--- a/cast/common/channel/message_framer.cc
+++ b/cast/common/channel/message_framer.cc
@@ -10,8 +10,8 @@
 #include <limits>
 
 #include "cast/common/channel/proto/cast_channel.pb.h"
-#include "platform/api/logging.h"
 #include "util/big_endian.h"
+#include "util/logging.h"
 
 namespace cast {
 namespace channel {
diff --git a/cast/sender/channel/cast_auth_util.cc b/cast/sender/channel/cast_auth_util.cc
index ec9a889b..9f706259 100644
--- a/cast/sender/channel/cast_auth_util.cc
+++ b/cast/sender/channel/cast_auth_util.cc
@@ -11,9 +11,9 @@
 #include "cast/common/certificate/cast_cert_validator.h"
 #include "cast/common/certificate/cast_cert_validator_internal.h"
 #include "cast/common/certificate/cast_crl.h"
-#include "platform/api/logging.h"
 #include "platform/api/time.h"
 #include "platform/base/error.h"
+#include "util/logging.h"
 
 namespace cast {
 namespace channel {
diff --git a/cast/sender/channel/cast_auth_util_unittest.cc b/cast/sender/channel/cast_auth_util_unittest.cc
index be8c71e7..6ea4ea6a 100644
--- a/cast/sender/channel/cast_auth_util_unittest.cc
+++ b/cast/sender/channel/cast_auth_util_unittest.cc
@@ -12,8 +12,8 @@
 #include "cast/common/certificate/test_helpers.h"
 #include "cast/common/channel/proto/cast_channel.pb.h"
 #include "gtest/gtest.h"
-#include "platform/api/logging.h"
 #include "platform/api/time.h"
+#include "util/logging.h"
 
 namespace cast {
 namespace channel {
diff --git a/cast/sender/channel/sender_socket_factory.h b/cast/sender/channel/sender_socket_factory.h
index d5b6622d..62fa6d97 100644
--- a/cast/sender/channel/sender_socket_factory.h
+++ b/cast/sender/channel/sender_socket_factory.h
@@ -11,9 +11,9 @@
 
 #include "cast/common/channel/cast_socket.h"
 #include "cast/sender/channel/cast_auth_util.h"
-#include "platform/api/logging.h"
 #include "platform/api/tls_connection_factory.h"
 #include "platform/base/ip_address.h"
+#include "util/logging.h"
 
 namespace cast {
 namespace channel {
diff --git a/cast/streaming/receiver_session.cc b/cast/streaming/receiver_session.cc
index 615656b0..4ad3a3b6 100644
--- a/cast/streaming/receiver_session.cc
+++ b/cast/streaming/receiver_session.cc
@@ -6,7 +6,7 @@
 
 #include <utility>
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace cast {
 namespace streaming {
diff --git a/discovery/dnssd/impl/querier_impl.cc b/discovery/dnssd/impl/querier_impl.cc
index 1d5ced8c..0b8a2a12 100644
--- a/discovery/dnssd/impl/querier_impl.cc
+++ b/discovery/dnssd/impl/querier_impl.cc
@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace discovery {
diff --git a/discovery/dnssd/impl/querier_impl_unittest.cc b/discovery/dnssd/impl/querier_impl_unittest.cc
index 63be2b45..9f86aabf 100644
--- a/discovery/dnssd/impl/querier_impl_unittest.cc
+++ b/discovery/dnssd/impl/querier_impl_unittest.cc
@@ -13,7 +13,7 @@
 #include "discovery/mdns/testing/mdns_test_util.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace discovery {
diff --git a/discovery/dnssd/public/dns_sd_instance_record.cc b/discovery/dnssd/public/dns_sd_instance_record.cc
index 20b99d05..e0aaea9b 100644
--- a/discovery/dnssd/public/dns_sd_instance_record.cc
+++ b/discovery/dnssd/public/dns_sd_instance_record.cc
@@ -5,7 +5,7 @@
 #include "discovery/dnssd/public/dns_sd_instance_record.h"
 
 #include "absl/strings/ascii.h"
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace discovery {
diff --git a/discovery/mdns/mdns_reader.cc b/discovery/mdns/mdns_reader.cc
index d1ed12d2..21174e74 100644
--- a/discovery/mdns/mdns_reader.cc
+++ b/discovery/mdns/mdns_reader.cc
@@ -7,7 +7,7 @@
 #include <algorithm>
 #include <utility>
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace discovery {
diff --git a/discovery/mdns/mdns_records.h b/discovery/mdns/mdns_records.h
index d53e85fd..605e02c7 100644
--- a/discovery/mdns/mdns_records.h
+++ b/discovery/mdns/mdns_records.h
@@ -13,8 +13,8 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/variant.h"
 #include "discovery/mdns/public/mdns_constants.h"
-#include "platform/api/logging.h"
 #include "platform/base/ip_address.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace discovery {
diff --git a/discovery/mdns/mdns_writer.cc b/discovery/mdns/mdns_writer.cc
index dcc5adf0..58037f7e 100644
--- a/discovery/mdns/mdns_writer.cc
+++ b/discovery/mdns/mdns_writer.cc
@@ -6,7 +6,7 @@
 
 #include "absl/hash/hash.h"
 #include "absl/strings/ascii.h"
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace discovery {
diff --git a/osp/impl/discovery/mdns/domain_name.h b/osp/impl/discovery/mdns/domain_name.h
index 7a5e6314..347d7608 100644
--- a/osp/impl/discovery/mdns/domain_name.h
+++ b/osp/impl/discovery/mdns/domain_name.h
@@ -11,8 +11,8 @@
 #include <vector>
 
 #include "absl/strings/string_view.h"
-#include "platform/api/logging.h"
 #include "platform/base/error.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace mdns {
diff --git a/osp/impl/discovery/mdns/mdns_responder_adapter_impl.cc b/osp/impl/discovery/mdns/mdns_responder_adapter_impl.cc
index 329a1329..5aed32e8 100644
--- a/osp/impl/discovery/mdns/mdns_responder_adapter_impl.cc
+++ b/osp/impl/discovery/mdns/mdns_responder_adapter_impl.cc
@@ -10,7 +10,7 @@
 #include <iostream>
 #include <memory>
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 #include "util/trace_logging.h"
 
 using openscreen::platform::TraceCategory;
diff --git a/osp/impl/discovery/mdns/mdns_responder_platform.cc b/osp/impl/discovery/mdns/mdns_responder_platform.cc
index 323955ee..01603be4 100644
--- a/osp/impl/discovery/mdns/mdns_responder_platform.cc
+++ b/osp/impl/discovery/mdns/mdns_responder_platform.cc
@@ -10,13 +10,13 @@
 #include <limits>
 #include <vector>
 
-#include "platform/api/logging.h"
 #include "platform/api/network_interface.h"
 #include "platform/api/time.h"
 #include "platform/api/udp_socket.h"
 #include "platform/base/error.h"
 #include "platform/base/ip_address.h"
 #include "third_party/mDNSResponder/src/mDNSCore/mDNSEmbeddedAPI.h"
+#include "util/logging.h"
 
 using openscreen::platform::Clock;
 using std::chrono::duration_cast;
diff --git a/osp/impl/internal_services.cc b/osp/impl/internal_services.cc
index 8b456d2c..43d17b65 100644
--- a/osp/impl/internal_services.cc
+++ b/osp/impl/internal_services.cc
@@ -8,9 +8,9 @@
 
 #include "osp/impl/discovery/mdns/mdns_responder_adapter_impl.h"
 #include "osp/impl/mdns_responder_service.h"
-#include "platform/api/logging.h"
 #include "platform/api/udp_socket.h"
 #include "platform/base/error.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace {
diff --git a/osp/impl/mdns_platform_service.cc b/osp/impl/mdns_platform_service.cc
index 7570ed9f..ee34ace8 100644
--- a/osp/impl/mdns_platform_service.cc
+++ b/osp/impl/mdns_platform_service.cc
@@ -6,7 +6,7 @@
 
 #include <cstring>
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 
diff --git a/osp/impl/mdns_responder_service.cc b/osp/impl/mdns_responder_service.cc
index ff75f3ec..5dc42bc0 100644
--- a/osp/impl/mdns_responder_service.cc
+++ b/osp/impl/mdns_responder_service.cc
@@ -9,8 +9,8 @@
 #include <utility>
 
 #include "osp/impl/internal_services.h"
-#include "platform/api/logging.h"
 #include "platform/base/error.h"
+#include "util/logging.h"
 #include "util/trace_logging.h"
 
 using openscreen::platform::TraceCategory;
diff --git a/osp/impl/presentation/presentation_common.h b/osp/impl/presentation/presentation_common.h
index f0473fe0..9845f245 100644
--- a/osp/impl/presentation/presentation_common.h
+++ b/osp/impl/presentation/presentation_common.h
@@ -12,8 +12,8 @@
 #include "osp/public/message_demuxer.h"
 #include "osp/public/network_service_manager.h"
 #include "osp/public/protocol_connection_server.h"
-#include "platform/api/logging.h"
 #include "platform/api/time.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace presentation {
diff --git a/osp/impl/presentation/presentation_connection.cc b/osp/impl/presentation/presentation_connection.cc
index adcfde17..74298362 100644
--- a/osp/impl/presentation/presentation_connection.cc
+++ b/osp/impl/presentation/presentation_connection.cc
@@ -15,7 +15,7 @@
 #include "osp/public/presentation/presentation_controller.h"
 #include "osp/public/presentation/presentation_receiver.h"
 #include "osp/public/protocol_connection.h"
-#include "platform/api/logging.h"
+#include "util/logging.h"
 #include "util/std_util.h"
 
 // TODO(crbug.com/openscreen/27): Address TODOs in this file
diff --git a/osp/impl/presentation/presentation_controller.cc b/osp/impl/presentation/presentation_controller.cc
index b91e1e2f..30f751f4 100644
--- a/osp/impl/presentation/presentation_controller.cc
+++ b/osp/impl/presentation/presentation_controller.cc
@@ -15,7 +15,7 @@
 #include "osp/public/message_demuxer.h"
 #include "osp/public/network_service_manager.h"
 #include "osp/public/protocol_connection_client.h"
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace presentation {
diff --git a/osp/impl/presentation/presentation_receiver.cc b/osp/impl/presentation/presentation_receiver.cc
index c98dcce3..f38cf327 100644
--- a/osp/impl/presentation/presentation_receiver.cc
+++ b/osp/impl/presentation/presentation_receiver.cc
@@ -12,8 +12,8 @@
 #include "osp/public/message_demuxer.h"
 #include "osp/public/network_service_manager.h"
 #include "osp/public/protocol_connection_server.h"
-#include "platform/api/logging.h"
 #include "platform/api/time.h"
+#include "util/logging.h"
 #include "util/trace_logging.h"
 
 using openscreen::platform::TraceCategory;
diff --git a/osp/impl/presentation/url_availability_requester.cc b/osp/impl/presentation/url_availability_requester.cc
index 25fa108c..4bafca13 100644
--- a/osp/impl/presentation/url_availability_requester.cc
+++ b/osp/impl/presentation/url_availability_requester.cc
@@ -10,7 +10,7 @@
 
 #include "osp/impl/presentation/presentation_common.h"
 #include "osp/public/network_service_manager.h"
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 using openscreen::platform::Clock;
 using std::chrono::seconds;
diff --git a/osp/impl/presentation/url_availability_requester_unittest.cc b/osp/impl/presentation/url_availability_requester_unittest.cc
index 153170a7..1ac018bb 100644
--- a/osp/impl/presentation/url_availability_requester_unittest.cc
+++ b/osp/impl/presentation/url_availability_requester_unittest.cc
@@ -13,9 +13,9 @@
 #include "osp/msgs/osp_messages.h"
 #include "osp/public/network_service_manager.h"
 #include "osp/public/testing/message_demuxer_test_support.h"
-#include "platform/api/logging.h"
 #include "platform/test/fake_clock.h"
 #include "platform/test/fake_task_runner.h"
+#include "util/logging.h"
 
 using std::chrono::milliseconds;
 using std::chrono::seconds;
diff --git a/osp/impl/quic/quic_client.cc b/osp/impl/quic/quic_client.cc
index 7b3b0bff..24a066f3 100644
--- a/osp/impl/quic/quic_client.cc
+++ b/osp/impl/quic/quic_client.cc
@@ -9,9 +9,9 @@
 #include <memory>
 
 #include "absl/types/optional.h"
-#include "platform/api/logging.h"
 #include "platform/api/task_runner.h"
 #include "platform/api/time.h"
+#include "util/logging.h"
 
 namespace openscreen {
 
diff --git a/osp/impl/quic/quic_client_unittest.cc b/osp/impl/quic/quic_client_unittest.cc
index 9218f43d..23dbad15 100644
--- a/osp/impl/quic/quic_client_unittest.cc
+++ b/osp/impl/quic/quic_client_unittest.cc
@@ -14,10 +14,10 @@
 #include "osp/public/network_metrics.h"
 #include "osp/public/network_service_manager.h"
 #include "osp/public/testing/message_demuxer_test_support.h"
-#include "platform/api/logging.h"
 #include "platform/base/error.h"
 #include "platform/test/fake_clock.h"
 #include "platform/test/fake_task_runner.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace {
diff --git a/osp/impl/quic/quic_connection_factory_impl.cc b/osp/impl/quic/quic_connection_factory_impl.cc
index 2f25f5d2..bad7ee77 100644
--- a/osp/impl/quic/quic_connection_factory_impl.cc
+++ b/osp/impl/quic/quic_connection_factory_impl.cc
@@ -8,7 +8,6 @@
 #include <memory>
 
 #include "osp/impl/quic/quic_connection_impl.h"
-#include "platform/api/logging.h"
 #include "platform/api/task_runner.h"
 #include "platform/api/time.h"
 #include "platform/base/error.h"
@@ -16,6 +15,7 @@
 #include "third_party/chromium_quic/src/base/task_runner.h"
 #include "third_party/chromium_quic/src/net/third_party/quic/core/quic_constants.h"
 #include "third_party/chromium_quic/src/net/third_party/quic/platform/impl/quic_chromium_clock.h"
+#include "util/logging.h"
 #include "util/trace_logging.h"
 
 using openscreen::platform::TraceCategory;
diff --git a/osp/impl/quic/quic_connection_impl.cc b/osp/impl/quic/quic_connection_impl.cc
index 1c15daf2..6abb1694 100644
--- a/osp/impl/quic/quic_connection_impl.cc
+++ b/osp/impl/quic/quic_connection_impl.cc
@@ -9,9 +9,9 @@
 
 #include "absl/types/optional.h"
 #include "osp/impl/quic/quic_connection_factory_impl.h"
-#include "platform/api/logging.h"
 #include "platform/base/error.h"
 #include "third_party/chromium_quic/src/net/third_party/quic/platform/impl/quic_chromium_clock.h"
+#include "util/logging.h"
 #include "util/trace_logging.h"
 
 using openscreen::platform::TraceCategory;
diff --git a/osp/impl/quic/quic_server.cc b/osp/impl/quic/quic_server.cc
index c1ec14e7..1fe226a3 100644
--- a/osp/impl/quic/quic_server.cc
+++ b/osp/impl/quic/quic_server.cc
@@ -8,9 +8,9 @@
 #include <memory>
 
 #include "absl/types/optional.h"
-#include "platform/api/logging.h"
 #include "platform/api/task_runner.h"
 #include "platform/api/time.h"
+#include "util/logging.h"
 
 namespace openscreen {
 
diff --git a/osp/impl/quic/quic_service_common.cc b/osp/impl/quic/quic_service_common.cc
index 1bc26fea..60a3ef94 100644
--- a/osp/impl/quic/quic_service_common.cc
+++ b/osp/impl/quic/quic_service_common.cc
@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 
diff --git a/osp/impl/quic/testing/fake_quic_connection.cc b/osp/impl/quic/testing/fake_quic_connection.cc
index ff605622..9c8eab9d 100644
--- a/osp/impl/quic/testing/fake_quic_connection.cc
+++ b/osp/impl/quic/testing/fake_quic_connection.cc
@@ -7,7 +7,7 @@
 #include <memory>
 
 #include "osp/impl/quic/testing/fake_quic_connection_factory.h"
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 
diff --git a/osp/impl/quic/testing/fake_quic_connection_factory.cc b/osp/impl/quic/testing/fake_quic_connection_factory.cc
index 599cebc9..239c2039 100644
--- a/osp/impl/quic/testing/fake_quic_connection_factory.cc
+++ b/osp/impl/quic/testing/fake_quic_connection_factory.cc
@@ -7,7 +7,7 @@
 #include <algorithm>
 #include <memory>
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 
diff --git a/osp/impl/service_listener_impl.cc b/osp/impl/service_listener_impl.cc
index a32ae9f7..4c7bd0cb 100644
--- a/osp/impl/service_listener_impl.cc
+++ b/osp/impl/service_listener_impl.cc
@@ -4,8 +4,8 @@
 
 #include "osp/impl/service_listener_impl.h"
 
-#include "platform/api/logging.h"
 #include "platform/base/error.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace {
diff --git a/osp/impl/service_publisher_impl.cc b/osp/impl/service_publisher_impl.cc
index 6c2dcaf5..f793465a 100644
--- a/osp/impl/service_publisher_impl.cc
+++ b/osp/impl/service_publisher_impl.cc
@@ -4,7 +4,7 @@
 
 #include "osp/impl/service_publisher_impl.h"
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace {
diff --git a/osp/impl/testing/fake_mdns_platform_service.cc b/osp/impl/testing/fake_mdns_platform_service.cc
index 689f0d25..866566b4 100644
--- a/osp/impl/testing/fake_mdns_platform_service.cc
+++ b/osp/impl/testing/fake_mdns_platform_service.cc
@@ -6,7 +6,7 @@
 
 #include <algorithm>
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 
diff --git a/osp/impl/testing/fake_mdns_responder_adapter.cc b/osp/impl/testing/fake_mdns_responder_adapter.cc
index 74e5348b..a0989ec8 100644
--- a/osp/impl/testing/fake_mdns_responder_adapter.cc
+++ b/osp/impl/testing/fake_mdns_responder_adapter.cc
@@ -6,8 +6,8 @@
 
 #include <algorithm>
 
-#include "platform/api/logging.h"
 #include "platform/base/error.h"
+#include "util/logging.h"
 
 namespace openscreen {
 
diff --git a/osp/impl/with_destruction_callback.cc b/osp/impl/with_destruction_callback.cc
index b182baeb..28816a62 100644
--- a/osp/impl/with_destruction_callback.cc
+++ b/osp/impl/with_destruction_callback.cc
@@ -4,7 +4,7 @@
 
 #include "osp/impl/with_destruction_callback.h"
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 
diff --git a/osp/msgs/request_response_handler.h b/osp/msgs/request_response_handler.h
index 7c496c91..a316e33c 100644
--- a/osp/msgs/request_response_handler.h
+++ b/osp/msgs/request_response_handler.h
@@ -13,9 +13,9 @@
 #include "osp/public/message_demuxer.h"
 #include "osp/public/network_service_manager.h"
 #include "osp/public/protocol_connection.h"
-#include "platform/api/logging.h"
 #include "platform/base/error.h"
 #include "platform/base/macros.h"
+#include "util/logging.h"
 
 namespace openscreen {
 
diff --git a/osp/public/message_demuxer.cc b/osp/public/message_demuxer.cc
index c1afed19..c23e02d0 100644
--- a/osp/public/message_demuxer.cc
+++ b/osp/public/message_demuxer.cc
@@ -7,9 +7,9 @@
 #include <memory>
 
 #include "osp/impl/quic/quic_connection.h"
-#include "platform/api/logging.h"
 #include "platform/base/error.h"
 #include "util/big_endian.h"
+#include "util/logging.h"
 
 namespace openscreen {
 
diff --git a/osp/public/presentation/presentation_connection.h b/osp/public/presentation/presentation_connection.h
index eb39b6aa..54c8ba16 100644
--- a/osp/public/presentation/presentation_connection.h
+++ b/osp/public/presentation/presentation_connection.h
@@ -14,11 +14,11 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "osp/public/message_demuxer.h"
-#include "platform/api/logging.h"
 #include "platform/api/time.h"
 #include "platform/base/error.h"
 #include "platform/base/ip_address.h"
 #include "platform/base/macros.h"
+#include "util/logging.h"
 
 namespace openscreen {
 
diff --git a/osp/public/protocol_connection.h b/osp/public/protocol_connection.h
index 184723fa..7d18dc54 100644
--- a/osp/public/protocol_connection.h
+++ b/osp/public/protocol_connection.h
@@ -10,8 +10,8 @@
 #include <type_traits>
 
 #include "osp/msgs/osp_messages.h"
-#include "platform/api/logging.h"
 #include "platform/base/error.h"
+#include "util/logging.h"
 
 namespace openscreen {
 
diff --git a/osp/public/service_info.cc b/osp/public/service_info.cc
index b7e3fcee..ce423da7 100644
--- a/osp/public/service_info.cc
+++ b/osp/public/service_info.cc
@@ -7,7 +7,7 @@
 #include <algorithm>
 #include <utility>
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 
diff --git a/platform/BUILD.gn b/platform/BUILD.gn
index 49f6f26f..b20b9356 100644
--- a/platform/BUILD.gn
+++ b/platform/BUILD.gn
@@ -8,7 +8,6 @@ source_set("platform") {
   defines = []
 
   sources = [
-    "api/internal/logging_macros.h",
     "api/logging.h",
     "api/network_interface.cc",
     "api/network_interface.h",
diff --git a/platform/api/logging.h b/platform/api/logging.h
index 29f6f928..9ff79d1a 100644
--- a/platform/api/logging.h
+++ b/platform/api/logging.h
@@ -58,12 +58,4 @@ void Break();
 }  // namespace platform
 }  // namespace openscreen
 
-// Convenience macros and inline code that Open Screen code uses to invoke the
-// above embedder-implemented functions.
-//
-// TODO(crbug.com/openscreen/77): Remove this, move logging_macros.h to
-// util/logging.h, and search-and-replace all #includes throughout the code
-// base.
-#include "platform/api/internal/logging_macros.h"  // NOLINT
-
 #endif  // PLATFORM_API_LOGGING_H_
diff --git a/platform/api/task_runner.h b/platform/api/task_runner.h
index fc8a7376..8170d017 100644
--- a/platform/api/task_runner.h
+++ b/platform/api/task_runner.h
@@ -8,7 +8,6 @@
 #include <future>
 
 #include "absl/types/optional.h"
-#include "platform/api/logging.h"
 #include "platform/api/time.h"
 
 namespace openscreen {
diff --git a/platform/base/ip_address.cc b/platform/base/ip_address.cc
index eb4ddc8e..a4f496a3 100644
--- a/platform/base/ip_address.cc
+++ b/platform/base/ip_address.cc
@@ -8,7 +8,7 @@
 #include <iomanip>
 
 #include "absl/types/optional.h"
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 
diff --git a/platform/base/location.cc b/platform/base/location.cc
index 54e62903..c665034e 100644
--- a/platform/base/location.cc
+++ b/platform/base/location.cc
@@ -5,8 +5,8 @@
 #include "platform/base/location.h"
 
 #include "absl/strings/str_cat.h"
-#include "platform/api/logging.h"
 #include "platform/base/macros.h"
+#include "util/logging.h"
 
 namespace openscreen {
 
diff --git a/platform/base/serial_delete_ptr.h b/platform/base/serial_delete_ptr.h
index 23088152..009c7629 100644
--- a/platform/base/serial_delete_ptr.h
+++ b/platform/base/serial_delete_ptr.h
@@ -9,6 +9,7 @@
 #include <utility>
 
 #include "platform/api/task_runner.h"
+#include "util/logging.h"
 
 namespace openscreen {
 
diff --git a/platform/base/tls_credentials.cc b/platform/base/tls_credentials.cc
index 71bffbba..849bae08 100644
--- a/platform/base/tls_credentials.cc
+++ b/platform/base/tls_credentials.cc
@@ -15,9 +15,9 @@
 #include <utility>
 
 #include "absl/strings/str_cat.h"
-#include "platform/api/logging.h"
 #include "util/crypto/openssl_util.h"
 #include "util/crypto/sha2.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace platform {
diff --git a/platform/base/trace_logging_activation.cc b/platform/base/trace_logging_activation.cc
index 6a23f2d7..58fa7954 100644
--- a/platform/base/trace_logging_activation.cc
+++ b/platform/base/trace_logging_activation.cc
@@ -4,7 +4,7 @@
 
 #include "platform/base/trace_logging_activation.h"
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace platform {
diff --git a/platform/base/udp_packet.cc b/platform/base/udp_packet.cc
index 42176592..ec2ad0ca 100644
--- a/platform/base/udp_packet.cc
+++ b/platform/base/udp_packet.cc
@@ -4,7 +4,7 @@
 
 #include "platform/base/udp_packet.h"
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace platform {
diff --git a/platform/impl/logging.h b/platform/impl/logging.h
index 56e3b919..033691f8 100644
--- a/platform/impl/logging.h
+++ b/platform/impl/logging.h
@@ -5,7 +5,7 @@
 #ifndef PLATFORM_IMPL_LOGGING_H_
 #define PLATFORM_IMPL_LOGGING_H_
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace platform {
diff --git a/platform/impl/network_interface_linux.cc b/platform/impl/network_interface_linux.cc
index bb6928a9..c2e8af86 100644
--- a/platform/impl/network_interface_linux.cc
+++ b/platform/impl/network_interface_linux.cc
@@ -22,10 +22,10 @@
 #include <cstring>
 
 #include "absl/strings/string_view.h"
-#include "platform/api/logging.h"
 #include "platform/api/network_interface.h"
 #include "platform/base/ip_address.h"
 #include "platform/impl/scoped_pipe.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace platform {
diff --git a/platform/impl/network_interface_mac.cc b/platform/impl/network_interface_mac.cc
index 96050a9d..4d47f19d 100644
--- a/platform/impl/network_interface_mac.cc
+++ b/platform/impl/network_interface_mac.cc
@@ -17,10 +17,10 @@
 #include <string>
 #include <vector>
 
-#include "platform/api/logging.h"
 #include "platform/api/network_interface.h"
 #include "platform/base/ip_address.h"
 #include "platform/impl/scoped_pipe.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace platform {
diff --git a/platform/impl/scoped_pipe_unittest.cc b/platform/impl/scoped_pipe_unittest.cc
index 5aa68452..21371aa7 100644
--- a/platform/impl/scoped_pipe_unittest.cc
+++ b/platform/impl/scoped_pipe_unittest.cc
@@ -8,7 +8,7 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace {
diff --git a/platform/impl/scoped_wake_lock_mac.cc b/platform/impl/scoped_wake_lock_mac.cc
index 4f5797a7..719f93bb 100644
--- a/platform/impl/scoped_wake_lock_mac.cc
+++ b/platform/impl/scoped_wake_lock_mac.cc
@@ -6,8 +6,8 @@
 
 #include <CoreFoundation/CoreFoundation.h>
 
-#include "platform/api/logging.h"
 #include "platform/api/task_runner.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace platform {
diff --git a/platform/impl/socket_address_posix.cc b/platform/impl/socket_address_posix.cc
index 2c2a6e5a..d91975c6 100644
--- a/platform/impl/socket_address_posix.cc
+++ b/platform/impl/socket_address_posix.cc
@@ -6,7 +6,7 @@
 
 #include <vector>
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace platform {
diff --git a/platform/impl/socket_handle_waiter.cc b/platform/impl/socket_handle_waiter.cc
index 8df49e2f..e3731b34 100644
--- a/platform/impl/socket_handle_waiter.cc
+++ b/platform/impl/socket_handle_waiter.cc
@@ -8,7 +8,7 @@
 #include <atomic>
 
 #include "absl/algorithm/container.h"
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace platform {
diff --git a/platform/impl/socket_handle_waiter_posix.cc b/platform/impl/socket_handle_waiter_posix.cc
index f24f218b..0cfca99b 100644
--- a/platform/impl/socket_handle_waiter_posix.cc
+++ b/platform/impl/socket_handle_waiter_posix.cc
@@ -9,11 +9,11 @@
 #include <algorithm>
 #include <vector>
 
-#include "platform/api/logging.h"
 #include "platform/base/error.h"
 #include "platform/impl/socket_handle_posix.h"
 #include "platform/impl/timeval_posix.h"
 #include "platform/impl/udp_socket_posix.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace platform {
diff --git a/platform/impl/task_runner.cc b/platform/impl/task_runner.cc
index 9bacacf4..8ff92b34 100644
--- a/platform/impl/task_runner.cc
+++ b/platform/impl/task_runner.cc
@@ -6,7 +6,7 @@
 
 #include <thread>
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace platform {
diff --git a/platform/impl/text_trace_logging_platform.cc b/platform/impl/text_trace_logging_platform.cc
index c0e56efd..573369a6 100644
--- a/platform/impl/text_trace_logging_platform.cc
+++ b/platform/impl/text_trace_logging_platform.cc
@@ -6,7 +6,7 @@
 
 #include <sstream>
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace platform {
diff --git a/platform/impl/time.cc b/platform/impl/time.cc
index e2dbcbeb..7f843db7 100644
--- a/platform/impl/time.cc
+++ b/platform/impl/time.cc
@@ -7,7 +7,7 @@
 #include <ctime>
 #include <ratio>
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 using std::chrono::duration_cast;
 using std::chrono::high_resolution_clock;
diff --git a/platform/impl/tls_connection_factory_posix.cc b/platform/impl/tls_connection_factory_posix.cc
index fd3a0115..eb99bf50 100644
--- a/platform/impl/tls_connection_factory_posix.cc
+++ b/platform/impl/tls_connection_factory_posix.cc
@@ -16,7 +16,6 @@
 
 #include <cstring>
 
-#include "platform/api/logging.h"
 #include "platform/api/task_runner.h"
 #include "platform/api/tls_connection_factory.h"
 #include "platform/base/tls_connect_options.h"
@@ -25,6 +24,7 @@
 #include "platform/impl/stream_socket.h"
 #include "platform/impl/tls_connection_posix.h"
 #include "util/crypto/openssl_util.h"
+#include "util/logging.h"
 #include "util/trace_logging.h"
 
 namespace openscreen {
diff --git a/platform/impl/tls_connection_posix.cc b/platform/impl/tls_connection_posix.cc
index a67e4f04..3fa39037 100644
--- a/platform/impl/tls_connection_posix.cc
+++ b/platform/impl/tls_connection_posix.cc
@@ -20,11 +20,11 @@
 
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
-#include "platform/api/logging.h"
 #include "platform/api/task_runner.h"
 #include "platform/base/error.h"
 #include "platform/impl/stream_socket.h"
 #include "util/crypto/openssl_util.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace platform {
diff --git a/platform/impl/tls_data_router_posix.cc b/platform/impl/tls_data_router_posix.cc
index 25773d5a..642d4a93 100644
--- a/platform/impl/tls_data_router_posix.cc
+++ b/platform/impl/tls_data_router_posix.cc
@@ -4,9 +4,9 @@
 
 #include "platform/impl/tls_data_router_posix.h"
 
-#include "platform/api/logging.h"
 #include "platform/impl/stream_socket_posix.h"
 #include "platform/impl/tls_connection_posix.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace platform {
diff --git a/platform/impl/tls_data_router_posix.h b/platform/impl/tls_data_router_posix.h
index 2ece472c..fb8ac45c 100644
--- a/platform/impl/tls_data_router_posix.h
+++ b/platform/impl/tls_data_router_posix.h
@@ -9,9 +9,9 @@
 #include <vector>
 
 #include "absl/base/thread_annotations.h"
-#include "platform/api/logging.h"
 #include "platform/api/time.h"
 #include "platform/impl/socket_handle_waiter.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace platform {
diff --git a/platform/impl/tls_write_buffer.cc b/platform/impl/tls_write_buffer.cc
index 7b0df3b7..f0370868 100644
--- a/platform/impl/tls_write_buffer.cc
+++ b/platform/impl/tls_write_buffer.cc
@@ -7,8 +7,8 @@
 #include <algorithm>
 #include <cstring>
 
-#include "platform/api/logging.h"
 #include "platform/api/tls_connection.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace platform {
diff --git a/platform/impl/udp_socket_posix.cc b/platform/impl/udp_socket_posix.cc
index c4226024..927ab315 100644
--- a/platform/impl/udp_socket_posix.cc
+++ b/platform/impl/udp_socket_posix.cc
@@ -20,10 +20,10 @@
 #include <type_traits>
 
 #include "absl/types/optional.h"
-#include "platform/api/logging.h"
 #include "platform/api/task_runner.h"
 #include "platform/base/error.h"
 #include "platform/impl/udp_socket_reader_posix.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace platform {
diff --git a/platform/impl/udp_socket_reader_posix.cc b/platform/impl/udp_socket_reader_posix.cc
index 0e9ce34e..3892081b 100644
--- a/platform/impl/udp_socket_reader_posix.cc
+++ b/platform/impl/udp_socket_reader_posix.cc
@@ -7,9 +7,9 @@
 #include <chrono>
 #include <functional>
 
-#include "platform/api/logging.h"
 #include "platform/impl/socket_handle_posix.h"
 #include "platform/impl/udp_socket_posix.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace platform {
diff --git a/platform/impl/weak_ptr.h b/platform/impl/weak_ptr.h
index e065b067..173c57e8 100644
--- a/platform/impl/weak_ptr.h
+++ b/platform/impl/weak_ptr.h
@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 
diff --git a/platform/test/fake_clock.cc b/platform/test/fake_clock.cc
index 12e3e021..78977ad2 100644
--- a/platform/test/fake_clock.cc
+++ b/platform/test/fake_clock.cc
@@ -4,8 +4,8 @@
 
 #include "platform/test/fake_clock.h"
 
-#include "platform/api/logging.h"
 #include "platform/test/fake_task_runner.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace platform {
diff --git a/platform/test/fake_task_runner.cc b/platform/test/fake_task_runner.cc
index 0bd83953..f906da34 100644
--- a/platform/test/fake_task_runner.cc
+++ b/platform/test/fake_task_runner.cc
@@ -4,7 +4,7 @@
 
 #include "platform/test/fake_task_runner.h"
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace platform {
diff --git a/platform/test/fake_udp_socket.h b/platform/test/fake_udp_socket.h
index a129393a..78736c4e 100644
--- a/platform/test/fake_udp_socket.h
+++ b/platform/test/fake_udp_socket.h
@@ -10,11 +10,11 @@
 #include <queue>
 
 #include "gmock/gmock.h"
-#include "platform/api/logging.h"
 #include "platform/api/time.h"
 #include "platform/api/udp_socket.h"
 #include "platform/test/fake_clock.h"
 #include "platform/test/fake_task_runner.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace platform {
diff --git a/platform/test/trace_logging_helpers.h b/platform/test/trace_logging_helpers.h
index 1058d6cf..e9d4f3f6 100644
--- a/platform/test/trace_logging_helpers.h
+++ b/platform/test/trace_logging_helpers.h
@@ -8,8 +8,8 @@
 #define PLATFORM_TEST_TRACE_LOGGING_HELPERS_H_
 
 #include "gmock/gmock.h"
-#include "platform/api/logging.h"
 #include "platform/base/trace_logging_activation.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace platform {
diff --git a/streaming/cast/clock_drift_smoother.cc b/streaming/cast/clock_drift_smoother.cc
index e8e10f6c..fb3d91e7 100644
--- a/streaming/cast/clock_drift_smoother.cc
+++ b/streaming/cast/clock_drift_smoother.cc
@@ -6,7 +6,7 @@
 
 #include <cmath>
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace cast_streaming {
diff --git a/streaming/cast/compound_rtcp_builder.cc b/streaming/cast/compound_rtcp_builder.cc
index 13b23969..505b45e6 100644
--- a/streaming/cast/compound_rtcp_builder.cc
+++ b/streaming/cast/compound_rtcp_builder.cc
@@ -8,10 +8,10 @@
 #include <iterator>
 #include <limits>
 
-#include "platform/api/logging.h"
 #include "streaming/cast/packet_util.h"
 #include "streaming/cast/rtcp_session.h"
 #include "util/integer_division.h"
+#include "util/logging.h"
 #include "util/std_util.h"
 
 namespace openscreen {
diff --git a/streaming/cast/compound_rtcp_parser.cc b/streaming/cast/compound_rtcp_parser.cc
index a97a7b3c..772183fa 100644
--- a/streaming/cast/compound_rtcp_parser.cc
+++ b/streaming/cast/compound_rtcp_parser.cc
@@ -6,9 +6,9 @@
 
 #include <algorithm>
 
-#include "platform/api/logging.h"
 #include "streaming/cast/packet_util.h"
 #include "streaming/cast/rtcp_session.h"
+#include "util/logging.h"
 #include "util/std_util.h"
 
 namespace openscreen {
diff --git a/streaming/cast/environment.cc b/streaming/cast/environment.cc
index da2caaee..acabc867 100644
--- a/streaming/cast/environment.cc
+++ b/streaming/cast/environment.cc
@@ -4,9 +4,9 @@
 
 #include "streaming/cast/environment.h"
 
-#include "platform/api/logging.h"
 #include "platform/api/task_runner.h"
 #include "streaming/cast/rtp_defines.h"
+#include "util/logging.h"
 
 namespace openscreen {
 
diff --git a/streaming/cast/expanded_value_base.h b/streaming/cast/expanded_value_base.h
index 2acab484..a6bdaabe 100644
--- a/streaming/cast/expanded_value_base.h
+++ b/streaming/cast/expanded_value_base.h
@@ -9,7 +9,7 @@
 
 #include <limits>
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace cast_streaming {
diff --git a/streaming/cast/frame_collector.cc b/streaming/cast/frame_collector.cc
index d32aaefe..2f2480ba 100644
--- a/streaming/cast/frame_collector.cc
+++ b/streaming/cast/frame_collector.cc
@@ -8,9 +8,9 @@
 #include <limits>
 #include <numeric>
 
-#include "platform/api/logging.h"
 #include "streaming/cast/frame_id.h"
 #include "streaming/cast/rtp_defines.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace cast_streaming {
diff --git a/streaming/cast/ntp_time.cc b/streaming/cast/ntp_time.cc
index 60b816ce..3c202819 100644
--- a/streaming/cast/ntp_time.cc
+++ b/streaming/cast/ntp_time.cc
@@ -4,7 +4,7 @@
 
 #include "streaming/cast/ntp_time.h"
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 using openscreen::platform::Clock;
 using std::chrono::duration_cast;
diff --git a/streaming/cast/receiver.cc b/streaming/cast/receiver.cc
index ed432423..c269b8a9 100644
--- a/streaming/cast/receiver.cc
+++ b/streaming/cast/receiver.cc
@@ -8,9 +8,9 @@
 #include <functional>
 
 #include "absl/types/span.h"
-#include "platform/api/logging.h"
 #include "streaming/cast/constants.h"
 #include "streaming/cast/receiver_packet_router.h"
+#include "util/logging.h"
 #include "util/std_util.h"
 
 using openscreen::platform::Clock;
diff --git a/streaming/cast/receiver_demo/decoder.cc b/streaming/cast/receiver_demo/decoder.cc
index 775b5b12..42adf87b 100644
--- a/streaming/cast/receiver_demo/decoder.cc
+++ b/streaming/cast/receiver_demo/decoder.cc
@@ -2,7 +2,7 @@
 
 #include <sstream>
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace cast_streaming {
diff --git a/streaming/cast/receiver_demo/dummy_player.cc b/streaming/cast/receiver_demo/dummy_player.cc
index cccd5eea..1fbb9f54 100644
--- a/streaming/cast/receiver_demo/dummy_player.cc
+++ b/streaming/cast/receiver_demo/dummy_player.cc
@@ -7,8 +7,8 @@
 #include <chrono>
 
 #include "absl/types/span.h"
-#include "platform/api/logging.h"
 #include "streaming/cast/encoded_frame.h"
+#include "util/logging.h"
 
 using std::chrono::microseconds;
 
diff --git a/streaming/cast/receiver_demo/sdl_audio_player.cc b/streaming/cast/receiver_demo/sdl_audio_player.cc
index df87cd2d..5cf48550 100644
--- a/streaming/cast/receiver_demo/sdl_audio_player.cc
+++ b/streaming/cast/receiver_demo/sdl_audio_player.cc
@@ -8,9 +8,9 @@
 #include <sstream>
 
 #include "absl/types/span.h"
-#include "platform/api/logging.h"
 #include "streaming/cast/receiver_demo/avcodec_glue.h"
 #include "util/big_endian.h"
+#include "util/logging.h"
 
 using std::chrono::duration_cast;
 using std::chrono::milliseconds;
diff --git a/streaming/cast/receiver_demo/sdl_glue.cc b/streaming/cast/receiver_demo/sdl_glue.cc
index 94917016..2329f790 100644
--- a/streaming/cast/receiver_demo/sdl_glue.cc
+++ b/streaming/cast/receiver_demo/sdl_glue.cc
@@ -4,9 +4,9 @@
 
 #include "streaming/cast/receiver_demo/sdl_glue.h"
 
-#include "platform/api/logging.h"
 #include "platform/api/task_runner.h"
 #include "platform/api/time.h"
+#include "util/logging.h"
 
 using openscreen::platform::Clock;
 using openscreen::platform::TaskRunner;
diff --git a/streaming/cast/receiver_demo/sdl_player_base.cc b/streaming/cast/receiver_demo/sdl_player_base.cc
index 51b272dc..af88190d 100644
--- a/streaming/cast/receiver_demo/sdl_player_base.cc
+++ b/streaming/cast/receiver_demo/sdl_player_base.cc
@@ -8,10 +8,10 @@
 #include <sstream>
 
 #include "absl/types/span.h"
-#include "platform/api/logging.h"
 #include "streaming/cast/encoded_frame.h"
 #include "streaming/cast/receiver_demo/avcodec_glue.h"
 #include "util/big_endian.h"
+#include "util/logging.h"
 
 using std::chrono::duration_cast;
 using std::chrono::milliseconds;
diff --git a/streaming/cast/receiver_demo/sdl_video_player.cc b/streaming/cast/receiver_demo/sdl_video_player.cc
index 4f9f531a..da45f3eb 100644
--- a/streaming/cast/receiver_demo/sdl_video_player.cc
+++ b/streaming/cast/receiver_demo/sdl_video_player.cc
@@ -6,8 +6,8 @@
 
 #include <sstream>
 
-#include "platform/api/logging.h"
 #include "streaming/cast/receiver_demo/avcodec_glue.h"
+#include "util/logging.h"
 
 using openscreen::platform::Clock;
 using openscreen::platform::ClockNowFunctionPtr;
diff --git a/streaming/cast/receiver_packet_router.cc b/streaming/cast/receiver_packet_router.cc
index dfba572d..7fd6b7cd 100644
--- a/streaming/cast/receiver_packet_router.cc
+++ b/streaming/cast/receiver_packet_router.cc
@@ -7,9 +7,9 @@
 #include <algorithm>
 #include <iomanip>
 
-#include "platform/api/logging.h"
 #include "streaming/cast/packet_util.h"
 #include "streaming/cast/receiver.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace cast_streaming {
diff --git a/streaming/cast/receiver_unittest.cc b/streaming/cast/receiver_unittest.cc
index ca75d258..9f3e141a 100644
--- a/streaming/cast/receiver_unittest.cc
+++ b/streaming/cast/receiver_unittest.cc
@@ -14,7 +14,6 @@
 #include "cast/streaming/session_config.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "platform/api/logging.h"
 #include "platform/api/time.h"
 #include "platform/api/udp_socket.h"
 #include "platform/base/error.h"
@@ -34,6 +33,7 @@
 #include "streaming/cast/rtp_time.h"
 #include "streaming/cast/sender_report_builder.h"
 #include "streaming/cast/ssrc.h"
+#include "util/logging.h"
 
 using openscreen::platform::Clock;
 using openscreen::platform::FakeClock;
diff --git a/streaming/cast/rtcp_session.cc b/streaming/cast/rtcp_session.cc
index 49c0a5b3..29438275 100644
--- a/streaming/cast/rtcp_session.cc
+++ b/streaming/cast/rtcp_session.cc
@@ -4,7 +4,7 @@
 
 #include "streaming/cast/rtcp_session.h"
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace cast_streaming {
diff --git a/streaming/cast/rtp_packet_parser.cc b/streaming/cast/rtp_packet_parser.cc
index c06066d3..452114f3 100644
--- a/streaming/cast/rtp_packet_parser.cc
+++ b/streaming/cast/rtp_packet_parser.cc
@@ -7,8 +7,8 @@
 #include <algorithm>
 #include <utility>
 
-#include "platform/api/logging.h"
 #include "streaming/cast/packet_util.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace cast_streaming {
diff --git a/streaming/cast/rtp_packetizer.cc b/streaming/cast/rtp_packetizer.cc
index 18850433..b2e59f88 100644
--- a/streaming/cast/rtp_packetizer.cc
+++ b/streaming/cast/rtp_packetizer.cc
@@ -8,11 +8,11 @@
 #include <limits>
 #include <random>
 
-#include "platform/api/logging.h"
 #include "platform/api/time.h"
 #include "streaming/cast/packet_util.h"
 #include "util/big_endian.h"
 #include "util/integer_division.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace cast_streaming {
diff --git a/streaming/cast/sender_report_builder.cc b/streaming/cast/sender_report_builder.cc
index a3243e20..e2254171 100644
--- a/streaming/cast/sender_report_builder.cc
+++ b/streaming/cast/sender_report_builder.cc
@@ -4,8 +4,8 @@
 
 #include "streaming/cast/sender_report_builder.h"
 
-#include "platform/api/logging.h"
 #include "streaming/cast/packet_util.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace cast_streaming {
diff --git a/streaming/cast/sender_report_parser.cc b/streaming/cast/sender_report_parser.cc
index ad49dec1..8bda880a 100644
--- a/streaming/cast/sender_report_parser.cc
+++ b/streaming/cast/sender_report_parser.cc
@@ -4,8 +4,8 @@
 
 #include "streaming/cast/sender_report_parser.h"
 
-#include "platform/api/logging.h"
 #include "streaming/cast/packet_util.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace cast_streaming {
diff --git a/tools/cddl/codegen.cc b/tools/cddl/codegen.cc
index e0fa7507..6454b5e0 100644
--- a/tools/cddl/codegen.cc
+++ b/tools/cddl/codegen.cc
@@ -1579,8 +1579,8 @@ bool WriteSourcePrologue(int fd, const std::string& header_filename) {
   static const char prologue[] =
       R"(#include "%s"
 
-#include "platform/api/logging.h"
 #include "third_party/tinycbor/src/src/utf8_p.h"
+#include "util/logging.h"
 
 namespace openscreen {
 namespace msgs {
diff --git a/util/BUILD.gn b/util/BUILD.gn
index 4c6e2cba..475b2dd6 100644
--- a/util/BUILD.gn
+++ b/util/BUILD.gn
@@ -23,6 +23,7 @@ source_set("util") {
     "json/json_reader.h",
     "json/json_writer.cc",
     "json/json_writer.h",
+    "logging.h",
     "operation_loop.cc",
     "operation_loop.h",
     "saturate_cast.h",
diff --git a/util/alarm.cc b/util/alarm.cc
index 4ecb3f07..c72815a1 100644
--- a/util/alarm.cc
+++ b/util/alarm.cc
@@ -4,7 +4,7 @@
 
 #include "util/alarm.h"
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 
diff --git a/util/crypto/openssl_util.cc b/util/crypto/openssl_util.cc
index c6adfc7c..ec5b1908 100644
--- a/util/crypto/openssl_util.cc
+++ b/util/crypto/openssl_util.cc
@@ -13,7 +13,7 @@
 #include "openssl/crypto.h"
 #include "openssl/err.h"
 #include "openssl/ssl.h"
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 
diff --git a/util/crypto/rsa_private_key.cc b/util/crypto/rsa_private_key.cc
index d0ebd3f5..9571f9f4 100644
--- a/util/crypto/rsa_private_key.cc
+++ b/util/crypto/rsa_private_key.cc
@@ -15,8 +15,8 @@
 #include "openssl/evp.h"
 #include "openssl/mem.h"
 #include "openssl/rsa.h"
-#include "platform/api/logging.h"
 #include "util/crypto/openssl_util.h"
+#include "util/logging.h"
 
 namespace openscreen {
 RSAPrivateKey::~RSAPrivateKey() = default;
diff --git a/util/crypto/secure_hash.cc b/util/crypto/secure_hash.cc
index 14ed726a..8b8732a3 100644
--- a/util/crypto/secure_hash.cc
+++ b/util/crypto/secure_hash.cc
@@ -9,8 +9,8 @@
 #include <cstring>
 
 #include "openssl/mem.h"
-#include "platform/api/logging.h"
 #include "util/crypto/openssl_util.h"
+#include "util/logging.h"
 
 namespace openscreen {
 
diff --git a/util/json/json_reader.cc b/util/json/json_reader.cc
index 587ef0f3..e98f4aa6 100644
--- a/util/json/json_reader.cc
+++ b/util/json/json_reader.cc
@@ -8,8 +8,8 @@
 #include <string>
 
 #include "json/value.h"
-#include "platform/api/logging.h"
 #include "platform/base/error.h"
+#include "util/logging.h"
 
 namespace openscreen {
 
diff --git a/util/json/json_writer.cc b/util/json/json_writer.cc
index c2d01521..65130f8e 100644
--- a/util/json/json_writer.cc
+++ b/util/json/json_writer.cc
@@ -10,8 +10,8 @@
 #include <utility>
 
 #include "json/value.h"
-#include "platform/api/logging.h"
 #include "platform/base/error.h"
+#include "util/logging.h"
 
 namespace openscreen {
 JsonWriter::JsonWriter() {
diff --git a/platform/api/internal/logging_macros.h b/util/logging.h
index 36e884ef..54870111 100644
--- a/platform/api/internal/logging_macros.h
+++ b/util/logging.h
@@ -2,11 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PLATFORM_API_INTERNAL_LOGGING_MACROS_H_
-#define PLATFORM_API_INTERNAL_LOGGING_MACROS_H_
+#ifndef UTIL_LOGGING_H_
+#define UTIL_LOGGING_H_
 
 #include <sstream>
 
+#include "platform/api/logging.h"
+
 namespace openscreen {
 namespace platform {
 namespace internal {
@@ -139,4 +141,4 @@ class Voidify {
 
 #define OSP_NOTREACHED() OSP_LOG_FATAL << __func__ << ": NOTREACHED() hit."
 
-#endif  // PLATFORM_API_INTERNAL_LOGGING_MACROS_H_
+#endif  // UTIL_LOGGING_H_
diff --git a/util/operation_loop.cc b/util/operation_loop.cc
index f35b39d3..9575fa3a 100644
--- a/util/operation_loop.cc
+++ b/util/operation_loop.cc
@@ -5,7 +5,7 @@
 
 #include <algorithm>
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {
 
diff --git a/util/trace_logging/scoped_trace_operations.cc b/util/trace_logging/scoped_trace_operations.cc
index 0795e9c9..7b19b74d 100644
--- a/util/trace_logging/scoped_trace_operations.cc
+++ b/util/trace_logging/scoped_trace_operations.cc
@@ -6,9 +6,9 @@
 
 #include "absl/types/optional.h"
 #include "build/config/features.h"
-#include "platform/api/logging.h"
 #include "platform/api/trace_logging_platform.h"
 #include "platform/base/trace_logging_activation.h"
+#include "util/logging.h"
 
 #if defined(ENABLE_TRACE_LOGGING)
 
diff --git a/util/trace_logging/scoped_trace_operations.h b/util/trace_logging/scoped_trace_operations.h
index 592d4528..f8af42da 100644
--- a/util/trace_logging/scoped_trace_operations.h
+++ b/util/trace_logging/scoped_trace_operations.h
@@ -14,6 +14,7 @@
 #include "platform/api/time.h"
 #include "platform/base/error.h"
 #include "platform/base/trace_logging_types.h"
+#include "util/logging.h"
 
 #if defined(ENABLE_TRACE_LOGGING)
 
diff --git a/util/yet_another_bit_vector.cc b/util/yet_another_bit_vector.cc
index a581a974..903649fd 100644
--- a/util/yet_another_bit_vector.cc
+++ b/util/yet_another_bit_vector.cc
@@ -7,7 +7,7 @@
 #include <algorithm>
 #include <utility>
 
-#include "platform/api/logging.h"
+#include "util/logging.h"
 
 namespace openscreen {