137 files changed, 433 insertions, 432 deletions

diff --git a/BUILD.gn b/BUILD.gn
index 5a9d5a2c..aa17de35 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 import("//build_overrides/build.gni")
-import("build/config/services.gni")
+import("osp/build/config/services.gni")
 
 config("root_config_overrides") {
   if (build_with_chromium) {
@@ -15,8 +15,8 @@ config("root_config_overrides") {
 # source_sets).
 group("gn_all") {
   deps = [
-    "api",
-    "msgs",
+    "osp",
+    "osp/msgs",
     "osp_base",
     "platform",
     "third_party/abseil",
@@ -25,7 +25,7 @@ group("gn_all") {
   ]
 
   if (use_mdns_responder) {
-    deps += [ "discovery/mdns:embedder_demo" ]
+    deps += [ "osp/impl/discovery/mdns:embedder_demo" ]
   }
 
   if (use_chromium_quic) {
@@ -40,9 +40,9 @@ group("gn_all") {
 executable("openscreen_unittests") {
   testonly = true
   deps = [
-    "api:api_unittests",
-    "discovery/mdns:mdns_unittests",
-    "msgs:unittests",
+    "osp:osp_unittests",
+    "osp/impl/discovery/mdns:mdns_unittests",
+    "osp/msgs:unittests",
     "osp_base:osp_base_unittests",
     "platform:platform_unittests",
     "streaming/cast:cast_unittests",
@@ -54,14 +54,14 @@ executable("openscreen_unittests") {
 if (use_chromium_quic && use_mdns_responder) {
   executable("demo") {
     sources = [
-      "demo/demo.cc",
+      "osp/demo/demo.cc",
     ]
 
     deps = [
-      "api:api_with_chromium_quic",
-      "discovery/mdns",
-      "osp_base",
-      "platform",
+      "//osp:osp_with_chromium_quic",
+      "//osp/impl/discovery/mdns",
+      "//osp_base",
+      "//platform",
     ]
   }
 }
diff --git a/DEPS b/DEPS
index c33dd151..28a9bbfc 100644
--- a/DEPS
+++ b/DEPS
@@ -94,9 +94,8 @@ recursedeps = [
 # TODO(mfoltz): Change to allow only base and third_party from the top level
 # once OSP code is moved into osp/.
 include_rules = [
-    '+api',
+    '+osp',
     '+osp_base',
-    '+msgs',
     '+platform',
     '+third_party',
 
diff --git a/api/BUILD.gn b/osp/BUILD.gn
index c44e8c4d..4b1c3f67 100644
--- a/api/BUILD.gn
+++ b/osp/BUILD.gn
@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("../build/config/services.gni")
+import("build/config/services.gni")
 
-source_set("api") {
+source_set("osp") {
   public_deps = [
-    "public:api",
+    "public",
   ]
   deps = [
     "impl",
@@ -14,9 +14,9 @@ source_set("api") {
 }
 
 if (use_chromium_quic) {
-  source_set("api_with_chromium_quic") {
+  source_set("osp_with_chromium_quic") {
     public_deps = [
-      ":api",
+      ":osp",
     ]
     deps = [
       "impl:chromium_quic_integration",
@@ -24,7 +24,7 @@ if (use_chromium_quic) {
   }
 }
 
-source_set("api_unittests") {
+source_set("osp_unittests") {
   testonly = true
 
   sources = [
@@ -43,13 +43,14 @@ source_set("api_unittests") {
   ]
 
   deps = [
-    ":api",
     "../third_party/abseil",
     "../third_party/googletest:gmock",
     "../third_party/googletest:gtest",
+    "impl",
     "impl/quic:test_support",
     "impl/testing",
     "impl/testing:fakes_unittests",
+    "public",
     "public:test_support",
   ]
   configs += [ "..:root_config_overrides" ]
diff --git a/build/config/services.gni b/osp/build/config/services.gni
index 1d3d3466..1d3d3466 100644
--- a/build/config/services.gni
+++ b/osp/build/config/services.gni
diff --git a/demo/README.md b/osp/demo/README.md
index b5e70ea4..b5e70ea4 100644
--- a/demo/README.md
+++ b/osp/demo/README.md
diff --git a/demo/demo.cc b/osp/demo/demo.cc
index a62e9d74..469fb307 100644
--- a/demo/demo.cc
+++ b/osp/demo/demo.cc
@@ -13,19 +13,19 @@
 #include <vector>
 
 #include "absl/strings/string_view.h"
-#include "api/public/mdns_service_listener_factory.h"
-#include "api/public/mdns_service_publisher_factory.h"
-#include "api/public/message_demuxer.h"
-#include "api/public/network_service_manager.h"
-#include "api/public/presentation/presentation_controller.h"
-#include "api/public/presentation/presentation_receiver.h"
-#include "api/public/protocol_connection_client.h"
-#include "api/public/protocol_connection_client_factory.h"
-#include "api/public/protocol_connection_server.h"
-#include "api/public/protocol_connection_server_factory.h"
-#include "api/public/service_listener.h"
-#include "api/public/service_publisher.h"
-#include "msgs/osp_messages.h"
+#include "osp/msgs/osp_messages.h"
+#include "osp/public/mdns_service_listener_factory.h"
+#include "osp/public/mdns_service_publisher_factory.h"
+#include "osp/public/message_demuxer.h"
+#include "osp/public/network_service_manager.h"
+#include "osp/public/presentation/presentation_controller.h"
+#include "osp/public/presentation/presentation_receiver.h"
+#include "osp/public/protocol_connection_client.h"
+#include "osp/public/protocol_connection_client_factory.h"
+#include "osp/public/protocol_connection_server.h"
+#include "osp/public/protocol_connection_server_factory.h"
+#include "osp/public/service_listener.h"
+#include "osp/public/service_publisher.h"
 #include "platform/api/logging.h"
 #include "platform/api/network_interface.h"
 #include "platform/api/time.h"
diff --git a/docs/pi.md b/osp/docs/pi.md
index 76b35ea2..76b35ea2 100644
--- a/docs/pi.md
+++ b/osp/docs/pi.md
diff --git a/go/README b/osp/go/README
index f94ba080..f94ba080 100644
--- a/go/README
+++ b/osp/go/README
diff --git a/go/base.go b/osp/go/base.go
index 6cb879a5..6cb879a5 100644
--- a/go/base.go
+++ b/osp/go/base.go
diff --git a/go/binary.go b/osp/go/binary.go
index 1ab80d29..1ab80d29 100644
--- a/go/binary.go
+++ b/osp/go/binary.go
diff --git a/go/client.go b/osp/go/client.go
index 61b52148..61b52148 100644
--- a/go/client.go
+++ b/osp/go/client.go
diff --git a/go/cmd/go.sum b/osp/go/cmd/go.sum
index 1a164b0a..1a164b0a 100644
--- a/go/cmd/go.sum
+++ b/osp/go/cmd/go.sum
diff --git a/go/cmd/osp.go b/osp/go/cmd/osp.go
index 86e87b07..86e87b07 100644
--- a/go/cmd/osp.go
+++ b/osp/go/cmd/osp.go
diff --git a/go/cmd/test.go b/osp/go/cmd/test.go
index 5eac0aa8..5eac0aa8 100644
--- a/go/cmd/test.go
+++ b/osp/go/cmd/test.go
diff --git a/go/controller.go b/osp/go/controller.go
index 005ff52d..005ff52d 100644
--- a/go/controller.go
+++ b/osp/go/controller.go
diff --git a/go/go.mod b/osp/go/go.mod
index 4928182e..4928182e 100644
--- a/go/go.mod
+++ b/osp/go/go.mod
diff --git a/go/go.sum b/osp/go/go.sum
index 1a164b0a..1a164b0a 100644
--- a/go/go.sum
+++ b/osp/go/go.sum
diff --git a/go/mdns.go b/osp/go/mdns.go
index 591ef6e7..591ef6e7 100644
--- a/go/mdns.go
+++ b/osp/go/mdns.go
diff --git a/go/messages.go b/osp/go/messages.go
index ffc85633..ffc85633 100644
--- a/go/messages.go
+++ b/osp/go/messages.go
diff --git a/go/quic.go b/osp/go/quic.go
index 39cbe958..39cbe958 100644
--- a/go/quic.go
+++ b/osp/go/quic.go
diff --git a/go/receiver.go b/osp/go/receiver.go
index de1f3727..de1f3727 100644
--- a/go/receiver.go
+++ b/osp/go/receiver.go
diff --git a/go/server.go b/osp/go/server.go
index a2ee06c1..a2ee06c1 100644
--- a/go/server.go
+++ b/osp/go/server.go
diff --git a/api/impl/BUILD.gn b/osp/impl/BUILD.gn
index 77164985..16350069 100644
--- a/api/impl/BUILD.gn
+++ b/osp/impl/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("../../build/config/services.gni")
+import("../../osp/build/config/services.gni")
 
 source_set("impl") {
   sources = [
@@ -36,15 +36,15 @@ source_set("impl") {
   }
 
   public_deps = [
-    "../../msgs",
-    "../public:api",
+    "../../osp/msgs",
+    "../../osp/public",
   ]
   deps = [
     "../../osp_base",
     "../../platform",
     "quic",
   ]
-  configs += [ "../..:root_config_overrides" ]
+  configs += [ "../../:root_config_overrides" ]
 }
 
 if (use_chromium_quic) {
@@ -58,14 +58,14 @@ if (use_chromium_quic) {
       "quic/quic_connection_impl.h",
     ]
 
-    public_configs = [ "//third_party/chromium_quic:chromium_quic_config" ]
+    public_configs = [ "../../third_party/chromium_quic:chromium_quic_config" ]
 
     deps = [
+      "../../osp/msgs",
+      "../../osp_base",
+      "../../platform",
+      "../../third_party/chromium_quic",
       "quic",
-      "//msgs",
-      "//osp_base",
-      "//platform",
-      "//third_party/chromium_quic",
     ]
   }
 }
diff --git a/api/impl/DEPS b/osp/impl/DEPS
index 4a747c86..63752366 100644
--- a/api/impl/DEPS
+++ b/osp/impl/DEPS
@@ -3,5 +3,5 @@
 # found in the LICENSE file.
 
 include_rules = [
-    '+discovery/mdns',
+    '+osp/impl/discovery/mdns',
 ]
diff --git a/discovery/mdns/BUILD.gn b/osp/impl/discovery/mdns/BUILD.gn
index 95a43d27..eb0a5a7a 100644
--- a/discovery/mdns/BUILD.gn
+++ b/osp/impl/discovery/mdns/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("../../build/config/services.gni")
+import("../../../build/config/services.gni")
 
 source_set("mdns_interface") {
   sources = [
@@ -13,10 +13,10 @@ source_set("mdns_interface") {
   ]
 
   public_deps = [
-    "../../osp_base",
-    "../../platform",
+    "../../../../osp_base",
+    "../../../../platform",
   ]
-  configs += [ "../..:root_config_overrides" ]
+  configs += [ "../../../..:root_config_overrides" ]
 }
 
 source_set("mdns_unittests") {
@@ -28,10 +28,10 @@ source_set("mdns_unittests") {
 
   deps = [
     ":mdns_interface",
-    "../../third_party/googletest:gmock",
-    "../../third_party/googletest:gtest",
+    "../../../../third_party/googletest:gmock",
+    "../../../../third_party/googletest:gtest",
   ]
-  configs += [ "../..:root_config_overrides" ]
+  configs += [ "../../../..:root_config_overrides" ]
 
   if (use_mdns_responder) {
     sources += [ "mdns_responder_adapter_impl_unittest.cc" ]
@@ -60,12 +60,12 @@ if (use_mdns_responder) {
 
     public_deps = [
       ":mdns_interface",
-      "../../osp_base",
-      "../../platform",
+      "../../../../osp_base",
+      "../../../../platform",
     ]
 
     deps = [
-      "../../third_party/mDNSResponder:core",
+      "../../../../third_party/mDNSResponder:core",
     ]
   }
 }
diff --git a/discovery/mdns/domain_name.cc b/osp/impl/discovery/mdns/domain_name.cc
index 9262aa0e..30d4b357 100644
--- a/discovery/mdns/domain_name.cc
+++ b/osp/impl/discovery/mdns/domain_name.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "discovery/mdns/domain_name.h"
+#include "osp/impl/discovery/mdns/domain_name.h"
 
 #include <algorithm>
 #include <iterator>
diff --git a/discovery/mdns/domain_name.h b/osp/impl/discovery/mdns/domain_name.h
index 826dfbb3..d743a213 100644
--- a/discovery/mdns/domain_name.h
+++ b/osp/impl/discovery/mdns/domain_name.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef DISCOVERY_MDNS_DOMAIN_NAME_H_
-#define DISCOVERY_MDNS_DOMAIN_NAME_H_
+#ifndef OSP_IMPL_DISCOVERY_MDNS_DOMAIN_NAME_H_
+#define OSP_IMPL_DISCOVERY_MDNS_DOMAIN_NAME_H_
 
 #include <cstdint>
 #include <ostream>
@@ -89,4 +89,4 @@ std::ostream& operator<<(std::ostream& os, const DomainName& domain_name);
 }  // namespace mdns
 }  // namespace openscreen
 
-#endif  // DISCOVERY_MDNS_DOMAIN_NAME_H_
+#endif  // OSP_IMPL_DISCOVERY_MDNS_DOMAIN_NAME_H_
diff --git a/discovery/mdns/domain_name_unittest.cc b/osp/impl/discovery/mdns/domain_name_unittest.cc
index ce5cfca0..c561ec26 100644
--- a/discovery/mdns/domain_name_unittest.cc
+++ b/osp/impl/discovery/mdns/domain_name_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "discovery/mdns/domain_name.h"
+#include "osp/impl/discovery/mdns/domain_name.h"
 
 #include <sstream>
 
diff --git a/discovery/mdns/embedder_demo.cc b/osp/impl/discovery/mdns/embedder_demo.cc
index 01ff1a41..943827d6 100644
--- a/discovery/mdns/embedder_demo.cc
+++ b/osp/impl/discovery/mdns/embedder_demo.cc
@@ -10,7 +10,7 @@
 #include <memory>
 #include <vector>
 
-#include "discovery/mdns/mdns_responder_adapter_impl.h"
+#include "osp/impl/discovery/mdns/mdns_responder_adapter_impl.h"
 #include "osp_base/error.h"
 #include "platform/api/logging.h"
 
diff --git a/discovery/mdns/mdns_responder_adapter.cc b/osp/impl/discovery/mdns/mdns_responder_adapter.cc
index 1a8b2f9c..a393d40e 100644
--- a/discovery/mdns/mdns_responder_adapter.cc
+++ b/osp/impl/discovery/mdns/mdns_responder_adapter.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "discovery/mdns/mdns_responder_adapter.h"
+#include "osp/impl/discovery/mdns/mdns_responder_adapter.h"
 
 namespace openscreen {
 namespace mdns {
diff --git a/discovery/mdns/mdns_responder_adapter.h b/osp/impl/discovery/mdns/mdns_responder_adapter.h
index d361fc1e..2f5a90c3 100644
--- a/discovery/mdns/mdns_responder_adapter.h
+++ b/osp/impl/discovery/mdns/mdns_responder_adapter.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef DISCOVERY_MDNS_MDNS_RESPONDER_ADAPTER_H_
-#define DISCOVERY_MDNS_MDNS_RESPONDER_ADAPTER_H_
+#ifndef OSP_IMPL_DISCOVERY_MDNS_MDNS_RESPONDER_ADAPTER_H_
+#define OSP_IMPL_DISCOVERY_MDNS_MDNS_RESPONDER_ADAPTER_H_
 
 #include <cstdint>
 #include <map>
 #include <string>
 #include <vector>
 
-#include "discovery/mdns/domain_name.h"
-#include "discovery/mdns/mdns_responder_platform.h"
+#include "osp/impl/discovery/mdns/domain_name.h"
+#include "osp/impl/discovery/mdns/mdns_responder_platform.h"
 #include "osp_base/error.h"
 #include "osp_base/ip_address.h"
 #include "platform/api/network_interface.h"
@@ -264,4 +264,4 @@ class MdnsResponderAdapter {
 }  // namespace mdns
 }  // namespace openscreen
 
-#endif  // DISCOVERY_MDNS_MDNS_RESPONDER_ADAPTER_H_
+#endif  // OSP_IMPL_DISCOVERY_MDNS_MDNS_RESPONDER_ADAPTER_H_
diff --git a/discovery/mdns/mdns_responder_adapter_impl.cc b/osp/impl/discovery/mdns/mdns_responder_adapter_impl.cc
index 415f7829..16eea535 100644
--- a/discovery/mdns/mdns_responder_adapter_impl.cc
+++ b/osp/impl/discovery/mdns/mdns_responder_adapter_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "discovery/mdns/mdns_responder_adapter_impl.h"
+#include "osp/impl/discovery/mdns/mdns_responder_adapter_impl.h"
 
 #include <algorithm>
 #include <cctype>
diff --git a/discovery/mdns/mdns_responder_adapter_impl.h b/osp/impl/discovery/mdns/mdns_responder_adapter_impl.h
index ca1cecb5..cbbc5766 100644
--- a/discovery/mdns/mdns_responder_adapter_impl.h
+++ b/osp/impl/discovery/mdns/mdns_responder_adapter_impl.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef DISCOVERY_MDNS_MDNS_RESPONDER_ADAPTER_IMPL_H_
-#define DISCOVERY_MDNS_MDNS_RESPONDER_ADAPTER_IMPL_H_
+#ifndef OSP_IMPL_DISCOVERY_MDNS_MDNS_RESPONDER_ADAPTER_IMPL_H_
+#define OSP_IMPL_DISCOVERY_MDNS_MDNS_RESPONDER_ADAPTER_IMPL_H_
 
 #include <map>
 #include <memory>
 #include <vector>
 
-#include "discovery/mdns/mdns_responder_adapter.h"
+#include "osp/impl/discovery/mdns/mdns_responder_adapter.h"
 #include "osp_base/error.h"
 #include "platform/api/socket.h"
 #include "third_party/mDNSResponder/src/mDNSCore/mDNSEmbeddedAPI.h"
@@ -156,4 +156,4 @@ class MdnsResponderAdapterImpl final : public MdnsResponderAdapter {
 }  // namespace mdns
 }  // namespace openscreen
 
-#endif  // DISCOVERY_MDNS_MDNS_RESPONDER_ADAPTER_IMPL_H_
+#endif  // OSP_IMPL_DISCOVERY_MDNS_MDNS_RESPONDER_ADAPTER_IMPL_H_
diff --git a/discovery/mdns/mdns_responder_adapter_impl_unittest.cc b/osp/impl/discovery/mdns/mdns_responder_adapter_impl_unittest.cc
index c6b5805e..cab7a16d 100644
--- a/discovery/mdns/mdns_responder_adapter_impl_unittest.cc
+++ b/osp/impl/discovery/mdns/mdns_responder_adapter_impl_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "discovery/mdns/mdns_responder_adapter_impl.h"
+#include "osp/impl/discovery/mdns/mdns_responder_adapter_impl.h"
 
 #include <memory>
 #include <string>
diff --git a/discovery/mdns/mdns_responder_platform.cc b/osp/impl/discovery/mdns/mdns_responder_platform.cc
index f4879f0d..4004aab1 100644
--- a/discovery/mdns/mdns_responder_platform.cc
+++ b/osp/impl/discovery/mdns/mdns_responder_platform.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "discovery/mdns/mdns_responder_platform.h"
+#include "osp/impl/discovery/mdns/mdns_responder_platform.h"
 
 #include <algorithm>
 #include <chrono>
diff --git a/discovery/mdns/mdns_responder_platform.h b/osp/impl/discovery/mdns/mdns_responder_platform.h
index 606f22a4..791887a8 100644
--- a/discovery/mdns/mdns_responder_platform.h
+++ b/osp/impl/discovery/mdns/mdns_responder_platform.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef DISCOVERY_MDNS_MDNS_RESPONDER_PLATFORM_H_
-#define DISCOVERY_MDNS_MDNS_RESPONDER_PLATFORM_H_
+#ifndef OSP_IMPL_DISCOVERY_MDNS_MDNS_RESPONDER_PLATFORM_H_
+#define OSP_IMPL_DISCOVERY_MDNS_MDNS_RESPONDER_PLATFORM_H_
 
 #include <vector>
 
@@ -13,4 +13,4 @@ struct mDNS_PlatformSupport_struct {
   std::vector<openscreen::platform::UdpSocket*> sockets;
 };
 
-#endif  // DISCOVERY_MDNS_MDNS_RESPONDER_PLATFORM_H_
+#endif  // OSP_IMPL_DISCOVERY_MDNS_MDNS_RESPONDER_PLATFORM_H_
diff --git a/api/impl/internal_services.cc b/osp/impl/internal_services.cc
index 0ac71f93..9f25d99b 100644
--- a/api/impl/internal_services.cc
+++ b/osp/impl/internal_services.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/internal_services.h"
+#include "osp/impl/internal_services.h"
 
 #include <algorithm>
 
-#include "api/impl/mdns_responder_service.h"
-#include "discovery/mdns/mdns_responder_adapter_impl.h"
+#include "osp/impl/discovery/mdns/mdns_responder_adapter_impl.h"
+#include "osp/impl/mdns_responder_service.h"
 #include "osp_base/error.h"
 #include "platform/api/logging.h"
 #include "platform/api/socket.h"
diff --git a/api/impl/internal_services.h b/osp/impl/internal_services.h
index 2d7eb5a5..0c015dcb 100644
--- a/api/impl/internal_services.h
+++ b/osp/impl/internal_services.h
@@ -2,21 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_IMPL_INTERNAL_SERVICES_H_
-#define API_IMPL_INTERNAL_SERVICES_H_
+#ifndef OSP_IMPL_INTERNAL_SERVICES_H_
+#define OSP_IMPL_INTERNAL_SERVICES_H_
 
 #include <memory>
 #include <vector>
 
-#include "api/impl/mdns_platform_service.h"
-#include "api/impl/mdns_responder_service.h"
-#include "api/impl/quic/quic_connection_factory.h"
-#include "api/impl/service_listener_impl.h"
-#include "api/impl/service_publisher_impl.h"
-#include "api/public/mdns_service_listener_factory.h"
-#include "api/public/mdns_service_publisher_factory.h"
-#include "api/public/protocol_connection_client.h"
-#include "api/public/protocol_connection_server.h"
+#include "osp/impl/mdns_platform_service.h"
+#include "osp/impl/mdns_responder_service.h"
+#include "osp/impl/quic/quic_connection_factory.h"
+#include "osp/impl/service_listener_impl.h"
+#include "osp/impl/service_publisher_impl.h"
+#include "osp/public/mdns_service_listener_factory.h"
+#include "osp/public/mdns_service_publisher_factory.h"
+#include "osp/public/protocol_connection_client.h"
+#include "osp/public/protocol_connection_server.h"
 #include "osp_base/ip_address.h"
 #include "osp_base/macros.h"
 #include "platform/api/event_waiter.h"
@@ -82,4 +82,4 @@ class InternalServices {
 
 }  // namespace openscreen
 
-#endif  // API_IMPL_INTERNAL_SERVICES_H_
+#endif  // OSP_IMPL_INTERNAL_SERVICES_H_
diff --git a/api/impl/mdns_platform_service.cc b/osp/impl/mdns_platform_service.cc
index a3db4b8f..7570ed9f 100644
--- a/api/impl/mdns_platform_service.cc
+++ b/osp/impl/mdns_platform_service.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/mdns_platform_service.h"
+#include "osp/impl/mdns_platform_service.h"
 
 #include <cstring>
 
diff --git a/api/impl/mdns_platform_service.h b/osp/impl/mdns_platform_service.h
index 99bf366e..48ea094c 100644
--- a/api/impl/mdns_platform_service.h
+++ b/osp/impl/mdns_platform_service.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_IMPL_MDNS_PLATFORM_SERVICE_H_
-#define API_IMPL_MDNS_PLATFORM_SERVICE_H_
+#ifndef OSP_IMPL_MDNS_PLATFORM_SERVICE_H_
+#define OSP_IMPL_MDNS_PLATFORM_SERVICE_H_
 
 #include <vector>
 
@@ -40,4 +40,4 @@ class MdnsPlatformService {
 
 }  // namespace openscreen
 
-#endif  // API_IMPL_MDNS_PLATFORM_SERVICE_H_
+#endif  // OSP_IMPL_MDNS_PLATFORM_SERVICE_H_
diff --git a/api/impl/mdns_responder_service.cc b/osp/impl/mdns_responder_service.cc
index f4584836..ca021000 100644
--- a/api/impl/mdns_responder_service.cc
+++ b/osp/impl/mdns_responder_service.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/mdns_responder_service.h"
+#include "osp/impl/mdns_responder_service.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 
-#include "api/impl/internal_services.h"
+#include "osp/impl/internal_services.h"
 #include "osp_base/error.h"
 #include "platform/api/logging.h"
 
diff --git a/api/impl/mdns_responder_service.h b/osp/impl/mdns_responder_service.h
index 6d8f3f0c..2c23c176 100644
--- a/api/impl/mdns_responder_service.h
+++ b/osp/impl/mdns_responder_service.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_IMPL_MDNS_RESPONDER_SERVICE_H_
-#define API_IMPL_MDNS_RESPONDER_SERVICE_H_
+#ifndef OSP_IMPL_MDNS_RESPONDER_SERVICE_H_
+#define OSP_IMPL_MDNS_RESPONDER_SERVICE_H_
 
 #include <array>
 #include <map>
@@ -12,10 +12,10 @@
 #include <string>
 #include <vector>
 
-#include "api/impl/mdns_platform_service.h"
-#include "api/impl/service_listener_impl.h"
-#include "api/impl/service_publisher_impl.h"
-#include "discovery/mdns/mdns_responder_adapter.h"
+#include "osp/impl/discovery/mdns/mdns_responder_adapter.h"
+#include "osp/impl/mdns_platform_service.h"
+#include "osp/impl/service_listener_impl.h"
+#include "osp/impl/service_publisher_impl.h"
 #include "osp_base/ip_address.h"
 #include "platform/api/network_interface.h"
 #include "platform/base/event_loop.h"
@@ -174,4 +174,4 @@ class MdnsResponderService final : public ServiceListenerImpl::Delegate,
 
 }  // namespace openscreen
 
-#endif  // API_IMPL_MDNS_RESPONDER_SERVICE_H_
+#endif  // OSP_IMPL_MDNS_RESPONDER_SERVICE_H_
diff --git a/api/impl/mdns_responder_service_unittest.cc b/osp/impl/mdns_responder_service_unittest.cc
index b289e812..a2c75353 100644
--- a/api/impl/mdns_responder_service_unittest.cc
+++ b/osp/impl/mdns_responder_service_unittest.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/mdns_responder_service.h"
+#include "osp/impl/mdns_responder_service.h"
 
 #include <cstdint>
 #include <memory>
 
-#include "api/impl/service_listener_impl.h"
-#include "api/impl/testing/fake_mdns_platform_service.h"
-#include "api/impl/testing/fake_mdns_responder_adapter.h"
+#include "osp/impl/service_listener_impl.h"
+#include "osp/impl/testing/fake_mdns_platform_service.h"
+#include "osp/impl/testing/fake_mdns_responder_adapter.h"
 #include "third_party/googletest/src/googlemock/include/gmock/gmock.h"
 #include "third_party/googletest/src/googletest/include/gtest/gtest.h"
 
diff --git a/api/impl/mdns_service_listener_factory.cc b/osp/impl/mdns_service_listener_factory.cc
index 80285a4c..d6b7d0f2 100644
--- a/api/impl/mdns_service_listener_factory.cc
+++ b/osp/impl/mdns_service_listener_factory.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/public/mdns_service_listener_factory.h"
+#include "osp/public/mdns_service_listener_factory.h"
 
-#include "api/impl/internal_services.h"
+#include "osp/impl/internal_services.h"
 
 namespace openscreen {
 
diff --git a/api/impl/mdns_service_publisher_factory.cc b/osp/impl/mdns_service_publisher_factory.cc
index 6ab40820..05cc6952 100644
--- a/api/impl/mdns_service_publisher_factory.cc
+++ b/osp/impl/mdns_service_publisher_factory.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/public/mdns_service_publisher_factory.h"
+#include "osp/public/mdns_service_publisher_factory.h"
 
-#include "api/impl/internal_services.h"
+#include "osp/impl/internal_services.h"
 
 namespace openscreen {
 
diff --git a/api/impl/network_service_manager.cc b/osp/impl/network_service_manager.cc
index 699fbcf4..92a43384 100644
--- a/api/impl/network_service_manager.cc
+++ b/osp/impl/network_service_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/public/network_service_manager.h"
+#include "osp/public/network_service_manager.h"
 
 namespace {
 
diff --git a/api/impl/presentation/presentation_common.cc b/osp/impl/presentation/presentation_common.cc
index 773e8826..e3493a96 100644
--- a/api/impl/presentation/presentation_common.cc
+++ b/osp/impl/presentation/presentation_common.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/presentation/presentation_common.h"
+#include "osp/impl/presentation/presentation_common.h"
 
 #include "absl/strings/ascii.h"
 
diff --git a/api/impl/presentation/presentation_common.h b/osp/impl/presentation/presentation_common.h
index b0c76ac0..f0473fe0 100644
--- a/api/impl/presentation/presentation_common.h
+++ b/osp/impl/presentation/presentation_common.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_IMPL_PRESENTATION_PRESENTATION_COMMON_H_
-#define API_IMPL_PRESENTATION_PRESENTATION_COMMON_H_
+#ifndef OSP_IMPL_PRESENTATION_PRESENTATION_COMMON_H_
+#define OSP_IMPL_PRESENTATION_PRESENTATION_COMMON_H_
 
 #include <algorithm>
 #include <memory>
 
-#include "api/public/message_demuxer.h"
-#include "api/public/network_service_manager.h"
-#include "api/public/protocol_connection_server.h"
-#include "msgs/osp_messages.h"
+#include "osp/msgs/osp_messages.h"
+#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"
 
@@ -46,4 +46,4 @@ class PresentationID {
 }  // namespace presentation
 }  // namespace openscreen
 
-#endif  // API_IMPL_PRESENTATION_PRESENTATION_COMMON_H_
\ No newline at end of file
+#endif  // OSP_IMPL_PRESENTATION_PRESENTATION_COMMON_H_
diff --git a/api/impl/presentation/presentation_connection.cc b/osp/impl/presentation/presentation_connection.cc
index d594017d..c8b8d3fa 100644
--- a/api/impl/presentation/presentation_connection.cc
+++ b/osp/impl/presentation/presentation_connection.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/public/presentation/presentation_connection.h"
+#include "osp/public/presentation/presentation_connection.h"
 
 #include <algorithm>
 #include <memory>
 
 #include "absl/strings/string_view.h"
-#include "api/impl/presentation/presentation_common.h"
-#include "api/public/network_service_manager.h"
-#include "api/public/presentation/presentation_controller.h"
-#include "api/public/presentation/presentation_receiver.h"
-#include "api/public/protocol_connection.h"
-#include "msgs/osp_messages.h"
+#include "osp/impl/presentation/presentation_common.h"
+#include "osp/msgs/osp_messages.h"
+#include "osp/public/network_service_manager.h"
+#include "osp/public/presentation/presentation_controller.h"
+#include "osp/public/presentation/presentation_receiver.h"
+#include "osp/public/protocol_connection.h"
 #include "osp_base/std_util.h"
 #include "platform/api/logging.h"
 
diff --git a/api/impl/presentation/presentation_connection_unittest.cc b/osp/impl/presentation/presentation_connection_unittest.cc
index 58c55daf..af7be921 100644
--- a/api/impl/presentation/presentation_connection_unittest.cc
+++ b/osp/impl/presentation/presentation_connection_unittest.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/public/presentation/presentation_connection.h"
+#include "osp/public/presentation/presentation_connection.h"
 
 #include <memory>
 
 #include "absl/strings/string_view.h"
-#include "api/impl/quic/testing/fake_quic_connection.h"
-#include "api/impl/quic/testing/fake_quic_connection_factory.h"
-#include "api/impl/quic/testing/quic_test_support.h"
-#include "api/impl/testing/fake_clock.h"
-#include "api/public/network_service_manager.h"
-#include "api/public/presentation/presentation_controller.h"
+#include "osp/impl/quic/testing/fake_quic_connection.h"
+#include "osp/impl/quic/testing/fake_quic_connection_factory.h"
+#include "osp/impl/quic/testing/quic_test_support.h"
+#include "osp/impl/testing/fake_clock.h"
+#include "osp/public/network_service_manager.h"
+#include "osp/public/presentation/presentation_controller.h"
 #include "third_party/googletest/src/googlemock/include/gmock/gmock.h"
 #include "third_party/googletest/src/googletest/include/gtest/gtest.h"
 
diff --git a/api/impl/presentation/presentation_controller.cc b/osp/impl/presentation/presentation_controller.cc
index 74098674..6c852da7 100644
--- a/api/impl/presentation/presentation_controller.cc
+++ b/osp/impl/presentation/presentation_controller.cc
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/public/presentation/presentation_controller.h"
+#include "osp/public/presentation/presentation_controller.h"
 
 #include <algorithm>
 #include <sstream>
 #include <type_traits>
 
 #include "absl/types/optional.h"
-#include "api/impl/presentation/url_availability_requester.h"
-#include "api/public/message_demuxer.h"
-#include "api/public/network_service_manager.h"
-#include "api/public/protocol_connection_client.h"
-#include "msgs/osp_messages.h"
-#include "msgs/request_response_handler.h"
+#include "osp/impl/presentation/url_availability_requester.h"
+#include "osp/msgs/osp_messages.h"
+#include "osp/msgs/request_response_handler.h"
+#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"
 
 namespace openscreen {
diff --git a/api/impl/presentation/presentation_controller_unittest.cc b/osp/impl/presentation/presentation_controller_unittest.cc
index f203d3c4..a743c0d8 100644
--- a/api/impl/presentation/presentation_controller_unittest.cc
+++ b/osp/impl/presentation/presentation_controller_unittest.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/public/presentation/presentation_controller.h"
+#include "osp/public/presentation/presentation_controller.h"
 
 #include <string>
 #include <vector>
 
-#include "api/impl/quic/testing/quic_test_support.h"
-#include "api/impl/service_listener_impl.h"
-#include "api/impl/testing/fake_clock.h"
-#include "api/public/message_demuxer.h"
-#include "api/public/network_service_manager.h"
-#include "api/public/testing/message_demuxer_test_support.h"
+#include "osp/impl/quic/testing/quic_test_support.h"
+#include "osp/impl/service_listener_impl.h"
+#include "osp/impl/testing/fake_clock.h"
+#include "osp/public/message_demuxer.h"
+#include "osp/public/network_service_manager.h"
+#include "osp/public/testing/message_demuxer_test_support.h"
 #include "third_party/googletest/src/googlemock/include/gmock/gmock.h"
 #include "third_party/googletest/src/googletest/include/gtest/gtest.h"
 
diff --git a/api/impl/presentation/presentation_receiver.cc b/osp/impl/presentation/presentation_receiver.cc
index 611c9ce5..d0779276 100644
--- a/api/impl/presentation/presentation_receiver.cc
+++ b/osp/impl/presentation/presentation_receiver.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/public/presentation/presentation_receiver.h"
+#include "osp/public/presentation/presentation_receiver.h"
 
 #include <algorithm>
 #include <memory>
 
-#include "api/impl/presentation/presentation_common.h"
-#include "api/public/message_demuxer.h"
-#include "api/public/network_service_manager.h"
-#include "api/public/protocol_connection_server.h"
-#include "msgs/osp_messages.h"
+#include "osp/impl/presentation/presentation_common.h"
+#include "osp/msgs/osp_messages.h"
+#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"
 
diff --git a/api/impl/presentation/presentation_receiver_unittest.cc b/osp/impl/presentation/presentation_receiver_unittest.cc
index 563f8578..b888f9bd 100644
--- a/api/impl/presentation/presentation_receiver_unittest.cc
+++ b/osp/impl/presentation/presentation_receiver_unittest.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/public/presentation/presentation_receiver.h"
+#include "osp/public/presentation/presentation_receiver.h"
 
 #include <memory>
 
-#include "api/impl/quic/quic_client.h"
-#include "api/impl/quic/quic_server.h"
-#include "api/impl/quic/testing/fake_quic_connection_factory.h"
-#include "api/impl/quic/testing/quic_test_support.h"
-#include "api/impl/testing/fake_clock.h"
-#include "api/public/network_service_manager.h"
-#include "api/public/protocol_connection_server.h"
-#include "api/public/testing/message_demuxer_test_support.h"
+#include "osp/impl/quic/quic_client.h"
+#include "osp/impl/quic/quic_server.h"
+#include "osp/impl/quic/testing/fake_quic_connection_factory.h"
+#include "osp/impl/quic/testing/quic_test_support.h"
+#include "osp/impl/testing/fake_clock.h"
+#include "osp/public/network_service_manager.h"
+#include "osp/public/protocol_connection_server.h"
+#include "osp/public/testing/message_demuxer_test_support.h"
 #include "third_party/googletest/src/googlemock/include/gmock/gmock.h"
 #include "third_party/googletest/src/googletest/include/gtest/gtest.h"
 
diff --git a/api/impl/presentation/url_availability_requester.cc b/osp/impl/presentation/url_availability_requester.cc
index 9f912a5a..25fa108c 100644
--- a/api/impl/presentation/url_availability_requester.cc
+++ b/osp/impl/presentation/url_availability_requester.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/presentation/url_availability_requester.h"
+#include "osp/impl/presentation/url_availability_requester.h"
 
 #include <algorithm>
 #include <chrono>
 #include <memory>
 
-#include "api/impl/presentation/presentation_common.h"
-#include "api/public/network_service_manager.h"
+#include "osp/impl/presentation/presentation_common.h"
+#include "osp/public/network_service_manager.h"
 #include "platform/api/logging.h"
 
 using openscreen::platform::Clock;
diff --git a/api/impl/presentation/url_availability_requester.h b/osp/impl/presentation/url_availability_requester.h
index 62f959c5..750b1dad 100644
--- a/api/impl/presentation/url_availability_requester.h
+++ b/osp/impl/presentation/url_availability_requester.h
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_IMPL_PRESENTATION_URL_AVAILABILITY_REQUESTER_H_
-#define API_IMPL_PRESENTATION_URL_AVAILABILITY_REQUESTER_H_
+#ifndef OSP_IMPL_PRESENTATION_URL_AVAILABILITY_REQUESTER_H_
+#define OSP_IMPL_PRESENTATION_URL_AVAILABILITY_REQUESTER_H_
 
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 
-#include "api/public/message_demuxer.h"
-#include "api/public/presentation/presentation_controller.h"
-#include "api/public/protocol_connection_client.h"
-#include "api/public/service_info.h"
-#include "msgs/osp_messages.h"
+#include "osp/msgs/osp_messages.h"
+#include "osp/public/message_demuxer.h"
+#include "osp/public/presentation/presentation_controller.h"
+#include "osp/public/protocol_connection_client.h"
+#include "osp/public/service_info.h"
 #include "osp_base/error.h"
 #include "platform/api/time.h"
 
@@ -149,4 +149,4 @@ class UrlAvailabilityRequester {
 }  // namespace presentation
 }  // namespace openscreen
 
-#endif  // API_IMPL_PRESENTATION_URL_AVAILABILITY_REQUESTER_H_
+#endif  // OSP_IMPL_PRESENTATION_URL_AVAILABILITY_REQUESTER_H_
diff --git a/api/impl/presentation/url_availability_requester_unittest.cc b/osp/impl/presentation/url_availability_requester_unittest.cc
index 014b5063..635d3b29 100644
--- a/api/impl/presentation/url_availability_requester_unittest.cc
+++ b/osp/impl/presentation/url_availability_requester_unittest.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/presentation/url_availability_requester.h"
+#include "osp/impl/presentation/url_availability_requester.h"
 
 #include <memory>
 
-#include "api/impl/quic/quic_client.h"
-#include "api/impl/quic/testing/quic_test_support.h"
-#include "api/impl/testing/fake_clock.h"
-#include "api/public/network_service_manager.h"
-#include "api/public/testing/message_demuxer_test_support.h"
-#include "msgs/osp_messages.h"
+#include "osp/impl/quic/quic_client.h"
+#include "osp/impl/quic/testing/quic_test_support.h"
+#include "osp/impl/testing/fake_clock.h"
+#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 "third_party/googletest/src/googlemock/include/gmock/gmock.h"
 #include "third_party/googletest/src/googletest/include/gtest/gtest.h"
diff --git a/api/impl/protocol_connection_client_factory.cc b/osp/impl/protocol_connection_client_factory.cc
index dbed49eb..11eafcce 100644
--- a/api/impl/protocol_connection_client_factory.cc
+++ b/osp/impl/protocol_connection_client_factory.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/public/protocol_connection_client_factory.h"
+#include "osp/public/protocol_connection_client_factory.h"
 
 #include <memory>
 
-#include "api/impl/quic/quic_client.h"
-#include "api/impl/quic/quic_connection_factory_impl.h"
+#include "osp/impl/quic/quic_client.h"
+#include "osp/impl/quic/quic_connection_factory_impl.h"
 
 namespace openscreen {
 
diff --git a/api/impl/protocol_connection_server_factory.cc b/osp/impl/protocol_connection_server_factory.cc
index 97f06bad..f3bf17b2 100644
--- a/api/impl/protocol_connection_server_factory.cc
+++ b/osp/impl/protocol_connection_server_factory.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/public/protocol_connection_server_factory.h"
+#include "osp/public/protocol_connection_server_factory.h"
 
 #include <memory>
 
-#include "api/impl/quic/quic_connection_factory_impl.h"
-#include "api/impl/quic/quic_server.h"
+#include "osp/impl/quic/quic_connection_factory_impl.h"
+#include "osp/impl/quic/quic_server.h"
 
 namespace openscreen {
 
diff --git a/api/impl/quic/BUILD.gn b/osp/impl/quic/BUILD.gn
index 5eaf9a45..e05c4946 100644
--- a/api/impl/quic/BUILD.gn
+++ b/osp/impl/quic/BUILD.gn
@@ -17,7 +17,7 @@ source_set("quic") {
   deps = [
     "../../../osp_base",
     "../../../platform",
-    "../../public:api",
+    "../../public",
   ]
   configs += [ "../../..:root_config_overrides" ]
 }
@@ -34,10 +34,10 @@ source_set("test_support") {
   ]
 
   deps = [
-    "../../../msgs",
     "../../../osp_base",
     "../../../platform",
-    "//third_party/googletest:gmock",
+    "../../../third_party/googletest:gmock",
+    "../../msgs",
   ]
   configs += [ "../../..:root_config_overrides" ]
 }
diff --git a/api/impl/quic/quic_client.cc b/osp/impl/quic/quic_client.cc
index 252e04ca..34b5281f 100644
--- a/api/impl/quic/quic_client.cc
+++ b/osp/impl/quic/quic_client.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/quic/quic_client.h"
+#include "osp/impl/quic/quic_client.h"
 
 #include <algorithm>
 #include <memory>
diff --git a/api/impl/quic/quic_client.h b/osp/impl/quic/quic_client.h
index 3498ffb5..742eeced 100644
--- a/api/impl/quic/quic_client.h
+++ b/osp/impl/quic/quic_client.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_IMPL_QUIC_QUIC_CLIENT_H_
-#define API_IMPL_QUIC_QUIC_CLIENT_H_
+#ifndef OSP_IMPL_QUIC_QUIC_CLIENT_H_
+#define OSP_IMPL_QUIC_QUIC_CLIENT_H_
 
 #include <cstdint>
 #include <map>
 #include <memory>
 #include <vector>
 
-#include "api/impl/quic/quic_connection_factory.h"
-#include "api/impl/quic/quic_service_common.h"
-#include "api/public/protocol_connection_client.h"
+#include "osp/impl/quic/quic_connection_factory.h"
+#include "osp/impl/quic/quic_service_common.h"
+#include "osp/public/protocol_connection_client.h"
 #include "osp_base/ip_address.h"
 
 namespace openscreen {
@@ -124,4 +124,4 @@ class QuicClient final : public ProtocolConnectionClient,
 
 }  // namespace openscreen
 
-#endif  // API_IMPL_QUIC_QUIC_CLIENT_H_
+#endif  // OSP_IMPL_QUIC_QUIC_CLIENT_H_
diff --git a/api/impl/quic/quic_client_unittest.cc b/osp/impl/quic/quic_client_unittest.cc
index 2deb10a8..bc4fcc2d 100644
--- a/api/impl/quic/quic_client_unittest.cc
+++ b/osp/impl/quic/quic_client_unittest.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/quic/quic_client.h"
+#include "osp/impl/quic/quic_client.h"
 
 #include <memory>
 
-#include "api/impl/quic/quic_service_common.h"
-#include "api/impl/quic/testing/fake_quic_connection_factory.h"
-#include "api/impl/quic/testing/quic_test_support.h"
-#include "api/impl/testing/fake_clock.h"
-#include "api/public/network_metrics.h"
-#include "api/public/network_service_manager.h"
-#include "api/public/testing/message_demuxer_test_support.h"
+#include "osp/impl/quic/quic_service_common.h"
+#include "osp/impl/quic/testing/fake_quic_connection_factory.h"
+#include "osp/impl/quic/testing/quic_test_support.h"
+#include "osp/impl/testing/fake_clock.h"
+#include "osp/public/network_metrics.h"
+#include "osp/public/network_service_manager.h"
+#include "osp/public/testing/message_demuxer_test_support.h"
 #include "osp_base/error.h"
 #include "platform/api/logging.h"
 #include "third_party/googletest/src/googlemock/include/gmock/gmock.h"
diff --git a/api/impl/quic/quic_connection.h b/osp/impl/quic/quic_connection.h
index 05036833..e603169c 100644
--- a/api/impl/quic/quic_connection.h
+++ b/osp/impl/quic/quic_connection.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_IMPL_QUIC_QUIC_CONNECTION_H_
-#define API_IMPL_QUIC_QUIC_CONNECTION_H_
+#ifndef OSP_IMPL_QUIC_QUIC_CONNECTION_H_
+#define OSP_IMPL_QUIC_QUIC_CONNECTION_H_
 
 #include <memory>
 #include <vector>
@@ -83,4 +83,4 @@ class QuicConnection {
 
 }  // namespace openscreen
 
-#endif  // API_IMPL_QUIC_QUIC_CONNECTION_H_
+#endif  // OSP_IMPL_QUIC_QUIC_CONNECTION_H_
diff --git a/api/impl/quic/quic_connection_factory.h b/osp/impl/quic/quic_connection_factory.h
index 993d60b2..df3cf771 100644
--- a/api/impl/quic/quic_connection_factory.h
+++ b/osp/impl/quic/quic_connection_factory.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_IMPL_QUIC_QUIC_CONNECTION_FACTORY_H_
-#define API_IMPL_QUIC_QUIC_CONNECTION_FACTORY_H_
+#ifndef OSP_IMPL_QUIC_QUIC_CONNECTION_FACTORY_H_
+#define OSP_IMPL_QUIC_QUIC_CONNECTION_FACTORY_H_
 
 #include <memory>
 #include <vector>
 
-#include "api/impl/quic/quic_connection.h"
+#include "osp/impl/quic/quic_connection.h"
 #include "osp_base/ip_address.h"
 
 namespace openscreen {
@@ -45,4 +45,4 @@ class QuicConnectionFactory {
 
 }  // namespace openscreen
 
-#endif  // API_IMPL_QUIC_QUIC_CONNECTION_FACTORY_H_
+#endif  // OSP_IMPL_QUIC_QUIC_CONNECTION_FACTORY_H_
diff --git a/api/impl/quic/quic_connection_factory_impl.cc b/osp/impl/quic/quic_connection_factory_impl.cc
index 6f3bb895..d9f5a056 100644
--- a/api/impl/quic/quic_connection_factory_impl.cc
+++ b/osp/impl/quic/quic_connection_factory_impl.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/quic/quic_connection_factory_impl.h"
+#include "osp/impl/quic/quic_connection_factory_impl.h"
 
 #include <algorithm>
 #include <memory>
 
-#include "api/impl/quic/quic_connection_impl.h"
+#include "osp/impl/quic/quic_connection_impl.h"
 #include "osp_base/error.h"
 #include "platform/api/logging.h"
 #include "platform/base/event_loop.h"
diff --git a/api/impl/quic/quic_connection_factory_impl.h b/osp/impl/quic/quic_connection_factory_impl.h
index 1b4b8849..c2b926ef 100644
--- a/api/impl/quic/quic_connection_factory_impl.h
+++ b/osp/impl/quic/quic_connection_factory_impl.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_IMPL_QUIC_QUIC_CONNECTION_FACTORY_IMPL_H_
-#define API_IMPL_QUIC_QUIC_CONNECTION_FACTORY_IMPL_H_
+#ifndef OSP_IMPL_QUIC_QUIC_CONNECTION_FACTORY_IMPL_H_
+#define OSP_IMPL_QUIC_QUIC_CONNECTION_FACTORY_IMPL_H_
 
 #include <map>
 #include <memory>
 
-#include "api/impl/quic/quic_connection_factory.h"
+#include "osp/impl/quic/quic_connection_factory.h"
 #include "osp_base/ip_address.h"
 #include "platform/api/event_waiter.h"
 #include "platform/api/socket.h"
@@ -56,4 +56,4 @@ class QuicConnectionFactoryImpl final : public QuicConnectionFactory {
 
 }  // namespace openscreen
 
-#endif  // API_IMPL_QUIC_QUIC_CONNECTION_FACTORY_IMPL_H_
+#endif  // OSP_IMPL_QUIC_QUIC_CONNECTION_FACTORY_IMPL_H_
diff --git a/api/impl/quic/quic_connection_impl.cc b/osp/impl/quic/quic_connection_impl.cc
index 341acca0..ae0ef112 100644
--- a/api/impl/quic/quic_connection_impl.cc
+++ b/osp/impl/quic/quic_connection_impl.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/quic/quic_connection_impl.h"
+#include "osp/impl/quic/quic_connection_impl.h"
 
 #include <limits>
 #include <memory>
 
 #include "absl/types/optional.h"
-#include "api/impl/quic/quic_connection_factory_impl.h"
+#include "osp/impl/quic/quic_connection_factory_impl.h"
 #include "osp_base/error.h"
 #include "platform/api/logging.h"
 #include "third_party/chromium_quic/src/net/third_party/quic/platform/impl/quic_chromium_clock.h"
diff --git a/api/impl/quic/quic_connection_impl.h b/osp/impl/quic/quic_connection_impl.h
index 4555df97..e87ab90e 100644
--- a/api/impl/quic/quic_connection_impl.h
+++ b/osp/impl/quic/quic_connection_impl.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_IMPL_QUIC_QUIC_CONNECTION_IMPL_H_
-#define API_IMPL_QUIC_QUIC_CONNECTION_IMPL_H_
+#ifndef OSP_IMPL_QUIC_QUIC_CONNECTION_IMPL_H_
+#define OSP_IMPL_QUIC_QUIC_CONNECTION_IMPL_H_
 
 #include <list>
 #include <memory>
 
-#include "api/impl/quic/quic_connection.h"
+#include "osp/impl/quic/quic_connection.h"
 #include "osp_base/ip_address.h"
 #include "platform/api/socket.h"
 #include "third_party/chromium_quic/src/base/callback.h"
@@ -96,4 +96,4 @@ class QuicConnectionImpl final : public QuicConnection,
 
 }  // namespace openscreen
 
-#endif  // API_IMPL_QUIC_QUIC_CONNECTION_IMPL_H_
+#endif  // OSP_IMPL_QUIC_QUIC_CONNECTION_IMPL_H_
diff --git a/api/impl/quic/quic_server.cc b/osp/impl/quic/quic_server.cc
index 9f542a4d..3f94a136 100644
--- a/api/impl/quic/quic_server.cc
+++ b/osp/impl/quic/quic_server.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/quic/quic_server.h"
+#include "osp/impl/quic/quic_server.h"
 
 #include <memory>
 
diff --git a/api/impl/quic/quic_server.h b/osp/impl/quic/quic_server.h
index bfecc71d..d7af8bf7 100644
--- a/api/impl/quic/quic_server.h
+++ b/osp/impl/quic/quic_server.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_IMPL_QUIC_QUIC_SERVER_H_
-#define API_IMPL_QUIC_QUIC_SERVER_H_
+#ifndef OSP_IMPL_QUIC_QUIC_SERVER_H_
+#define OSP_IMPL_QUIC_QUIC_SERVER_H_
 
 #include <cstdint>
 #include <map>
 #include <memory>
 
-#include "api/impl/quic/quic_connection_factory.h"
-#include "api/impl/quic/quic_service_common.h"
-#include "api/public/protocol_connection_server.h"
+#include "osp/impl/quic/quic_connection_factory.h"
+#include "osp/impl/quic/quic_service_common.h"
+#include "osp/public/protocol_connection_server.h"
 #include "osp_base/ip_address.h"
 
 namespace openscreen {
@@ -96,4 +96,4 @@ class QuicServer final : public ProtocolConnectionServer,
 
 }  // namespace openscreen
 
-#endif  // API_IMPL_QUIC_QUIC_SERVER_H_
+#endif  // OSP_IMPL_QUIC_QUIC_SERVER_H_
diff --git a/api/impl/quic/quic_server_unittest.cc b/osp/impl/quic/quic_server_unittest.cc
index 64bcffcc..108c23a0 100644
--- a/api/impl/quic/quic_server_unittest.cc
+++ b/osp/impl/quic/quic_server_unittest.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/quic/quic_server.h"
+#include "osp/impl/quic/quic_server.h"
 
 #include <memory>
 
-#include "api/impl/quic/testing/fake_quic_connection_factory.h"
-#include "api/impl/quic/testing/quic_test_support.h"
-#include "api/impl/testing/fake_clock.h"
-#include "api/public/network_metrics.h"
-#include "api/public/network_service_manager.h"
-#include "api/public/testing/message_demuxer_test_support.h"
+#include "osp/impl/quic/testing/fake_quic_connection_factory.h"
+#include "osp/impl/quic/testing/quic_test_support.h"
+#include "osp/impl/testing/fake_clock.h"
+#include "osp/public/network_metrics.h"
+#include "osp/public/network_service_manager.h"
+#include "osp/public/testing/message_demuxer_test_support.h"
 #include "osp_base/error.h"
 #include "third_party/googletest/src/googlemock/include/gmock/gmock.h"
 #include "third_party/googletest/src/googletest/include/gtest/gtest.h"
diff --git a/api/impl/quic/quic_service_common.cc b/osp/impl/quic/quic_service_common.cc
index 420daa9e..115407b8 100644
--- a/api/impl/quic/quic_service_common.cc
+++ b/osp/impl/quic/quic_service_common.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/quic/quic_service_common.h"
+#include "osp/impl/quic/quic_service_common.h"
 
 #include <memory>
 
diff --git a/api/impl/quic/quic_service_common.h b/osp/impl/quic/quic_service_common.h
index 62d4d39b..d4644845 100644
--- a/api/impl/quic/quic_service_common.h
+++ b/osp/impl/quic/quic_service_common.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_IMPL_QUIC_QUIC_SERVICE_COMMON_H_
-#define API_IMPL_QUIC_QUIC_SERVICE_COMMON_H_
+#ifndef OSP_IMPL_QUIC_QUIC_SERVICE_COMMON_H_
+#define OSP_IMPL_QUIC_QUIC_SERVICE_COMMON_H_
 
 #include <cstdint>
 #include <map>
 #include <memory>
 #include <vector>
 
-#include "api/impl/quic/quic_connection.h"
-#include "api/public/protocol_connection.h"
+#include "osp/impl/quic/quic_connection.h"
+#include "osp/public/protocol_connection.h"
 
 namespace openscreen {
 
@@ -137,4 +137,4 @@ struct ServiceConnectionData {
 
 }  // namespace openscreen
 
-#endif  // API_IMPL_QUIC_QUIC_SERVICE_COMMON_H_
+#endif  // OSP_IMPL_QUIC_QUIC_SERVICE_COMMON_H_
diff --git a/api/impl/quic/testing/fake_quic_connection.cc b/osp/impl/quic/testing/fake_quic_connection.cc
index bfcf3900..bd427c47 100644
--- a/api/impl/quic/testing/fake_quic_connection.cc
+++ b/osp/impl/quic/testing/fake_quic_connection.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/quic/testing/fake_quic_connection.h"
+#include "osp/impl/quic/testing/fake_quic_connection.h"
 
 #include <memory>
 
-#include "api/impl/quic/testing/fake_quic_connection_factory.h"
+#include "osp/impl/quic/testing/fake_quic_connection_factory.h"
 #include "platform/api/logging.h"
 
 namespace openscreen {
diff --git a/api/impl/quic/testing/fake_quic_connection.h b/osp/impl/quic/testing/fake_quic_connection.h
index 76f21cac..3cadef0f 100644
--- a/api/impl/quic/testing/fake_quic_connection.h
+++ b/osp/impl/quic/testing/fake_quic_connection.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_IMPL_QUIC_TESTING_FAKE_QUIC_CONNECTION_H_
-#define API_IMPL_QUIC_TESTING_FAKE_QUIC_CONNECTION_H_
+#ifndef OSP_IMPL_QUIC_TESTING_FAKE_QUIC_CONNECTION_H_
+#define OSP_IMPL_QUIC_TESTING_FAKE_QUIC_CONNECTION_H_
 
 #include <map>
 #include <vector>
 
-#include "api/impl/quic/quic_connection.h"
+#include "osp/impl/quic/quic_connection.h"
 
 namespace openscreen {
 
@@ -71,4 +71,4 @@ class FakeQuicConnection final : public QuicConnection {
 
 }  // namespace openscreen
 
-#endif  // API_IMPL_QUIC_TESTING_FAKE_QUIC_CONNECTION_H_
+#endif  // OSP_IMPL_QUIC_TESTING_FAKE_QUIC_CONNECTION_H_
diff --git a/api/impl/quic/testing/fake_quic_connection_factory.cc b/osp/impl/quic/testing/fake_quic_connection_factory.cc
index 094fa195..7de3c9d9 100644
--- a/api/impl/quic/testing/fake_quic_connection_factory.cc
+++ b/osp/impl/quic/testing/fake_quic_connection_factory.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/quic/testing/fake_quic_connection_factory.h"
+#include "osp/impl/quic/testing/fake_quic_connection_factory.h"
 
 #include <algorithm>
 #include <memory>
diff --git a/api/impl/quic/testing/fake_quic_connection_factory.h b/osp/impl/quic/testing/fake_quic_connection_factory.h
index f0cbffbd..c2fa364c 100644
--- a/api/impl/quic/testing/fake_quic_connection_factory.h
+++ b/osp/impl/quic/testing/fake_quic_connection_factory.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_IMPL_QUIC_TESTING_FAKE_QUIC_CONNECTION_FACTORY_H_
-#define API_IMPL_QUIC_TESTING_FAKE_QUIC_CONNECTION_FACTORY_H_
+#ifndef OSP_IMPL_QUIC_TESTING_FAKE_QUIC_CONNECTION_FACTORY_H_
+#define OSP_IMPL_QUIC_TESTING_FAKE_QUIC_CONNECTION_FACTORY_H_
 
 #include <vector>
 
-#include "api/impl/quic/quic_connection_factory.h"
-#include "api/impl/quic/testing/fake_quic_connection.h"
-#include "api/public/message_demuxer.h"
+#include "osp/impl/quic/quic_connection_factory.h"
+#include "osp/impl/quic/testing/fake_quic_connection.h"
+#include "osp/public/message_demuxer.h"
 
 namespace openscreen {
 
@@ -83,4 +83,4 @@ class FakeServerQuicConnectionFactory final : public QuicConnectionFactory {
 
 }  // namespace openscreen
 
-#endif  // API_IMPL_QUIC_TESTING_FAKE_QUIC_CONNECTION_FACTORY_H_
+#endif  // OSP_IMPL_QUIC_TESTING_FAKE_QUIC_CONNECTION_FACTORY_H_
diff --git a/api/impl/quic/testing/quic_test_support.cc b/osp/impl/quic/testing/quic_test_support.cc
index 44126ca6..09cf96d7 100644
--- a/api/impl/quic/testing/quic_test_support.cc
+++ b/osp/impl/quic/testing/quic_test_support.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/quic/testing/quic_test_support.h"
+#include "osp/impl/quic/testing/quic_test_support.h"
 
 #include <memory>
 
-#include "api/impl/quic/quic_client.h"
-#include "api/impl/quic/quic_server.h"
-#include "api/public/network_service_manager.h"
+#include "osp/impl/quic/quic_client.h"
+#include "osp/impl/quic/quic_server.h"
+#include "osp/public/network_service_manager.h"
 
 namespace openscreen {
 
diff --git a/api/impl/quic/testing/quic_test_support.h b/osp/impl/quic/testing/quic_test_support.h
index 8aba0a1f..d28b38f2 100644
--- a/api/impl/quic/testing/quic_test_support.h
+++ b/osp/impl/quic/testing/quic_test_support.h
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_IMPL_QUIC_TESTING_QUIC_TEST_SUPPORT_H_
-#define API_IMPL_QUIC_TESTING_QUIC_TEST_SUPPORT_H_
+#ifndef OSP_IMPL_QUIC_TESTING_QUIC_TEST_SUPPORT_H_
+#define OSP_IMPL_QUIC_TESTING_QUIC_TEST_SUPPORT_H_
 
 #include <memory>
 
-#include "api/impl/quic/quic_client.h"
-#include "api/impl/quic/quic_server.h"
-#include "api/impl/quic/testing/fake_quic_connection_factory.h"
-#include "api/impl/testing/fake_clock.h"
-#include "api/public/message_demuxer.h"
-#include "api/public/network_metrics.h"
-#include "api/public/protocol_connection_client.h"
-#include "api/public/protocol_connection_server.h"
+#include "osp/impl/quic/quic_client.h"
+#include "osp/impl/quic/quic_server.h"
+#include "osp/impl/quic/testing/fake_quic_connection_factory.h"
+#include "osp/impl/testing/fake_clock.h"
+#include "osp/public/message_demuxer.h"
+#include "osp/public/network_metrics.h"
+#include "osp/public/protocol_connection_client.h"
+#include "osp/public/protocol_connection_server.h"
 #include "osp_base/ip_address.h"
 #include "platform/api/time.h"
 #include "third_party/googletest/src/googlemock/include/gmock/gmock.h"
@@ -71,4 +71,4 @@ class FakeQuicBridge {
 
 }  // namespace openscreen
 
-#endif  // API_IMPL_QUIC_TESTING_QUIC_TEST_SUPPORT_H_
+#endif  // OSP_IMPL_QUIC_TESTING_QUIC_TEST_SUPPORT_H_
diff --git a/api/impl/receiver_list.cc b/osp/impl/receiver_list.cc
index f21333a7..a4f11047 100644
--- a/api/impl/receiver_list.cc
+++ b/osp/impl/receiver_list.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/receiver_list.h"
+#include "osp/impl/receiver_list.h"
 
 #include <algorithm>
 
diff --git a/api/impl/receiver_list.h b/osp/impl/receiver_list.h
index e4ffe57b..3ef63692 100644
--- a/api/impl/receiver_list.h
+++ b/osp/impl/receiver_list.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_IMPL_RECEIVER_LIST_H_
-#define API_IMPL_RECEIVER_LIST_H_
+#ifndef OSP_IMPL_RECEIVER_LIST_H_
+#define OSP_IMPL_RECEIVER_LIST_H_
 
 #include <vector>
 
-#include "api/public/service_info.h"
+#include "osp/public/service_info.h"
 #include "osp_base/error.h"
 
 namespace openscreen {
@@ -33,4 +33,4 @@ class ReceiverList {
 
 }  // namespace openscreen
 
-#endif  // API_IMPL_RECEIVER_LIST_H_
+#endif  // OSP_IMPL_RECEIVER_LIST_H_
diff --git a/api/impl/receiver_list_unittest.cc b/osp/impl/receiver_list_unittest.cc
index 4fca5f79..7da923e4 100644
--- a/api/impl/receiver_list_unittest.cc
+++ b/osp/impl/receiver_list_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/receiver_list.h"
+#include "osp/impl/receiver_list.h"
 
 #include "osp_base/error.h"
 #include "third_party/googletest/src/googletest/include/gtest/gtest.h"
diff --git a/api/impl/service_listener_impl.cc b/osp/impl/service_listener_impl.cc
index 20be1d4d..f3dcce58 100644
--- a/api/impl/service_listener_impl.cc
+++ b/osp/impl/service_listener_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/service_listener_impl.h"
+#include "osp/impl/service_listener_impl.h"
 
 #include "osp_base/error.h"
 #include "platform/api/logging.h"
diff --git a/api/impl/service_listener_impl.h b/osp/impl/service_listener_impl.h
index b86b9c34..dafccac5 100644
--- a/api/impl/service_listener_impl.h
+++ b/osp/impl/service_listener_impl.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_IMPL_SERVICE_LISTENER_IMPL_H_
-#define API_IMPL_SERVICE_LISTENER_IMPL_H_
+#ifndef OSP_IMPL_SERVICE_LISTENER_IMPL_H_
+#define OSP_IMPL_SERVICE_LISTENER_IMPL_H_
 
 #include <vector>
 
-#include "api/impl/receiver_list.h"
-#include "api/public/service_info.h"
-#include "api/public/service_listener.h"
+#include "osp/impl/receiver_list.h"
+#include "osp/public/service_info.h"
+#include "osp/public/service_listener.h"
 #include "osp_base/macros.h"
 #include "osp_base/with_destruction_callback.h"
 
@@ -84,4 +84,4 @@ class ServiceListenerImpl final : public ServiceListener,
 
 }  // namespace openscreen
 
-#endif  // API_IMPL_SERVICE_LISTENER_IMPL_H_
+#endif  // OSP_IMPL_SERVICE_LISTENER_IMPL_H_
diff --git a/api/impl/service_listener_impl_unittest.cc b/osp/impl/service_listener_impl_unittest.cc
index fc66d89e..3b91fd9f 100644
--- a/api/impl/service_listener_impl_unittest.cc
+++ b/osp/impl/service_listener_impl_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/service_listener_impl.h"
+#include "osp/impl/service_listener_impl.h"
 
 #include <memory>
 
diff --git a/api/impl/service_publisher_impl.cc b/osp/impl/service_publisher_impl.cc
index 3a0a3983..808c3967 100644
--- a/api/impl/service_publisher_impl.cc
+++ b/osp/impl/service_publisher_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/service_publisher_impl.h"
+#include "osp/impl/service_publisher_impl.h"
 
 #include "platform/api/logging.h"
 
diff --git a/api/impl/service_publisher_impl.h b/osp/impl/service_publisher_impl.h
index 4f309256..b20ac0ba 100644
--- a/api/impl/service_publisher_impl.h
+++ b/osp/impl/service_publisher_impl.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_IMPL_SERVICE_PUBLISHER_IMPL_H_
-#define API_IMPL_SERVICE_PUBLISHER_IMPL_H_
+#ifndef OSP_IMPL_SERVICE_PUBLISHER_IMPL_H_
+#define OSP_IMPL_SERVICE_PUBLISHER_IMPL_H_
 
-#include "api/public/service_publisher.h"
+#include "osp/public/service_publisher.h"
 #include "osp_base/macros.h"
 #include "osp_base/with_destruction_callback.h"
 
@@ -65,4 +65,4 @@ class ServicePublisherImpl final : public ServicePublisher,
 
 }  // namespace openscreen
 
-#endif  // API_IMPL_SERVICE_PUBLISHER_IMPL_H_
+#endif  // OSP_IMPL_SERVICE_PUBLISHER_IMPL_H_
diff --git a/api/impl/service_publisher_impl_unittest.cc b/osp/impl/service_publisher_impl_unittest.cc
index 4b8fc03c..fb63713a 100644
--- a/api/impl/service_publisher_impl_unittest.cc
+++ b/osp/impl/service_publisher_impl_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/service_publisher_impl.h"
+#include "osp/impl/service_publisher_impl.h"
 
 #include <memory>
 
diff --git a/api/impl/testing/BUILD.gn b/osp/impl/testing/BUILD.gn
index b9090b95..d78ec963 100644
--- a/api/impl/testing/BUILD.gn
+++ b/osp/impl/testing/BUILD.gn
@@ -14,8 +14,8 @@ source_set("testing") {
   ]
 
   deps = [
-    "../../../discovery/mdns:mdns_interface",
     "../../../platform",
+    "../discovery/mdns:mdns_interface",
   ]
   configs += [ "../../..:root_config_overrides" ]
 }
@@ -30,7 +30,7 @@ source_set("fakes_unittests") {
   deps = [
     ":testing",
     "../../../third_party/abseil",
-    "//third_party/googletest:gtest",
+    "../../../third_party/googletest:gtest",
   ]
   configs += [ "../../..:root_config_overrides" ]
 }
diff --git a/api/impl/testing/fake_clock.cc b/osp/impl/testing/fake_clock.cc
index a96c8ef1..3ca0c381 100644
--- a/api/impl/testing/fake_clock.cc
+++ b/osp/impl/testing/fake_clock.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/testing/fake_clock.h"
+#include "osp/impl/testing/fake_clock.h"
 
 #include "platform/api/logging.h"
 
diff --git a/api/impl/testing/fake_clock.h b/osp/impl/testing/fake_clock.h
index bfbc48db..0d543b06 100644
--- a/api/impl/testing/fake_clock.h
+++ b/osp/impl/testing/fake_clock.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_IMPL_TESTING_FAKE_CLOCK_H_
-#define API_IMPL_TESTING_FAKE_CLOCK_H_
+#ifndef OSP_IMPL_TESTING_FAKE_CLOCK_H_
+#define OSP_IMPL_TESTING_FAKE_CLOCK_H_
 
 #include "platform/api/time.h"
 
@@ -25,4 +25,4 @@ class FakeClock {
 
 }  // namespace openscreen
 
-#endif  // API_IMPL_TESTING_FAKE_CLOCK_H_
+#endif  // OSP_IMPL_TESTING_FAKE_CLOCK_H_
diff --git a/api/impl/testing/fake_mdns_platform_service.cc b/osp/impl/testing/fake_mdns_platform_service.cc
index e7fbafe6..689f0d25 100644
--- a/api/impl/testing/fake_mdns_platform_service.cc
+++ b/osp/impl/testing/fake_mdns_platform_service.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/testing/fake_mdns_platform_service.h"
+#include "osp/impl/testing/fake_mdns_platform_service.h"
 
 #include <algorithm>
 
diff --git a/api/impl/testing/fake_mdns_platform_service.h b/osp/impl/testing/fake_mdns_platform_service.h
index edc594f6..c08996fc 100644
--- a/api/impl/testing/fake_mdns_platform_service.h
+++ b/osp/impl/testing/fake_mdns_platform_service.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_IMPL_TESTING_FAKE_MDNS_PLATFORM_SERVICE_H_
-#define API_IMPL_TESTING_FAKE_MDNS_PLATFORM_SERVICE_H_
+#ifndef OSP_IMPL_TESTING_FAKE_MDNS_PLATFORM_SERVICE_H_
+#define OSP_IMPL_TESTING_FAKE_MDNS_PLATFORM_SERVICE_H_
 
 #include <vector>
 
-#include "api/impl/mdns_platform_service.h"
+#include "osp/impl/mdns_platform_service.h"
 
 namespace openscreen {
 
@@ -34,4 +34,4 @@ class FakeMdnsPlatformService final : public MdnsPlatformService {
 
 }  // namespace openscreen
 
-#endif  // API_IMPL_TESTING_FAKE_MDNS_PLATFORM_SERVICE_H_
+#endif  // OSP_IMPL_TESTING_FAKE_MDNS_PLATFORM_SERVICE_H_
diff --git a/api/impl/testing/fake_mdns_platform_service_unittest.cc b/osp/impl/testing/fake_mdns_platform_service_unittest.cc
index 0de41545..6ec56156 100644
--- a/api/impl/testing/fake_mdns_platform_service_unittest.cc
+++ b/osp/impl/testing/fake_mdns_platform_service_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/testing/fake_mdns_platform_service.h"
+#include "osp/impl/testing/fake_mdns_platform_service.h"
 
 #include <cstdint>
 
diff --git a/api/impl/testing/fake_mdns_responder_adapter.cc b/osp/impl/testing/fake_mdns_responder_adapter.cc
index 6c43959e..10b459d8 100644
--- a/api/impl/testing/fake_mdns_responder_adapter.cc
+++ b/osp/impl/testing/fake_mdns_responder_adapter.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/testing/fake_mdns_responder_adapter.h"
+#include "osp/impl/testing/fake_mdns_responder_adapter.h"
 
 #include <algorithm>
 
diff --git a/api/impl/testing/fake_mdns_responder_adapter.h b/osp/impl/testing/fake_mdns_responder_adapter.h
index 47e5c7f6..c4855974 100644
--- a/api/impl/testing/fake_mdns_responder_adapter.h
+++ b/osp/impl/testing/fake_mdns_responder_adapter.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_IMPL_TESTING_FAKE_MDNS_RESPONDER_ADAPTER_H_
-#define API_IMPL_TESTING_FAKE_MDNS_RESPONDER_ADAPTER_H_
+#ifndef OSP_IMPL_TESTING_FAKE_MDNS_RESPONDER_ADAPTER_H_
+#define OSP_IMPL_TESTING_FAKE_MDNS_RESPONDER_ADAPTER_H_
 
 #include <set>
 #include <vector>
 
-#include "discovery/mdns/mdns_responder_adapter.h"
+#include "osp/impl/discovery/mdns/mdns_responder_adapter.h"
 
 namespace openscreen {
 
@@ -201,4 +201,4 @@ class FakeMdnsResponderAdapter final : public mdns::MdnsResponderAdapter {
 
 }  // namespace openscreen
 
-#endif  // API_IMPL_TESTING_FAKE_MDNS_RESPONDER_ADAPTER_H_
+#endif  // OSP_IMPL_TESTING_FAKE_MDNS_RESPONDER_ADAPTER_H_
diff --git a/api/impl/testing/fake_mdns_responder_adapter_unittest.cc b/osp/impl/testing/fake_mdns_responder_adapter_unittest.cc
index 28cc928c..cdafa39d 100644
--- a/api/impl/testing/fake_mdns_responder_adapter_unittest.cc
+++ b/osp/impl/testing/fake_mdns_responder_adapter_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/impl/testing/fake_mdns_responder_adapter.h"
+#include "osp/impl/testing/fake_mdns_responder_adapter.h"
 
 #include "third_party/googletest/src/googletest/include/gtest/gtest.h"
 
diff --git a/msgs/BUILD.gn b/osp/msgs/BUILD.gn
index 99276de0..576f56c4 100644
--- a/msgs/BUILD.gn
+++ b/osp/msgs/BUILD.gn
@@ -13,18 +13,18 @@ source_set("msgs") {
     ":cddl_gen",
   ]
   deps = [
-    "../third_party/abseil",
-    "../third_party/tinycbor",
+    "../../third_party/abseil",
+    "../../third_party/tinycbor",
   ]
-  configs += [ "..:root_config_overrides" ]
+  configs += [ "../..:root_config_overrides" ]
 }
 
 config("cddl_gen_config") {
-  include_dirs = [ "$root_gen_dir" + "/" + rebase_path("..", "//") ]
+  include_dirs = [ "$root_gen_dir" ]
 }
 
 action("cddl_gen") {
-  script = "../tools/cddl/cddl.py"
+  script = "../../tools/cddl/cddl.py"
   sources = [
     "osp_messages.cddl",
   ]
@@ -51,7 +51,7 @@ action("cddl_gen") {
          ] + rebase_path(sources, root_build_dir)
 
   deps = [
-    "../tools/cddl",
+    "../../tools/cddl",
   ]
 }
 
@@ -64,7 +64,7 @@ source_set("unittests") {
 
   deps = [
     ":msgs",
-    "../third_party/googletest:gtest",
+    "../../third_party/googletest:gtest",
   ]
-  configs += [ "..:root_config_overrides" ]
+  configs += [ "../..:root_config_overrides" ]
 }
diff --git a/msgs/messages_unittest.cc b/osp/msgs/messages_unittest.cc
index 08c6a87e..94d0c96c 100644
--- a/msgs/messages_unittest.cc
+++ b/osp/msgs/messages_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "msgs/osp_messages.h"
+#include "osp/msgs/osp_messages.h"
 #include "third_party/googletest/src/googletest/include/gtest/gtest.h"
 
 namespace openscreen {
diff --git a/msgs/osp_messages.cddl b/osp/msgs/osp_messages.cddl
index e9b6c316..e9b6c316 100644
--- a/msgs/osp_messages.cddl
+++ b/osp/msgs/osp_messages.cddl
diff --git a/msgs/request_response_handler.h b/osp/msgs/request_response_handler.h
index 485e7873..0ecd4f7b 100644
--- a/msgs/request_response_handler.h
+++ b/osp/msgs/request_response_handler.h
@@ -2,14 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MSGS_REQUEST_RESPONSE_HANDLER_H_
-#define MSGS_REQUEST_RESPONSE_HANDLER_H_
+#ifndef OSP_MSGS_REQUEST_RESPONSE_HANDLER_H_
+#define OSP_MSGS_REQUEST_RESPONSE_HANDLER_H_
 
 #include <cstddef>
 #include <cstdint>
 
-#include "api/public/message_demuxer.h"
-#include "api/public/protocol_connection.h"
+#include "osp/public/message_demuxer.h"
+#include "osp/public/network_service_manager.h"
+#include "osp/public/protocol_connection.h"
 #include "osp_base/error.h"
 #include "osp_base/macros.h"
 #include "platform/api/logging.h"
@@ -203,4 +204,4 @@ class RequestResponseHandler : public MessageDemuxer::MessageCallback {
 
 }  // namespace openscreen
 
-#endif  // MSGS_REQUEST_RESPONSE_HANDLER_H_
+#endif  // OSP_MSGS_REQUEST_RESPONSE_HANDLER_H_
diff --git a/api/public/BUILD.gn b/osp/public/BUILD.gn
index 392893bd..a556b9e1 100644
--- a/api/public/BUILD.gn
+++ b/osp/public/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("//build_overrides/build.gni")
 
-source_set("api") {
+source_set("public") {
   sources = [
     "client_config.cc",
     "client_config.h",
@@ -38,7 +38,7 @@ source_set("api") {
   ]
 
   public_deps = [
-    "../../msgs",
+    "../msgs",
   ]
   deps = [
     "../../osp_base",
diff --git a/api/public/client_config.cc b/osp/public/client_config.cc
index 432d7687..d3d43b72 100644
--- a/api/public/client_config.cc
+++ b/osp/public/client_config.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/public/client_config.h"
+#include "osp/public/client_config.h"
 
 namespace openscreen {
 
diff --git a/api/public/client_config.h b/osp/public/client_config.h
index bed2e23b..3530fdb5 100644
--- a/api/public/client_config.h
+++ b/osp/public/client_config.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_PUBLIC_CLIENT_CONFIG_H_
-#define API_PUBLIC_CLIENT_CONFIG_H_
+#ifndef OSP_PUBLIC_CLIENT_CONFIG_H_
+#define OSP_PUBLIC_CLIENT_CONFIG_H_
 
 #include <cstdint>
 #include <vector>
@@ -24,4 +24,4 @@ struct ClientConfig {
 
 }  // namespace openscreen
 
-#endif  // API_PUBLIC_CLIENT_CONFIG_H_
+#endif  // OSP_PUBLIC_CLIENT_CONFIG_H_
diff --git a/api/public/endpoint_request_ids.cc b/osp/public/endpoint_request_ids.cc
index 8a27a7a9..15e9be1e 100644
--- a/api/public/endpoint_request_ids.cc
+++ b/osp/public/endpoint_request_ids.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/public/endpoint_request_ids.h"
+#include "osp/public/endpoint_request_ids.h"
 
 namespace openscreen {
 
diff --git a/api/public/endpoint_request_ids.h b/osp/public/endpoint_request_ids.h
index f8290467..d57fab28 100644
--- a/api/public/endpoint_request_ids.h
+++ b/osp/public/endpoint_request_ids.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_PUBLIC_ENDPOINT_REQUEST_IDS_H_
-#define API_PUBLIC_ENDPOINT_REQUEST_IDS_H_
+#ifndef OSP_PUBLIC_ENDPOINT_REQUEST_IDS_H_
+#define OSP_PUBLIC_ENDPOINT_REQUEST_IDS_H_
 
 #include <cstdint>
 #include <map>
@@ -40,4 +40,4 @@ class EndpointRequestIds {
 
 }  // namespace openscreen
 
-#endif  // API_PUBLIC_ENDPOINT_REQUEST_IDS_H_
+#endif  // OSP_PUBLIC_ENDPOINT_REQUEST_IDS_H_
diff --git a/api/public/endpoint_request_ids_unittest.cc b/osp/public/endpoint_request_ids_unittest.cc
index ebddddf3..7dec61bf 100644
--- a/api/public/endpoint_request_ids_unittest.cc
+++ b/osp/public/endpoint_request_ids_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/public/endpoint_request_ids.h"
+#include "osp/public/endpoint_request_ids.h"
 
 #include "third_party/googletest/src/googletest/include/gtest/gtest.h"
 
diff --git a/api/public/mdns_service_listener_factory.h b/osp/public/mdns_service_listener_factory.h
index 24e1cd8e..de424267 100644
--- a/api/public/mdns_service_listener_factory.h
+++ b/osp/public/mdns_service_listener_factory.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_PUBLIC_MDNS_SERVICE_LISTENER_FACTORY_H_
-#define API_PUBLIC_MDNS_SERVICE_LISTENER_FACTORY_H_
+#ifndef OSP_PUBLIC_MDNS_SERVICE_LISTENER_FACTORY_H_
+#define OSP_PUBLIC_MDNS_SERVICE_LISTENER_FACTORY_H_
 
 #include <memory>
 
-#include "api/public/service_listener.h"
+#include "osp/public/service_listener.h"
 
 namespace openscreen {
 
@@ -25,4 +25,4 @@ class MdnsServiceListenerFactory {
 
 }  // namespace openscreen
 
-#endif  // API_PUBLIC_MDNS_SERVICE_LISTENER_FACTORY_H_
+#endif  // OSP_PUBLIC_MDNS_SERVICE_LISTENER_FACTORY_H_
diff --git a/api/public/mdns_service_publisher_factory.h b/osp/public/mdns_service_publisher_factory.h
index 277f58ce..a2623404 100644
--- a/api/public/mdns_service_publisher_factory.h
+++ b/osp/public/mdns_service_publisher_factory.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_PUBLIC_MDNS_SERVICE_PUBLISHER_FACTORY_H_
-#define API_PUBLIC_MDNS_SERVICE_PUBLISHER_FACTORY_H_
+#ifndef OSP_PUBLIC_MDNS_SERVICE_PUBLISHER_FACTORY_H_
+#define OSP_PUBLIC_MDNS_SERVICE_PUBLISHER_FACTORY_H_
 
 #include <memory>
 
-#include "api/public/service_publisher.h"
+#include "osp/public/service_publisher.h"
 
 namespace openscreen {
 
@@ -20,4 +20,4 @@ class MdnsServicePublisherFactory {
 
 }  // namespace openscreen
 
-#endif  // API_PUBLIC_MDNS_SERVICE_PUBLISHER_FACTORY_H_
+#endif  // OSP_PUBLIC_MDNS_SERVICE_PUBLISHER_FACTORY_H_
diff --git a/api/public/message_demuxer.cc b/osp/public/message_demuxer.cc
index c558b74e..a79a2dbc 100644
--- a/api/public/message_demuxer.cc
+++ b/osp/public/message_demuxer.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/public/message_demuxer.h"
+#include "osp/public/message_demuxer.h"
 
 #include <memory>
 
-#include "api/impl/quic/quic_connection.h"
+#include "osp/impl/quic/quic_connection.h"
 #include "osp_base/big_endian.h"
 #include "osp_base/error.h"
 #include "platform/api/logging.h"
diff --git a/api/public/message_demuxer.h b/osp/public/message_demuxer.h
index 83d060ac..f22ac650 100644
--- a/api/public/message_demuxer.h
+++ b/osp/public/message_demuxer.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_PUBLIC_MESSAGE_DEMUXER_H_
-#define API_PUBLIC_MESSAGE_DEMUXER_H_
+#ifndef OSP_PUBLIC_MESSAGE_DEMUXER_H_
+#define OSP_PUBLIC_MESSAGE_DEMUXER_H_
 
 #include <map>
 #include <memory>
 #include <vector>
 
-#include "msgs/osp_messages.h"
+#include "osp/msgs/osp_messages.h"
 #include "osp_base/error.h"
 #include "platform/api/time.h"
 
@@ -131,4 +131,4 @@ class MessageTypeDecoder {
 
 }  // namespace openscreen
 
-#endif  // API_PUBLIC_MESSAGE_DEMUXER_H_
+#endif  // OSP_PUBLIC_MESSAGE_DEMUXER_H_
diff --git a/api/public/message_demuxer_unittest.cc b/osp/public/message_demuxer_unittest.cc
index 03c90125..d35705e9 100644
--- a/api/public/message_demuxer_unittest.cc
+++ b/osp/public/message_demuxer_unittest.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/public/message_demuxer.h"
+#include "osp/public/message_demuxer.h"
 
-#include "api/impl/testing/fake_clock.h"
-#include "api/public/testing/message_demuxer_test_support.h"
-#include "msgs/osp_messages.h"
+#include "osp/impl/testing/fake_clock.h"
+#include "osp/msgs/osp_messages.h"
+#include "osp/public/testing/message_demuxer_test_support.h"
 #include "third_party/googletest/src/googlemock/include/gmock/gmock.h"
 #include "third_party/googletest/src/googletest/include/gtest/gtest.h"
 #include "third_party/tinycbor/src/src/cbor.h"
diff --git a/api/public/network_metrics.h b/osp/public/network_metrics.h
index 06b5fac5..491b0b26 100644
--- a/api/public/network_metrics.h
+++ b/osp/public/network_metrics.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_PUBLIC_NETWORK_METRICS_H_
-#define API_PUBLIC_NETWORK_METRICS_H_
+#ifndef OSP_PUBLIC_NETWORK_METRICS_H_
+#define OSP_PUBLIC_NETWORK_METRICS_H_
 
 #include <cstdint>
 
@@ -40,4 +40,4 @@ struct NetworkMetrics {
 
 }  // namespace openscreen
 
-#endif  // API_PUBLIC_NETWORK_METRICS_H_
+#endif  // OSP_PUBLIC_NETWORK_METRICS_H_
diff --git a/api/public/network_service_manager.h b/osp/public/network_service_manager.h
index 28a0cfa5..83972840 100644
--- a/api/public/network_service_manager.h
+++ b/osp/public/network_service_manager.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_PUBLIC_NETWORK_SERVICE_MANAGER_H_
-#define API_PUBLIC_NETWORK_SERVICE_MANAGER_H_
+#ifndef OSP_PUBLIC_NETWORK_SERVICE_MANAGER_H_
+#define OSP_PUBLIC_NETWORK_SERVICE_MANAGER_H_
 
 #include <memory>
 
-#include "api/public/protocol_connection_client.h"
-#include "api/public/protocol_connection_server.h"
-#include "api/public/service_listener.h"
-#include "api/public/service_publisher.h"
+#include "osp/public/protocol_connection_client.h"
+#include "osp/public/protocol_connection_server.h"
+#include "osp/public/service_listener.h"
+#include "osp/public/service_publisher.h"
 
 namespace openscreen {
 
@@ -78,4 +78,4 @@ class NetworkServiceManager final {
 
 }  // namespace openscreen
 
-#endif  // API_PUBLIC_NETWORK_SERVICE_MANAGER_H_
+#endif  // OSP_PUBLIC_NETWORK_SERVICE_MANAGER_H_
diff --git a/api/public/presentation/presentation_connection.h b/osp/public/presentation/presentation_connection.h
index 2c42e3df..71df0cec 100644
--- a/api/public/presentation/presentation_connection.h
+++ b/osp/public/presentation/presentation_connection.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_PUBLIC_PRESENTATION_PRESENTATION_CONNECTION_H_
-#define API_PUBLIC_PRESENTATION_PRESENTATION_CONNECTION_H_
+#ifndef OSP_PUBLIC_PRESENTATION_PRESENTATION_CONNECTION_H_
+#define OSP_PUBLIC_PRESENTATION_PRESENTATION_CONNECTION_H_
 
 #include <cstdint>
 #include <map>
@@ -13,7 +13,7 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "api/public/message_demuxer.h"
+#include "osp/public/message_demuxer.h"
 #include "osp_base/error.h"
 #include "osp_base/ip_address.h"
 #include "osp_base/macros.h"
@@ -213,4 +213,4 @@ class ConnectionManager final : public MessageDemuxer::MessageCallback {
 }  // namespace presentation
 }  // namespace openscreen
 
-#endif  // API_PUBLIC_PRESENTATION_PRESENTATION_CONNECTION_H_
+#endif  // OSP_PUBLIC_PRESENTATION_PRESENTATION_CONNECTION_H_
diff --git a/api/public/presentation/presentation_controller.h b/osp/public/presentation/presentation_controller.h
index 4d38fa35..c4f80d7c 100644
--- a/api/public/presentation/presentation_controller.h
+++ b/osp/public/presentation/presentation_controller.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_PUBLIC_PRESENTATION_PRESENTATION_CONTROLLER_H_
-#define API_PUBLIC_PRESENTATION_PRESENTATION_CONTROLLER_H_
+#ifndef OSP_PUBLIC_PRESENTATION_PRESENTATION_CONTROLLER_H_
+#define OSP_PUBLIC_PRESENTATION_PRESENTATION_CONTROLLER_H_
 
 #include <map>
 #include <memory>
@@ -11,9 +11,9 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "api/public/presentation/presentation_connection.h"
-#include "api/public/protocol_connection.h"
-#include "api/public/service_listener.h"
+#include "osp/public/presentation/presentation_connection.h"
+#include "osp/public/protocol_connection.h"
+#include "osp/public/service_listener.h"
 #include "osp_base/error.h"
 #include "platform/api/time.h"
 
@@ -219,4 +219,4 @@ class Controller final : public ServiceListener::Observer,
 }  // namespace presentation
 }  // namespace openscreen
 
-#endif  // API_PUBLIC_PRESENTATION_PRESENTATION_CONTROLLER_H_
+#endif  // OSP_PUBLIC_PRESENTATION_PRESENTATION_CONTROLLER_H_
diff --git a/api/public/presentation/presentation_receiver.h b/osp/public/presentation/presentation_receiver.h
index 97fa6e87..d12bbd89 100644
--- a/api/public/presentation/presentation_receiver.h
+++ b/osp/public/presentation/presentation_receiver.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_PUBLIC_PRESENTATION_PRESENTATION_RECEIVER_H_
-#define API_PUBLIC_PRESENTATION_PRESENTATION_RECEIVER_H_
+#ifndef OSP_PUBLIC_PRESENTATION_PRESENTATION_RECEIVER_H_
+#define OSP_PUBLIC_PRESENTATION_PRESENTATION_RECEIVER_H_
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "api/public/message_demuxer.h"
-#include "api/public/presentation/presentation_connection.h"
-#include "msgs/osp_messages.h"
+#include "osp/msgs/osp_messages.h"
+#include "osp/public/message_demuxer.h"
+#include "osp/public/presentation/presentation_connection.h"
 
 namespace openscreen {
 namespace presentation {
@@ -150,4 +150,4 @@ class Receiver final : public MessageDemuxer::MessageCallback,
 }  // namespace presentation
 }  // namespace openscreen
 
-#endif  // API_PUBLIC_PRESENTATION_PRESENTATION_RECEIVER_H_
+#endif  // OSP_PUBLIC_PRESENTATION_PRESENTATION_RECEIVER_H_
diff --git a/api/public/protocol_connection.cc b/osp/public/protocol_connection.cc
index 20f8b493..cff64fb0 100644
--- a/api/public/protocol_connection.cc
+++ b/osp/public/protocol_connection.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/public/protocol_connection.h"
+#include "osp/public/protocol_connection.h"
 
 namespace openscreen {
 
diff --git a/api/public/protocol_connection.h b/osp/public/protocol_connection.h
index 447c9879..494f652e 100644
--- a/api/public/protocol_connection.h
+++ b/osp/public/protocol_connection.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_PUBLIC_PROTOCOL_CONNECTION_H_
-#define API_PUBLIC_PROTOCOL_CONNECTION_H_
+#ifndef OSP_PUBLIC_PROTOCOL_CONNECTION_H_
+#define OSP_PUBLIC_PROTOCOL_CONNECTION_H_
 
 #include <cstddef>
 #include <cstdint>
 #include <type_traits>
 
-#include "msgs/osp_messages.h"
+#include "osp/msgs/osp_messages.h"
 #include "osp_base/error.h"
 #include "platform/api/logging.h"
 
@@ -105,4 +105,4 @@ class ProtocolConnectionServiceObserver {
 
 }  // namespace openscreen
 
-#endif  // API_PUBLIC_PROTOCOL_CONNECTION_H_
+#endif  // OSP_PUBLIC_PROTOCOL_CONNECTION_H_
diff --git a/api/public/protocol_connection_client.cc b/osp/public/protocol_connection_client.cc
index 6028df2e..57295176 100644
--- a/api/public/protocol_connection_client.cc
+++ b/osp/public/protocol_connection_client.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/public/protocol_connection_client.h"
+#include "osp/public/protocol_connection_client.h"
 
 namespace openscreen {
 
diff --git a/api/public/protocol_connection_client.h b/osp/public/protocol_connection_client.h
index 89e3b0ed..24b96592 100644
--- a/api/public/protocol_connection_client.h
+++ b/osp/public/protocol_connection_client.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_PUBLIC_PROTOCOL_CONNECTION_CLIENT_H_
-#define API_PUBLIC_PROTOCOL_CONNECTION_CLIENT_H_
+#ifndef OSP_PUBLIC_PROTOCOL_CONNECTION_CLIENT_H_
+#define OSP_PUBLIC_PROTOCOL_CONNECTION_CLIENT_H_
 
 #include <memory>
 #include <ostream>
 #include <string>
 
-#include "api/public/endpoint_request_ids.h"
-#include "api/public/message_demuxer.h"
-#include "api/public/protocol_connection.h"
+#include "osp/public/endpoint_request_ids.h"
+#include "osp/public/message_demuxer.h"
+#include "osp/public/protocol_connection.h"
 #include "osp_base/error.h"
 #include "osp_base/ip_address.h"
 #include "osp_base/macros.h"
@@ -121,4 +121,4 @@ std::ostream& operator<<(std::ostream& os,
 
 }  // namespace openscreen
 
-#endif  // API_PUBLIC_PROTOCOL_CONNECTION_CLIENT_H_
+#endif  // OSP_PUBLIC_PROTOCOL_CONNECTION_CLIENT_H_
diff --git a/api/public/protocol_connection_client_factory.h b/osp/public/protocol_connection_client_factory.h
index 199c7e2b..f1190f77 100644
--- a/api/public/protocol_connection_client_factory.h
+++ b/osp/public/protocol_connection_client_factory.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_PUBLIC_PROTOCOL_CONNECTION_CLIENT_FACTORY_H_
-#define API_PUBLIC_PROTOCOL_CONNECTION_CLIENT_FACTORY_H_
+#ifndef OSP_PUBLIC_PROTOCOL_CONNECTION_CLIENT_FACTORY_H_
+#define OSP_PUBLIC_PROTOCOL_CONNECTION_CLIENT_FACTORY_H_
 
 #include <memory>
 
-#include "api/public/protocol_connection_client.h"
+#include "osp/public/protocol_connection_client.h"
 
 namespace openscreen {
 
@@ -20,4 +20,4 @@ class ProtocolConnectionClientFactory {
 
 }  // namespace openscreen
 
-#endif  // API_PUBLIC_PROTOCOL_CONNECTION_CLIENT_FACTORY_H_
+#endif  // OSP_PUBLIC_PROTOCOL_CONNECTION_CLIENT_FACTORY_H_
diff --git a/api/public/protocol_connection_server.cc b/osp/public/protocol_connection_server.cc
index 1b6c82da..fc4cd020 100644
--- a/api/public/protocol_connection_server.cc
+++ b/osp/public/protocol_connection_server.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/public/protocol_connection_server.h"
+#include "osp/public/protocol_connection_server.h"
 
 namespace openscreen {
 
diff --git a/api/public/protocol_connection_server.h b/osp/public/protocol_connection_server.h
index dc990153..5ded44a7 100644
--- a/api/public/protocol_connection_server.h
+++ b/osp/public/protocol_connection_server.h
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_PUBLIC_PROTOCOL_CONNECTION_SERVER_H_
-#define API_PUBLIC_PROTOCOL_CONNECTION_SERVER_H_
+#ifndef OSP_PUBLIC_PROTOCOL_CONNECTION_SERVER_H_
+#define OSP_PUBLIC_PROTOCOL_CONNECTION_SERVER_H_
 
 #include <memory>
 #include <ostream>
 #include <string>
 #include <vector>
 
-#include "api/public/endpoint_request_ids.h"
-#include "api/public/message_demuxer.h"
-#include "api/public/protocol_connection.h"
-#include "api/public/server_config.h"
+#include "osp/public/endpoint_request_ids.h"
+#include "osp/public/message_demuxer.h"
+#include "osp/public/protocol_connection.h"
+#include "osp/public/server_config.h"
 #include "osp_base/error.h"
 #include "osp_base/ip_address.h"
 #include "osp_base/macros.h"
@@ -101,4 +101,4 @@ std::ostream& operator<<(std::ostream& os,
 
 }  // namespace openscreen
 
-#endif  // API_PUBLIC_PROTOCOL_CONNECTION_SERVER_H_
+#endif  // OSP_PUBLIC_PROTOCOL_CONNECTION_SERVER_H_
diff --git a/api/public/protocol_connection_server_factory.h b/osp/public/protocol_connection_server_factory.h
index c9326429..1a825926 100644
--- a/api/public/protocol_connection_server_factory.h
+++ b/osp/public/protocol_connection_server_factory.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_PUBLIC_PROTOCOL_CONNECTION_SERVER_FACTORY_H_
-#define API_PUBLIC_PROTOCOL_CONNECTION_SERVER_FACTORY_H_
+#ifndef OSP_PUBLIC_PROTOCOL_CONNECTION_SERVER_FACTORY_H_
+#define OSP_PUBLIC_PROTOCOL_CONNECTION_SERVER_FACTORY_H_
 
 #include <memory>
 
-#include "api/public/protocol_connection_server.h"
-#include "api/public/server_config.h"
+#include "osp/public/protocol_connection_server.h"
+#include "osp/public/server_config.h"
 
 namespace openscreen {
 
@@ -22,4 +22,4 @@ class ProtocolConnectionServerFactory {
 
 }  // namespace openscreen
 
-#endif  // API_PUBLIC_PROTOCOL_CONNECTION_SERVER_FACTORY_H_
+#endif  // OSP_PUBLIC_PROTOCOL_CONNECTION_SERVER_FACTORY_H_
diff --git a/api/public/server_config.cc b/osp/public/server_config.cc
index fa14f946..354eb731 100644
--- a/api/public/server_config.cc
+++ b/osp/public/server_config.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/public/server_config.h"
+#include "osp/public/server_config.h"
 
 namespace openscreen {
 
diff --git a/api/public/server_config.h b/osp/public/server_config.h
index 967563bb..9095ed69 100644
--- a/api/public/server_config.h
+++ b/osp/public/server_config.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_PUBLIC_SERVER_CONFIG_H_
-#define API_PUBLIC_SERVER_CONFIG_H_
+#ifndef OSP_PUBLIC_SERVER_CONFIG_H_
+#define OSP_PUBLIC_SERVER_CONFIG_H_
 
 #include <cstdint>
 #include <vector>
@@ -30,4 +30,4 @@ struct ServerConfig {
 
 }  // namespace openscreen
 
-#endif  // API_PUBLIC_SERVER_CONFIG_H_
+#endif  // OSP_PUBLIC_SERVER_CONFIG_H_
diff --git a/api/public/service_info.cc b/osp/public/service_info.cc
index 2b701b72..f021f92b 100644
--- a/api/public/service_info.cc
+++ b/osp/public/service_info.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/public/service_info.h"
+#include "osp/public/service_info.h"
 
 #include <algorithm>
 #include <utility>
diff --git a/api/public/service_info.h b/osp/public/service_info.h
index a7989d37..6dd069f4 100644
--- a/api/public/service_info.h
+++ b/osp/public/service_info.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_PUBLIC_SERVICE_INFO_H_
-#define API_PUBLIC_SERVICE_INFO_H_
+#ifndef OSP_PUBLIC_SERVICE_INFO_H_
+#define OSP_PUBLIC_SERVICE_INFO_H_
 
 #include <cstdint>
 #include <string>
@@ -42,4 +42,4 @@ struct ServiceInfo {
 
 }  // namespace openscreen
 
-#endif  // API_PUBLIC_SERVICE_INFO_H_
+#endif  // OSP_PUBLIC_SERVICE_INFO_H_
diff --git a/api/public/service_info_unittest.cc b/osp/public/service_info_unittest.cc
index a92f532d..a68e0935 100644
--- a/api/public/service_info_unittest.cc
+++ b/osp/public/service_info_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/public/service_info.h"
+#include "osp/public/service_info.h"
 
 #include "osp_base/error.h"
 #include "third_party/googletest/src/googletest/include/gtest/gtest.h"
diff --git a/api/public/service_listener.cc b/osp/public/service_listener.cc
index f2ad75d8..97698631 100644
--- a/api/public/service_listener.cc
+++ b/osp/public/service_listener.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/public/service_listener.h"
+#include "osp/public/service_listener.h"
 
 namespace openscreen {
 
diff --git a/api/public/service_listener.h b/osp/public/service_listener.h
index fab0e22e..f480670f 100644
--- a/api/public/service_listener.h
+++ b/osp/public/service_listener.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_PUBLIC_SERVICE_LISTENER_H_
-#define API_PUBLIC_SERVICE_LISTENER_H_
+#ifndef OSP_PUBLIC_SERVICE_LISTENER_H_
+#define OSP_PUBLIC_SERVICE_LISTENER_H_
 
 #include <cstdint>
 #include <string>
 #include <vector>
 
-#include "api/public/service_info.h"
+#include "osp/public/service_info.h"
 #include "osp_base/macros.h"
 #include "osp_base/time.h"
 
@@ -159,4 +159,4 @@ class ServiceListener {
 
 }  // namespace openscreen
 
-#endif  // API_PUBLIC_SERVICE_LISTENER_H_
+#endif  // OSP_PUBLIC_SERVICE_LISTENER_H_
diff --git a/api/public/service_publisher.cc b/osp/public/service_publisher.cc
index 63a1371a..b34940b6 100644
--- a/api/public/service_publisher.cc
+++ b/osp/public/service_publisher.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "api/public/service_publisher.h"
+#include "osp/public/service_publisher.h"
 
 namespace openscreen {
 
diff --git a/api/public/service_publisher.h b/osp/public/service_publisher.h
index b57253ef..2580116d 100644
--- a/api/public/service_publisher.h
+++ b/osp/public/service_publisher.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_PUBLIC_SERVICE_PUBLISHER_H_
-#define API_PUBLIC_SERVICE_PUBLISHER_H_
+#ifndef OSP_PUBLIC_SERVICE_PUBLISHER_H_
+#define OSP_PUBLIC_SERVICE_PUBLISHER_H_
 
 #include <cstdint>
 #include <string>
@@ -154,4 +154,4 @@ class ServicePublisher {
 
 }  // namespace openscreen
 
-#endif  // API_PUBLIC_SERVICE_PUBLISHER_H_
+#endif  // OSP_PUBLIC_SERVICE_PUBLISHER_H_
diff --git a/api/public/testing/message_demuxer_test_support.h b/osp/public/testing/message_demuxer_test_support.h
index 870c1828..7551217e 100644
--- a/api/public/testing/message_demuxer_test_support.h
+++ b/osp/public/testing/message_demuxer_test_support.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef API_PUBLIC_TESTING_MESSAGE_DEMUXER_TEST_SUPPORT_H_
-#define API_PUBLIC_TESTING_MESSAGE_DEMUXER_TEST_SUPPORT_H_
+#ifndef OSP_PUBLIC_TESTING_MESSAGE_DEMUXER_TEST_SUPPORT_H_
+#define OSP_PUBLIC_TESTING_MESSAGE_DEMUXER_TEST_SUPPORT_H_
 
-#include "api/public/message_demuxer.h"
+#include "osp/public/message_demuxer.h"
 #include "platform/api/time.h"
 #include "third_party/googletest/src/googlemock/include/gmock/gmock.h"
 
@@ -26,4 +26,4 @@ class MockMessageCallback final : public MessageDemuxer::MessageCallback {
 
 }  // namespace openscreen
 
-#endif  // API_PUBLIC_TESTING_MESSAGE_DEMUXER_TEST_SUPPORT_H_
+#endif  // OSP_PUBLIC_TESTING_MESSAGE_DEMUXER_TEST_SUPPORT_H_
diff --git a/platform/base/task_runner_unittest.cc b/platform/base/task_runner_unittest.cc
index d4fa376c..d22d4a82 100644
--- a/platform/base/task_runner_unittest.cc
+++ b/platform/base/task_runner_unittest.cc
@@ -4,7 +4,7 @@
 
 #include <thread>  // NOLINT
 
-#include "api/impl/testing/fake_clock.h"
+#include "osp/impl/testing/fake_clock.h"
 #include "platform/api/task_runner_factory.h"
 #include "platform/api/time.h"
 #include "platform/base/task_runner_impl.h"