diff --git a/src/controller/tests/TestEventCaching.cpp b/src/controller/tests/TestEventCaching.cpp index f69f5614592db7..3ff85ebdf96cdc 100644 --- a/src/controller/tests/TestEventCaching.cpp +++ b/src/controller/tests/TestEventCaching.cpp @@ -22,7 +22,6 @@ #include "app/ConcreteAttributePath.h" #include "protocols/interaction_model/Constants.h" #include <app-common/zap-generated/cluster-objects.h> -#include <app/AppConfig.h> #include <app/BufferedReadCallback.h> #include <app/CommandHandlerInterface.h> #include <app/EventLogging.h> diff --git a/src/controller/tests/TestEventNumberCaching.cpp b/src/controller/tests/TestEventNumberCaching.cpp index 01526388f4e459..1244a77481209e 100644 --- a/src/controller/tests/TestEventNumberCaching.cpp +++ b/src/controller/tests/TestEventNumberCaching.cpp @@ -19,7 +19,6 @@ #include "app-common/zap-generated/ids/Clusters.h" #include "app/ClusterStateCache.h" #include <app-common/zap-generated/cluster-objects.h> -#include <app/AppConfig.h> #include <app/BufferedReadCallback.h> #include <app/CommandHandlerInterface.h> #include <app/EventLogging.h> diff --git a/src/controller/tests/TestServerCommandDispatch.cpp b/src/controller/tests/TestServerCommandDispatch.cpp index 40b4c098ba52e6..a87ec5d1bcd8d3 100644 --- a/src/controller/tests/TestServerCommandDispatch.cpp +++ b/src/controller/tests/TestServerCommandDispatch.cpp @@ -26,7 +26,6 @@ #include "app-common/zap-generated/ids/Clusters.h" #include "protocols/interaction_model/Constants.h" #include <app-common/zap-generated/cluster-objects.h> -#include <app/AppConfig.h> #include <app/CommandHandlerInterface.h> #include <app/InteractionModelEngine.h> #include <app/tests/AppTestContext.h> diff --git a/src/controller/tests/TestWriteChunking.cpp b/src/controller/tests/TestWriteChunking.cpp index 2190195887ad41..d8c748129a755d 100644 --- a/src/controller/tests/TestWriteChunking.cpp +++ b/src/controller/tests/TestWriteChunking.cpp @@ -21,7 +21,6 @@ #include "app/ConcreteAttributePath.h" #include "protocols/interaction_model/Constants.h" #include <app-common/zap-generated/cluster-objects.h> -#include <app/AppConfig.h> #include <app/AttributeAccessInterface.h> #include <app/AttributeAccessInterfaceRegistry.h> #include <app/CommandHandlerInterface.h> diff --git a/src/messaging/ReliableMessageContext.cpp b/src/messaging/ReliableMessageContext.cpp index 30f00a67814a25..882c5423b78a73 100644 --- a/src/messaging/ReliableMessageContext.cpp +++ b/src/messaging/ReliableMessageContext.cpp @@ -23,16 +23,14 @@ #include <inttypes.h> -#include <messaging/ExchangeContext.h> -#include <messaging/ExchangeMgr.h> -#include <messaging/ReliableMessageContext.h> - -#include <app/AppConfig.h> #include <lib/core/CHIPEncoding.h> #include <lib/support/CodeUtils.h> #include <lib/support/Defer.h> #include <messaging/ErrorCategory.h> +#include <messaging/ExchangeContext.h> +#include <messaging/ExchangeMgr.h> #include <messaging/Flags.h> +#include <messaging/ReliableMessageContext.h> #include <messaging/ReliableMessageMgr.h> #include <platform/PlatformManager.h> #include <protocols/Protocols.h> diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn index 84870e55362c41..16287f1afb16de 100644 --- a/src/platform/BUILD.gn +++ b/src/platform/BUILD.gn @@ -509,7 +509,6 @@ if (chip_device_platform != "none") { public_deps = [ ":platform_base", - "${chip_root}/src/app:app_config", # TODO: Move into platforms using it "${chip_root}/src/app/common:cluster-objects", "${chip_root}/src/crypto", "${chip_root}/src/lib/support",