diff --git a/.clang-tidy b/.clang-tidy
index 9a30fbef54..db61b810c9 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -31,9 +31,12 @@ Checks: >
   -misc-unused-alias-decls,
   -misc-use-anonymous-namespace,
   cppcoreguidelines-*,
+  -cppcoreguidelines-owning-memory,
+  -cppcoreguidelines-avoid-do-while,
   -cppcoreguidelines-avoid-c-arrays,
   -cppcoreguidelines-avoid-magic-numbers,
   -cppcoreguidelines-init-variables,
   -cppcoreguidelines-macro-usage,
   -cppcoreguidelines-non-private-member-variables-in-classes,
+  -cppcoreguidelines-avoid-non-const-global-variables,
   -cppcoreguidelines-pro-*
\ No newline at end of file
diff --git a/.github/workflows/clang-tidy.yaml b/.github/workflows/clang-tidy.yaml
index 9e5f6c26db..612ff05270 100644
--- a/.github/workflows/clang-tidy.yaml
+++ b/.github/workflows/clang-tidy.yaml
@@ -68,7 +68,7 @@ jobs:
       - name: Run clang-tidy
         run: |
           cd build
-          make -j$(nproc) 2>&1 | tee -a clang-tidy.log || exit 1
+          make 2>&1 | tee -a clang-tidy.log || exit 1
 
       - uses: actions/upload-artifact@v4
         with:
diff --git a/.iwyu.imp b/.iwyu.imp
index 53fddd24aa..7ebbeae511 100644
--- a/.iwyu.imp
+++ b/.iwyu.imp
@@ -9,5 +9,8 @@
 
   # Local opentelemetry-cpp
 
+  { "include": ["<gtest/gtest-message.h>", "private", "<gtest/gtest.h>", "public"] },
+  { "include": ["<gtest/gtest-test-part.h>", "private", "<gtest/gtest.h>", "public"] },
+  { "include": ["<gtest/gtest_pred_impl.h>", "private", "<gtest/gtest.h>", "public"] },
 ]
 
diff --git a/api/include/opentelemetry/baggage/propagation/baggage_propagator.h b/api/include/opentelemetry/baggage/propagation/baggage_propagator.h
index 6de32882c0..d75409ed60 100644
--- a/api/include/opentelemetry/baggage/propagation/baggage_propagator.h
+++ b/api/include/opentelemetry/baggage/propagation/baggage_propagator.h
@@ -3,9 +3,15 @@
 
 #pragma once
 
+#include <memory>
+#include <string>
+
 #include "opentelemetry/baggage/baggage.h"
 #include "opentelemetry/baggage/baggage_context.h"
+#include "opentelemetry/context/context.h"
 #include "opentelemetry/context/propagation/text_map_propagator.h"
+#include "opentelemetry/nostd/function_ref.h"
+#include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
diff --git a/api/include/opentelemetry/common/key_value_iterable_view.h b/api/include/opentelemetry/common/key_value_iterable_view.h
index fb1a6ea019..e22fb6f06f 100644
--- a/api/include/opentelemetry/common/key_value_iterable_view.h
+++ b/api/include/opentelemetry/common/key_value_iterable_view.h
@@ -3,9 +3,14 @@
 
 #pragma once
 
+#include <stddef.h>
+#include <initializer_list>
 #include <iterator>
+#include <type_traits>
 #include <utility>
+#include <vector>
 
+#include "opentelemetry/common/attribute_value.h"
 #include "opentelemetry/common/key_value_iterable.h"
 #include "opentelemetry/nostd/function_ref.h"
 #include "opentelemetry/nostd/span.h"
diff --git a/api/include/opentelemetry/context/context.h b/api/include/opentelemetry/context/context.h
index cf5c9cd319..620ca51c8b 100644
--- a/api/include/opentelemetry/context/context.h
+++ b/api/include/opentelemetry/context/context.h
@@ -4,9 +4,12 @@
 #pragma once
 
 #include <cstring>
+#include <utility>
+
 #include "opentelemetry/context/context_value.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/nostd/variant.h"
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
diff --git a/api/include/opentelemetry/context/runtime_context.h b/api/include/opentelemetry/context/runtime_context.h
index cccc71e32f..73d4dcd908 100644
--- a/api/include/opentelemetry/context/runtime_context.h
+++ b/api/include/opentelemetry/context/runtime_context.h
@@ -3,8 +3,12 @@
 
 #pragma once
 
+#include <stddef.h>
+#include <algorithm>
+
 #include "opentelemetry/common/macros.h"
 #include "opentelemetry/context/context.h"
+#include "opentelemetry/context/context_value.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/nostd/unique_ptr.h"
diff --git a/api/include/opentelemetry/nostd/function_ref.h b/api/include/opentelemetry/nostd/function_ref.h
index 1064c966d7..6f0c2dd330 100644
--- a/api/include/opentelemetry/nostd/function_ref.h
+++ b/api/include/opentelemetry/nostd/function_ref.h
@@ -3,8 +3,10 @@
 
 #pragma once
 
-#include <memory>
+#include <iosfwd>
+#include <memory>  // IWYU pragma: keep
 #include <type_traits>
+#include <utility>
 
 #include "opentelemetry/version.h"
 
