diff --git a/src/app/util/util.h b/src/app/util/util.h
index 6d84a7c0ee947f..d79b63612dd1b0 100644
--- a/src/app/util/util.h
+++ b/src/app/util/util.h
@@ -21,6 +21,7 @@
 
 #include <app/util/af-types.h>
 #include <app/util/endpoint-config-api.h>
+#include <lib/core/DataModelTypes.h>
 
 void emberAfInit();
 
diff --git a/src/lib/dnssd/platform/DnssdBrowseDelegate.h b/src/lib/dnssd/platform/DnssdBrowseDelegate.h
index 8d95a03b8d020e..bb0e6e51867a87 100644
--- a/src/lib/dnssd/platform/DnssdBrowseDelegate.h
+++ b/src/lib/dnssd/platform/DnssdBrowseDelegate.h
@@ -17,6 +17,9 @@
 
 #pragma once
 
+#include <lib/core/CHIPError.h>
+#include <lib/support/DLLUtil.h>
+
 namespace chip {
 namespace Dnssd {
 
diff --git a/src/lib/support/CommonIterator.h b/src/lib/support/CommonIterator.h
index 689625aa292a94..fc799c33b233eb 100644
--- a/src/lib/support/CommonIterator.h
+++ b/src/lib/support/CommonIterator.h
@@ -22,6 +22,8 @@
 
 #pragma once
 
+#include <stddef.h>
+
 namespace chip {
 
 /**
diff --git a/src/protocols/bdx/DiagnosticLogs.h b/src/protocols/bdx/DiagnosticLogs.h
index 60ec2a33080c9c..a3bf0428186705 100644
--- a/src/protocols/bdx/DiagnosticLogs.h
+++ b/src/protocols/bdx/DiagnosticLogs.h
@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include <stdint.h>
+
 namespace chip {
 namespace bdx {
 namespace DiagnosticLogs {
diff --git a/src/transport/TracingStructs.h b/src/transport/TracingStructs.h
index 5f57663e46dba2..987e2311950dc9 100644
--- a/src/transport/TracingStructs.h
+++ b/src/transport/TracingStructs.h
@@ -19,6 +19,7 @@
 #include <lib/support/Span.h>
 #include <transport/Session.h>
 #include <transport/raw/MessageHeader.h>
+#include <transport/raw/PeerAddress.h>
 
 namespace chip {
 namespace Tracing {