diff --git a/src/datadog/base64.cpp b/src/datadog/base64.cpp
index 35aa4833..91fec843 100644
--- a/src/datadog/base64.cpp
+++ b/src/datadog/base64.cpp
@@ -1,4 +1,4 @@
-#include "base64.h"
+#include <datadog/base64.h>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/src/datadog/base64.h b/src/datadog/base64.h
index f2539872..aa56c925 100644
--- a/src/datadog/base64.h
+++ b/src/datadog/base64.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <string>
+#include <datadog/string_view.h>
 
-#include "string_view.h"
+#include <string>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/cerr_logger.cpp b/src/datadog/cerr_logger.cpp
index 239eee45..fa4bee45 100644
--- a/src/datadog/cerr_logger.cpp
+++ b/src/datadog/cerr_logger.cpp
@@ -1,4 +1,4 @@
-#include "cerr_logger.h"
+#include <datadog/cerr_logger.h>
 
 #include <iostream>
 
diff --git a/src/datadog/cerr_logger.h b/src/datadog/cerr_logger.h
index 7abd722e..1b434681 100644
--- a/src/datadog/cerr_logger.h
+++ b/src/datadog/cerr_logger.h
@@ -7,11 +7,11 @@
 // `CerrLogger` is the default logger used by `Tracer` unless otherwise
 // configured in `TracerConfig`.
 
+#include <datadog/logger.h>
+
 #include <mutex>
 #include <sstream>
 
-#include "logger.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/clock.cpp b/src/datadog/clock.cpp
index 819740cb..b74a5b72 100644
--- a/src/datadog/clock.cpp
+++ b/src/datadog/clock.cpp
@@ -1,4 +1,4 @@
-#include "clock.h"
+#include <datadog/clock.h>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/collector.h b/src/datadog/collector.h
index 64de43c0..224c7759 100644
--- a/src/datadog/collector.h
+++ b/src/datadog/collector.h
@@ -10,13 +10,13 @@
 // adjusted to increase or decrease the rate at which traces are kept.  See the
 // `response_handler` parameter to `Collector::send`.
 
+#include <datadog/expected.h>
+#include <datadog/optional.h>
+
+#include <datadog/json_fwd.hpp>
 #include <memory>
 #include <vector>
 
-#include "expected.h"
-#include "json_fwd.hpp"
-#include "optional.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/collector_response.cpp b/src/datadog/collector_response.cpp
index 2edb7b16..3eeccbe6 100644
--- a/src/datadog/collector_response.cpp
+++ b/src/datadog/collector_response.cpp
@@ -1,4 +1,4 @@
-#include "collector_response.h"
+#include <datadog/collector_response.h>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/collector_response.h b/src/datadog/collector_response.h
index 7d72e8d5..79af2f09 100644
--- a/src/datadog/collector_response.h
+++ b/src/datadog/collector_response.h
@@ -13,12 +13,12 @@
 // See `TraceSampler::handle_collector_response` in `trace_sampler.h` for more
 // information.
 
+#include <datadog/rate.h>
+#include <datadog/string_view.h>
+
 #include <string>
 #include <unordered_map>
 
-#include "rate.h"
-#include "string_view.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/config.h b/src/datadog/config.h
index 18b73031..732ca4f2 100644
--- a/src/datadog/config.h
+++ b/src/datadog/config.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "error.h"
-#include "optional.h"
+#include <datadog/error.h>
+#include <datadog/optional.h>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/config_manager.cpp b/src/datadog/config_manager.cpp
index 2609739b..59b8cccd 100644
--- a/src/datadog/config_manager.cpp
+++ b/src/datadog/config_manager.cpp
@@ -1,8 +1,7 @@
-#include "config_manager.h"
-
-#include "parse_util.h"
-#include "string_util.h"
-#include "trace_sampler.h"
+#include <datadog/config_manager.h>
+#include <datadog/parse_util.h>
+#include <datadog/string_util.h>
+#include <datadog/trace_sampler.h>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/config_manager.h b/src/datadog/config_manager.h
index 6c59fa74..9ec6a4eb 100644
--- a/src/datadog/config_manager.h
+++ b/src/datadog/config_manager.h
@@ -5,16 +5,16 @@
 // It utilizes a mutex to ensure thread safety when updating or accessing
 // the configuration.
 
+#include <datadog/clock.h>
+#include <datadog/optional.h>
+#include <datadog/remote_config/listener.h>
+#include <datadog/span_defaults.h>
+#include <datadog/tracer_config.h>
+#include <datadog/tracer_telemetry.h>
+
+#include <datadog/json.hpp>
 #include <mutex>
 
-#include "clock.h"
-#include "json.hpp"
-#include "optional.h"
-#include "remote_config/listener.h"
-#include "span_defaults.h"
-#include "tracer_config.h"
-#include "tracer_telemetry.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/curl.cpp b/src/datadog/curl.cpp
index 0f828bc1..ee6239e2 100644
--- a/src/datadog/curl.cpp
+++ b/src/datadog/curl.cpp
@@ -1,10 +1,18 @@
-#include "curl.h"
+#include <datadog/clock.h>
+#include <datadog/curl.h>
+#include <datadog/dict_reader.h>
+#include <datadog/dict_writer.h>
+#include <datadog/http_client.h>
+#include <datadog/logger.h>
+#include <datadog/string_util.h>
+#include <datadog/string_view.h>
 
 #include <algorithm>
 #include <cctype>
 #include <chrono>
 #include <condition_variable>
 #include <cstddef>
+#include <datadog/json.hpp>
 #include <iterator>
 #include <list>
 #include <memory>
@@ -13,15 +21,6 @@
 #include <unordered_map>
 #include <unordered_set>
 