@@ -12,7 +14,7 @@ OPENTELEMETRY_BEGIN_NAMESPACE
 namespace nostd
 {
 template <class Sig>
-class function_ref;
+class function_ref;  // IWYU pragma: keep
 
 /**
  * Non-owning function reference that can be used as a more performant
diff --git a/api/include/opentelemetry/nostd/string_view.h b/api/include/opentelemetry/nostd/string_view.h
index 5ee86dce23..f0e5bd9e2a 100644
--- a/api/include/opentelemetry/nostd/string_view.h
+++ b/api/include/opentelemetry/nostd/string_view.h
@@ -12,13 +12,14 @@
 
 #if !defined(OPENTELEMETRY_HAVE_STD_STRING_VIEW)
 #  include <algorithm>
-#  include <cstddef>
 #  include <cstring>
+#  include <functional>
 #  include <ostream>
 #  include <stdexcept>
 #  include <string>
+#  include <type_traits>
+#  include <utility>
 
-#  include "opentelemetry/common/macros.h"
 #  include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
diff --git a/api/include/opentelemetry/nostd/variant.h b/api/include/opentelemetry/nostd/variant.h
index d0b2d96001..6f3837c588 100644
--- a/api/include/opentelemetry/nostd/variant.h
+++ b/api/include/opentelemetry/nostd/variant.h
@@ -54,7 +54,7 @@ OPENTELEMETRY_END_NAMESPACE
 #  ifdef HAVE_ABSEIL
 #    include "absl/types/variant.h"
 #  else
-#    include "./internal/absl/types/variant.h"
+#    include "opentelemetry/nostd/internal/absl/types/variant.h"
 #  endif
 
 #  ifdef _MSC_VER
diff --git a/api/include/opentelemetry/plugin/dynamic_load.h b/api/include/opentelemetry/plugin/dynamic_load.h
index 10b4a34af4..2da2713555 100644
--- a/api/include/opentelemetry/plugin/dynamic_load.h
+++ b/api/include/opentelemetry/plugin/dynamic_load.h
@@ -6,19 +6,19 @@
 #include <memory>
 #include <string>
 
+#include "opentelemetry/plugin/factory.h"
+#include "opentelemetry/version.h"
+
 #ifdef _WIN32
 #  include "opentelemetry/plugin/detail/dynamic_load_windows.h"  // IWYU pragma: export
 #else
 #  include "opentelemetry/plugin/detail/dynamic_load_unix.h"  // IWYU pragma: export
 #endif
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace plugin
 {
 
-class Factory;
-
 /**
  * Load an OpenTelemetry implementation as a plugin.
  * @param plugin the path to the plugin to load
diff --git a/api/include/opentelemetry/trace/noop.h b/api/include/opentelemetry/trace/noop.h
index 345c4ba0c9..fa0c7957df 100644
--- a/api/include/opentelemetry/trace/noop.h
+++ b/api/include/opentelemetry/trace/noop.h
@@ -7,15 +7,21 @@
 // This file is part of the internal implementation of OpenTelemetry. Nothing in this file should be
 // used directly. Please refer to span.h and tracer.h for documentation on these interfaces.
 
-#include <memory>
+#include <stdint.h>
+#include <utility>
 
-#include "opentelemetry/context/runtime_context.h"
+#include "opentelemetry/common/attribute_value.h"
+#include "opentelemetry/common/key_value_iterable.h"
+#include "opentelemetry/common/timestamp.h"
+#include "opentelemetry/context/context_value.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/nostd/unique_ptr.h"
 #include "opentelemetry/trace/span.h"
 #include "opentelemetry/trace/span_context.h"
 #include "opentelemetry/trace/span_context_kv_iterable.h"
+#include "opentelemetry/trace/span_metadata.h"
+#include "opentelemetry/trace/span_startoptions.h"
 #include "opentelemetry/trace/tracer.h"
 #include "opentelemetry/trace/tracer_provider.h"
 #include "opentelemetry/version.h"
diff --git a/api/include/opentelemetry/trace/provider.h b/api/include/opentelemetry/trace/provider.h
index d5a52a02f6..1439b579be 100644
--- a/api/include/opentelemetry/trace/provider.h
+++ b/api/include/opentelemetry/trace/provider.h
@@ -5,18 +5,16 @@
 
 #include <mutex>
 
-#include "opentelemetry/common/macros.h"
 #include "opentelemetry/common/spin_lock_mutex.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/trace/noop.h"
+#include "opentelemetry/trace/tracer_provider.h"
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace trace
 {
 
-class TracerProvider;
-
 /**
  * Stores the singleton global TracerProvider.
  */
diff --git a/api/include/opentelemetry/trace/scope.h b/api/include/opentelemetry/trace/scope.h
index 11ded4ab6c..20c415cc72 100644
--- a/api/include/opentelemetry/trace/scope.h
+++ b/api/include/opentelemetry/trace/scope.h
@@ -3,9 +3,11 @@
 
 #pragma once
 
+#include "opentelemetry/context/context.h"
 #include "opentelemetry/context/runtime_context.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/unique_ptr.h"
+#include "opentelemetry/trace/span.h"
 #include "opentelemetry/trace/span_metadata.h"
 #include "opentelemetry/version.h"
 
@@ -13,8 +15,6 @@ OPENTELEMETRY_BEGIN_NAMESPACE
 namespace trace
 {
 
-class Span;
-
 /**
  * Controls how long a span is active.
  *
diff --git a/api/include/opentelemetry/trace/span_context.h b/api/include/opentelemetry/trace/span_context.h
index 5fcab6e7ed..9403a74fb6 100644
--- a/api/include/opentelemetry/trace/span_context.h
+++ b/api/include/opentelemetry/trace/span_context.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include <stdint.h>
+
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/trace/span_id.h"
 #include "opentelemetry/trace/trace_flags.h"
diff --git a/api/include/opentelemetry/trace/trace_state.h b/api/include/opentelemetry/trace/trace_state.h
index f51410025a..753f48c99e 100644
--- a/api/include/opentelemetry/trace/trace_state.h
+++ b/api/include/opentelemetry/trace/trace_state.h
@@ -3,13 +3,14 @@
 
 #pragma once
 
-#include <cstdint>
+#include <ctype.h>
+#include <cstddef>
 #include <string>
+#include <vector>
 
 #include "opentelemetry/common/kv_properties.h"
 #include "opentelemetry/nostd/function_ref.h"
 #include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/nostd/unique_ptr.h"
 #include "opentelemetry/version.h"
diff --git a/api/test/baggage/baggage_benchmark.cc b/api/test/baggage/baggage_benchmark.cc
index 4ced142327..0786537cc0 100644
--- a/api/test/baggage/baggage_benchmark.cc
+++ b/api/test/baggage/baggage_benchmark.cc
@@ -1,11 +1,14 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <benchmark/benchmark.h>
+#include <stddef.h>
+#include <memory>
+#include <string>
+
 #include "opentelemetry/baggage/baggage.h"
 #include "opentelemetry/nostd/string_view.h"
-
-#include <benchmark/benchmark.h>
-#include <cstdint>
+#include "opentelemetry/nostd/utility.h"
 
 using namespace opentelemetry::baggage;
 namespace nostd = opentelemetry::nostd;
diff --git a/api/test/baggage/baggage_test.cc b/api/test/baggage/baggage_test.cc
index f29615c983..6f0347eef9 100644
--- a/api/test/baggage/baggage_test.cc
+++ b/api/test/baggage/baggage_test.cc
@@ -1,15 +1,17 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/nostd/string_view.h"
-
+#include <assert.h>
 #include <gtest/gtest.h>
+#include <stddef.h>
 #include <string>
 #include <vector>
 
 #include "opentelemetry/baggage/baggage.h"
+#include "opentelemetry/common/kv_properties.h"
+#include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/string_view.h"
 
-using namespace opentelemetry;
 using namespace opentelemetry::baggage;
 
 std::string header_with_custom_entries(size_t num_entries)
@@ -82,7 +84,8 @@ TEST(BaggageTest, ValidateExtractHeader)
   {
     auto baggage = Baggage::FromHeader(testcase.input);
     size_t index = 0;
-    baggage->GetAllEntries([&testcase, &index](nostd::string_view key, nostd::string_view value) {
+    baggage->GetAllEntries([&testcase, &index](opentelemetry::nostd::string_view key,
+                                               opentelemetry::nostd::string_view value) {
       EXPECT_EQ(key, testcase.keys[index]);
       EXPECT_EQ(value, testcase.values[index]);
       index++;
@@ -97,7 +100,7 @@ TEST(BaggageTest, ValidateExtractHeader)
   // Entries beyond threshold are dropped
   auto baggage = Baggage::FromHeader(header_with_custom_entries(Baggage::kMaxKeyValuePairs + 1));
   auto header  = baggage->ToHeader();
-  common::KeyValueStringTokenizer kv_str_tokenizer(header);
+  opentelemetry::common::KeyValueStringTokenizer kv_str_tokenizer(header);
   int expected_tokens = Baggage::kMaxKeyValuePairs;
   EXPECT_EQ(kv_str_tokenizer.NumTokens(), expected_tokens);
 
@@ -126,7 +129,7 @@ TEST(BaggageTest, ValidateInjectHeader)
 
   for (auto &testcase : testcases)
   {
-    nostd::shared_ptr<Baggage> baggage(new Baggage{});
+    opentelemetry::nostd::shared_ptr<Baggage> baggage(new Baggage{});
     for (size_t i = 0; i < testcase.keys.size(); i++)
     {
       baggage = baggage->Set(testcase.keys[i], testcase.values[i]);
@@ -202,17 +205,17 @@ TEST(BaggageTest, BaggageRemove)
 
 TEST(BaggageTest, BaggageGetAll)
 {
-  std::string baggage_header           = "k1=v1,k2=v2,k3=v3";
-  auto baggage                         = Baggage::FromHeader(baggage_header);
-  const int kNumPairs                  = 3;
-  nostd::string_view keys[kNumPairs]   = {"k1", "k2", "k3"};
-  nostd::string_view values[kNumPairs] = {"v1", "v2", "v3"};
-  size_t index                         = 0;
-  baggage->GetAllEntries(
-      [&keys, &values, &index](nostd::string_view key, nostd::string_view value) {
-        EXPECT_EQ(key, keys[index]);
-        EXPECT_EQ(value, values[index]);
-        index++;
-        return true;
-      });
+  std::string baggage_header                          = "k1=v1,k2=v2,k3=v3";
+  auto baggage                                        = Baggage::FromHeader(baggage_header);
+  const int kNumPairs                                 = 3;
+  opentelemetry::nostd::string_view keys[kNumPairs]   = {"k1", "k2", "k3"};
+  opentelemetry::nostd::string_view values[kNumPairs] = {"v1", "v2", "v3"};
+  size_t index                                        = 0;
+  baggage->GetAllEntries([&keys, &values, &index](opentelemetry::nostd::string_view key,
+                                                  opentelemetry::nostd::string_view value) {
+    EXPECT_EQ(key, keys[index]);
+    EXPECT_EQ(value, values[index]);
+    index++;
+    return true;
+  });
 }
diff --git a/api/test/baggage/propagation/baggage_propagator_test.cc b/api/test/baggage/propagation/baggage_propagator_test.cc
index 83de75757b..0efe1fac19 100644
--- a/api/test/baggage/propagation/baggage_propagator_test.cc
+++ b/api/test/baggage/propagation/baggage_propagator_test.cc
@@ -2,11 +2,20 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/baggage/propagation/baggage_propagator.h"
 #include <gtest/gtest.h>
 #include <map>
+#include <memory>
 #include <string>
+#include <utility>
+#include <vector>
+
+#include "opentelemetry/baggage/baggage.h"
 #include "opentelemetry/baggage/baggage_context.h"
+#include "opentelemetry/baggage/propagation/baggage_propagator.h"
+#include "opentelemetry/context/context.h"
+#include "opentelemetry/context/propagation/text_map_propagator.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/nostd/utility.h"
 
 using namespace opentelemetry;
 using namespace opentelemetry::baggage::propagation;
@@ -15,7 +24,7 @@ class BaggageCarrierTest : public context::propagation::TextMapCarrier
 {
 public:
   BaggageCarrierTest() = default;
-  virtual nostd::string_view Get(nostd::string_view key) const noexcept override
+  nostd::string_view Get(nostd::string_view key) const noexcept override
   {
     auto it = headers_.find(std::string(key));
     if (it != headers_.end())
@@ -24,7 +33,7 @@ class BaggageCarrierTest : public context::propagation::TextMapCarrier
     }
     return "";
   }
-  virtual void Set(nostd::string_view key, nostd::string_view value) noexcept override
+  void Set(nostd::string_view key, nostd::string_view value) noexcept override
   {
     headers_[std::string(key)] = std::string(value);
   }
diff --git a/api/test/common/kv_properties_test.cc b/api/test/common/kv_properties_test.cc
index f616664265..e81ee6979c 100644
--- a/api/test/common/kv_properties_test.cc
+++ b/api/test/common/kv_properties_test.cc
@@ -3,12 +3,15 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <gtest/gtest.h>
-#include <opentelemetry/common/kv_properties.h>
-
+#include <stddef.h>
 #include <string>
 #include <utility>
 #include <vector>
 
+#include <opentelemetry/common/kv_properties.h>
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/nostd/utility.h"
+
 // ------------------------- Entry class tests ---------------------------------
 
 using namespace opentelemetry;
diff --git a/api/test/common/spinlock_benchmark.cc b/api/test/common/spinlock_benchmark.cc
index d0fef2c41b..b5e98a2108 100644
--- a/api/test/common/spinlock_benchmark.cc
+++ b/api/test/common/spinlock_benchmark.cc
@@ -1,10 +1,21 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/common/spin_lock_mutex.h"
-
 #include <benchmark/benchmark.h>
-#include <mutex>
+#include <stdint.h>
+#include <algorithm>
+#include <atomic>
+#include <thread>
+#include <vector>
+
+#if defined(__i386__) || defined(__x86_64__)
+#  if defined(__clang__) || defined(__INTEL_COMPILER)
+#    include <emmintrin.h>  // for _mm_pause
+#  endif
+#endif
+
+#include "opentelemetry/common/macros.h"
+#include "opentelemetry/common/spin_lock_mutex.h"
 
 namespace
 {
diff --git a/api/test/common/string_util_test.cc b/api/test/common/string_util_test.cc
index da2e635119..f074d4fbe3 100644
--- a/api/test/common/string_util_test.cc
+++ b/api/test/common/string_util_test.cc
@@ -2,11 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <gtest/gtest.h>
-#include <opentelemetry/common/string_util.h>
+#include <string.h>
 
-#include <string>
-#include <utility>
-#include <vector>
+#include <opentelemetry/common/string_util.h>
 
 // ------------------------- StringUtil class tests ---------------------------------
 
diff --git a/api/test/context/context_test.cc b/api/test/context/context_test.cc
index 294f1cd180..0798d7a130 100644
--- a/api/test/context/context_test.cc
+++ b/api/test/context/context_test.cc
@@ -1,11 +1,16 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/context/context.h"
-
+#include <gtest/gtest.h>
+#include <stdint.h>
 #include <map>
+#include <string>
 
-#include <gtest/gtest.h>
+#include "opentelemetry/context/context.h"
+#include "opentelemetry/context/context_value.h"
+#include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/nostd/variant.h"
 
 using namespace opentelemetry;
 
diff --git a/api/test/context/propagation/composite_propagator_test.cc b/api/test/context/propagation/composite_propagator_test.cc
index 5bf18710ed..e905f64e1a 100644
--- a/api/test/context/propagation/composite_propagator_test.cc
+++ b/api/test/context/propagation/composite_propagator_test.cc
@@ -1,22 +1,32 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/trace/scope.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context.h"
+#include <gtest/gtest.h>
+#include <stdint.h>
+#include <algorithm>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
+#include "opentelemetry/context/context.h"
 #include "opentelemetry/context/propagation/composite_propagator.h"
 #include "opentelemetry/context/propagation/text_map_propagator.h"
+#include "opentelemetry/context/runtime_context.h"
+#include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/nostd/variant.h"
 #include "opentelemetry/trace/default_span.h"
 #include "opentelemetry/trace/propagation/b3_propagator.h"
 #include "opentelemetry/trace/propagation/http_trace_context.h"
-
-#include <map>
-#include <memory>
-#include <string>
-
-#include <gtest/gtest.h>
+#include "opentelemetry/trace/scope.h"
+#include "opentelemetry/trace/span.h"
+#include "opentelemetry/trace/span_context.h"
+#include "opentelemetry/trace/span_id.h"
+#include "opentelemetry/trace/span_metadata.h"
+#include "opentelemetry/trace/trace_flags.h"
+#include "opentelemetry/trace/trace_id.h"
 
 using namespace opentelemetry;
 
@@ -31,7 +41,7 @@ static std::string Hex(const T &id_item)
 class TextMapCarrierTest : public context::propagation::TextMapCarrier
 {
 public:
-  virtual nostd::string_view Get(nostd::string_view key) const noexcept override
+  nostd::string_view Get(nostd::string_view key) const noexcept override
   {
     auto it = headers_.find(std::string(key));
     if (it != headers_.end())
@@ -40,7 +50,7 @@ class TextMapCarrierTest : public context::propagation::TextMapCarrier
     }
     return "";
   }
-  virtual void Set(nostd::string_view key, nostd::string_view value) noexcept override
+  void Set(nostd::string_view key, nostd::string_view value) noexcept override
   {
     headers_[std::string(key)] = std::string(value);
   }
@@ -66,7 +76,7 @@ class CompositePropagatorTest : public ::testing::Test
         new context::propagation::CompositePropagator(std::move(propogator_list));
   }
 
-  ~CompositePropagatorTest() { delete composite_propagator_; }
+  ~CompositePropagatorTest() override { delete composite_propagator_; }
 
 protected:
   context::propagation::CompositePropagator *composite_propagator_;
diff --git a/api/test/context/runtime_context_test.cc b/api/test/context/runtime_context_test.cc
index cd551c599c..f8407b0ca8 100644
--- a/api/test/context/runtime_context_test.cc
+++ b/api/test/context/runtime_context_test.cc
@@ -1,13 +1,22 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/context/runtime_context.h"
-#include "opentelemetry/context/context.h"
-
+#include <gtest/gtest.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <algorithm>
 #include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
-#include <gtest/gtest.h>
+#include "opentelemetry/context/context.h"
+#include "opentelemetry/context/context_value.h"
+#include "opentelemetry/context/runtime_context.h"
+#include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/nostd/unique_ptr.h"
+#include "opentelemetry/nostd/variant.h"
 
 using namespace opentelemetry;
 
diff --git a/api/test/core/timestamp_test.cc b/api/test/core/timestamp_test.cc
index 8efc0215be..ba3c70e4e5 100644
--- a/api/test/core/timestamp_test.cc
+++ b/api/test/core/timestamp_test.cc
@@ -1,9 +1,11 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/common/timestamp.h"
-
 #include <gtest/gtest.h>
+#include <stdlib.h>
+#include <chrono>
+
+#include "opentelemetry/common/timestamp.h"
 
 using opentelemetry::common::SteadyTimestamp;
 using opentelemetry::common::SystemTimestamp;
diff --git a/api/test/core/version_test.cc b/api/test/core/version_test.cc
index 2e360ffdad..1ceb68602b 100644
--- a/api/test/core/version_test.cc
+++ b/api/test/core/version_test.cc
@@ -1,9 +1,11 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/version.h"
-
 #include <gtest/gtest.h>
+#include <stdio.h>
+#include <string>
+
+#include "opentelemetry/version.h"
 
 TEST(VersionTest, Consistency)
 {
diff --git a/api/test/logs/logger_benchmark.cc b/api/test/logs/logger_benchmark.cc
index db225d496a..29808fa003 100644
--- a/api/test/logs/logger_benchmark.cc
+++ b/api/test/logs/logger_benchmark.cc
@@ -1,29 +1,30 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/logs/logger.h"
-#include "opentelemetry/logs/provider.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-
-#include <chrono>
+#include <benchmark/benchmark.h>
+#include <stdint.h>
+#include <algorithm>
 #include <condition_variable>
+#include <cstddef>
 #include <functional>
 #include <mutex>
 #include <thread>
 #include <vector>
 
-#include <benchmark/benchmark.h>
+#include "opentelemetry/common/key_value_iterable_view.h"
+#include "opentelemetry/logs/event_id.h"
+#include "opentelemetry/logs/logger.h"
+#include "opentelemetry/logs/logger_provider.h"
+#include "opentelemetry/logs/provider.h"
+#include "opentelemetry/logs/severity.h"
+#include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/nostd/string_view.h"
 
 using opentelemetry::logs::EventId;
 using opentelemetry::logs::Provider;
 using opentelemetry::logs::Severity;
 
-namespace common  = opentelemetry::common;
-namespace nostd   = opentelemetry::nostd;
-namespace trace   = opentelemetry::trace;
-namespace log_api = opentelemetry::logs;
-
 namespace
 {
 
@@ -32,7 +33,7 @@ constexpr int64_t kMaxIterations = 1000000000;
 class Barrier
 {
 public:
-  explicit Barrier(std::size_t iCount) : mThreshold(iCount), mCount(iCount), mGeneration(0) {}
+  explicit Barrier(std::size_t iCount) : mThreshold(iCount), mCount(iCount) {}
 
   void Wait()
   {
@@ -55,7 +56,7 @@ class Barrier
   std::condition_variable mCond;
   std::size_t mThreshold;
   std::size_t mCount;
-  std::size_t mGeneration;
+  std::size_t mGeneration{0};
 };
 
 static void ThreadRoutine(Barrier &barrier,
@@ -84,14 +85,14 @@ static void ThreadRoutine(Barrier &barrier,
 
 void MultiThreadRunner(benchmark::State &state, const std::function<void()> &func)
 {
-  int num_threads = std::thread::hardware_concurrency();
+  uint32_t num_threads = std::thread::hardware_concurrency();
 
   Barrier barrier(num_threads);
 
   std::vector<std::thread> threads;
 
   threads.reserve(num_threads);
-  for (int i = 0; i < num_threads; i++)
+  for (uint32_t i = 0; i < num_threads; i++)
   {
     threads.emplace_back(ThreadRoutine, std::ref(barrier), std::ref(state), i, func);
   }
diff --git a/api/test/logs/logger_test.cc b/api/test/logs/logger_test.cc
index 848f053453..351e079dd4 100644
--- a/api/test/logs/logger_test.cc
+++ b/api/test/logs/logger_test.cc
@@ -2,13 +2,27 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <gtest/gtest.h>
-#include <array>
+#include <map>
+#include <string>
+#include <utility>
 #include <vector>
 
-#include "opentelemetry/common/timestamp.h"
+#include "opentelemetry/common/attribute_value.h"
+#include "opentelemetry/common/key_value_iterable.h"
+#include "opentelemetry/common/key_value_iterable_view.h"
+#include "opentelemetry/logs/event_id.h"
+#include "opentelemetry/logs/event_logger.h"
+#include "opentelemetry/logs/event_logger_provider.h"
+#include "opentelemetry/logs/log_record.h"
 #include "opentelemetry/logs/logger.h"
+#include "opentelemetry/logs/logger_provider.h"
 #include "opentelemetry/logs/provider.h"
+#include "opentelemetry/logs/severity.h"
 #include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/nostd/unique_ptr.h"
+#include "opentelemetry/nostd/utility.h"
 
 using opentelemetry::logs::EventId;
 using opentelemetry::logs::Logger;
diff --git a/api/test/logs/provider_test.cc b/api/test/logs/provider_test.cc
index 92c589ef7e..298289ceab 100644
--- a/api/test/logs/provider_test.cc
+++ b/api/test/logs/provider_test.cc
@@ -2,10 +2,17 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <gtest/gtest.h>
-#include <array>
+#include <string>
 
+#include "opentelemetry/common/key_value_iterable.h"
+#include "opentelemetry/logs/event_logger.h"
+#include "opentelemetry/logs/event_logger_provider.h"
+#include "opentelemetry/logs/logger.h"
+#include "opentelemetry/logs/logger_provider.h"
 #include "opentelemetry/logs/provider.h"
 #include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/nostd/utility.h"
 
 using opentelemetry::logs::EventLogger;
 using opentelemetry::logs::EventLoggerProvider;
diff --git a/api/test/metrics/meter_provider_test.cc b/api/test/metrics/meter_provider_test.cc
index b8fb083799..639f0e8f49 100644
--- a/api/test/metrics/meter_provider_test.cc
+++ b/api/test/metrics/meter_provider_test.cc
@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <gtest/gtest.h>
+
+#include "opentelemetry/metrics/meter_provider.h"
 #include "opentelemetry/metrics/noop.h"
 #include "opentelemetry/metrics/provider.h"
 #include "opentelemetry/nostd/shared_ptr.h"
diff --git a/api/test/metrics/noop_sync_instrument_test.cc b/api/test/metrics/noop_sync_instrument_test.cc
index 6411e0e820..4218f2b4ff 100644
--- a/api/test/metrics/noop_sync_instrument_test.cc
+++ b/api/test/metrics/noop_sync_instrument_test.cc
@@ -2,8 +2,15 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <gtest/gtest.h>
+#include <stdint.h>
 #include <map>
+#include <memory>
+#include <string>
+
+#include "opentelemetry/context/context.h"
 #include "opentelemetry/metrics/noop.h"
+#include "opentelemetry/metrics/sync_instruments.h"
+#include "opentelemetry/nostd/string_view.h"
 
 TEST(Counter, Add)
 {
diff --git a/api/test/nostd/shared_ptr_test.cc b/api/test/nostd/shared_ptr_test.cc
index 5c290c6284..e5f77709b1 100644
--- a/api/test/nostd/shared_ptr_test.cc
+++ b/api/test/nostd/shared_ptr_test.cc
@@ -1,11 +1,13 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/nostd/shared_ptr.h"
-
 #include <gtest/gtest.h>
-
+#include <stddef.h>
 #include <algorithm>
+#include <utility>
+#include <vector>
+
+#include "opentelemetry/nostd/shared_ptr.h"
 
 using opentelemetry::nostd::shared_ptr;
 
@@ -35,7 +37,7 @@ class C
 class D : public C
 {
 public:
-  virtual ~D() {}
+  ~D() override {}
 };
 
 TEST(SharedPtrTest, DefaultConstruction)
diff --git a/api/test/nostd/span_test.cc b/api/test/nostd/span_test.cc
index 17427a249a..b54883d67a 100644
--- a/api/test/nostd/span_test.cc
+++ b/api/test/nostd/span_test.cc
@@ -1,10 +1,8 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/nostd/span.h"
-
-#include <cstdint>
-
+#include <gtest/gtest.h>
+#include <stddef.h>
 #include <algorithm>
 #include <array>
 #include <iterator>
@@ -12,7 +10,7 @@
 #include <type_traits>
 #include <vector>
 
-#include <gtest/gtest.h>
+#include "opentelemetry/nostd/span.h"
 
 using opentelemetry::nostd::span;
 
diff --git a/api/test/nostd/string_view_test.cc b/api/test/nostd/string_view_test.cc
index bbd5cb0648..f32da62b42 100644
--- a/api/test/nostd/string_view_test.cc
+++ b/api/test/nostd/string_view_test.cc
@@ -1,11 +1,14 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/nostd/string_view.h"
-
 #include <gtest/gtest.h>
 #include <cstring>
 #include <map>
+#include <stdexcept>
+#include <string>
+#include <utility>
+
+#include "opentelemetry/nostd/string_view.h"
 
 using opentelemetry::nostd::string_view;
 
diff --git a/api/test/nostd/unique_ptr_test.cc b/api/test/nostd/unique_ptr_test.cc
index 893525c266..9fbe058822 100644
--- a/api/test/nostd/unique_ptr_test.cc
+++ b/api/test/nostd/unique_ptr_test.cc
@@ -1,9 +1,11 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/nostd/unique_ptr.h"
-
 #include <gtest/gtest.h>
+#include <type_traits>
+#include <utility>
+
+#include "opentelemetry/nostd/unique_ptr.h"
 
 using opentelemetry::nostd::unique_ptr;
 
diff --git a/api/test/nostd/utility_test.cc b/api/test/nostd/utility_test.cc
index 821b2a70a4..5c62df0c88 100644
--- a/api/test/nostd/utility_test.cc
+++ b/api/test/nostd/utility_test.cc
@@ -1,13 +1,13 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/nostd/utility.h"
-
+#include <gtest/gtest.h>
+#include <initializer_list>
 #include <tuple>
 #include <type_traits>
 #include <vector>
 
-#include <gtest/gtest.h>
+#include "opentelemetry/nostd/utility.h"
 
 namespace nostd = opentelemetry::nostd;
 
diff --git a/api/test/plugin/dynamic_load_test.cc b/api/test/plugin/dynamic_load_test.cc
index 8e8b14800c..68a27b5a8f 100644
--- a/api/test/plugin/dynamic_load_test.cc
+++ b/api/test/plugin/dynamic_load_test.cc
@@ -1,10 +1,10 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/plugin/dynamic_load.h"
-#include "opentelemetry/plugin/factory.h"
-
 #include <gtest/gtest.h>
+#include <string>
+
+#include "opentelemetry/plugin/dynamic_load.h"
 
 TEST(LoadFactoryTest, FailureTest)
 {
diff --git a/api/test/singleton/component_a.cc b/api/test/singleton/component_a.cc
index bdf03cb699..1660f85685 100644
--- a/api/test/singleton/component_a.cc
+++ b/api/test/singleton/component_a.cc
@@ -1,9 +1,12 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include "opentelemetry/context/context_value.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/trace/provider.h"
-#include "opentelemetry/version.h"
+#include "opentelemetry/trace/scope.h"
+#include "opentelemetry/trace/tracer.h"
+#include "opentelemetry/trace/tracer_provider.h"
 
 #include "component_a.h"
 
diff --git a/api/test/singleton/component_b.cc b/api/test/singleton/component_b.cc
index 966d9c461a..ea53f39b6e 100644
--- a/api/test/singleton/component_b.cc
+++ b/api/test/singleton/component_b.cc
@@ -1,9 +1,12 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include "opentelemetry/context/context_value.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/trace/provider.h"
-#include "opentelemetry/version.h"
+#include "opentelemetry/trace/scope.h"
+#include "opentelemetry/trace/tracer.h"
+#include "opentelemetry/trace/tracer_provider.h"
 
 #include "component_b.h"
 
diff --git a/api/test/singleton/component_c.cc b/api/test/singleton/component_c.cc
index cd87ceb727..9fae8b41db 100644
--- a/api/test/singleton/component_c.cc
+++ b/api/test/singleton/component_c.cc
@@ -1,9 +1,12 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include "opentelemetry/context/context_value.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/trace/provider.h"
-#include "opentelemetry/version.h"
+#include "opentelemetry/trace/scope.h"
+#include "opentelemetry/trace/tracer.h"
+#include "opentelemetry/trace/tracer_provider.h"
 
 #define BUILD_COMPONENT_C
 
diff --git a/api/test/singleton/component_d.cc b/api/test/singleton/component_d.cc
index 313fd1d23a..57f3252826 100644
--- a/api/test/singleton/component_d.cc
+++ b/api/test/singleton/component_d.cc
@@ -1,9 +1,12 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include "opentelemetry/context/context_value.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/trace/provider.h"
-#include "opentelemetry/version.h"
+#include "opentelemetry/trace/scope.h"
+#include "opentelemetry/trace/tracer.h"
+#include "opentelemetry/trace/tracer_provider.h"
 
 #define BUILD_COMPONENT_D
 
diff --git a/api/test/singleton/component_e.cc b/api/test/singleton/component_e.cc
index 9c88d27732..94eec808ab 100644
--- a/api/test/singleton/component_e.cc
+++ b/api/test/singleton/component_e.cc
@@ -1,9 +1,12 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include "opentelemetry/context/context_value.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/trace/provider.h"
-#include "opentelemetry/version.h"
+#include "opentelemetry/trace/scope.h"
+#include "opentelemetry/trace/tracer.h"
+#include "opentelemetry/trace/tracer_provider.h"
 
 #define BUILD_COMPONENT_E
 
diff --git a/api/test/singleton/component_f.cc b/api/test/singleton/component_f.cc
index 33b0af2fbd..9083e2bced 100644
--- a/api/test/singleton/component_f.cc
+++ b/api/test/singleton/component_f.cc
@@ -1,9 +1,12 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include "opentelemetry/context/context_value.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/trace/provider.h"
-#include "opentelemetry/version.h"
+#include "opentelemetry/trace/scope.h"
+#include "opentelemetry/trace/tracer.h"
+#include "opentelemetry/trace/tracer_provider.h"
 
 #define BUILD_COMPONENT_F
 
diff --git a/api/test/singleton/component_g.cc b/api/test/singleton/component_g.cc
index 50de03ee98..0529ca7c27 100644
--- a/api/test/singleton/component_g.cc
+++ b/api/test/singleton/component_g.cc
@@ -1,9 +1,12 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include "opentelemetry/context/context_value.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/trace/provider.h"
-#include "opentelemetry/version.h"
+#include "opentelemetry/trace/scope.h"
+#include "opentelemetry/trace/tracer.h"
+#include "opentelemetry/trace/tracer_provider.h"
 
 namespace trace = opentelemetry::trace;
 namespace nostd = opentelemetry::nostd;
diff --git a/api/test/singleton/component_h.cc b/api/test/singleton/component_h.cc
index 3ff6e0cc5a..a66ab96858 100644
--- a/api/test/singleton/component_h.cc
+++ b/api/test/singleton/component_h.cc
@@ -1,9 +1,12 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include "opentelemetry/context/context_value.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/trace/provider.h"
-#include "opentelemetry/version.h"
+#include "opentelemetry/trace/scope.h"
+#include "opentelemetry/trace/tracer.h"
+#include "opentelemetry/trace/tracer_provider.h"
 
 namespace trace = opentelemetry::trace;
 namespace nostd = opentelemetry::nostd;
diff --git a/api/test/singleton/singleton_test.cc b/api/test/singleton/singleton_test.cc
index fb4551cfe9..d212221118 100644
--- a/api/test/singleton/singleton_test.cc
+++ b/api/test/singleton/singleton_test.cc
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <gtest/gtest.h>
+#include <stdint.h>
 
 /*
   TODO:
@@ -12,8 +13,6 @@
 #  include <dlfcn.h>
 #endif
 
-#include <iostream>
-
 #include "component_a.h"
 #include "component_b.h"
 #include "component_c.h"
@@ -21,11 +20,18 @@
 #include "component_e.h"
 #include "component_f.h"
 
+#include "opentelemetry/common/key_value_iterable.h"
+#include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/nostd/utility.h"
 #include "opentelemetry/trace/default_span.h"
+#include "opentelemetry/trace/noop.h"
 #include "opentelemetry/trace/provider.h"
 #include "opentelemetry/trace/span.h"
+#include "opentelemetry/trace/span_context.h"
 #include "opentelemetry/trace/span_context_kv_iterable.h"
 #include "opentelemetry/trace/span_startoptions.h"
+#include "opentelemetry/trace/tracer.h"
 #include "opentelemetry/trace/tracer_provider.h"
 
 using namespace opentelemetry;
diff --git a/api/test/trace/key_value_iterable_view_test.cc b/api/test/trace/key_value_iterable_view_test.cc
index e0f43c4afb..b2334b8f98 100644
--- a/api/test/trace/key_value_iterable_view_test.cc
+++ b/api/test/trace/key_value_iterable_view_test.cc
@@ -1,11 +1,18 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/common/key_value_iterable_view.h"
-
 #include <gtest/gtest.h>
 #include <map>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "opentelemetry/common/attribute_value.h"
+#include "opentelemetry/common/key_value_iterable.h"
+#include "opentelemetry/common/key_value_iterable_view.h"
+#include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/nostd/type_traits.h"
+#include "opentelemetry/nostd/utility.h"
 
 using namespace opentelemetry;
 
diff --git a/api/test/trace/noop_test.cc b/api/test/trace/noop_test.cc
index b47700d442..26663c738f 100644
--- a/api/test/trace/noop_test.cc
+++ b/api/test/trace/noop_test.cc
@@ -1,14 +1,27 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/trace/noop.h"
-#include "opentelemetry/common/timestamp.h"
-
+#include <gtest/gtest.h>
+#include <stdint.h>
+#include <initializer_list>
 #include <map>
-#include <memory>
 #include <string>
+#include <utility>
+#include <vector>
 
-#include <gtest/gtest.h>
+#include "opentelemetry/common/timestamp.h"
+#include "opentelemetry/context/context_value.h"
+#include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/nostd/unique_ptr.h"
+#include "opentelemetry/trace/noop.h"
+#include "opentelemetry/trace/span.h"
+#include "opentelemetry/trace/span_context.h"
+#include "opentelemetry/trace/span_id.h"
+#include "opentelemetry/trace/span_metadata.h"
+#include "opentelemetry/trace/trace_flags.h"
+#include "opentelemetry/trace/trace_id.h"
+#include "opentelemetry/trace/tracer.h"
 
 namespace trace_api = opentelemetry::trace;
 namespace nonstd    = opentelemetry::nostd;
diff --git a/api/test/trace/propagation/b3_propagation_test.cc b/api/test/trace/propagation/b3_propagation_test.cc
index 5546916abc..a2a0581ad1 100644
--- a/api/test/trace/propagation/b3_propagation_test.cc
+++ b/api/test/trace/propagation/b3_propagation_test.cc
@@ -1,21 +1,37 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <gtest/gtest.h>
+#include <stdint.h>
+#include <map>
+#include <string>
+#include <utility>
+#include "util.h"
+
+#include "opentelemetry/context/context.h"
+#include "opentelemetry/context/context_value.h"
+#include "opentelemetry/context/propagation/text_map_propagator.h"
 #include "opentelemetry/context/runtime_context.h"
+#include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/nostd/variant.h"
+#include "opentelemetry/trace/default_span.h"
 #include "opentelemetry/trace/propagation/b3_propagator.h"
 #include "opentelemetry/trace/scope.h"
-#include "util.h"
-
-#include <map>
-
-#include <gtest/gtest.h>
+#include "opentelemetry/trace/span.h"
+#include "opentelemetry/trace/span_context.h"
+#include "opentelemetry/trace/span_id.h"
+#include "opentelemetry/trace/span_metadata.h"
+#include "opentelemetry/trace/trace_flags.h"
+#include "opentelemetry/trace/trace_id.h"
 
 using namespace opentelemetry;
 
 class TextMapCarrierTest : public context::propagation::TextMapCarrier
 {
 public:
-  virtual nostd::string_view Get(nostd::string_view key) const noexcept override
+  nostd::string_view Get(nostd::string_view key) const noexcept override
   {
     auto it = headers_.find(std::string(key));
     if (it != headers_.end())
@@ -24,7 +40,7 @@ class TextMapCarrierTest : public context::propagation::TextMapCarrier
     }
     return "";
   }
-  virtual void Set(nostd::string_view key, nostd::string_view value) noexcept override
+  void Set(nostd::string_view key, nostd::string_view value) noexcept override
   {
     headers_[std::string(key)] = std::string(value);
   }
diff --git a/api/test/trace/propagation/detail/hex_test.cc b/api/test/trace/propagation/detail/hex_test.cc
index f4bd765f48..88cf5b46b0 100644
--- a/api/test/trace/propagation/detail/hex_test.cc
+++ b/api/test/trace/propagation/detail/hex_test.cc
@@ -1,11 +1,12 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/trace/propagation/detail/hex.h"
-
-#include <map>
-
 #include <gtest/gtest.h>
+#include <stdint.h>
+#include <string>
+
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/trace/propagation/detail/hex.h"
 
 using namespace opentelemetry;
 
diff --git a/api/test/trace/propagation/http_text_format_test.cc b/api/test/trace/propagation/http_text_format_test.cc
index e41e0fe65c..54f041a9cc 100644
--- a/api/test/trace/propagation/http_text_format_test.cc
+++ b/api/test/trace/propagation/http_text_format_test.cc
@@ -1,24 +1,42 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <gtest/gtest.h>
+#include <stdint.h>
+#include <algorithm>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+#include "util.h"
+
+#include "opentelemetry/context/context.h"
+#include "opentelemetry/context/context_value.h"
 #include "opentelemetry/context/propagation/global_propagator.h"
+#include "opentelemetry/context/propagation/text_map_propagator.h"
 #include "opentelemetry/context/runtime_context.h"
+#include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/nostd/variant.h"
 #include "opentelemetry/trace/context.h"
+#include "opentelemetry/trace/default_span.h"
 #include "opentelemetry/trace/propagation/http_trace_context.h"
 #include "opentelemetry/trace/scope.h"
-#include "util.h"
-
-#include <map>
-#include <unordered_map>
-
-#include <gtest/gtest.h>
+#include "opentelemetry/trace/span.h"
+#include "opentelemetry/trace/span_context.h"
+#include "opentelemetry/trace/span_id.h"
+#include "opentelemetry/trace/span_metadata.h"
+#include "opentelemetry/trace/trace_flags.h"
+#include "opentelemetry/trace/trace_id.h"
+#include "opentelemetry/trace/trace_state.h"
 
 using namespace opentelemetry;
 
 class TextMapCarrierTest : public context::propagation::TextMapCarrier
 {
 public:
-  virtual nostd::string_view Get(nostd::string_view key) const noexcept override
+  nostd::string_view Get(nostd::string_view key) const noexcept override
   {
     auto it = headers_.find(std::string(key));
     if (it != headers_.end())
@@ -27,7 +45,7 @@ class TextMapCarrierTest : public context::propagation::TextMapCarrier
     }
     return "";
   }
-  virtual void Set(nostd::string_view key, nostd::string_view value) noexcept override
+  void Set(nostd::string_view key, nostd::string_view value) noexcept override
   {
     headers_[std::string(key)] = std::string(value);
   }
diff --git a/api/test/trace/propagation/jaeger_propagation_test.cc b/api/test/trace/propagation/jaeger_propagation_test.cc
index add38eac6c..637d2206b8 100644
--- a/api/test/trace/propagation/jaeger_propagation_test.cc
+++ b/api/test/trace/propagation/jaeger_propagation_test.cc
@@ -1,20 +1,40 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/trace/propagation/jaeger.h"
-#include "opentelemetry/trace/scope.h"
-#include "util.h"
-
+#include <gtest/gtest.h>
+#include <stdint.h>
+#include <algorithm>
 #include <map>
+#include <string>
+#include <utility>
+#include <vector>
+#include "util.h"
 
-#include <gtest/gtest.h>
+#include "opentelemetry/context/context.h"
+#include "opentelemetry/context/context_value.h"
+#include "opentelemetry/context/propagation/text_map_propagator.h"
+#include "opentelemetry/context/runtime_context.h"
+#include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/nostd/variant.h"
+#include "opentelemetry/trace/context.h"
+#include "opentelemetry/trace/default_span.h"
+#include "opentelemetry/trace/propagation/jaeger.h"
+#include "opentelemetry/trace/scope.h"
+#include "opentelemetry/trace/span.h"
+#include "opentelemetry/trace/span_context.h"
+#include "opentelemetry/trace/span_id.h"
+#include "opentelemetry/trace/span_metadata.h"
+#include "opentelemetry/trace/trace_flags.h"
+#include "opentelemetry/trace/trace_id.h"
 
 using namespace opentelemetry;
 
 class TextMapCarrierTest : public context::propagation::TextMapCarrier
 {
 public:
-  virtual nostd::string_view Get(nostd::string_view key) const noexcept override
+  nostd::string_view Get(nostd::string_view key) const noexcept override
   {
     auto it = headers_.find(std::string(key));
     if (it != headers_.end())
@@ -23,7 +43,7 @@ class TextMapCarrierTest : public context::propagation::TextMapCarrier
     }
     return "";
   }
-  virtual void Set(nostd::string_view key, nostd::string_view value) noexcept override
+  void Set(nostd::string_view key, nostd::string_view value) noexcept override
   {
     headers_[std::string(key)] = std::string(value);
   }
diff --git a/api/test/trace/provider_test.cc b/api/test/trace/provider_test.cc
index be2ca2842c..6b59d91245 100644
--- a/api/test/trace/provider_test.cc
+++ b/api/test/trace/provider_test.cc
@@ -1,12 +1,14 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/trace/provider.h"
+#include <gtest/gtest.h>
+
 #include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/trace/provider.h"
+#include "opentelemetry/trace/tracer.h"
 #include "opentelemetry/trace/tracer_provider.h"
 
-#include <gtest/gtest.h>
-
 using opentelemetry::trace::Provider;
 using opentelemetry::trace::Tracer;
 using opentelemetry::trace::TracerProvider;
diff --git a/api/test/trace/scope_test.cc b/api/test/trace/scope_test.cc
index b74905b167..1383122bbc 100644
--- a/api/test/trace/scope_test.cc
+++ b/api/test/trace/scope_test.cc
@@ -1,12 +1,16 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/trace/scope.h"
-#include "opentelemetry/context/context.h"
+#include <gtest/gtest.h>
+
+#include "opentelemetry/context/context_value.h"
+#include "opentelemetry/context/runtime_context.h"
 #include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/variant.h"
 #include "opentelemetry/trace/noop.h"
-
-#include <gtest/gtest.h>
+#include "opentelemetry/trace/scope.h"
+#include "opentelemetry/trace/span.h"
+#include "opentelemetry/trace/span_metadata.h"
 
 using opentelemetry::trace::kSpanKey;
 using opentelemetry::trace::NoopSpan;
diff --git a/api/test/trace/span_benchmark.cc b/api/test/trace/span_benchmark.cc
index 3120eb0e5a..8770ec14a0 100644
--- a/api/test/trace/span_benchmark.cc
+++ b/api/test/trace/span_benchmark.cc
@@ -1,15 +1,24 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <benchmark/benchmark.h>
+#include <cstdint>
+
+#include "opentelemetry/context/context_value.h"
+#include "opentelemetry/context/runtime_context.h"
 #include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/nostd/variant.h"
 #include "opentelemetry/trace/context.h"
+#include "opentelemetry/trace/default_span.h"
 #include "opentelemetry/trace/noop.h"
+#include "opentelemetry/trace/span.h"
+#include "opentelemetry/trace/span_context.h"
 #include "opentelemetry/trace/span_id.h"
+#include "opentelemetry/trace/span_startoptions.h"
+#include "opentelemetry/trace/trace_flags.h"
 #include "opentelemetry/trace/trace_id.h"
-
-#include <cstdint>
-
-#include <benchmark/benchmark.h>
+#include "opentelemetry/trace/tracer.h"
 
 using opentelemetry::trace::SpanContext;
 namespace trace_api = opentelemetry::trace;
diff --git a/api/test/trace/span_id_benchmark.cc b/api/test/trace/span_id_benchmark.cc
index 42d4aeb465..236fa3ac76 100644
--- a/api/test/trace/span_id_benchmark.cc
+++ b/api/test/trace/span_id_benchmark.cc
@@ -1,11 +1,12 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/trace/span_id.h"
-
 #include <benchmark/benchmark.h>
 #include <cstdint>
 
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/trace/span_id.h"
+
 namespace
 {
 using opentelemetry::trace::SpanId;
diff --git a/api/test/trace/trace_flags_test.cc b/api/test/trace/trace_flags_test.cc
index 783b56d839..d900c6f7d5 100644
--- a/api/test/trace/trace_flags_test.cc
+++ b/api/test/trace/trace_flags_test.cc
@@ -1,12 +1,11 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/trace/trace_flags.h"
-
-#include <cstring>
+#include <gtest/gtest.h>
+#include <stdint.h>
 #include <string>
 
-#include <gtest/gtest.h>
+#include "opentelemetry/trace/trace_flags.h"
 
 namespace
 {
diff --git a/api/test/trace/trace_state_test.cc b/api/test/trace/trace_state_test.cc
index e6ed73c1f4..d136bddb00 100644
--- a/api/test/trace/trace_state_test.cc
+++ b/api/test/trace/trace_state_test.cc
@@ -1,10 +1,13 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/trace/trace_state.h"
-
 #include <gtest/gtest.h>
+#include <stddef.h>
+#include <memory>
+#include <string>
+
 #include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/trace/trace_state.h"
 
 namespace
 {
diff --git a/api/test/trace/tracer_test.cc b/api/test/trace/tracer_test.cc
index 8e16f15e25..77396a24d2 100644
--- a/api/test/trace/tracer_test.cc
+++ b/api/test/trace/tracer_test.cc
@@ -1,11 +1,14 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <gtest/gtest.h>
+
+#include "opentelemetry/context/context_value.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/trace/noop.h"
-#include "opentelemetry/trace/scope.h"
-
-#include <gtest/gtest.h>
+#include "opentelemetry/trace/span.h"
+#include "opentelemetry/trace/span_context.h"
+#include "opentelemetry/trace/tracer.h"
 
 namespace trace_api = opentelemetry::trace;
 namespace nostd     = opentelemetry::nostd;
diff --git a/examples/http/server.cc b/examples/http/server.cc
index 3dbdae8512..85cccc234d 100644
--- a/examples/http/server.cc
+++ b/examples/http/server.cc
@@ -21,8 +21,8 @@ constexpr const char *server_name = "localhost";
 class RequestHandler : public HTTP_SERVER_NS::HttpRequestCallback
 {
 public:
-  virtual int onHttpRequest(HTTP_SERVER_NS::HttpRequest const &request,
-                            HTTP_SERVER_NS::HttpResponse &response) override
+  int onHttpRequest(HTTP_SERVER_NS::HttpRequest const &request,
+                    HTTP_SERVER_NS::HttpResponse &response) override
   {
     StartSpanOptions options;
     options.kind          = SpanKind::kServer;  // server
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_factory.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_factory.h
index f8b3ee1fc3..11b185a384 100644
--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_factory.h
+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_factory.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_options.h"
 #include "opentelemetry/sdk/metrics/push_metric_exporter.h"
 
diff --git a/exporters/otlp/src/otlp_file_client.cc b/exporters/otlp/src/otlp_file_client.cc
index cc6e074bfd..bdd6eac27d 100644
--- a/exporters/otlp/src/otlp_file_client.cc
+++ b/exporters/otlp/src/otlp_file_client.cc
@@ -966,7 +966,7 @@ class OPENTELEMETRY_LOCAL_SYMBOL OtlpFileSystemBackend : public OtlpFileAppender
 {
 public:
   explicit OtlpFileSystemBackend(const OtlpFileClientFileSystemOptions &options)
-      : options_(options), is_initialized_{false}, check_file_path_interval_{0}
+      : options_(options), is_initialized_{false}
   {
     file_ = std::make_shared<FileStats>();
     file_->is_shutdown.store(false);
@@ -1539,7 +1539,7 @@ class OPENTELEMETRY_LOCAL_SYMBOL OtlpFileSystemBackend : public OtlpFileAppender
   std::shared_ptr<FileStats> file_;
 
   std::atomic<bool> is_initialized_;
-  std::time_t check_file_path_interval_;
+  std::time_t check_file_path_interval_{0};
 };
 
 class OPENTELEMETRY_LOCAL_SYMBOL OtlpFileOstreamBackend : public OtlpFileAppender
@@ -1568,7 +1568,7 @@ class OPENTELEMETRY_LOCAL_SYMBOL OtlpFileOstreamBackend : public OtlpFileAppende
 };
 
 OtlpFileClient::OtlpFileClient(OtlpFileClientOptions &&options)
-    : is_shutdown_(false), options_(options)
+    : is_shutdown_(false), options_(std::move(options))
 {
   if (nostd::holds_alternative<OtlpFileClientFileSystemOptions>(options_.backend_options))
   {
diff --git a/exporters/otlp/src/otlp_file_metric_exporter_options.cc b/exporters/otlp/src/otlp_file_metric_exporter_options.cc
index 3ad8eaa457..e1b1f5ca7a 100644
--- a/exporters/otlp/src/otlp_file_metric_exporter_options.cc
+++ b/exporters/otlp/src/otlp_file_metric_exporter_options.cc
@@ -13,6 +13,7 @@ namespace otlp
 {
 
 OtlpFileMetricExporterOptions::OtlpFileMetricExporterOptions()
+    : aggregation_temporality(PreferredAggregationTemporality::kCumulative)
 {
   console_debug = false;
 
@@ -25,8 +26,6 @@ OtlpFileMetricExporterOptions::OtlpFileMetricExporterOptions()
   fs_options.rotate_size    = 10;
 
   backend_options = fs_options;
-
-  aggregation_temporality = PreferredAggregationTemporality::kCumulative;
 }
 
 OtlpFileMetricExporterOptions::~OtlpFileMetricExporterOptions() {}
diff --git a/exporters/otlp/src/otlp_grpc_metric_exporter_options.cc b/exporters/otlp/src/otlp_grpc_metric_exporter_options.cc
index 983561424f..0d84ec276f 100644
--- a/exporters/otlp/src/otlp_grpc_metric_exporter_options.cc
+++ b/exporters/otlp/src/otlp_grpc_metric_exporter_options.cc
@@ -11,6 +11,7 @@ namespace otlp
 {
 
 OtlpGrpcMetricExporterOptions::OtlpGrpcMetricExporterOptions()
+    : aggregation_temporality(PreferredAggregationTemporality::kCumulative)
 {
   endpoint                    = GetOtlpDefaultGrpcMetricsEndpoint();
   use_ssl_credentials         = !GetOtlpDefaultGrpcMetricsIsInsecure(); /* negation intended. */
@@ -28,8 +29,6 @@ OtlpGrpcMetricExporterOptions::OtlpGrpcMetricExporterOptions()
   metadata   = GetOtlpDefaultMetricsHeaders();
   user_agent = GetOtlpDefaultUserAgent();
 
-  aggregation_temporality = PreferredAggregationTemporality::kCumulative;
-
   max_threads = 0;
 
   compression = GetOtlpDefaultMetricsCompression();
diff --git a/exporters/otlp/src/otlp_http_client.cc b/exporters/otlp/src/otlp_http_client.cc
index 07b9108a3a..876719fa1e 100644
--- a/exporters/otlp/src/otlp_http_client.cc
+++ b/exporters/otlp/src/otlp_http_client.cc
@@ -707,7 +707,7 @@ OtlpHttpClient::~OtlpHttpClient()
 OtlpHttpClient::OtlpHttpClient(OtlpHttpClientOptions &&options,
                                std::shared_ptr<ext::http::client::HttpClient> http_client)
     : is_shutdown_(false),
-      options_(options),
+      options_(std::move(options)),
       http_client_(std::move(http_client)),
       start_session_counter_(0),
       finished_session_counter_(0)
diff --git a/exporters/otlp/src/otlp_http_exporter_options.cc b/exporters/otlp/src/otlp_http_exporter_options.cc
index 753efcb481..0b00fc9708 100644
--- a/exporters/otlp/src/otlp_http_exporter_options.cc
+++ b/exporters/otlp/src/otlp_http_exporter_options.cc
@@ -16,27 +16,28 @@ namespace otlp
 {
 
 OtlpHttpExporterOptions::OtlpHttpExporterOptions()
+    : json_bytes_mapping(JsonBytesMappingKind::kHexId),
+      use_json_name(false),
+      console_debug(false),
+      ssl_insecure_skip_verify(false)
 {
-  url                = GetOtlpDefaultHttpTracesEndpoint();
-  content_type       = GetOtlpHttpProtocolFromString(GetOtlpDefaultHttpTracesProtocol());
-  json_bytes_mapping = JsonBytesMappingKind::kHexId;
-  use_json_name      = false;
-  console_debug      = false;
-  timeout            = GetOtlpDefaultTracesTimeout();
-  http_headers       = GetOtlpDefaultTracesHeaders();
+  url          = GetOtlpDefaultHttpTracesEndpoint();
+  content_type = GetOtlpHttpProtocolFromString(GetOtlpDefaultHttpTracesProtocol());
+
+  timeout      = GetOtlpDefaultTracesTimeout();
+  http_headers = GetOtlpDefaultTracesHeaders();
 
 #ifdef ENABLE_ASYNC_EXPORT
   max_concurrent_requests     = 64;
   max_requests_per_connection = 8;
 #endif /* ENABLE_ASYNC_EXPORT */
 
-  ssl_insecure_skip_verify = false;
-  ssl_ca_cert_path         = GetOtlpDefaultTracesSslCertificatePath();
-  ssl_ca_cert_string       = GetOtlpDefaultTracesSslCertificateString();
-  ssl_client_key_path      = GetOtlpDefaultTracesSslClientKeyPath();
-  ssl_client_key_string    = GetOtlpDefaultTracesSslClientKeyString();
-  ssl_client_cert_path     = GetOtlpDefaultTracesSslClientCertificatePath();
-  ssl_client_cert_string   = GetOtlpDefaultTracesSslClientCertificateString();
+  ssl_ca_cert_path       = GetOtlpDefaultTracesSslCertificatePath();
+  ssl_ca_cert_string     = GetOtlpDefaultTracesSslCertificateString();
+  ssl_client_key_path    = GetOtlpDefaultTracesSslClientKeyPath();
+  ssl_client_key_string  = GetOtlpDefaultTracesSslClientKeyString();
+  ssl_client_cert_path   = GetOtlpDefaultTracesSslClientCertificatePath();
+  ssl_client_cert_string = GetOtlpDefaultTracesSslClientCertificateString();
 
   ssl_min_tls      = GetOtlpDefaultTracesSslTlsMinVersion();
   ssl_max_tls      = GetOtlpDefaultTracesSslTlsMaxVersion();
diff --git a/exporters/otlp/src/otlp_http_log_record_exporter_options.cc b/exporters/otlp/src/otlp_http_log_record_exporter_options.cc
index 08a04cfa80..f193ea10df 100644
--- a/exporters/otlp/src/otlp_http_log_record_exporter_options.cc
+++ b/exporters/otlp/src/otlp_http_log_record_exporter_options.cc
@@ -16,27 +16,28 @@ namespace otlp
 {
 
 OtlpHttpLogRecordExporterOptions::OtlpHttpLogRecordExporterOptions()
+    : json_bytes_mapping(JsonBytesMappingKind::kHexId),
+      use_json_name(false),
+      console_debug(false),
+      ssl_insecure_skip_verify(false)
 {
-  url                = GetOtlpDefaultHttpLogsEndpoint();
-  content_type       = GetOtlpHttpProtocolFromString(GetOtlpDefaultHttpLogsProtocol());
-  json_bytes_mapping = JsonBytesMappingKind::kHexId;
-  use_json_name      = false;
-  console_debug      = false;
-  timeout            = GetOtlpDefaultLogsTimeout();
-  http_headers       = GetOtlpDefaultLogsHeaders();
+  url          = GetOtlpDefaultHttpLogsEndpoint();
+  content_type = GetOtlpHttpProtocolFromString(GetOtlpDefaultHttpLogsProtocol());
+
+  timeout      = GetOtlpDefaultLogsTimeout();
+  http_headers = GetOtlpDefaultLogsHeaders();
 
 #ifdef ENABLE_ASYNC_EXPORT
   max_concurrent_requests     = 64;
   max_requests_per_connection = 8;
 #endif
 
-  ssl_insecure_skip_verify = false;
-  ssl_ca_cert_path         = GetOtlpDefaultLogsSslCertificatePath();
-  ssl_ca_cert_string       = GetOtlpDefaultLogsSslCertificateString();
-  ssl_client_key_path      = GetOtlpDefaultLogsSslClientKeyPath();
-  ssl_client_key_string    = GetOtlpDefaultLogsSslClientKeyString();
-  ssl_client_cert_path     = GetOtlpDefaultLogsSslClientCertificatePath();
-  ssl_client_cert_string   = GetOtlpDefaultLogsSslClientCertificateString();
+  ssl_ca_cert_path       = GetOtlpDefaultLogsSslCertificatePath();
+  ssl_ca_cert_string     = GetOtlpDefaultLogsSslCertificateString();
+  ssl_client_key_path    = GetOtlpDefaultLogsSslClientKeyPath();
+  ssl_client_key_string  = GetOtlpDefaultLogsSslClientKeyString();
+  ssl_client_cert_path   = GetOtlpDefaultLogsSslClientCertificatePath();
+  ssl_client_cert_string = GetOtlpDefaultLogsSslClientCertificateString();
 
   ssl_min_tls      = GetOtlpDefaultLogsSslTlsMinVersion();
   ssl_max_tls      = GetOtlpDefaultLogsSslTlsMaxVersion();
diff --git a/exporters/otlp/src/otlp_http_metric_exporter_options.cc b/exporters/otlp/src/otlp_http_metric_exporter_options.cc
index 66d65fa54b..95a8dd885c 100644
--- a/exporters/otlp/src/otlp_http_metric_exporter_options.cc
+++ b/exporters/otlp/src/otlp_http_metric_exporter_options.cc
@@ -17,28 +17,29 @@ namespace otlp
 {
 
 OtlpHttpMetricExporterOptions::OtlpHttpMetricExporterOptions()
+    : json_bytes_mapping(JsonBytesMappingKind::kHexId),
+      use_json_name(false),
+      console_debug(false),
+      aggregation_temporality(PreferredAggregationTemporality::kCumulative),
+      ssl_insecure_skip_verify(false)
 {
-  url                     = GetOtlpDefaultMetricsEndpoint();
-  content_type            = GetOtlpHttpProtocolFromString(GetOtlpDefaultHttpMetricsProtocol());
-  json_bytes_mapping      = JsonBytesMappingKind::kHexId;
-  use_json_name           = false;
-  console_debug           = false;
-  timeout                 = GetOtlpDefaultMetricsTimeout();
-  http_headers            = GetOtlpDefaultMetricsHeaders();
-  aggregation_temporality = PreferredAggregationTemporality::kCumulative;
+  url          = GetOtlpDefaultMetricsEndpoint();
+  content_type = GetOtlpHttpProtocolFromString(GetOtlpDefaultHttpMetricsProtocol());
+
+  timeout      = GetOtlpDefaultMetricsTimeout();
+  http_headers = GetOtlpDefaultMetricsHeaders();
 
 #ifdef ENABLE_ASYNC_EXPORT
   max_concurrent_requests     = 64;
   max_requests_per_connection = 8;
 #endif
 
-  ssl_insecure_skip_verify = false;
-  ssl_ca_cert_path         = GetOtlpDefaultMetricsSslCertificatePath();
-  ssl_ca_cert_string       = GetOtlpDefaultMetricsSslCertificateString();
-  ssl_client_key_path      = GetOtlpDefaultMetricsSslClientKeyPath();
-  ssl_client_key_string    = GetOtlpDefaultMetricsSslClientKeyString();
-  ssl_client_cert_path     = GetOtlpDefaultMetricsSslClientCertificatePath();
-  ssl_client_cert_string   = GetOtlpDefaultMetricsSslClientCertificateString();
+  ssl_ca_cert_path       = GetOtlpDefaultMetricsSslCertificatePath();
+  ssl_ca_cert_string     = GetOtlpDefaultMetricsSslCertificateString();
+  ssl_client_key_path    = GetOtlpDefaultMetricsSslClientKeyPath();
+  ssl_client_key_string  = GetOtlpDefaultMetricsSslClientKeyString();
+  ssl_client_cert_path   = GetOtlpDefaultMetricsSslClientCertificatePath();
+  ssl_client_cert_string = GetOtlpDefaultMetricsSslClientCertificateString();
 
   ssl_min_tls      = GetOtlpDefaultMetricsSslTlsMinVersion();
   ssl_max_tls      = GetOtlpDefaultMetricsSslTlsMaxVersion();
diff --git a/exporters/otlp/src/otlp_populate_attribute_utils.cc b/exporters/otlp/src/otlp_populate_attribute_utils.cc
index a2ef2edafa..490e4c771b 100644
--- a/exporters/otlp/src/otlp_populate_attribute_utils.cc
+++ b/exporters/otlp/src/otlp_populate_attribute_utils.cc
@@ -72,7 +72,8 @@ void OtlpPopulateAttributeUtils::PopulateAnyValue(
   }
   else if (nostd::holds_alternative<uint64_t>(value))
   {
-    proto_value->set_int_value(nostd::get<uint64_t>(value));
+    proto_value->set_int_value(
+        nostd::get<uint64_t>(value));  // NOLINT(cppcoreguidelines-narrowing-conversions)
   }
   else if (nostd::holds_alternative<double>(value))
   {
@@ -132,7 +133,8 @@ void OtlpPopulateAttributeUtils::PopulateAnyValue(
     auto array_value = proto_value->mutable_array_value();
     for (const auto &val : nostd::get<nostd::span<const uint64_t>>(value))
     {
-      array_value->add_values()->set_int_value(val);
+      array_value->add_values()->set_int_value(
+          val);  // NOLINT(cppcoreguidelines-narrowing-conversions)
     }
   }
   else if (nostd::holds_alternative<nostd::span<const double>>(value))
@@ -186,7 +188,8 @@ void OtlpPopulateAttributeUtils::PopulateAnyValue(
   }
   else if (nostd::holds_alternative<uint64_t>(value))
   {
-    proto_value->set_int_value(nostd::get<uint64_t>(value));
+    proto_value->set_int_value(
+        nostd::get<uint64_t>(value));  // NOLINT(cppcoreguidelines-narrowing-conversions)
   }
   else if (nostd::holds_alternative<double>(value))
   {
@@ -217,7 +220,8 @@ void OtlpPopulateAttributeUtils::PopulateAnyValue(
     auto array_value = proto_value->mutable_array_value();
     for (const auto &val : nostd::get<std::vector<uint32_t>>(value))
     {
-      array_value->add_values()->set_int_value(val);
+      array_value->add_values()->set_int_value(
+          val);  // NOLINT(cppcoreguidelines-narrowing-conversions)
     }
   }
   else if (nostd::holds_alternative<std::vector<int64_t>>(value))
@@ -233,7 +237,8 @@ void OtlpPopulateAttributeUtils::PopulateAnyValue(
     auto array_value = proto_value->mutable_array_value();
     for (const auto &val : nostd::get<std::vector<uint64_t>>(value))
     {
-      array_value->add_values()->set_int_value(val);
+      array_value->add_values()->set_int_value(
+          val);  // NOLINT(cppcoreguidelines-narrowing-conversions)
     }
   }
   else if (nostd::holds_alternative<std::vector<double>>(value))
diff --git a/exporters/prometheus/src/exporter_utils.cc b/exporters/prometheus/src/exporter_utils.cc
index 35ee748273..77fcd56ad2 100644
--- a/exporters/prometheus/src/exporter_utils.cc
+++ b/exporters/prometheus/src/exporter_utils.cc
@@ -284,11 +284,11 @@ std::string PrometheusExporterUtils::SanitizeNames(std::string name)
 }
 
 #if OPENTELEMETRY_HAVE_WORKING_REGEX
-std::regex INVALID_CHARACTERS_PATTERN("[^a-zA-Z0-9]");
-std::regex CHARACTERS_BETWEEN_BRACES_PATTERN("\\{(.*?)\\}");
-std::regex SANITIZE_LEADING_UNDERSCORES("^_+");
-std::regex SANITIZE_TRAILING_UNDERSCORES("_+$");
-std::regex SANITIZE_CONSECUTIVE_UNDERSCORES("[_]{2,}");
+const std::regex INVALID_CHARACTERS_PATTERN("[^a-zA-Z0-9]");
+const std::regex CHARACTERS_BETWEEN_BRACES_PATTERN("\\{(.*?)\\}");
+const std::regex SANITIZE_LEADING_UNDERSCORES("^_+");
+const std::regex SANITIZE_TRAILING_UNDERSCORES("_+$");
+const std::regex SANITIZE_CONSECUTIVE_UNDERSCORES("[_]{2,}");
 #endif
 
 std::string PrometheusExporterUtils::GetEquivalentPrometheusUnit(
diff --git a/exporters/prometheus/test/collector_test.cc b/exporters/prometheus/test/collector_test.cc
index 63f840bc9a..a70fd317b3 100644
--- a/exporters/prometheus/test/collector_test.cc
+++ b/exporters/prometheus/test/collector_test.cc
@@ -23,7 +23,7 @@ class MockMetricProducer : public opentelemetry::sdk::metrics::MetricProducer
 
 public:
   MockMetricProducer(std::chrono::microseconds sleep_ms = std::chrono::microseconds::zero())
-      : sleep_ms_{sleep_ms}, data_sent_size_(0)
+      : sleep_ms_{sleep_ms}
   {}
 
   bool Collect(nostd::function_ref<bool(ResourceMetrics &)> callback) noexcept override
@@ -39,7 +39,7 @@ class MockMetricProducer : public opentelemetry::sdk::metrics::MetricProducer
 
 private:
   std::chrono::microseconds sleep_ms_;
-  size_t data_sent_size_;
+  size_t data_sent_size_{0};
 };
 
 class MockMetricReader : public opentelemetry::sdk::metrics::MetricReader
diff --git a/exporters/zipkin/src/zipkin_exporter.cc b/exporters/zipkin/src/zipkin_exporter.cc
index a554cbf4cc..4c5723c674 100644
--- a/exporters/zipkin/src/zipkin_exporter.cc
+++ b/exporters/zipkin/src/zipkin_exporter.cc
@@ -50,9 +50,11 @@ ZipkinExporter::ZipkinExporter() : options_(ZipkinExporterOptions()), url_parser
 
 ZipkinExporter::ZipkinExporter(
     std::shared_ptr<opentelemetry::ext::http::client::HttpClientSync> http_client)
-    : options_(ZipkinExporterOptions()), url_parser_(options_.endpoint)
+    : options_(ZipkinExporterOptions()),
+      http_client_(std::move(http_client)),
+      url_parser_(options_.endpoint)
 {
-  http_client_ = http_client;
+
   InitializeLocalEndpoint();
 }
 
diff --git a/ext/include/opentelemetry/ext/http/client/http_client.h b/ext/include/opentelemetry/ext/http/client/http_client.h
index 1089402e28..d17215da9b 100644
--- a/ext/include/opentelemetry/ext/http/client/http_client.h
+++ b/ext/include/opentelemetry/ext/http/client/http_client.h
@@ -6,8 +6,10 @@
 #include <chrono>
 #include <cstring>
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
+
 #include "opentelemetry/nostd/function_ref.h"
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/version.h"
diff --git a/ext/src/http/client/curl/http_client_curl.cc b/ext/src/http/client/curl/http_client_curl.cc
index 67b0b93a54..22f20fb0e0 100644
--- a/ext/src/http/client/curl/http_client_curl.cc
+++ b/ext/src/http/client/curl/http_client_curl.cc
@@ -185,13 +185,12 @@ void Session::FinishOperation()
 }
 
 HttpClient::HttpClient()
-    : next_session_id_{0},
+    : multi_handle_(curl_multi_init()),
+      next_session_id_{0},
       max_sessions_per_connection_{8},
       scheduled_delay_milliseconds_{std::chrono::milliseconds(256)},
       curl_global_initializer_(HttpCurlGlobalInitializer::GetInstance())
-{
-  multi_handle_ = curl_multi_init();
-}
+{}
 
 HttpClient::~HttpClient()
 {
diff --git a/ext/test/http/curl_http_test.cc b/ext/test/http/curl_http_test.cc
index 0dc6e5d5e8..d5351d2314 100644
--- a/ext/test/http/curl_http_test.cc
+++ b/ext/test/http/curl_http_test.cc
@@ -26,12 +26,11 @@ namespace nostd       = opentelemetry::nostd;
 class CustomEventHandler : public http_client::EventHandler
 {
 public:
-  virtual void OnResponse(http_client::Response & /* response */) noexcept override
+  void OnResponse(http_client::Response & /* response */) noexcept override
   {
     got_response_ = true;
   }
-  virtual void OnEvent(http_client::SessionState state,
-                       nostd::string_view /* reason */) noexcept override
+  void OnEvent(http_client::SessionState state, nostd::string_view /* reason */) noexcept override
   {
     switch (state)
     {
@@ -113,7 +112,7 @@ class BasicCurlHttpTests : public ::testing::Test, public HTTP_SERVER_NS::HttpRe
 public:
   BasicCurlHttpTests() : is_setup_(false), is_running_(false) {}
 
-  virtual void SetUp() override
+  void SetUp() override
   {
     if (is_setup_.exchange(true))
     {
@@ -132,7 +131,7 @@ class BasicCurlHttpTests : public ::testing::Test, public HTTP_SERVER_NS::HttpRe
     is_running_ = true;
   }
 
-  virtual void TearDown() override
+  void TearDown() override
   {
     if (!is_setup_.exchange(false))
       return;
@@ -140,8 +139,8 @@ class BasicCurlHttpTests : public ::testing::Test, public HTTP_SERVER_NS::HttpRe
     is_running_ = false;
   }
 
-  virtual int onHttpRequest(HTTP_SERVER_NS::HttpRequest const &request,
-                            HTTP_SERVER_NS::HttpResponse &response) override
+  int onHttpRequest(HTTP_SERVER_NS::HttpRequest const &request,
+                    HTTP_SERVER_NS::HttpResponse &response) override
   {
     int response_status = 404;
     if (request.uri == "/get/")
diff --git a/ext/test/w3c_tracecontext_test/main.cc b/ext/test/w3c_tracecontext_test/main.cc
index d9819cde0d..4e9fb36796 100644
--- a/ext/test/w3c_tracecontext_test/main.cc
+++ b/ext/test/w3c_tracecontext_test/main.cc
@@ -30,7 +30,7 @@ class TextMapCarrierTest : public context::propagation::TextMapCarrier
 {
 public:
   TextMapCarrierTest(std::map<std::string, std::string> &headers) : headers_(headers) {}
-  virtual nostd::string_view Get(nostd::string_view key) const noexcept override
+  nostd::string_view Get(nostd::string_view key) const noexcept override
   {
     auto it = headers_.find(std::string(key));
     if (it != headers_.end())
@@ -39,7 +39,7 @@ class TextMapCarrierTest : public context::propagation::TextMapCarrier
     }
     return "";
   }
-  virtual void Set(nostd::string_view key, nostd::string_view value) noexcept override
+  void Set(nostd::string_view key, nostd::string_view value) noexcept override
   {
     headers_[std::string(key)] = std::string(value);
   }
diff --git a/functional/otlp/func_http_main.cc b/functional/otlp/func_http_main.cc
index ece1588425..99fec8443e 100644
--- a/functional/otlp/func_http_main.cc
+++ b/functional/otlp/func_http_main.cc
@@ -1,6 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <iostream>
diff --git a/sdk/include/opentelemetry/sdk/common/circular_buffer.h b/sdk/include/opentelemetry/sdk/common/circular_buffer.h
index c2548012b1..6541612158 100644
--- a/sdk/include/opentelemetry/sdk/common/circular_buffer.h
+++ b/sdk/include/opentelemetry/sdk/common/circular_buffer.h
@@ -113,7 +113,6 @@ class CircularBuffer
         data_[head_index].Swap(ptr);
       }
     }
-    return true;
   }
 
   bool Add(std::unique_ptr<T> &&ptr) noexcept
diff --git a/sdk/src/common/base64.cc b/sdk/src/common/base64.cc
index 3c572fe344..a78b88ad68 100644
--- a/sdk/src/common/base64.cc
+++ b/sdk/src/common/base64.cc
@@ -200,15 +200,10 @@ static int Base64UnescapeInternal(unsigned char *dst,
     ++line_len;
     if (src[i] == padding_char)
     {
-      if (++j > 2)
+      if (++j > 2 || (valid_slen & 3) == 1 || (valid_slen & 3) == 2)
       {
         return -2;
       }
-      else if ((valid_slen & 3) == 1 || (valid_slen & 3) == 2)
-      {
-        // First and second char of every group can not be padding char
-        return -2;
-      }
     }
     else
     {
diff --git a/sdk/src/logs/logger_provider.cc b/sdk/src/logs/logger_provider.cc
index fdea3eb51a..46bf1ade33 100644
--- a/sdk/src/logs/logger_provider.cc
+++ b/sdk/src/logs/logger_provider.cc
@@ -31,13 +31,13 @@ LoggerProvider::LoggerProvider(std::unique_ptr<LogRecordProcessor> &&processor,
 {
   std::vector<std::unique_ptr<LogRecordProcessor>> processors;
   processors.emplace_back(std::move(processor));
-  context_ = std::make_shared<LoggerContext>(std::move(processors), std::move(resource));
+  context_ = std::make_shared<LoggerContext>(std::move(processors), resource);
   OTEL_INTERNAL_LOG_DEBUG("[LoggerProvider] LoggerProvider created.");
 }
 
 LoggerProvider::LoggerProvider(std::vector<std::unique_ptr<LogRecordProcessor>> &&processors,
                                const opentelemetry::sdk::resource::Resource &resource) noexcept
-    : context_{std::make_shared<LoggerContext>(std::move(processors), std::move(resource))}
+    : context_{std::make_shared<LoggerContext>(std::move(processors), resource)}
 {}
 
 LoggerProvider::LoggerProvider() noexcept
diff --git a/sdk/src/metrics/aggregation/lastvalue_aggregation.cc b/sdk/src/metrics/aggregation/lastvalue_aggregation.cc
index 0380015234..2bc0eddb0e 100644
--- a/sdk/src/metrics/aggregation/lastvalue_aggregation.cc
+++ b/sdk/src/metrics/aggregation/lastvalue_aggregation.cc
@@ -28,9 +28,7 @@ LongLastValueAggregation::LongLastValueAggregation()
   point_data_.value_              = static_cast<int64_t>(0);
 }
 
-LongLastValueAggregation::LongLastValueAggregation(LastValuePointData &&data)
-    : point_data_{std::move(data)}
-{}
+LongLastValueAggregation::LongLastValueAggregation(LastValuePointData &&data) : point_data_{data} {}
 
 LongLastValueAggregation::LongLastValueAggregation(const LastValuePointData &data)
     : point_data_{data}
@@ -51,12 +49,12 @@ std::unique_ptr<Aggregation> LongLastValueAggregation::Merge(
   if (nostd::get<LastValuePointData>(ToPoint()).sample_ts_.time_since_epoch() >
       nostd::get<LastValuePointData>(delta.ToPoint()).sample_ts_.time_since_epoch())
   {
-    LastValuePointData merge_data = std::move(nostd::get<LastValuePointData>(ToPoint()));
+    LastValuePointData merge_data = nostd::get<LastValuePointData>(ToPoint());
     return std::unique_ptr<Aggregation>(new LongLastValueAggregation(std::move(merge_data)));
   }
   else
   {
-    LastValuePointData merge_data = std::move(nostd::get<LastValuePointData>(delta.ToPoint()));
+    LastValuePointData merge_data = nostd::get<LastValuePointData>(delta.ToPoint());
     return std::unique_ptr<Aggregation>(new LongLastValueAggregation(std::move(merge_data)));
   }
 }
@@ -66,12 +64,12 @@ std::unique_ptr<Aggregation> LongLastValueAggregation::Diff(const Aggregation &n
   if (nostd::get<LastValuePointData>(ToPoint()).sample_ts_.time_since_epoch() >
       nostd::get<LastValuePointData>(next.ToPoint()).sample_ts_.time_since_epoch())
   {
-    LastValuePointData diff_data = std::move(nostd::get<LastValuePointData>(ToPoint()));
+    LastValuePointData diff_data = nostd::get<LastValuePointData>(ToPoint());
     return std::unique_ptr<Aggregation>(new LongLastValueAggregation(std::move(diff_data)));
   }
   else
   {
-    LastValuePointData diff_data = std::move(nostd::get<LastValuePointData>(next.ToPoint()));
+    LastValuePointData diff_data = nostd::get<LastValuePointData>(next.ToPoint());
     return std::unique_ptr<Aggregation>(new LongLastValueAggregation(std::move(diff_data)));
   }
 }
@@ -89,7 +87,7 @@ DoubleLastValueAggregation::DoubleLastValueAggregation()
 }
 
 DoubleLastValueAggregation::DoubleLastValueAggregation(LastValuePointData &&data)
-    : point_data_{std::move(data)}
+    : point_data_{data}
 {}
 
 DoubleLastValueAggregation::DoubleLastValueAggregation(const LastValuePointData &data)
@@ -111,12 +109,12 @@ std::unique_ptr<Aggregation> DoubleLastValueAggregation::Merge(
   if (nostd::get<LastValuePointData>(ToPoint()).sample_ts_.time_since_epoch() >
       nostd::get<LastValuePointData>(delta.ToPoint()).sample_ts_.time_since_epoch())
   {
-    LastValuePointData merge_data = std::move(nostd::get<LastValuePointData>(ToPoint()));
+    LastValuePointData merge_data = nostd::get<LastValuePointData>(ToPoint());
     return std::unique_ptr<Aggregation>(new DoubleLastValueAggregation(std::move(merge_data)));
   }
   else
   {
-    LastValuePointData merge_data = std::move(nostd::get<LastValuePointData>(delta.ToPoint()));
+    LastValuePointData merge_data = nostd::get<LastValuePointData>(delta.ToPoint());
     return std::unique_ptr<Aggregation>(new DoubleLastValueAggregation(std::move(merge_data)));
   }
 }
@@ -127,12 +125,12 @@ std::unique_ptr<Aggregation> DoubleLastValueAggregation::Diff(
   if (nostd::get<LastValuePointData>(ToPoint()).sample_ts_.time_since_epoch() >
       nostd::get<LastValuePointData>(next.ToPoint()).sample_ts_.time_since_epoch())
   {
-    LastValuePointData diff_data = std::move(nostd::get<LastValuePointData>(ToPoint()));
+    LastValuePointData diff_data = nostd::get<LastValuePointData>(ToPoint());
     return std::unique_ptr<Aggregation>(new DoubleLastValueAggregation(std::move(diff_data)));
   }
   else
   {
-    LastValuePointData diff_data = std::move(nostd::get<LastValuePointData>(next.ToPoint()));
+    LastValuePointData diff_data = nostd::get<LastValuePointData>(next.ToPoint());
     return std::unique_ptr<Aggregation>(new DoubleLastValueAggregation(std::move(diff_data)));
   }
 }
diff --git a/sdk/src/metrics/aggregation/sum_aggregation.cc b/sdk/src/metrics/aggregation/sum_aggregation.cc
index 1e0442e92c..ce0d4c5de5 100644
--- a/sdk/src/metrics/aggregation/sum_aggregation.cc
+++ b/sdk/src/metrics/aggregation/sum_aggregation.cc
@@ -27,7 +27,7 @@ LongSumAggregation::LongSumAggregation(bool is_monotonic)
   point_data_.is_monotonic_ = is_monotonic;
 }
 
-LongSumAggregation::LongSumAggregation(SumPointData &&data) : point_data_{std::move(data)} {}
+LongSumAggregation::LongSumAggregation(SumPointData &&data) : point_data_{data} {}
 
 LongSumAggregation::LongSumAggregation(const SumPointData &data) : point_data_{data} {}
 
@@ -81,7 +81,7 @@ DoubleSumAggregation::DoubleSumAggregation(bool is_monotonic)
   point_data_.is_monotonic_ = is_monotonic;
 }
 
-DoubleSumAggregation::DoubleSumAggregation(SumPointData &&data) : point_data_(std::move(data)) {}
+DoubleSumAggregation::DoubleSumAggregation(SumPointData &&data) : point_data_(data) {}
 
 DoubleSumAggregation::DoubleSumAggregation(const SumPointData &data) : point_data_(data) {}
 
diff --git a/sdk/src/metrics/export/periodic_exporting_metric_reader.cc b/sdk/src/metrics/export/periodic_exporting_metric_reader.cc
index 7ca2747337..1ebfc2a1b6 100644
--- a/sdk/src/metrics/export/periodic_exporting_metric_reader.cc
+++ b/sdk/src/metrics/export/periodic_exporting_metric_reader.cc
@@ -106,19 +106,22 @@ bool PeriodicExportingMetricReader::CollectAndExportOnce()
     std::promise<void> sender;
     auto receiver = sender.get_future();
 
-    task_thread.reset(new std::thread([this, &cancel_export_for_timeout] {
-      this->Collect([this, &cancel_export_for_timeout](ResourceMetrics &metric_data) {
-        if (cancel_export_for_timeout.load(std::memory_order_acquire))
-        {
-          OTEL_INTERNAL_LOG_ERROR(
-              "[Periodic Exporting Metric Reader] Collect took longer configured time: "
-              << this->export_timeout_millis_.count() << " ms, and timed out");
-          return false;
-        }
-        this->exporter_->Export(metric_data);
-        return true;
-      });
-    }));
+    task_thread.reset(
+        new std::thread([this, &cancel_export_for_timeout, sender = std::move(sender)] {
+          this->Collect([this, &cancel_export_for_timeout](ResourceMetrics &metric_data) {
+            if (cancel_export_for_timeout.load(std::memory_order_acquire))
+            {
+              OTEL_INTERNAL_LOG_ERROR(
+                  "[Periodic Exporting Metric Reader] Collect took longer configured time: "
+                  << this->export_timeout_millis_.count() << " ms, and timed out");
+              return false;
+            }
+            this->exporter_->Export(metric_data);
+            return true;
+          });
+
+          const_cast<std::promise<void> &>(sender).set_value();
+        }));
 
     std::future_status status;
     do
diff --git a/sdk/src/metrics/state/sync_metric_storage.cc b/sdk/src/metrics/state/sync_metric_storage.cc
index fe736e64f3..ad6ea27821 100644
--- a/sdk/src/metrics/state/sync_metric_storage.cc
+++ b/sdk/src/metrics/state/sync_metric_storage.cc
@@ -39,7 +39,7 @@ bool SyncMetricStorage::Collect(CollectorHandle *collector,
   }
 
   return temporal_metric_storage_.buildMetrics(collector, collectors, sdk_start_ts, collection_ts,
-                                               std::move(delta_metrics), callback);
+                                               delta_metrics, callback);
 }
 
 }  // namespace metrics
diff --git a/sdk/src/trace/batch_span_processor.cc b/sdk/src/trace/batch_span_processor.cc
index 6aa6a49949..f0f55d20e8 100644
--- a/sdk/src/trace/batch_span_processor.cc
+++ b/sdk/src/trace/batch_span_processor.cc
@@ -66,7 +66,7 @@ void BatchSpanProcessor::OnEnd(std::unique_ptr<Recordable> &&span) noexcept
     return;
   }
 
-  if (buffer_.Add(span) == false)
+  if (buffer_.Add(std::move(span)) == false)
   {
     OTEL_INTERNAL_LOG_WARN("BatchSpanProcessor queue is full - dropping span.");
     return;
diff --git a/sdk/src/trace/samplers/parent_factory.cc b/sdk/src/trace/samplers/parent_factory.cc
index 7f1bc088d6..63a7eff1c4 100644
--- a/sdk/src/trace/samplers/parent_factory.cc
+++ b/sdk/src/trace/samplers/parent_factory.cc
@@ -16,7 +16,7 @@ namespace trace
 std::unique_ptr<Sampler> ParentBasedSamplerFactory::Create(
     const std::shared_ptr<Sampler> &delegate_sampler)
 {
-  std::unique_ptr<Sampler> sampler(new ParentBasedSampler(std::move(delegate_sampler)));
+  std::unique_ptr<Sampler> sampler(new ParentBasedSampler(delegate_sampler));
   return sampler;
 }
 
diff --git a/sdk/test/common/random_test.cc b/sdk/test/common/random_test.cc
index 243a998041..e22e0508fc 100644
--- a/sdk/test/common/random_test.cc
+++ b/sdk/test/common/random_test.cc
@@ -51,6 +51,7 @@ TEST(RandomTest, AtomicFlagMultiThreadTest)
 {
   std::vector<std::thread> threads;
   std::atomic_uint count(0);
+  threads.reserve(10);
   for (int i = 0; i < 10; ++i)
   {
     threads.push_back(std::thread(doSomethingOnce, &count));
diff --git a/sdk/test/metrics/periodic_exporting_metric_reader_test.cc b/sdk/test/metrics/periodic_exporting_metric_reader_test.cc
index f65c10ca05..277a20582f 100644
--- a/sdk/test/metrics/periodic_exporting_metric_reader_test.cc
+++ b/sdk/test/metrics/periodic_exporting_metric_reader_test.cc
@@ -51,7 +51,7 @@ class MockMetricProducer : public MetricProducer
 {
 public:
   MockMetricProducer(std::chrono::microseconds sleep_ms = std::chrono::microseconds::zero())
-      : sleep_ms_{sleep_ms}, data_sent_size_(0)
+      : sleep_ms_{sleep_ms}
   {}
 
   bool Collect(nostd::function_ref<bool(ResourceMetrics &)> callback) noexcept override
@@ -67,7 +67,7 @@ class MockMetricProducer : public MetricProducer
 
 private:
   std::chrono::microseconds sleep_ms_;
-  size_t data_sent_size_;
+  size_t data_sent_size_{0};
 };
 
 TEST(PeriodicExporingMetricReader, BasicTests)