diff --git a/src/app/DataVersionFilter.h b/src/app/DataVersionFilter.h
index 83ad93207119b1..069a61d688e112 100644
--- a/src/app/DataVersionFilter.h
+++ b/src/app/DataVersionFilter.h
@@ -19,6 +19,7 @@
 #pragma once
 
 #include <app/util/basic-types.h>
+#include <lib/core/Optional.h>
 
 namespace chip {
 namespace app {
diff --git a/src/app/GlobalAttributes.h b/src/app/GlobalAttributes.h
index 4221294cc3f00d..82980a798d2072 100644
--- a/src/app/GlobalAttributes.h
+++ b/src/app/GlobalAttributes.h
@@ -18,6 +18,7 @@
 #pragma once
 
 #include <app-common/zap-generated/ids/Attributes.h>
+#include <lib/support/CodeUtils.h>
 
 namespace chip {
 namespace app {
diff --git a/src/app/InteractionModelHelper.h b/src/app/InteractionModelHelper.h
index 530ba2be196347..fe46b4d7910ab3 100644
--- a/src/app/InteractionModelHelper.h
+++ b/src/app/InteractionModelHelper.h
@@ -18,7 +18,10 @@
 
 #pragma once
 
+#include <app/StatusResponse.h>
 #include <system/SystemPacketBuffer.h>
+#include <system/TLVPacketBufferBackingStore.h>
+
 namespace chip {
 namespace app {
 
diff --git a/src/app/InteractionModelRevision.h b/src/app/InteractionModelRevision.h
index 3de6993414048a..8f38a342969ddd 100644
--- a/src/app/InteractionModelRevision.h
+++ b/src/app/InteractionModelRevision.h
@@ -17,6 +17,9 @@
 
 #pragma once
 
+#include <inttypes.h>
+#include <stddef.h>
+
 /**
  * CHIP_DEVICE_INTERACTION_MODEL_REVISION
  *
diff --git a/src/app/ReadHandler.h b/src/app/ReadHandler.h
index 3e192a2abf5f59..88b8ad8e13f2b5 100644
--- a/src/app/ReadHandler.h
+++ b/src/app/ReadHandler.h
@@ -32,6 +32,8 @@
 #include <app/EventManagement.h>
 #include <app/EventPathParams.h>
 #include <app/MessageDef/AttributePathIBs.h>
+#include <app/MessageDef/DataVersionFilterIBs.h>
+#include <app/MessageDef/EventFilterIBs.h>
 #include <app/MessageDef/EventPathIBs.h>
 #include <app/ObjectList.h>
 #include <lib/core/CHIPCore.h>
diff --git a/src/app/clusters/ias-zone-client/ias-zone-client.h b/src/app/clusters/ias-zone-client/ias-zone-client.h
index 2e52779e9545bc..6262d80f7c95e2 100644
--- a/src/app/clusters/ias-zone-client/ias-zone-client.h
+++ b/src/app/clusters/ias-zone-client/ias-zone-client.h
@@ -40,6 +40,7 @@
 
 #pragma once
 
+#include <app/util/af-types.h>
 #include <app/util/basic-types.h>
 
 typedef struct
diff --git a/src/app/util/MatterCallbacks.h b/src/app/util/MatterCallbacks.h
index c18ddaed0014aa..6a0b69388d67a5 100644
--- a/src/app/util/MatterCallbacks.h
+++ b/src/app/util/MatterCallbacks.h
@@ -19,6 +19,10 @@
 
 #pragma once
 
+#include <access/SubjectDescriptor.h>
+#include <app/ConcreteAttributePath.h>
+#include <app/ConcreteCommandPath.h>
+
 void MatterPreAttributeReadCallback(const chip::app::ConcreteAttributePath & attributePath);
 void MatterPostAttributeReadCallback(const chip::app::ConcreteAttributePath & attributePath);
 void MatterPreAttributeWriteCallback(const chip::app::ConcreteAttributePath & attributePath);
diff --git a/src/app/util/time-util.h b/src/app/util/time-util.h
index 804a7f44ebef78..abea896dd00110 100644
--- a/src/app/util/time-util.h
+++ b/src/app/util/time-util.h
@@ -40,6 +40,10 @@
 
 #pragma once
 
+#include <inttypes.h>
+
+#include <app/util/af-types.h>
+
 #define SECONDS_IN_MINUTE 60
 #define SECONDS_IN_HOUR 3600
 #define SECONDS_IN_DAY (SECONDS_IN_MINUTE * 60 * 24)
diff --git a/src/credentials/tests/CHIPAttCert_test_vectors.h b/src/credentials/tests/CHIPAttCert_test_vectors.h
index caa239986ac817..bc603ff75e0613 100644
--- a/src/credentials/tests/CHIPAttCert_test_vectors.h
+++ b/src/credentials/tests/CHIPAttCert_test_vectors.h
@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include <lib/support/Span.h>
+
 namespace chip {
 namespace TestCerts {
 
diff --git a/src/include/platform/GeneralFaults.h b/src/include/platform/GeneralFaults.h
index 182a4e32cbdefc..fc5f7d34d5b208 100644
--- a/src/include/platform/GeneralFaults.h
+++ b/src/include/platform/GeneralFaults.h
@@ -23,6 +23,7 @@
 #pragma once
 
 #include <lib/core/CHIPError.h>
+#include <lib/support/CodeUtils.h>
 
 namespace chip {
 namespace DeviceLayer {
diff --git a/src/include/platform/internal/EventLogging.h b/src/include/platform/internal/EventLogging.h
index 1a8dd07c3a435a..c250c9450de552 100644
--- a/src/include/platform/internal/EventLogging.h
+++ b/src/include/platform/internal/EventLogging.h
@@ -24,6 +24,8 @@
 
 #pragma once
 
+#include <lib/core/CHIPError.h>
+
 namespace chip {
 namespace DeviceLayer {
 namespace Internal {
diff --git a/src/lib/asn1/gen_asn1oid.py b/src/lib/asn1/gen_asn1oid.py
index a2e71c171b40db..e4c9943b68d2c2 100755
--- a/src/lib/asn1/gen_asn1oid.py
+++ b/src/lib/asn1/gen_asn1oid.py
@@ -237,6 +237,7 @@ def encodeOID(oid):
 #pragma once
 
 #include <cstdint>
+#include <cstddef>
 
 namespace chip {
 namespace ASN1 {
diff --git a/src/lib/support/LifetimePersistedCounter.h b/src/lib/support/LifetimePersistedCounter.h
index 7394615aede062..68bae745250486 100644
--- a/src/lib/support/LifetimePersistedCounter.h
+++ b/src/lib/support/LifetimePersistedCounter.h
@@ -27,6 +27,7 @@
 #pragma once
 
 #include <lib/support/CHIPCounter.h>
+#include <lib/support/CodeUtils.h>
 #include <platform/PersistedStorage.h>
 
 namespace chip {
diff --git a/src/protocols/secure_channel/MessageCounterManager.cpp b/src/protocols/secure_channel/MessageCounterManager.cpp
index 6903f5b199b8d4..26a245618e1d26 100644
--- a/src/protocols/secure_channel/MessageCounterManager.cpp
+++ b/src/protocols/secure_channel/MessageCounterManager.cpp
@@ -21,6 +21,8 @@
  *
  */
 
+#include <protocols/secure_channel/MessageCounterManager.h>
+
 #include <lib/core/CHIPCore.h>
 #include <lib/core/CHIPEncoding.h>
 #include <lib/core/CHIPKeyIds.h>
@@ -32,7 +34,6 @@
 #include <messaging/Flags.h>
 #include <protocols/Protocols.h>
 #include <protocols/secure_channel/Constants.h>
-#include <protocols/secure_channel/MessageCounterManager.h>
 
 namespace chip {
 namespace secure_channel {
diff --git a/src/protocols/secure_channel/MessageCounterManager.h b/src/protocols/secure_channel/MessageCounterManager.h
index 2984189b8e0b4f..80e23f210391d3 100644
--- a/src/protocols/secure_channel/MessageCounterManager.h
+++ b/src/protocols/secure_channel/MessageCounterManager.h
@@ -22,6 +22,8 @@
 
 #pragma once
 
+#include <messaging/ExchangeDelegate.h>
+#include <messaging/ExchangeMgr.h>
 #include <protocols/Protocols.h>
 #include <system/SystemPacketBuffer.h>
 #include <transport/MessageCounterManagerInterface.h>
@@ -29,8 +31,6 @@
 namespace chip {
 namespace secure_channel {
 
-class ExchangeManager;
-
 class MessageCounterManager : public Messaging::UnsolicitedMessageHandler,
                               public Messaging::ExchangeDelegate,
                               public Transport::MessageCounterManagerInterface
diff --git a/src/protocols/secure_channel/SessionEstablishmentDelegate.h b/src/protocols/secure_channel/SessionEstablishmentDelegate.h
index 12753872180359..f14566dae5a092 100644
--- a/src/protocols/secure_channel/SessionEstablishmentDelegate.h
+++ b/src/protocols/secure_channel/SessionEstablishmentDelegate.h
@@ -26,6 +26,7 @@
 #pragma once
 
 #include <system/SystemPacketBuffer.h>
+#include <transport/SessionHandle.h>
 #include <transport/raw/MessageHeader.h>
 #include <transport/raw/PeerAddress.h>
 
diff --git a/src/protocols/secure_channel/StatusReport.h b/src/protocols/secure_channel/StatusReport.h
index c0704d5bca4a99..cd26b798eab1db 100644
--- a/src/protocols/secure_channel/StatusReport.h
+++ b/src/protocols/secure_channel/StatusReport.h
@@ -20,6 +20,7 @@
 
 #include <lib/support/BufferWriter.h>
 #include <protocols/Protocols.h>
+#include <protocols/secure_channel/Constants.h>
 #include <system/SystemPacketBuffer.h>
 
 namespace chip {
diff --git a/src/transport/SessionDelegate.h b/src/transport/SessionDelegate.h
index 19f0960e47c696..5eedd6a8c72f69 100644
--- a/src/transport/SessionDelegate.h
+++ b/src/transport/SessionDelegate.h
@@ -16,7 +16,9 @@
 
 #pragma once
 
-#include <transport/SessionHandle.h>
+#include <inttypes.h>
+
+#include <lib/support/DLLUtil.h>
 
 namespace chip {
 
diff --git a/src/transport/SessionMessageDelegate.h b/src/transport/SessionMessageDelegate.h
index dee29514dfc020..e89ec2b9f4a5c2 100644
--- a/src/transport/SessionMessageDelegate.h
+++ b/src/transport/SessionMessageDelegate.h
@@ -17,6 +17,7 @@
 #pragma once
 
 #include <transport/SessionHandle.h>
+#include <transport/raw/MessageHeader.h>
 
 namespace chip {