diff --git a/presence/broadcast_request.h b/presence/broadcast_request.h
index dc380203..598ffdf3 100644
--- a/presence/broadcast_request.h
+++ b/presence/broadcast_request.h
@@ -18,7 +18,6 @@
 #include <string>
 #include <vector>
 
-#include "absl/types/optional.h"
 #include "absl/types/variant.h"
 #include "internal/proto/credential.pb.h"
 #include "presence/data_element.h"
diff --git a/presence/data_types.h b/presence/data_types.h
index 8333e7ff..48fdde74 100644
--- a/presence/data_types.h
+++ b/presence/data_types.h
@@ -15,8 +15,7 @@
 #ifndef THIRD_PARTY_NEARBY_PRESENCE_SCAN_CALLBACK_H_
 #define THIRD_PARTY_NEARBY_PRESENCE_SCAN_CALLBACK_H_
 
-#include <functional>
-#include <utility>
+#include <cstdint>
 
 #include "absl/functional/any_invocable.h"
 #include "internal/platform/logging.h"
diff --git a/presence/implementation/advertisement_factory.h b/presence/implementation/advertisement_factory.h
index 69321f54..54211944 100644
--- a/presence/implementation/advertisement_factory.h
+++ b/presence/implementation/advertisement_factory.h
@@ -16,10 +16,11 @@
 #define THIRD_PARTY_NEARBY_PRESENCE_ADVERTISEMENT_FACTORY_H_
 
 #include <string>
-#include <vector>
 
 #include "absl/status/statusor.h"
-#include "internal/proto/credential.pb.h"
+#include "absl/strings/string_view.h"
+#include "absl/types/optional.h"
+#include "internal/platform/implementation/credential_callbacks.h"
 #include "presence/implementation/base_broadcast_request.h"
 #include "presence/implementation/mediums/advertisement_data.h"
 
@@ -39,17 +40,18 @@ class AdvertisementFactory {
   // Returns a BLE advertisement for given `request.
   absl::StatusOr<AdvertisementData> CreateAdvertisement(
       const BaseBroadcastRequest& request,
-      absl::optional<LocalCredential> credential) const;
+      absl::optional<LocalCredential> credential) const;  // NOLINT
 
   absl::StatusOr<AdvertisementData> CreateAdvertisement(
       const BaseBroadcastRequest& request) const {
-    return CreateAdvertisement(request, absl::optional<LocalCredential>());
+    return CreateAdvertisement(request,
+                               absl::optional<LocalCredential>());  // NOLINT
   }
 
  private:
   absl::StatusOr<AdvertisementData> CreateBaseNpAdvertisement(
       const BaseBroadcastRequest& request,
-      absl::optional<LocalCredential> credential) const;
+      absl::optional<LocalCredential> credential) const;  // NOLINT
   absl::StatusOr<std::string> EncryptDataElements(
       const LocalCredential& credential, absl::string_view salt,
       absl::string_view data_elements) const;
diff --git a/presence/implementation/base_broadcast_request.h b/presence/implementation/base_broadcast_request.h
index 2b898a6b..36821ccc 100644
--- a/presence/implementation/base_broadcast_request.h
+++ b/presence/implementation/base_broadcast_request.h
@@ -17,6 +17,7 @@
 
 #include <stdint.h>
 
+#include <cstddef>
 #include <string>
 
 #include "absl/status/statusor.h"
diff --git a/presence/implementation/broadcast_manager.cc b/presence/implementation/broadcast_manager.cc
index 5bc5ed3a..5039db29 100644
--- a/presence/implementation/broadcast_manager.cc
+++ b/presence/implementation/broadcast_manager.cc
@@ -15,18 +15,26 @@
 #include "presence/implementation/broadcast_manager.h"
 
 #include <algorithm>
-#include <limits>
+#include <cstdint>
 #include <memory>