-#include "clock.h"
-#include "dict_reader.h"
-#include "dict_writer.h"
-#include "http_client.h"
-#include "json.hpp"
-#include "logger.h"
-#include "string_util.h"
-#include "string_view.h"
-
 namespace datadog {
 namespace tracing {
 namespace {
diff --git a/src/datadog/curl.h b/src/datadog/curl.h
index 6c1ef377..74fcb3bc 100644
--- a/src/datadog/curl.h
+++ b/src/datadog/curl.h
@@ -10,17 +10,16 @@
 // [1]: https://curl.se/libcurl/
 
 #include <curl/curl.h>
+#include <datadog/clock.h>
+#include <datadog/http_client.h>
 
 #include <chrono>
+#include <datadog/json_fwd.hpp>
 #include <functional>
 #include <memory>
 #include <string>
 #include <thread>
 
-#include "clock.h"
-#include "http_client.h"
-#include "json_fwd.hpp"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/datadog_agent.cpp b/src/datadog/datadog_agent.cpp
index ad15ec78..0c98dab5 100644
--- a/src/datadog/datadog_agent.cpp
+++ b/src/datadog/datadog_agent.cpp
@@ -1,24 +1,23 @@
-#include "datadog_agent.h"
+#include <datadog/collector_response.h>
+#include <datadog/datadog_agent.h>
+#include <datadog/datadog_agent_config.h>
+#include <datadog/dict_writer.h>
+#include <datadog/http_client.h>
+#include <datadog/logger.h>
+#include <datadog/msgpack.h>
+#include <datadog/span_data.h>
+#include <datadog/string_view.h>
+#include <datadog/trace_sampler.h>
+#include <datadog/tracer.h>
 
 #include <cassert>
 #include <chrono>
+#include <datadog/json.hpp>
 #include <string>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 
-#include "collector_response.h"
-#include "datadog_agent_config.h"
-#include "dict_writer.h"
-#include "http_client.h"
-#include "json.hpp"
-#include "logger.h"
-#include "msgpack.h"
-#include "span_data.h"
-#include "string_view.h"
-#include "trace_sampler.h"
-#include "tracer.h"
-
 namespace datadog {
 namespace tracing {
 namespace {
diff --git a/src/datadog/datadog_agent.h b/src/datadog/datadog_agent.h
index 6c4d1ded..ebffd2c6 100644
--- a/src/datadog/datadog_agent.h
+++ b/src/datadog/datadog_agent.h
@@ -6,20 +6,20 @@
 // `DatadogAgent` is configured by `DatadogAgentConfig`.  See
 // `datadog_agent_config.h`.
 
+#include <datadog/clock.h>
+#include <datadog/collector.h>
+#include <datadog/config_manager.h>
+#include <datadog/event_scheduler.h>
+#include <datadog/http_client.h>
+#include <datadog/metrics.h>
+#include <datadog/remote_config/remote_config.h>
+#include <datadog/tracer_signature.h>
+#include <datadog/tracer_telemetry.h>
+
 #include <memory>
 #include <mutex>
 #include <vector>
 
-#include "clock.h"
-#include "collector.h"
-#include "config_manager.h"
-#include "event_scheduler.h"
-#include "http_client.h"
-#include "metrics.h"
-#include "remote_config/remote_config.h"
-#include "tracer_signature.h"
-#include "tracer_telemetry.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/datadog_agent_config.cpp b/src/datadog/datadog_agent_config.cpp
index f1d382f9..9994f4a0 100644
--- a/src/datadog/datadog_agent_config.cpp
+++ b/src/datadog/datadog_agent_config.cpp
@@ -1,14 +1,13 @@
-#include "datadog_agent_config.h"
+#include <datadog/datadog_agent_config.h>
+#include <datadog/default_http_client.h>
+#include <datadog/environment.h>
+#include <datadog/parse_util.h>
+#include <datadog/threaded_event_scheduler.h>
 
 #include <algorithm>
 #include <chrono>
 #include <cstddef>
 
-#include "default_http_client.h"
-#include "environment.h"
-#include "parse_util.h"
-#include "threaded_event_scheduler.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/datadog_agent_config.h b/src/datadog/datadog_agent_config.h
index 39c2a313..bd4d1374 100644
--- a/src/datadog/datadog_agent_config.h
+++ b/src/datadog/datadog_agent_config.h
@@ -11,19 +11,19 @@
 // Typical usage of `DatadogAgentConfig` is implicit as part of `TracerConfig`.
 // See `tracer_config.h`.
 
+#include <datadog/clock.h>
+#include <datadog/config.h>
+#include <datadog/expected.h>
+#include <datadog/http_client.h>
+#include <datadog/remote_config/listener.h>
+#include <datadog/string_view.h>
+
 #include <chrono>
 #include <memory>
 #include <string>
 #include <unordered_map>
 #include <variant>
 
-#include "clock.h"
-#include "config.h"
-#include "expected.h"
-#include "http_client.h"
-#include "remote_config/listener.h"
-#include "string_view.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/default_http_client.h b/src/datadog/default_http_client.h
index cfeda7e5..f0b859b6 100644
--- a/src/datadog/default_http_client.h
+++ b/src/datadog/default_http_client.h
@@ -7,9 +7,9 @@
 // `default_http_client` is implemented in either `default_http_client_curl.cpp`
 // or `default_http_client_null.cpp`.
 
-#include <memory>
+#include <datadog/clock.h>
 
-#include "clock.h"
+#include <memory>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/default_http_client_curl.cpp b/src/datadog/default_http_client_curl.cpp
index 375acede..7c22368e 100644
--- a/src/datadog/default_http_client_curl.cpp
+++ b/src/datadog/default_http_client_curl.cpp
@@ -1,5 +1,5 @@
-#include "curl.h"
-#include "default_http_client.h"
+#include <datadog/curl.h>
+#include <datadog/default_http_client.h>
 
 // This file is included in the build when libcurl is included in the build.
 // It provides an implementation of `default_http_client` that returns a
diff --git a/src/datadog/default_http_client_null.cpp b/src/datadog/default_http_client_null.cpp
index b5a73ece..89b08c19 100644
--- a/src/datadog/default_http_client_null.cpp
+++ b/src/datadog/default_http_client_null.cpp
@@ -1,4 +1,4 @@
-#include "default_http_client.h"
+#include <datadog/default_http_client.h>
 
 // This file is included in the build when libcurl is not included in the build.
 // It provides an implementation of `default_http_client` that returns null,
diff --git a/src/datadog/dict_reader.h b/src/datadog/dict_reader.h
index c6ee310f..7fce7de9 100644
--- a/src/datadog/dict_reader.h
+++ b/src/datadog/dict_reader.h
@@ -4,10 +4,10 @@
 // read-only key/value mapping of strings.  It's used when extracting trace
 // context from externalized formats: HTTP headers, gRPC metadata, etc.
 
-#include <functional>
+#include <datadog/optional.h>
+#include <datadog/string_view.h>
 
-#include "optional.h"
-#include "string_view.h"
+#include <functional>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/dict_writer.h b/src/datadog/dict_writer.h
index 572acdd0..6adfdbf5 100644
--- a/src/datadog/dict_writer.h
+++ b/src/datadog/dict_writer.h
@@ -8,7 +8,7 @@
 // permitted to result from repeated invocations of `DictWriter::set` with the
 // same key.
 
-#include "string_view.h"
+#include <datadog/string_view.h>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/environment.cpp b/src/datadog/environment.cpp
index 780bb42b..79eeb171 100644
--- a/src/datadog/environment.cpp
+++ b/src/datadog/environment.cpp
@@ -1,8 +1,7 @@
-#include "environment.h"
+#include <datadog/environment.h>
 
 #include <cstdlib>
-
-#include "json.hpp"
+#include <datadog/json.hpp>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/environment.h b/src/datadog/environment.h
index 3669837a..0a5daefc 100644
--- a/src/datadog/environment.h
+++ b/src/datadog/environment.h
@@ -14,9 +14,10 @@
 //
 // `lookup` retrieves the value of `Variable` in the environment.
 
-#include "json_fwd.hpp"
-#include "optional.h"
-#include "string_view.h"
+#include <datadog/optional.h>
+#include <datadog/string_view.h>
+
+#include <datadog/json_fwd.hpp>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/error.cpp b/src/datadog/error.cpp
index 844d7140..c6c2db7c 100644
--- a/src/datadog/error.cpp
+++ b/src/datadog/error.cpp
@@ -1,4 +1,4 @@
-#include "error.h"
+#include <datadog/error.h>
 
 #include <ostream>
 #include <sstream>
diff --git a/src/datadog/error.h b/src/datadog/error.h
index fdc0dc33..10fe3446 100644
--- a/src/datadog/error.h
+++ b/src/datadog/error.h
@@ -10,11 +10,11 @@
 // `struct Error` is the error type used by the `Expected` class template.  See
 // `expected.h`.
 
+#include <datadog/string_view.h>
+
 #include <iosfwd>
 #include <string>
 
-#include "string_view.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/event_scheduler.h b/src/datadog/event_scheduler.h
index dc23aae0..06f5e40b 100644
--- a/src/datadog/event_scheduler.h
+++ b/src/datadog/event_scheduler.h
@@ -9,12 +9,12 @@
 // The default implementation is `ThreadedEventScheduler`.  See
 // `threaded_event_scheduler.h`.
 
+#include <datadog/error.h>
+
 #include <chrono>
+#include <datadog/json_fwd.hpp>
 #include <functional>
 
-#include "error.h"
-#include "json_fwd.hpp"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/expected.h b/src/datadog/expected.h
index 3b7f3e6f..b7792f0d 100644
--- a/src/datadog/expected.h
+++ b/src/datadog/expected.h
@@ -37,10 +37,10 @@
 // error then it cannot be "dereferenced" with `operator*`, i.e. it is analogous
 // to `Optional<Error>` (and is implemented as such).
 
-#include <variant>
+#include <datadog/error.h>
+#include <datadog/optional.h>
 
-#include "error.h"
-#include "optional.h"
+#include <variant>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/extracted_data.h b/src/datadog/extracted_data.h
index a28b0c16..ef407f77 100644
--- a/src/datadog/extracted_data.h
+++ b/src/datadog/extracted_data.h
@@ -3,15 +3,15 @@
 // This component provides a `struct`, `ExtractedData`, that stores fields
 // extracted from trace context. It's an implementation detail of this library.
 
+#include <datadog/optional.h>
+#include <datadog/propagation_style.h>
+#include <datadog/trace_id.h>
+
 #include <cstdint>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "optional.h"
-#include "propagation_style.h"
-#include "trace_id.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/extraction_util.cpp b/src/datadog/extraction_util.cpp
index 63cc9623..a19289a1 100644
--- a/src/datadog/extraction_util.cpp
+++ b/src/datadog/extraction_util.cpp
@@ -1,4 +1,11 @@
-#include "extraction_util.h"
+#include <datadog/extracted_data.h>
+#include <datadog/extraction_util.h>
+#include <datadog/hex.h>
+#include <datadog/logger.h>
+#include <datadog/parse_util.h>
+#include <datadog/string_util.h>
+#include <datadog/tag_propagation.h>
+#include <datadog/tags.h>
 
 #include <algorithm>
 #include <cstdint>
@@ -6,14 +13,6 @@
 #include <string>
 #include <unordered_map>
 
-#include "extracted_data.h"
-#include "hex.h"
-#include "logger.h"
-#include "parse_util.h"
-#include "string_util.h"
-#include "tag_propagation.h"
-#include "tags.h"
-
 namespace datadog {
 namespace tracing {
 namespace {
diff --git a/src/datadog/extraction_util.h b/src/datadog/extraction_util.h
index a4eacf49..e99af0fa 100644
--- a/src/datadog/extraction_util.h
+++ b/src/datadog/extraction_util.h
@@ -3,17 +3,17 @@
 // This component provides facilities for extracting trace context from a
 // `DictReader`. It is used by `Tracer::extract_trace`. See `tracer.cpp`.
 
+#include <datadog/dict_reader.h>
+#include <datadog/expected.h>
+#include <datadog/optional.h>
+#include <datadog/propagation_style.h>
+
 #include <cstdint>
 #include <string>
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
-#include "dict_reader.h"
-#include "expected.h"
-#include "optional.h"
-#include "propagation_style.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/glob.cpp b/src/datadog/glob.cpp
index 201c9b34..9d5043e4 100644
--- a/src/datadog/glob.cpp
+++ b/src/datadog/glob.cpp
@@ -1,4 +1,4 @@
-#include "glob.h"
+#include <datadog/glob.h>
 
 #include <cctype>
 #include <cstdint>
diff --git a/src/datadog/glob.h b/src/datadog/glob.h
index 77dcb574..dbb5f396 100644
--- a/src/datadog/glob.h
+++ b/src/datadog/glob.h
@@ -11,7 +11,7 @@
 // The patterns are here called "glob patterns," though they are different from
 // the patterns used in Unix shells.
 
-#include "string_view.h"
+#include <datadog/string_view.h>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/http_client.cpp b/src/datadog/http_client.cpp
index 07d72476..d98c62a3 100644
--- a/src/datadog/http_client.cpp
+++ b/src/datadog/http_client.cpp
@@ -1,9 +1,8 @@
-#include "http_client.h"
+#include <datadog/http_client.h>
+#include <datadog/string_util.h>
 
 #include <algorithm>
 
-#include "string_util.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/http_client.h b/src/datadog/http_client.h
index 8a5a9e15..25454544 100644
--- a/src/datadog/http_client.h
+++ b/src/datadog/http_client.h
@@ -8,14 +8,14 @@
 // If this library was built with support for libcurl, then `Curl` implements
 // `HTTPClient` in terms of libcurl.  See `curl.h`.
 
+#include <datadog/error.h>
+#include <datadog/expected.h>
+#include <datadog/optional.h>
+
 #include <chrono>
+#include <datadog/json_fwd.hpp>
 #include <functional>
 
-#include "error.h"
-#include "expected.h"
-#include "json_fwd.hpp"
-#include "optional.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/id_generator.cpp b/src/datadog/id_generator.cpp
index eb3b517c..0ac4d586 100644
--- a/src/datadog/id_generator.cpp
+++ b/src/datadog/id_generator.cpp
@@ -1,10 +1,9 @@
-#include "id_generator.h"
+#include <datadog/id_generator.h>
+#include <datadog/random.h>
 
 #include <bitset>
 #include <chrono>
 
-#include "random.h"
-
 namespace datadog {
 namespace tracing {
 namespace {
diff --git a/src/datadog/id_generator.h b/src/datadog/id_generator.h
index 834e8bf2..bf3e87d5 100644
--- a/src/datadog/id_generator.h
+++ b/src/datadog/id_generator.h
@@ -9,12 +9,12 @@
 // pseudo-random sequence of uniformly distributed 63-bit unsigned integers. The
 // sequence is randomly seeded once per thread and anytime the process forks.
 
+#include <datadog/clock.h>
+#include <datadog/trace_id.h>
+
 #include <cstdint>
 #include <memory>
 
-#include "clock.h"
-#include "trace_id.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/injection_options.h b/src/datadog/injection_options.h
index ce1b83f0..6e8b54d8 100644
--- a/src/datadog/injection_options.h
+++ b/src/datadog/injection_options.h
@@ -4,7 +4,7 @@
 // parameters to `Span::inject` that alter the behavior of trace context
 // propagation.
 
-#include "optional.h"
+#include <datadog/optional.h>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/limiter.cpp b/src/datadog/limiter.cpp
index dfe0d488..9831a905 100644
--- a/src/datadog/limiter.cpp
+++ b/src/datadog/limiter.cpp
@@ -1,4 +1,4 @@
-#include "limiter.h"
+#include <datadog/limiter.h>
 
 #include <algorithm>
 #include <cmath>
diff --git a/src/datadog/limiter.h b/src/datadog/limiter.h
index 16a3b821..ddddb5ef 100644
--- a/src/datadog/limiter.h
+++ b/src/datadog/limiter.h
@@ -8,10 +8,10 @@
 //
 // [1]: https://en.wikipedia.org/wiki/Token_bucket
 
-#include <vector>
+#include <datadog/clock.h>
+#include <datadog/rate.h>
 
-#include "clock.h"
-#include "rate.h"
+#include <vector>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/logger.cpp b/src/datadog/logger.cpp
index 87f3036a..00cb2422 100644
--- a/src/datadog/logger.cpp
+++ b/src/datadog/logger.cpp
@@ -1,6 +1,5 @@
-#include "logger.h"
-
-#include "error.h"
+#include <datadog/error.h>
+#include <datadog/logger.h>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/logger.h b/src/datadog/logger.h
index 6f03ac25..74214eab 100644
--- a/src/datadog/logger.h
+++ b/src/datadog/logger.h
@@ -39,11 +39,11 @@
 //       return;
 //     }
 
+#include <datadog/string_view.h>
+
 #include <functional>
 #include <ostream>
 
-#include "string_view.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/metrics.cpp b/src/datadog/metrics.cpp
index 19eaa47e..edc086f0 100644
--- a/src/datadog/metrics.cpp
+++ b/src/datadog/metrics.cpp
@@ -1,6 +1,6 @@
-#include "metrics.h"
+#include <datadog/metrics.h>
 
-#include "json.hpp"
+#include <datadog/json.hpp>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/msgpack.cpp b/src/datadog/msgpack.cpp
index dce353f5..6791cdc8 100644
--- a/src/datadog/msgpack.cpp
+++ b/src/datadog/msgpack.cpp
@@ -1,12 +1,11 @@
-#include "msgpack.h"
+#include <datadog/error.h>
+#include <datadog/msgpack.h>
 
 #include <cassert>
 #include <climits>
 #include <limits>
 #include <type_traits>
 
-#include "error.h"
-
 namespace datadog {
 namespace tracing {
 namespace msgpack {
diff --git a/src/datadog/msgpack.h b/src/datadog/msgpack.h
index 52b8a919..810226d0 100644
--- a/src/datadog/msgpack.h
+++ b/src/datadog/msgpack.h
@@ -11,15 +11,15 @@
 //
 // [1]: https://msgpack.org/index.html
 
+#include <datadog/expected.h>
+#include <datadog/string_view.h>
+
 #include <climits>
 #include <cstddef>
 #include <cstdint>
 #include <string>
 #include <utility>
 
-#include "expected.h"
-#include "string_view.h"
-
 namespace datadog {
 namespace tracing {
 namespace msgpack {
diff --git a/src/datadog/null_collector.cpp b/src/datadog/null_collector.cpp
index d86ef2db..3db4df4b 100644
--- a/src/datadog/null_collector.cpp
+++ b/src/datadog/null_collector.cpp
@@ -1,6 +1,6 @@
-#include "null_collector.h"
+#include <datadog/null_collector.h>
 
-#include "json.hpp"
+#include <datadog/json.hpp>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/null_collector.h b/src/datadog/null_collector.h
index bec1f12d..d1f75981 100644
--- a/src/datadog/null_collector.h
+++ b/src/datadog/null_collector.h
@@ -4,7 +4,7 @@
 // `Collector` interface in terms of a no-op. It's used by `Tracer` in lieu
 // of a `DatadogAgent` whenever `TracerConfig::report_traces` is `false`.
 
-#include "collector.h"
+#include <datadog/collector.h>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/optional.h b/src/datadog/optional.h
index ae1deb7c..24a98e0b 100644
--- a/src/datadog/optional.h
+++ b/src/datadog/optional.h
@@ -28,7 +28,7 @@
 #ifdef DD_USE_ABSEIL_FOR_ENVOY
 // Abseil examples, including usage in Envoy, include Abseil headers in quoted
 // style instead of angle bracket style, per Bazel's default build behavior.
-#include "absl/types/optional.h"
+#include <datadog/absl/types/optional.h>
 #else
 #include <optional>
 #endif  // defined DD_USE_ABSEIL_FOR_ENVOY
diff --git a/src/datadog/parse_util.cpp b/src/datadog/parse_util.cpp
index b444cd8d..b397a0af 100644
--- a/src/datadog/parse_util.cpp
+++ b/src/datadog/parse_util.cpp
@@ -1,4 +1,6 @@
-#include "parse_util.h"
+#include <datadog/error.h>
+#include <datadog/parse_util.h>
+#include <datadog/string_util.h>
 
 #include <algorithm>
 #include <cctype>
@@ -8,9 +10,6 @@
 #include <sstream>
 #include <string>
 
-#include "error.h"
-#include "string_util.h"
-
 namespace datadog {
 namespace tracing {
 namespace {
diff --git a/src/datadog/parse_util.h b/src/datadog/parse_util.h
index c8e4e83c..c1dbd484 100644
--- a/src/datadog/parse_util.h
+++ b/src/datadog/parse_util.h
@@ -2,14 +2,14 @@
 
 // This component provides parsing-related miscellanea.
 
+#include <datadog/expected.h>
+#include <datadog/string_view.h>
+
 #include <cstdint>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include "expected.h"
-#include "string_view.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/platform_util.cpp b/src/datadog/platform_util.cpp
index 600f4309..2194461b 100644
--- a/src/datadog/platform_util.cpp
+++ b/src/datadog/platform_util.cpp
@@ -1,4 +1,4 @@
-#include "platform_util.h"
+#include <datadog/platform_util.h>
 
 // clang-format off
 #if defined(__x86_64__) || defined(_M_X64)
diff --git a/src/datadog/propagation_style.cpp b/src/datadog/propagation_style.cpp
index 19241374..751ce688 100644
--- a/src/datadog/propagation_style.cpp
+++ b/src/datadog/propagation_style.cpp
@@ -1,9 +1,8 @@
-#include "propagation_style.h"
+#include <datadog/propagation_style.h>
+#include <datadog/string_util.h>
 
 #include <cassert>
-
-#include "json.hpp"
-#include "string_util.h"
+#include <datadog/json.hpp>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/propagation_style.h b/src/datadog/propagation_style.h
index 47958169..6a8aa311 100644
--- a/src/datadog/propagation_style.h
+++ b/src/datadog/propagation_style.h
@@ -5,11 +5,11 @@
 // one `std::vector<PropagationStyle>` for extraction and another for injection.
 // See `tracer_config.h`.
 
-#include <vector>
+#include <datadog/optional.h>
+#include <datadog/string_view.h>
 
-#include "json_fwd.hpp"
-#include "optional.h"
-#include "string_view.h"
+#include <datadog/json_fwd.hpp>
+#include <vector>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/random.cpp b/src/datadog/random.cpp
index 3125df04..4352e661 100644
--- a/src/datadog/random.cpp
+++ b/src/datadog/random.cpp
@@ -1,11 +1,10 @@
-#include "random.h"
+#include <datadog/hex.h>
+#include <datadog/platform_util.h>
+#include <datadog/random.h>
 
 #include <bitset>
 #include <random>
 
-#include "hex.h"
-#include "platform_util.h"
-
 namespace datadog {
 namespace tracing {
 namespace {
diff --git a/src/datadog/rate.cpp b/src/datadog/rate.cpp
index 22df57a8..4632ff9a 100644
--- a/src/datadog/rate.cpp
+++ b/src/datadog/rate.cpp
@@ -1,4 +1,4 @@
-#include "rate.h"
+#include <datadog/rate.h>
 
 #include <string>
 
diff --git a/src/datadog/rate.h b/src/datadog/rate.h
index f72b407b..c8daee20 100644
--- a/src/datadog/rate.h
+++ b/src/datadog/rate.h
@@ -8,9 +8,9 @@
 // zero value. The static member functions `Rate::one` and `Rate::zero` are
 // provided for convenience.
 
-#include <variant>
+#include <datadog/expected.h>
 
-#include "expected.h"
+#include <variant>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/remote_config/listener.h b/src/datadog/remote_config/listener.h
index 1ece2968..5ef914a8 100644
--- a/src/datadog/remote_config/listener.h
+++ b/src/datadog/remote_config/listener.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <string>
+#include <datadog/optional.h>
+#include <datadog/remote_config/capability.h>
+#include <datadog/remote_config/product.h>
 
-#include "../optional.h"
-#include "capability.h"
-#include "product.h"
+#include <string>
 
 namespace datadog {
 namespace remote_config {
diff --git a/src/datadog/remote_config/product.h b/src/datadog/remote_config/product.h
index 676606c1..c44e7f27 100644
--- a/src/datadog/remote_config/product.h
+++ b/src/datadog/remote_config/product.h
@@ -1,12 +1,12 @@
 #pragma once
 
+#include <datadog/string_util.h>
+#include <datadog/string_view.h>
+
 #include <cassert>
 #include <cstdint>
 #include <string>
 
-#include "../string_util.h"
-#include "../string_view.h"
-
 namespace datadog {
 namespace remote_config {
 
diff --git a/src/datadog/remote_config/remote_config.cpp b/src/datadog/remote_config/remote_config.cpp
index 4419757d..1c6a2424 100644
--- a/src/datadog/remote_config/remote_config.cpp
+++ b/src/datadog/remote_config/remote_config.cpp
@@ -1,17 +1,16 @@
-#include "remote_config.h"
+#include <datadog/base64.h>
+#include <datadog/random.h>
+#include <datadog/remote_config.h>
+#include <datadog/remote_config/capability.h>
+#include <datadog/remote_config/listener.h>
+#include <datadog/remote_config/product.h>
+#include <datadog/string_view.h>
 
 #include <cassert>
+#include <datadog/json.hpp>
 #include <regex>
 #include <unordered_set>
 
-#include "../base64.h"
-#include "../json.hpp"
-#include "../random.h"
-#include "../string_view.h"
-#include "capability.h"
-#include "listener.h"
-#include "product.h"
-
 using namespace datadog::tracing;
 using namespace nlohmann::literals;
 
diff --git a/src/datadog/remote_config/remote_config.h b/src/datadog/remote_config/remote_config.h
index 76c61b20..7373aaba 100644
--- a/src/datadog/remote_config/remote_config.h
+++ b/src/datadog/remote_config/remote_config.h
@@ -12,20 +12,20 @@
 // It interacts with the `ConfigManager` to seamlessly apply or revert
 // configurations based on responses received from the remote source.
 
+#include <datadog/logger.h>
+#include <datadog/optional.h>
+#include <datadog/remote_config/listener.h>
+#include <datadog/runtime_id.h>
+#include <datadog/string_view.h>
+#include <datadog/trace_sampler_config.h>
+#include <datadog/tracer_signature.h>
+
 #include <array>
 #include <cstdint>
 #include <memory>
 #include <set>
 #include <string>
 
-#include "../logger.h"
-#include "../optional.h"
-#include "../runtime_id.h"
-#include "../string_view.h"
-#include "../trace_sampler_config.h"
-#include "../tracer_signature.h"
-#include "listener.h"
-
 namespace datadog {
 namespace remote_config {
 
diff --git a/src/datadog/runtime_id.cpp b/src/datadog/runtime_id.cpp
index 22671690..bcfcbc27 100644
--- a/src/datadog/runtime_id.cpp
+++ b/src/datadog/runtime_id.cpp
@@ -1,6 +1,5 @@
-#include "runtime_id.h"
-
-#include "random.h"
+#include <datadog/random.h>
+#include <datadog/runtime_id.h>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/sampling_decision.h b/src/datadog/sampling_decision.h
index 9503b0d5..2d79b828 100644
--- a/src/datadog/sampling_decision.h
+++ b/src/datadog/sampling_decision.h
@@ -4,9 +4,9 @@
 // keep/drop sampling decision (for either trace sampling or span sampling) and
 // contains supporting information about the reason for the decision.
 
-#include "optional.h"
-#include "rate.h"
-#include "sampling_mechanism.h"
+#include <datadog/optional.h>
+#include <datadog/rate.h>
+#include <datadog/sampling_mechanism.h>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/sampling_priority.h b/src/datadog/sampling_priority.h
index b597dd9b..d80979c6 100644
--- a/src/datadog/sampling_priority.h
+++ b/src/datadog/sampling_priority.h
@@ -11,7 +11,7 @@
 // value does not denote any relationship among the different kinds of sampling
 // decisions.
 
-#include "sampling_mechanism.h"
+#include <datadog/sampling_mechanism.h>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/sampling_util.h b/src/datadog/sampling_util.h
index 162c571b..1c74d8ac 100644
--- a/src/datadog/sampling_util.h
+++ b/src/datadog/sampling_util.h
@@ -3,11 +3,11 @@
 // This component provides sampling-related miscellanea.  It's used by both
 // `TraceSampler` and `SpanSampler`.
 
+#include <datadog/rate.h>
+
 #include <cstdint>
 #include <limits>
 
-#include "rate.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/span.cpp b/src/datadog/span.cpp
index 3522923b..9d04a018 100644
--- a/src/datadog/span.cpp
+++ b/src/datadog/span.cpp
@@ -1,16 +1,15 @@
-#include "span.h"
+#include <datadog/dict_writer.h>
+#include <datadog/optional.h>
+#include <datadog/span.h>
+#include <datadog/span_config.h>
+#include <datadog/span_data.h>
+#include <datadog/string_view.h>
+#include <datadog/tags.h>
+#include <datadog/trace_segment.h>
 
 #include <cassert>
 #include <string>
 
-#include "dict_writer.h"
-#include "optional.h"
-#include "span_config.h"
-#include "span_data.h"
-#include "string_view.h"
-#include "tags.h"
-#include "trace_segment.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/span.h b/src/datadog/span.h
index 803658d2..b6a5c4f7 100644
--- a/src/datadog/span.h
+++ b/src/datadog/span.h
@@ -40,17 +40,17 @@
 // A `Span` is finished when it is destroyed.  The end time can be overridden
 // via the `set_end_time` member function prior to the span's destruction.
 
+#include <datadog/clock.h>
+#include <datadog/error.h>
+#include <datadog/optional.h>
+#include <datadog/string_view.h>
+#include <datadog/trace_id.h>
+
 #include <chrono>
 #include <cstdint>
 #include <functional>
 #include <memory>
 
-#include "clock.h"
-#include "error.h"
-#include "optional.h"
-#include "string_view.h"
-#include "trace_id.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/span_config.h b/src/datadog/span_config.h
index 3fb0fc1d..91e93451 100644
--- a/src/datadog/span_config.h
+++ b/src/datadog/span_config.h
@@ -13,13 +13,13 @@
 // when no corresponding property is specified in a `SpanConfig` argument.
 // See `SpanData::apply_config`.
 
+#include <datadog/clock.h>
+#include <datadog/optional.h>
+
 #include <string>
 #include <unordered_map>
 #include <variant>
 
-#include "clock.h"
-#include "optional.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/span_data.cpp b/src/datadog/span_data.cpp
index e575285d..76f48d69 100644
--- a/src/datadog/span_data.cpp
+++ b/src/datadog/span_data.cpp
@@ -1,15 +1,14 @@
-#include "span_data.h"
+#include <datadog/error.h>
+#include <datadog/msgpack.h>
+#include <datadog/span_config.h>
+#include <datadog/span_data.h>
+#include <datadog/span_defaults.h>
+#include <datadog/string_view.h>
+#include <datadog/tags.h>
 
 #include <cassert>
 #include <cstddef>
 
-#include "error.h"
-#include "msgpack.h"
-#include "span_config.h"
-#include "span_defaults.h"
-#include "string_view.h"
-#include "tags.h"
-
 namespace datadog {
 namespace tracing {
 namespace {
diff --git a/src/datadog/span_data.h b/src/datadog/span_data.h
index e5a7476f..7a3ba296 100644
--- a/src/datadog/span_data.h
+++ b/src/datadog/span_data.h
@@ -3,18 +3,18 @@
 // This component provides a `struct`, `SpanData`, that contains all data fields
 // relevant to `Span`. `SpanData` is what is consumed by `Collector`.
 
+#include <datadog/clock.h>
+#include <datadog/expected.h>
+#include <datadog/optional.h>
+#include <datadog/string_view.h>
+#include <datadog/trace_id.h>
+
 #include <cstddef>
 #include <memory>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include "clock.h"
-#include "expected.h"
-#include "optional.h"
-#include "string_view.h"
-#include "trace_id.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/span_defaults.cpp b/src/datadog/span_defaults.cpp
index 387eaf54..d5c3eea3 100644
--- a/src/datadog/span_defaults.cpp
+++ b/src/datadog/span_defaults.cpp
@@ -1,6 +1,6 @@
-#include "span_defaults.h"
+#include <datadog/span_defaults.h>
 
-#include "json.hpp"
+#include <datadog/json.hpp>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/span_defaults.h b/src/datadog/span_defaults.h
index 1c9b4fd2..7652413a 100644
--- a/src/datadog/span_defaults.h
+++ b/src/datadog/span_defaults.h
@@ -4,11 +4,10 @@
 // properties that are not otherwise specified in a `SpanConfig`.
 // `SpanDefaults` are specified as the `defaults` property of `TracerConfig`.
 
+#include <datadog/json_fwd.hpp>
 #include <string>
 #include <unordered_map>
 
-#include "json_fwd.hpp"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/span_matcher.cpp b/src/datadog/span_matcher.cpp
index e9020361..6ea8d47b 100644
--- a/src/datadog/span_matcher.cpp
+++ b/src/datadog/span_matcher.cpp
@@ -1,12 +1,11 @@
-#include "span_matcher.h"
+#include <datadog/error.h>
+#include <datadog/glob.h>
+#include <datadog/optional.h>
+#include <datadog/span_data.h>
+#include <datadog/span_matcher.h>
 
 #include <algorithm>
-
-#include "error.h"
-#include "glob.h"
-#include "json.hpp"
-#include "optional.h"
-#include "span_data.h"
+#include <datadog/json.hpp>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/span_matcher.h b/src/datadog/span_matcher.h
index ab70c91e..b8ae2bcc 100644
--- a/src/datadog/span_matcher.h
+++ b/src/datadog/span_matcher.h
@@ -9,12 +9,12 @@
 //
 // `SpanMatcher` is composed of glob patterns. See `glob.h`.
 
+#include <datadog/expected.h>
+
+#include <datadog/json_fwd.hpp>
 #include <string>
 #include <unordered_map>
 
-#include "expected.h"
-#include "json_fwd.hpp"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/span_sampler.cpp b/src/datadog/span_sampler.cpp
index 860c85fc..dfebb521 100644
--- a/src/datadog/span_sampler.cpp
+++ b/src/datadog/span_sampler.cpp
@@ -1,10 +1,10 @@
-#include "span_sampler.h"
+#include <datadog/sampling_mechanism.h>
+#include <datadog/sampling_priority.h>
+#include <datadog/sampling_util.h>
+#include <datadog/span_data.h>
+#include <datadog/span_sampler.h>
 
-#include "json.hpp"
-#include "sampling_mechanism.h"
-#include "sampling_priority.h"
-#include "sampling_util.h"
-#include "span_data.h"
+#include <datadog/json.hpp>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/span_sampler.h b/src/datadog/span_sampler.h
index f99717a7..a529c6d7 100644
--- a/src/datadog/span_sampler.h
+++ b/src/datadog/span_sampler.h
@@ -18,15 +18,15 @@
 // See `span_matcher.h` for a description of how spans are matched by span
 // sampling rules.
 
+#include <datadog/clock.h>
+#include <datadog/limiter.h>
+#include <datadog/sampling_decision.h>
+#include <datadog/span_sampler_config.h>
+
+#include <datadog/json_fwd.hpp>
 #include <memory>
 #include <mutex>
 
-#include "clock.h"
-#include "json_fwd.hpp"
-#include "limiter.h"
-#include "sampling_decision.h"
-#include "span_sampler_config.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/span_sampler_config.cpp b/src/datadog/span_sampler_config.cpp
index 38a33c11..20245459 100644
--- a/src/datadog/span_sampler_config.cpp
+++ b/src/datadog/span_sampler_config.cpp
@@ -1,14 +1,13 @@
-#include "span_sampler_config.h"
+#include <datadog/environment.h>
+#include <datadog/expected.h>
+#include <datadog/span_sampler_config.h>
 
 #include <cmath>
+#include <datadog/json.hpp>
 #include <fstream>
 #include <sstream>
 #include <unordered_set>
 
-#include "environment.h"
-#include "expected.h"
-#include "json.hpp"
-
 namespace datadog {
 namespace tracing {
 namespace {
diff --git a/src/datadog/span_sampler_config.h b/src/datadog/span_sampler_config.h
index 7061c410..e3040200 100644
--- a/src/datadog/span_sampler_config.h
+++ b/src/datadog/span_sampler_config.h
@@ -7,17 +7,17 @@
 // `SpanSamplerConfig` is specified as the `span_sampler` property of
 // `TracerConfig`.
 
+#include <datadog/config.h>
+#include <datadog/expected.h>
+#include <datadog/logger.h>
+#include <datadog/optional.h>
+#include <datadog/rate.h>
+#include <datadog/span_matcher.h>
+
+#include <datadog/json_fwd.hpp>
 #include <unordered_map>
 #include <vector>
 
-#include "config.h"
-#include "expected.h"
-#include "json_fwd.hpp"
-#include "logger.h"
-#include "optional.h"
-#include "rate.h"
-#include "span_matcher.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/string_util.cpp b/src/datadog/string_util.cpp
index 49607b13..9647323c 100644
--- a/src/datadog/string_util.cpp
+++ b/src/datadog/string_util.cpp
@@ -1,4 +1,4 @@
-#include "string_util.h"
+#include <datadog/string_util.h>
 
 #include <algorithm>
 #include <iomanip>
diff --git a/src/datadog/string_util.h b/src/datadog/string_util.h
index 9775df5e..4274859f 100644
--- a/src/datadog/string_util.h
+++ b/src/datadog/string_util.h
@@ -1,11 +1,11 @@
 #pragma once
 
+#include <datadog/propagation_style.h>
+#include <datadog/string_view.h>
+
 #include <string>
 #include <unordered_map>
 
-#include "propagation_style.h"
-#include "string_view.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/string_view.h b/src/datadog/string_view.h
index 5e20c17c..12370122 100644
--- a/src/datadog/string_view.h
+++ b/src/datadog/string_view.h
@@ -30,7 +30,7 @@
 #ifdef DD_USE_ABSEIL_FOR_ENVOY
 // Abseil examples, including usage in Envoy, include Abseil headers in quoted
 // style instead of angle bracket style, per Bazel's default build behavior.
-#include "absl/strings/string_view.h"
+#include <datadog/absl/strings/string_view.h>
 #else
 #include <string_view>
 #endif  // defined DD_USE_ABSEIL_FOR_ENVOY
diff --git a/src/datadog/tag_propagation.cpp b/src/datadog/tag_propagation.cpp
index 2d41a4a6..1b9ca95f 100644
--- a/src/datadog/tag_propagation.cpp
+++ b/src/datadog/tag_propagation.cpp
@@ -1,12 +1,11 @@
-#include "tag_propagation.h"
+#include <datadog/error.h>
+#include <datadog/string_util.h>
+#include <datadog/tag_propagation.h>
 
 #include <algorithm>
 #include <cstddef>
 #include <sstream>
 
-#include "error.h"
-#include "string_util.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/tag_propagation.h b/src/datadog/tag_propagation.h
index 99666856..21169139 100644
--- a/src/datadog/tag_propagation.h
+++ b/src/datadog/tag_propagation.h
@@ -11,13 +11,13 @@
 // This component provides serialization and deserialization routines for the
 // "x-datadog-tags" header format.
 
+#include <datadog/expected.h>
+#include <datadog/string_view.h>
+
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "expected.h"
-#include "string_view.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/tags.cpp b/src/datadog/tags.cpp
index 32e1d4d5..4b4279e8 100644
--- a/src/datadog/tags.cpp
+++ b/src/datadog/tags.cpp
@@ -1,4 +1,4 @@
-#include "tags.h"
+#include <datadog/tags.h>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/tags.h b/src/datadog/tags.h
index 63f5020f..cc7966e5 100644
--- a/src/datadog/tags.h
+++ b/src/datadog/tags.h
@@ -3,10 +3,10 @@
 // This component provides symbols for all span tag names that have special
 // meaning.
 
-#include <string>
+#include <datadog/string_util.h>
+#include <datadog/string_view.h>
 
-#include "string_util.h"
-#include "string_view.h"
+#include <string>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/threaded_event_scheduler.cpp b/src/datadog/threaded_event_scheduler.cpp
index 12e45d1f..d57b35c4 100644
--- a/src/datadog/threaded_event_scheduler.cpp
+++ b/src/datadog/threaded_event_scheduler.cpp
@@ -1,9 +1,8 @@
-#include "threaded_event_scheduler.h"
+#include <datadog/threaded_event_scheduler.h>
 
+#include <datadog/json.hpp>
 #include <thread>
 
-#include "json.hpp"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/threaded_event_scheduler.h b/src/datadog/threaded_event_scheduler.h
index 176cb2a1..4abb57ea 100644
--- a/src/datadog/threaded_event_scheduler.h
+++ b/src/datadog/threaded_event_scheduler.h
@@ -5,6 +5,8 @@
 // thread. It is the default implementation used if
 // `DatadogAgent::event_scheduler` is not specified.
 
+#include <datadog/event_scheduler.h>
+
 #include <chrono>
 #include <condition_variable>
 #include <functional>
@@ -14,8 +16,6 @@
 #include <thread>
 #include <vector>
 
-#include "event_scheduler.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/trace_id.cpp b/src/datadog/trace_id.cpp
index b8ba90f1..5f8a5989 100644
--- a/src/datadog/trace_id.cpp
+++ b/src/datadog/trace_id.cpp
@@ -1,8 +1,7 @@
-#include "trace_id.h"
-
-#include "hex.h"
-#include "parse_util.h"
-#include "string_util.h"
+#include <datadog/hex.h>
+#include <datadog/parse_util.h>
+#include <datadog/string_util.h>
+#include <datadog/trace_id.h>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/trace_id.h b/src/datadog/trace_id.h
index 334ba08c..5c05bb11 100644
--- a/src/datadog/trace_id.h
+++ b/src/datadog/trace_id.h
@@ -5,12 +5,12 @@
 // `TraceID` is 128 bits wide, though in some contexts only the lower 64 bits
 // are used.
 
+#include <datadog/expected.h>
+#include <datadog/string_view.h>
+
 #include <cstdint>
 #include <string>
 
-#include "expected.h"
-#include "string_view.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/trace_sampler.cpp b/src/datadog/trace_sampler.cpp
index 7688e237..3cd12c26 100644
--- a/src/datadog/trace_sampler.cpp
+++ b/src/datadog/trace_sampler.cpp
@@ -1,17 +1,16 @@
-#include "trace_sampler.h"
+#include <datadog/collector_response.h>
+#include <datadog/sampling_decision.h>
+#include <datadog/sampling_priority.h>
+#include <datadog/sampling_util.h>
+#include <datadog/span_data.h>
+#include <datadog/trace_sampler.h>
 
 #include <algorithm>
 #include <cassert>
 #include <cstdint>
+#include <datadog/json.hpp>
 #include <limits>
 
-#include "collector_response.h"
-#include "json.hpp"
-#include "sampling_decision.h"
-#include "sampling_priority.h"
-#include "sampling_util.h"
-#include "span_data.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/trace_sampler.h b/src/datadog/trace_sampler.h
index 30a1259c..6f763a73 100644
--- a/src/datadog/trace_sampler.h
+++ b/src/datadog/trace_sampler.h
@@ -83,17 +83,17 @@
 // configured via `TraceSamplerConfig::max_per_second` or the
 // `DD_TRACE_RATE_LIMIT` environment variable.
 
+#include <datadog/clock.h>
+#include <datadog/limiter.h>
+#include <datadog/optional.h>
+#include <datadog/rate.h>
+#include <datadog/trace_sampler_config.h>
+
+#include <datadog/json_fwd.hpp>
 #include <mutex>
 #include <string>
 #include <unordered_map>
 
-#include "clock.h"
-#include "json_fwd.hpp"
-#include "limiter.h"
-#include "optional.h"
-#include "rate.h"
-#include "trace_sampler_config.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/trace_sampler_config.cpp b/src/datadog/trace_sampler_config.cpp
index 8c0b0dcc..ea1d1cfb 100644
--- a/src/datadog/trace_sampler_config.cpp
+++ b/src/datadog/trace_sampler_config.cpp
@@ -1,13 +1,12 @@
-#include "trace_sampler_config.h"
+#include <datadog/environment.h>
+#include <datadog/parse_util.h>
+#include <datadog/string_util.h>
+#include <datadog/trace_sampler_config.h>
 
 #include <cmath>
+#include <datadog/json.hpp>
 #include <unordered_set>
 
-#include "environment.h"
-#include "json.hpp"
-#include "parse_util.h"
-#include "string_util.h"
-
 namespace datadog {
 namespace tracing {
 namespace {
diff --git a/src/datadog/trace_sampler_config.h b/src/datadog/trace_sampler_config.h
index 5dae211a..27c1f4d1 100644
--- a/src/datadog/trace_sampler_config.h
+++ b/src/datadog/trace_sampler_config.h
@@ -7,17 +7,17 @@
 // `TraceSamplerConfig` is specified as the `trace_sampler` property of
 // `TracerConfig`.
 
+#include <datadog/config.h>
+#include <datadog/expected.h>
+#include <datadog/optional.h>
+#include <datadog/rate.h>
+#include <datadog/sampling_mechanism.h>
+#include <datadog/span_matcher.h>
+
+#include <datadog/json_fwd.hpp>
 #include <unordered_map>
 #include <vector>
 
-#include "config.h"
-#include "expected.h"
-#include "json_fwd.hpp"
-#include "optional.h"
-#include "rate.h"
-#include "sampling_mechanism.h"
-#include "span_matcher.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/trace_segment.cpp b/src/datadog/trace_segment.cpp
index 6c63e553..23f2d049 100644
--- a/src/datadog/trace_segment.cpp
+++ b/src/datadog/trace_segment.cpp
@@ -1,31 +1,30 @@
-#include "trace_segment.h"
+#include <datadog/collector.h>
+#include <datadog/collector_response.h>
+#include <datadog/dict_reader.h>
+#include <datadog/dict_writer.h>
+#include <datadog/error.h>
+#include <datadog/hex.h>
+#include <datadog/injection_options.h>
+#include <datadog/logger.h>
+#include <datadog/optional.h>
+#include <datadog/platform_util.h>
+#include <datadog/random.h>
+#include <datadog/span_data.h>
+#include <datadog/span_defaults.h>
+#include <datadog/span_sampler.h>
+#include <datadog/tag_propagation.h>
+#include <datadog/tags.h>
+#include <datadog/trace_sampler.h>
+#include <datadog/trace_segment.h>
+#include <datadog/w3c_propagation.h>
 
 #include <cassert>
+#include <datadog/json.hpp>
 #include <string>
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
-#include "collector.h"
-#include "collector_response.h"
-#include "dict_reader.h"
-#include "dict_writer.h"
-#include "error.h"
-#include "hex.h"
-#include "injection_options.h"
-#include "json.hpp"
-#include "logger.h"
-#include "optional.h"
-#include "platform_util.h"
-#include "random.h"
-#include "span_data.h"
-#include "span_defaults.h"
-#include "span_sampler.h"
-#include "tag_propagation.h"
-#include "tags.h"
-#include "trace_sampler.h"
-#include "w3c_propagation.h"
-
 namespace datadog {
 namespace tracing {
 namespace {
diff --git a/src/datadog/trace_segment.h b/src/datadog/trace_segment.h
index 392d5c7d..3f008666 100644
--- a/src/datadog/trace_segment.h
+++ b/src/datadog/trace_segment.h
@@ -26,21 +26,21 @@
 // When all of the `Span`s associated with `TraceSegment` have been destroyed,
 // the `TraceSegment` submits them in a payload to a `Collector`.
 
+#include <datadog/config_manager.h>
+#include <datadog/expected.h>
+#include <datadog/metrics.h>
+#include <datadog/optional.h>
+#include <datadog/propagation_style.h>
+#include <datadog/sampling_decision.h>
+#include <datadog/sampling_priority.h>
+#include <datadog/tracer_telemetry.h>
+
 #include <cstddef>
 #include <memory>
 #include <mutex>
 #include <utility>
 #include <vector>
 
-#include "config_manager.h"
-#include "expected.h"
-#include "metrics.h"
-#include "optional.h"
-#include "propagation_style.h"
-#include "sampling_decision.h"
-#include "sampling_priority.h"
-#include "tracer_telemetry.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/tracer.cpp b/src/datadog/tracer.cpp
index da5eb525..a681bdd3 100644
--- a/src/datadog/tracer.cpp
+++ b/src/datadog/tracer.cpp
@@ -1,31 +1,30 @@
-#include "tracer.h"
+#include <datadog/datadog_agent.h>
+#include <datadog/dict_reader.h>
+#include <datadog/environment.h>
+#include <datadog/extracted_data.h>
+#include <datadog/extraction_util.h>
+#include <datadog/hex.h>
+#include <datadog/logger.h>
+#include <datadog/parse_util.h>
+#include <datadog/platform_util.h>
+#include <datadog/runtime_id.h>
+#include <datadog/span.h>
+#include <datadog/span_config.h>
+#include <datadog/span_data.h>
+#include <datadog/span_sampler.h>
+#include <datadog/tag_propagation.h>
+#include <datadog/tags.h>
+#include <datadog/trace_sampler.h>
+#include <datadog/trace_sampler_config.h>
+#include <datadog/trace_segment.h>
+#include <datadog/tracer.h>
+#include <datadog/tracer_signature.h>
+#include <datadog/version.h>
+#include <datadog/w3c_propagation.h>
 
 #include <algorithm>
 #include <cassert>
-
-#include "datadog_agent.h"
-#include "dict_reader.h"
-#include "environment.h"
-#include "extracted_data.h"
-#include "extraction_util.h"
-#include "hex.h"
-#include "json.hpp"
-#include "logger.h"
-#include "parse_util.h"
-#include "platform_util.h"
-#include "runtime_id.h"
-#include "span.h"
-#include "span_config.h"
-#include "span_data.h"
-#include "span_sampler.h"
-#include "tag_propagation.h"
-#include "tags.h"
-#include "trace_sampler.h"
-#include "trace_sampler_config.h"
-#include "trace_segment.h"
-#include "tracer_signature.h"
-#include "version.h"
-#include "w3c_propagation.h"
+#include <datadog/json.hpp>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/tracer.h b/src/datadog/tracer.h
index 4164d981..57303dd8 100644
--- a/src/datadog/tracer.h
+++ b/src/datadog/tracer.h
@@ -10,21 +10,21 @@
 // obtained from a `TracerConfig` via the `finalize_config` function.  See
 // `tracer_config.h`.
 
+#include <datadog/clock.h>
+#include <datadog/config_manager.h>
+#include <datadog/error.h>
+#include <datadog/expected.h>
+#include <datadog/id_generator.h>
+#include <datadog/optional.h>
+#include <datadog/span.h>
+#include <datadog/tracer_config.h>
+#include <datadog/tracer_signature.h>
+#include <datadog/tracer_telemetry.h>
+
 #include <cstddef>
+#include <datadog/json_fwd.hpp>
 #include <memory>
 
-#include "clock.h"
-#include "config_manager.h"
-#include "error.h"
-#include "expected.h"
-#include "id_generator.h"
-#include "json_fwd.hpp"
-#include "optional.h"
-#include "span.h"
-#include "tracer_config.h"
-#include "tracer_signature.h"
-#include "tracer_telemetry.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/tracer_config.cpp b/src/datadog/tracer_config.cpp
index 95e52a27..7f9d0960 100644
--- a/src/datadog/tracer_config.cpp
+++ b/src/datadog/tracer_config.cpp
@@ -1,22 +1,21 @@
-#include "tracer_config.h"
+#include <datadog/cerr_logger.h>
+#include <datadog/datadog_agent.h>
+#include <datadog/environment.h>
+#include <datadog/parse_util.h>
+#include <datadog/string_util.h>
+#include <datadog/string_view.h>
+#include <datadog/tracer_config.h>
 
 #include <algorithm>
 #include <cassert>
 #include <cctype>
 #include <cstddef>
+#include <datadog/json.hpp>
 #include <string>
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
 
-#include "cerr_logger.h"
-#include "datadog_agent.h"
-#include "environment.h"
-#include "json.hpp"
-#include "parse_util.h"
-#include "string_util.h"
-#include "string_view.h"
-
 namespace datadog {
 namespace tracing {
 namespace {
diff --git a/src/datadog/tracer_config.h b/src/datadog/tracer_config.h
index 49cf6ab2..487d2d1e 100644
--- a/src/datadog/tracer_config.h
+++ b/src/datadog/tracer_config.h
@@ -4,22 +4,22 @@
 // `Tracer`.  `Tracer` is instantiated with a `FinalizedTracerConfig`, which
 // must be obtained from the result of a call to `finalize_config`.
 
+#include <datadog/clock.h>
+#include <datadog/config.h>
+#include <datadog/datadog_agent_config.h>
+#include <datadog/error.h>
+#include <datadog/expected.h>
+#include <datadog/propagation_style.h>
+#include <datadog/runtime_id.h>
+#include <datadog/span_defaults.h>
+#include <datadog/span_sampler_config.h>
+#include <datadog/trace_sampler_config.h>
+
 #include <cstddef>
 #include <memory>
 #include <variant>
 #include <vector>
 
-#include "clock.h"
-#include "config.h"
-#include "datadog_agent_config.h"
-#include "error.h"
-#include "expected.h"
-#include "propagation_style.h"
-#include "runtime_id.h"
-#include "span_defaults.h"
-#include "span_sampler_config.h"
-#include "trace_sampler_config.h"
-
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/tracer_signature.h b/src/datadog/tracer_signature.h
index 042b4d37..545e9147 100644
--- a/src/datadog/tracer_signature.h
+++ b/src/datadog/tracer_signature.h
@@ -19,11 +19,11 @@
 //    polling the Datadog Agent. See
 //    `RemoteConfigurationManager::process_response` in `remote_config.h`.
 
-#include <string>
+#include <datadog/runtime_id.h>
+#include <datadog/string_view.h>
+#include <datadog/version.h>
 
-#include "runtime_id.h"
-#include "string_view.h"
-#include "version.h"
+#include <string>
 
 #define DD_TRACE_STRINGIFY(ARG) DD_TRACE_STRINGIFY_HELPER(ARG)
 #define DD_TRACE_STRINGIFY_HELPER(ARG) #ARG
diff --git a/src/datadog/tracer_telemetry.cpp b/src/datadog/tracer_telemetry.cpp
index 57bdd1e2..761342b4 100644
--- a/src/datadog/tracer_telemetry.cpp
+++ b/src/datadog/tracer_telemetry.cpp
@@ -1,9 +1,8 @@
-#include "tracer_telemetry.h"
-
-#include "logger.h"
-#include "platform_util.h"
-#include "span_defaults.h"
-#include "version.h"
+#include <datadog/logger.h>
+#include <datadog/platform_util.h>
+#include <datadog/span_defaults.h>
+#include <datadog/tracer_telemetry.h>
+#include <datadog/version.h>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/tracer_telemetry.h b/src/datadog/tracer_telemetry.h
index f129ea84..63c57761 100644
--- a/src/datadog/tracer_telemetry.h
+++ b/src/datadog/tracer_telemetry.h
@@ -28,15 +28,15 @@
 //
 // `app-client-configuration-change` messages are sent as soon as the tracer
 // configuration has been updated by a Remote Configuration event.
-#include <vector>
+#include <datadog/clock.h>
+#include <datadog/config.h>
+#include <datadog/metrics.h>
+#include <datadog/platform_util.h>
+#include <datadog/runtime_id.h>
+#include <datadog/tracer_signature.h>
 
-#include "clock.h"
-#include "config.h"
-#include "json.hpp"
-#include "metrics.h"
-#include "platform_util.h"
-#include "runtime_id.h"
-#include "tracer_signature.h"
+#include <datadog/json.hpp>
+#include <vector>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/version.cpp b/src/datadog/version.cpp
index 562cd4e6..b8a0a4f6 100644
--- a/src/datadog/version.cpp
+++ b/src/datadog/version.cpp
@@ -1,4 +1,4 @@
-#include "version.h"
+#include <datadog/version.h>
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/w3c_propagation.cpp b/src/datadog/w3c_propagation.cpp
index bb3fcc0a..af2a73d8 100644
--- a/src/datadog/w3c_propagation.cpp
+++ b/src/datadog/w3c_propagation.cpp
@@ -1,4 +1,10 @@
-#include "w3c_propagation.h"
+#include <datadog/dict_reader.h>
+#include <datadog/hex.h>
+#include <datadog/parse_util.h>
+#include <datadog/propagation_style.h>
+#include <datadog/string_util.h>
+#include <datadog/tags.h>
+#include <datadog/w3c_propagation.h>
 
 #include <algorithm>
 #include <cassert>
@@ -6,13 +12,6 @@
 #include <regex>
 #include <utility>
 
-#include "dict_reader.h"
-#include "hex.h"
-#include "parse_util.h"
-#include "propagation_style.h"
-#include "string_util.h"
-#include "tags.h"
-
 namespace datadog {
 namespace tracing {
 namespace {
diff --git a/src/datadog/w3c_propagation.h b/src/datadog/w3c_propagation.h
index 5ab06b24..fd6c8e9b 100644
--- a/src/datadog/w3c_propagation.h
+++ b/src/datadog/w3c_propagation.h
@@ -4,15 +4,15 @@
 // in the `PropagationStyle::W3C` style. These functions decode and encode the
 // "traceparent" and "tracestate" HTTP request headers.
 
+#include <datadog/expected.h>
+#include <datadog/extracted_data.h>
+#include <datadog/optional.h>
+#include <datadog/trace_id.h>
+
 #include <cstdint>
 #include <string>
 #include <unordered_map>
 
-#include "expected.h"
-#include "extracted_data.h"
-#include "optional.h"
-#include "trace_id.h"
-
 namespace datadog {
 namespace tracing {