From c1eafcd24f150ab9e1adf3e0718cfb19343f4f99 Mon Sep 17 00:00:00 2001
From: Michael Spang <spang@google.com>
Date: Wed, 17 Aug 2022 10:42:47 -0400
Subject: [PATCH] Add missing includes (#21913)

---
 examples/chip-tool/commands/clusters/CustomArgument.h    | 1 +
 examples/chip-tool/commands/discover/Commands.h          | 7 ++++---
 examples/chip-tool/commands/group/Commands.h             | 7 ++++---
 examples/chip-tool/commands/interactive/Commands.h       | 7 +++----
 examples/chip-tool/commands/pairing/Commands.h           | 9 +++++----
 examples/chip-tool/commands/payload/Commands.h           | 9 +++++----
 examples/chip-tool/templates/ComplexArgumentParser.zapt  | 5 +++++
 .../chip-tool/templates/logging/DataModelLogger.zapt     | 3 +++
 examples/chip-tool/templates/tests/commands.zapt         | 1 +
 src/app/tests/suites/include/PICSChecker.h               | 2 +-
 src/app/tests/suites/include/TestRunner.h                | 4 ++++
 src/lib/dnssd/minimal_mdns/ResponseBuilder.h             | 1 +
 .../zap-generated/cluster/ComplexArgumentParser.h        | 5 +++++
 .../zap-generated/cluster/logging/DataModelLogger.h      | 3 +++
 zzz_generated/chip-tool/zap-generated/test/Commands.h    | 1 +
 15 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/examples/chip-tool/commands/clusters/CustomArgument.h b/examples/chip-tool/commands/clusters/CustomArgument.h
index 6755703fa0b7d5..63fe7d7ade387e 100644
--- a/examples/chip-tool/commands/clusters/CustomArgument.h
+++ b/examples/chip-tool/commands/clusters/CustomArgument.h
@@ -19,6 +19,7 @@
 #pragma once
 
 #include <app-common/zap-generated/cluster-objects.h>
+#include <lib/support/BytesToHex.h>
 #include <lib/support/CHIPMemString.h>
 #include <lib/support/SafeInt.h>
 
diff --git a/examples/chip-tool/commands/discover/Commands.h b/examples/chip-tool/commands/discover/Commands.h
index f7a41183bedf56..b6ef1e3240ebb7 100644
--- a/examples/chip-tool/commands/discover/Commands.h
+++ b/examples/chip-tool/commands/discover/Commands.h
@@ -18,9 +18,10 @@
 
 #pragma once
 
-#include "DiscoverCommand.h"
-#include "DiscoverCommissionablesCommand.h"
-#include "DiscoverCommissionersCommand.h"
+#include "commands/common/Commands.h"
+#include "commands/discover/DiscoverCommand.h"
+#include "commands/discover/DiscoverCommissionablesCommand.h"
+#include "commands/discover/DiscoverCommissionersCommand.h"
 #include <lib/address_resolve/AddressResolve.h>
 
 class Resolve : public DiscoverCommand, public chip::AddressResolve::NodeListener
diff --git a/examples/chip-tool/commands/group/Commands.h b/examples/chip-tool/commands/group/Commands.h
index 6aa59c581fdd80..e60ba6853fda85 100644
--- a/examples/chip-tool/commands/group/Commands.h
+++ b/examples/chip-tool/commands/group/Commands.h
@@ -18,11 +18,12 @@
 
 #pragma once
 
-#include "../common/CHIPCommand.h"
-#include "../common/Command.h"
-
 #include <lib/support/Span.h>
 
+#include "commands/common/CHIPCommand.h"
+#include "commands/common/Command.h"
+#include "commands/common/Commands.h"
+
 class ShowControllerGroups : public CHIPCommand
 {
 public:
diff --git a/examples/chip-tool/commands/interactive/Commands.h b/examples/chip-tool/commands/interactive/Commands.h
index 19feb20f163999..04249045c9caef 100644
--- a/examples/chip-tool/commands/interactive/Commands.h
+++ b/examples/chip-tool/commands/interactive/Commands.h
@@ -18,10 +18,9 @@
 
 #pragma once
 
-#include "../common/CHIPCommand.h"
-#include "../common/Commands.h"
-
-#include "InteractiveCommands.h"
+#include "commands/common/CHIPCommand.h"
+#include "commands/common/Commands.h"
+#include "commands/interactive/InteractiveCommands.h"
 
 void registerCommandsInteractive(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
diff --git a/examples/chip-tool/commands/pairing/Commands.h b/examples/chip-tool/commands/pairing/Commands.h
index 80506e6df0e9e0..4841d0c0e0f03c 100644
--- a/examples/chip-tool/commands/pairing/Commands.h
+++ b/examples/chip-tool/commands/pairing/Commands.h
@@ -18,10 +18,11 @@
 
 #pragma once
 
-#include "CloseSessionCommand.h"
-#include "CommissionedListCommand.h"
-#include "OpenCommissioningWindowCommand.h"
-#include "PairingCommand.h"
+#include "commands/common/Commands.h"
+#include "commands/pairing/CloseSessionCommand.h"
+#include "commands/pairing/CommissionedListCommand.h"
+#include "commands/pairing/OpenCommissioningWindowCommand.h"
+#include "commands/pairing/PairingCommand.h"
 
 #include <app/server/Dnssd.h>
 #include <commands/common/CredentialIssuerCommands.h>
diff --git a/examples/chip-tool/commands/payload/Commands.h b/examples/chip-tool/commands/payload/Commands.h
index 1b5eb2c7c5c62a..0cc5cae0a0879c 100644
--- a/examples/chip-tool/commands/payload/Commands.h
+++ b/examples/chip-tool/commands/payload/Commands.h
@@ -18,10 +18,11 @@
 
 #pragma once
 
-#include "AdditionalDataParseCommand.h"
-#include "SetupPayloadGenerateCommand.h"
-#include "SetupPayloadParseCommand.h"
-#include "SetupPayloadVerhoeff.h"
+#include "commands/common/Commands.h"
+#include "commands/payload/AdditionalDataParseCommand.h"
+#include "commands/payload/SetupPayloadGenerateCommand.h"
+#include "commands/payload/SetupPayloadParseCommand.h"
+#include "commands/payload/SetupPayloadVerhoeff.h"
 
 void registerCommandsPayload(Commands & commands)
 {
diff --git a/examples/chip-tool/templates/ComplexArgumentParser.zapt b/examples/chip-tool/templates/ComplexArgumentParser.zapt
index 9597dc57fcbdab..9ac2c7094c8cd0 100644
--- a/examples/chip-tool/templates/ComplexArgumentParser.zapt
+++ b/examples/chip-tool/templates/ComplexArgumentParser.zapt
@@ -1,5 +1,10 @@
 {{> header}}
 
+#include <json/json.h>
+
+#include <lib/core/CHIPError.h>
+#include <app-common/zap-generated/cluster-objects.h>
+
 {{#structs_with_cluster_name}}
 static CHIP_ERROR Setup(const char * label, {{zapTypeToEncodableClusterObjectType name ns=clusterName}} & request, Json::Value & value);
 
diff --git a/examples/chip-tool/templates/logging/DataModelLogger.zapt b/examples/chip-tool/templates/logging/DataModelLogger.zapt
index 69550b9bdf12b1..468f26619d689d 100644
--- a/examples/chip-tool/templates/logging/DataModelLogger.zapt
+++ b/examples/chip-tool/templates/logging/DataModelLogger.zapt
@@ -1,5 +1,8 @@
 {{> header}}
 
+#include <lib/core/CHIPError.h>
+#include <app-common/zap-generated/cluster-objects.h>
+
 {{#structs_with_cluster_name}}
 static CHIP_ERROR LogValue(const char * label, size_t indent, {{zapTypeToDecodableClusterObjectType name ns=clusterName isArgument=true}} value);
 {{/structs_with_cluster_name}}
diff --git a/examples/chip-tool/templates/tests/commands.zapt b/examples/chip-tool/templates/tests/commands.zapt
index b960267359fa0d..64b9b349372e76 100644
--- a/examples/chip-tool/templates/tests/commands.zapt
+++ b/examples/chip-tool/templates/tests/commands.zapt
@@ -5,6 +5,7 @@
 #if CONFIG_ENABLE_YAML_TESTS
 
 #include <commands/tests/TestCommand.h>
+#include <commands/common/Commands.h>
 #include <lib/core/Optional.h>
 #include <lib/support/CHIPListUtils.h>
 #include <system/SystemClock.h>
diff --git a/src/app/tests/suites/include/PICSChecker.h b/src/app/tests/suites/include/PICSChecker.h
index 28c07af5a94482..e7c7b7deb9fd11 100644
--- a/src/app/tests/suites/include/PICSChecker.h
+++ b/src/app/tests/suites/include/PICSChecker.h
@@ -22,7 +22,7 @@
 
 #include <app/tests/suites/pics/PICSBooleanExpressionParser.h>
 #include <app/tests/suites/pics/PICSBooleanReader.h>
-
+#include <lib/core/Optional.h>
 #include <lib/support/logging/CHIPLogging.h>
 
 class PICSChecker
diff --git a/src/app/tests/suites/include/TestRunner.h b/src/app/tests/suites/include/TestRunner.h
index 3bdea10f29d7ab..9fd5450f14bc01 100644
--- a/src/app/tests/suites/include/TestRunner.h
+++ b/src/app/tests/suites/include/TestRunner.h
@@ -18,6 +18,10 @@
 
 #pragma once
 
+#include <string>
+
+#include <lib/core/CHIPError.h>
+#include <lib/core/Optional.h>
 #include <lib/support/UnitTestUtils.h>
 
 class TestRunner
diff --git a/src/lib/dnssd/minimal_mdns/ResponseBuilder.h b/src/lib/dnssd/minimal_mdns/ResponseBuilder.h
index 6391d185f8f9e9..3341576bf4bf60 100644
--- a/src/lib/dnssd/minimal_mdns/ResponseBuilder.h
+++ b/src/lib/dnssd/minimal_mdns/ResponseBuilder.h
@@ -19,6 +19,7 @@
 
 #include <system/SystemPacketBuffer.h>
 
+#include <lib/dnssd/minimal_mdns/Parser.h>
 #include <lib/dnssd/minimal_mdns/core/DnsHeader.h>
 #include <lib/dnssd/minimal_mdns/records/ResourceRecord.h>
 
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
index f0aad84c4ec221..874f778f58992f 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
@@ -17,6 +17,11 @@
 
 // THIS FILE IS GENERATED BY ZAP
 
+#include <json/json.h>
+
+#include <app-common/zap-generated/cluster-objects.h>
+#include <lib/core/CHIPError.h>
+
 static CHIP_ERROR Setup(const char * label, chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type & request,
                         Json::Value & value);
 
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
index 6eaf6cb9845421..9b079c170522cc 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
@@ -17,6 +17,9 @@
 
 // THIS FILE IS GENERATED BY ZAP
 
+#include <app-common/zap-generated/cluster-objects.h>
+#include <lib/core/CHIPError.h>
+
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::AccessControl::Structs::AccessControlEntry::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index bdd9b181fe77c9..3b2a0ea71e7199 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -21,6 +21,7 @@
 
 #if CONFIG_ENABLE_YAML_TESTS
 
+#include <commands/common/Commands.h>
 #include <commands/tests/TestCommand.h>
 #include <lib/core/Optional.h>
 #include <lib/support/CHIPListUtils.h>