-#include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "absl/time/time.h"
+#include "absl/base/thread_annotations.h"
+#include "absl/status/status.h"
+#include "absl/strings/str_format.h"
+#include "absl/strings/string_view.h"
+#include "absl/types/optional.h"
+#include "internal/platform/implementation/ble_v2.h"
+#include "internal/platform/implementation/credential_callbacks.h"
 #include "internal/platform/implementation/crypto.h"
-#include "internal/platform/implementation/system_clock.h"
 #include "internal/platform/logging.h"
+#include "presence/broadcast_request.h"
+#include "presence/data_types.h"
 #include "presence/implementation/advertisement_factory.h"
+#include "presence/implementation/base_broadcast_request.h"
+#include "presence/implementation/mediums/advertisement_data.h"
 
 namespace nearby {
 namespace presence {
@@ -146,11 +154,11 @@ void BroadcastManager::FetchCredentials(
               }});
 }
 
-absl::optional<LocalCredential> BroadcastManager::SelectCredential(
+absl::optional<LocalCredential> BroadcastManager::SelectCredential(  // NOLINT
     BaseBroadcastRequest& broadcast_request,
     std::vector<LocalCredential> credentials) {
   if (credentials.empty()) {
-    return absl::optional<LocalCredential>();
+    return absl::optional<LocalCredential>();  // NOLINT
   }
   auto credential =
       std::min_element(credentials.begin(), credentials.end(),
@@ -159,7 +167,7 @@ absl::optional<LocalCredential> BroadcastManager::SelectCredential(
                        });
   if (credential == credentials.end()) {
     NEARBY_LOGS(WARNING) << "No active credentials";
-    return absl::optional<LocalCredential>();
+    return absl::optional<LocalCredential>();  // NOLINT
   }
   std::string salt = SelectSalt(*credential, broadcast_request.salt);
   if (salt != broadcast_request.salt) {
@@ -169,15 +177,15 @@ absl::optional<LocalCredential> BroadcastManager::SelectCredential(
   return *credential;
 }
 
-absl::optional<LocalCredential> BroadcastManager::Advertise(
+absl::optional<LocalCredential> BroadcastManager::Advertise(  // NOLINT
     BroadcastSessionId id, BaseBroadcastRequest broadcast_request,
     std::vector<LocalCredential> credentials) {
   auto it = sessions_.find(id);
   if (it == sessions_.end()) {
     NEARBY_LOGS(INFO) << "Broadcast session terminated, id: " << id;
-    return absl::optional<LocalCredential>();
+    return absl::optional<LocalCredential>();  // NOLINT
   }
-  absl::optional<LocalCredential> credential =
+  absl::optional<LocalCredential> credential =  // NOLINT
       SelectCredential(broadcast_request, std::move(credentials));
   absl::StatusOr<AdvertisementData> advertisement =
       AdvertisementFactory().CreateAdvertisement(broadcast_request, credential);
@@ -185,7 +193,7 @@ absl::optional<LocalCredential> BroadcastManager::Advertise(
     NEARBY_LOGS(WARNING) << "Can't create advertisement, reason: "
                          << advertisement.status();
     NotifyStartCallbackStatus(id, advertisement.status());
-    return absl::optional<LocalCredential>();
+    return absl::optional<LocalCredential>(); //NOLINT
   }
   std::unique_ptr<AdvertisingSession> session =
       mediums_->GetBle().StartAdvertising(
@@ -197,7 +205,7 @@ absl::optional<LocalCredential> BroadcastManager::Advertise(
   if (!session) {
     NotifyStartCallbackStatus(id,
                               absl::InternalError("Can't start advertising"));
-    return absl::optional<LocalCredential>();
+    return absl::optional<LocalCredential>(); //NOLINT
   }
   it->second.SetAdvertisingSession(std::move(session));
   return credential;
diff --git a/presence/implementation/broadcast_manager.h b/presence/implementation/broadcast_manager.h
index d9a7fd52..7d274907 100644
--- a/presence/implementation/broadcast_manager.h
+++ b/presence/implementation/broadcast_manager.h
@@ -21,15 +21,20 @@
 #include <vector>
 
 #include "absl/base/thread_annotations.h"
+#include "absl/container/flat_hash_map.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
+#include "internal/platform/implementation/ble_v2.h"
+#include "internal/platform/runnable.h"
 #include "internal/platform/single_thread_executor.h"
-#include "internal/proto/credential.pb.h"
 #include "presence/broadcast_request.h"
 #include "presence/data_types.h"
 #include "presence/implementation/base_broadcast_request.h"
 #include "presence/implementation/credential_manager.h"
 #include "presence/implementation/mediums/mediums.h"
+#include "presence/power_mode.h"
 
 namespace nearby {
 namespace presence {
@@ -84,14 +89,14 @@ class BroadcastManager {
   void FetchCredentials(BroadcastSessionId id,
                         BaseBroadcastRequest broadcast_request)
       ABSL_EXCLUSIVE_LOCKS_REQUIRED(*executor_);
-  absl::optional<LocalCredential> SelectCredential(
+  absl::optional<LocalCredential> SelectCredential( //NOLINT
       BaseBroadcastRequest& broadcast_request,
       std::vector<LocalCredential> credentials);
 
   // Returns the private credential, if any, selected to generate the
   // advertisement. A salt used in the advertisement is added to the returned
   // private credential. The caller must save it in the storage.
-  absl::optional<LocalCredential> Advertise(
+  absl::optional<LocalCredential> Advertise( //NOLINT
       BroadcastSessionId id, BaseBroadcastRequest broadcast_request,
       std::vector<LocalCredential> credentials)
       ABSL_EXCLUSIVE_LOCKS_REQUIRED(*executor_);
diff --git a/presence/implementation/service_controller_impl.h b/presence/implementation/service_controller_impl.h
index 415d2ac6..b858b7b3 100644
--- a/presence/implementation/service_controller_impl.h
+++ b/presence/implementation/service_controller_impl.h
@@ -15,16 +15,21 @@
 #ifndef THIRD_PARTY_NEARBY_PRESENCE_IMPLEMENTATION_SERVICE_CONTROLLER_IMPL_H_
 #define THIRD_PARTY_NEARBY_PRESENCE_IMPLEMENTATION_SERVICE_CONTROLLER_IMPL_H_
 
-#include <memory>
 #include <string>
 #include <utility>
+#include <vector>
 
+#include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
+#include "internal/platform/implementation/credential_callbacks.h"
+#include "internal/platform/runnable.h"
+#include "internal/platform/single_thread_executor.h"
 #include "internal/proto/metadata.pb.h"
+#include "presence/broadcast_request.h"
+#include "presence/data_types.h"
 #include "presence/implementation/broadcast_manager.h"
 #include "presence/implementation/credential_manager.h"
-#include "presence/implementation/mediums/mediums.h"
 #include "presence/implementation/scan_manager.h"
 #include "presence/implementation/service_controller.h"
 #include "presence/scan_request.h"
diff --git a/presence/presence_device.h b/presence/presence_device.h
index 59a81124..93bac818 100644
--- a/presence/presence_device.h
+++ b/presence/presence_device.h
@@ -15,6 +15,7 @@
 #ifndef THIRD_PARTY_NEARBY_PRESENCE_PRESENCE_DEVICE_H_
 #define THIRD_PARTY_NEARBY_PRESENCE_PRESENCE_DEVICE_H_
 
+#include <optional>
 #include <string>
 #include <vector>
 
diff --git a/presence/presence_service_impl.h b/presence/presence_service_impl.h
index 7f03e586..a8d5a219 100644
--- a/presence/presence_service_impl.h
+++ b/presence/presence_service_impl.h
@@ -16,7 +16,6 @@
 #define THIRD_PARTY_NEARBY_PRESENCE_PRESENCE_SERVICE_IMPL_H_
 
 #include <memory>
-#include <utility>
 #include <vector>
 
 #include "absl/status/statusor.h"