diff --git a/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp b/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp index 93e93c25a653dd..ce04ae935f2030 100644 --- a/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp +++ b/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp @@ -15,7 +15,6 @@ * limitations under the License. */ -#include #include #include #include diff --git a/examples/bridge-app/esp32/main/DeviceCallbacks.cpp b/examples/bridge-app/esp32/main/DeviceCallbacks.cpp index e6e1f8b218a992..7748b0e1633b28 100644 --- a/examples/bridge-app/esp32/main/DeviceCallbacks.cpp +++ b/examples/bridge-app/esp32/main/DeviceCallbacks.cpp @@ -16,7 +16,6 @@ * limitations under the License. */ -#include #include #include #include diff --git a/examples/bridge-app/esp32/main/main.cpp b/examples/bridge-app/esp32/main/main.cpp index 5a90a98b9f4055..09581bcbffbec8 100644 --- a/examples/bridge-app/esp32/main/main.cpp +++ b/examples/bridge-app/esp32/main/main.cpp @@ -19,7 +19,6 @@ #include "DeviceCallbacks.h" #include "esp_log.h" #include "nvs_flash.h" -#include #include #include #include diff --git a/examples/bridge-app/linux/bridged-actions-stub.cpp b/examples/bridge-app/linux/bridged-actions-stub.cpp index aa28a3712e0f17..5f6bdcf53b6f89 100644 --- a/examples/bridge-app/linux/bridged-actions-stub.cpp +++ b/examples/bridge-app/linux/bridged-actions-stub.cpp @@ -15,7 +15,6 @@ * limitations under the License. */ -#include #include #include #include diff --git a/examples/bridge-app/linux/main.cpp b/examples/bridge-app/linux/main.cpp index 622c1cac4fd709..df297b04472761 100644 --- a/examples/bridge-app/linux/main.cpp +++ b/examples/bridge-app/linux/main.cpp @@ -20,8 +20,6 @@ #include #include -#include - #include #include #include diff --git a/examples/common/pigweed/rpc_services/Descriptor.h b/examples/common/pigweed/rpc_services/Descriptor.h index fca22fa1234aa8..48038831d62301 100644 --- a/examples/common/pigweed/rpc_services/Descriptor.h +++ b/examples/common/pigweed/rpc_services/Descriptor.h @@ -20,7 +20,6 @@ #include "descriptor_service/descriptor_service.rpc.pb.h" -#include #include #include #include diff --git a/examples/dynamic-bridge-app/linux/DynamicDevice.cpp b/examples/dynamic-bridge-app/linux/DynamicDevice.cpp index 94ef87edfbc1e4..c52f2eefc1f11e 100644 --- a/examples/dynamic-bridge-app/linux/DynamicDevice.cpp +++ b/examples/dynamic-bridge-app/linux/DynamicDevice.cpp @@ -17,7 +17,6 @@ * limitations under the License. */ -#include #include #include diff --git a/examples/dynamic-bridge-app/linux/bridged-actions-stub.cpp b/examples/dynamic-bridge-app/linux/bridged-actions-stub.cpp index f65dde8a3c9da6..3a1e3be9ac7829 100644 --- a/examples/dynamic-bridge-app/linux/bridged-actions-stub.cpp +++ b/examples/dynamic-bridge-app/linux/bridged-actions-stub.cpp @@ -15,7 +15,6 @@ * limitations under the License. */ -#include #include #include #include diff --git a/examples/dynamic-bridge-app/linux/main.cpp b/examples/dynamic-bridge-app/linux/main.cpp index 1bbe05ef64aced..e3a550a8297166 100644 --- a/examples/dynamic-bridge-app/linux/main.cpp +++ b/examples/dynamic-bridge-app/linux/main.cpp @@ -20,8 +20,6 @@ #include #include -#include - #include #include #include diff --git a/examples/lock-app/genio/src/AppTask.cpp b/examples/lock-app/genio/src/AppTask.cpp index 2b1db547997bc9..b06d9535c35c3b 100644 --- a/examples/lock-app/genio/src/AppTask.cpp +++ b/examples/lock-app/genio/src/AppTask.cpp @@ -23,7 +23,6 @@ #include "LEDWidget.h" #include "qrcodegen.h" -#include #include #include #include diff --git a/examples/lock-app/infineon/psoc6/src/AppTask.cpp b/examples/lock-app/infineon/psoc6/src/AppTask.cpp index 2120a10ace0393..1a695da5dc8511 100644 --- a/examples/lock-app/infineon/psoc6/src/AppTask.cpp +++ b/examples/lock-app/infineon/psoc6/src/AppTask.cpp @@ -21,7 +21,6 @@ #include "AppEvent.h" #include "ButtonHandler.h" #include "LEDWidget.h" -#include #include #include diff --git a/examples/lock-app/silabs/SiWx917/src/AppTask.cpp b/examples/lock-app/silabs/SiWx917/src/AppTask.cpp index fd8d49a8260b1e..bb9d15b6328039 100644 --- a/examples/lock-app/silabs/SiWx917/src/AppTask.cpp +++ b/examples/lock-app/silabs/SiWx917/src/AppTask.cpp @@ -35,7 +35,6 @@ #endif // QR_CODE_ENABLED #endif // DISPLAY_ENABLED -#include #include #include diff --git a/examples/lock-app/silabs/efr32/src/AppTask.cpp b/examples/lock-app/silabs/efr32/src/AppTask.cpp index a39cf6a15df18f..ef01ebedff6885 100644 --- a/examples/lock-app/silabs/efr32/src/AppTask.cpp +++ b/examples/lock-app/silabs/efr32/src/AppTask.cpp @@ -36,7 +36,6 @@ #endif // QR_CODE_ENABLED #endif // DISPLAY_ENABLED -#include #include #include diff --git a/examples/placeholder/linux/src/bridged-actions-stub.cpp b/examples/placeholder/linux/src/bridged-actions-stub.cpp index ff5a7a771e4923..db4a17a7820edf 100644 --- a/examples/placeholder/linux/src/bridged-actions-stub.cpp +++ b/examples/placeholder/linux/src/bridged-actions-stub.cpp @@ -15,7 +15,6 @@ * limitations under the License. */ -#include #include #include #include diff --git a/examples/tv-app/android/java/ContentLauncherManager.h b/examples/tv-app/android/java/ContentLauncherManager.h index bdc42c9cce5a3b..ba978500c2e3e5 100644 --- a/examples/tv-app/android/java/ContentLauncherManager.h +++ b/examples/tv-app/android/java/ContentLauncherManager.h @@ -18,8 +18,6 @@ #pragma once -#include - #include #include #include diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CHIPClientCallbacks.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CHIPClientCallbacks.h index 4458f51745a59b..3be02a7d723acc 100644 --- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CHIPClientCallbacks.h +++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CHIPClientCallbacks.h @@ -19,7 +19,6 @@ #pragma once -#include #include #include #include diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/IMClusterCommandHandler.cpp b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/IMClusterCommandHandler.cpp index 8f61a4bc3c38c3..de20da021761d1 100644 --- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/IMClusterCommandHandler.cpp +++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/IMClusterCommandHandler.cpp @@ -20,7 +20,6 @@ #include #include -#include #include #include #include diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/CHIPClientCallbacks.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/CHIPClientCallbacks.h index 4458f51745a59b..3be02a7d723acc 100644 --- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/CHIPClientCallbacks.h +++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/CHIPClientCallbacks.h @@ -19,7 +19,6 @@ #pragma once -#include #include #include #include diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/IMClusterCommandHandler.cpp b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/IMClusterCommandHandler.cpp index f0e07a1d5589e5..931f8329e5a1b9 100644 --- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/IMClusterCommandHandler.cpp +++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/IMClusterCommandHandler.cpp @@ -20,7 +20,6 @@ #include #include -#include #include #include #include diff --git a/src/app/app-platform/ContentApp.h b/src/app/app-platform/ContentApp.h index fd48e6f36a76c9..bfb45f08b49942 100644 --- a/src/app/app-platform/ContentApp.h +++ b/src/app/app-platform/ContentApp.h @@ -22,7 +22,6 @@ #pragma once -#include #include #include #include diff --git a/src/app/clusters/access-control-server/access-control-server.cpp b/src/app/clusters/access-control-server/access-control-server.cpp index 47b7a6168e4d74..3d73bd69b37589 100644 --- a/src/app/clusters/access-control-server/access-control-server.cpp +++ b/src/app/clusters/access-control-server/access-control-server.cpp @@ -17,7 +17,6 @@ #include -#include #include #include diff --git a/src/app/clusters/barrier-control-server/barrier-control-server.cpp b/src/app/clusters/barrier-control-server/barrier-control-server.cpp index 94f286bed4cbc4..9e9f1ae47148ec 100644 --- a/src/app/clusters/barrier-control-server/barrier-control-server.cpp +++ b/src/app/clusters/barrier-control-server/barrier-control-server.cpp @@ -16,7 +16,6 @@ */ #include "barrier-control-server.h" -#include #include #include #include diff --git a/src/app/clusters/client-monitoring-server/client-monitoring-server.cpp b/src/app/clusters/client-monitoring-server/client-monitoring-server.cpp index de7157ad777703..c417fb7942340d 100644 --- a/src/app/clusters/client-monitoring-server/client-monitoring-server.cpp +++ b/src/app/clusters/client-monitoring-server/client-monitoring-server.cpp @@ -18,7 +18,6 @@ #include "client-monitoring-server.h" #include "app/server/Server.h" -#include #include #include #include diff --git a/src/app/clusters/color-control-server/color-control-server.cpp b/src/app/clusters/color-control-server/color-control-server.cpp index 2e3c485db6c82d..1c07603ed2747a 100644 --- a/src/app/clusters/color-control-server/color-control-server.cpp +++ b/src/app/clusters/color-control-server/color-control-server.cpp @@ -16,7 +16,6 @@ */ #include "color-control-server.h" -#include #include #include #include diff --git a/src/app/clusters/content-launch-server/content-launch-delegate.h b/src/app/clusters/content-launch-server/content-launch-delegate.h index d52e49fe168468..ef8afc5dd92627 100644 --- a/src/app/clusters/content-launch-server/content-launch-delegate.h +++ b/src/app/clusters/content-launch-server/content-launch-delegate.h @@ -18,7 +18,6 @@ #pragma once -#include #include #include diff --git a/src/app/clusters/descriptor/descriptor.cpp b/src/app/clusters/descriptor/descriptor.cpp index fbd6574f06a59e..95f290a0afd732 100644 --- a/src/app/clusters/descriptor/descriptor.cpp +++ b/src/app/clusters/descriptor/descriptor.cpp @@ -20,7 +20,6 @@ * @brief Implementation for the Descriptor Server Cluster ***************************************************************************/ -#include #include #include #include diff --git a/src/app/clusters/fan-control-server/fan-control-server.cpp b/src/app/clusters/fan-control-server/fan-control-server.cpp index 1b526b13a4959d..9d3a36e1f6a9f2 100644 --- a/src/app/clusters/fan-control-server/fan-control-server.cpp +++ b/src/app/clusters/fan-control-server/fan-control-server.cpp @@ -23,7 +23,6 @@ #include #include -#include #include #include #include diff --git a/src/app/clusters/fault-injection-server/fault-injection-server.cpp b/src/app/clusters/fault-injection-server/fault-injection-server.cpp index 0b37ca757f20b2..0b7385e39dd98e 100644 --- a/src/app/clusters/fault-injection-server/fault-injection-server.cpp +++ b/src/app/clusters/fault-injection-server/fault-injection-server.cpp @@ -16,7 +16,6 @@ */ #include "app/server/Server.h" -#include #include #include #include diff --git a/src/app/clusters/fixed-label-server/fixed-label-server.cpp b/src/app/clusters/fixed-label-server/fixed-label-server.cpp index 129b40d9896c0f..22cca831167352 100644 --- a/src/app/clusters/fixed-label-server/fixed-label-server.cpp +++ b/src/app/clusters/fixed-label-server/fixed-label-server.cpp @@ -20,7 +20,6 @@ * @brief Implementation for the Fixed Label Server Cluster ***************************************************************************/ -#include #include #include #include diff --git a/src/app/clusters/level-control/level-control.cpp b/src/app/clusters/level-control/level-control.cpp index 14f472307be272..a2b66e84a1881f 100644 --- a/src/app/clusters/level-control/level-control.cpp +++ b/src/app/clusters/level-control/level-control.cpp @@ -19,7 +19,6 @@ #include "level-control.h" // this file contains all the common includes for clusters in the util -#include #include #include #include diff --git a/src/app/clusters/localization-configuration-server/localization-configuration-server.cpp b/src/app/clusters/localization-configuration-server/localization-configuration-server.cpp index 0776016f686ae0..144665b1c03b19 100644 --- a/src/app/clusters/localization-configuration-server/localization-configuration-server.cpp +++ b/src/app/clusters/localization-configuration-server/localization-configuration-server.cpp @@ -20,7 +20,6 @@ * @brief Implementation for the Localization Configuration Server Cluster ***************************************************************************/ -#include #include #include #include diff --git a/src/app/clusters/mode-select-server/mode-select-server.cpp b/src/app/clusters/mode-select-server/mode-select-server.cpp index bd925130aab116..42cb2fa5814243 100644 --- a/src/app/clusters/mode-select-server/mode-select-server.cpp +++ b/src/app/clusters/mode-select-server/mode-select-server.cpp @@ -15,7 +15,6 @@ * limitations under the License. */ -#include #include #include #include diff --git a/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp b/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp index 4d12b5bd711a10..1ba0e7b7212ebc 100644 --- a/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp +++ b/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp @@ -21,7 +21,6 @@ ***************************************************************************/ #include -#include #include #include #include diff --git a/src/app/clusters/power-source-configuration-server/power-source-configuration-server.cpp b/src/app/clusters/power-source-configuration-server/power-source-configuration-server.cpp index cc5df0e278bef1..7e9804286f07ef 100644 --- a/src/app/clusters/power-source-configuration-server/power-source-configuration-server.cpp +++ b/src/app/clusters/power-source-configuration-server/power-source-configuration-server.cpp @@ -20,7 +20,6 @@ * @brief Implementation for the Descriptor Server Cluster ***************************************************************************/ -#include #include #include #include diff --git a/src/app/clusters/time-format-localization-server/time-format-localization-server.cpp b/src/app/clusters/time-format-localization-server/time-format-localization-server.cpp index 5bb010a14d23a1..6f792a16d8be21 100644 --- a/src/app/clusters/time-format-localization-server/time-format-localization-server.cpp +++ b/src/app/clusters/time-format-localization-server/time-format-localization-server.cpp @@ -20,7 +20,6 @@ * @brief Implementation for the Time Format Localization Server Cluster ***************************************************************************/ -#include #include #include #include diff --git a/src/app/clusters/user-label-server/user-label-server.cpp b/src/app/clusters/user-label-server/user-label-server.cpp index 8b363d1a39b454..49a557b778baa2 100644 --- a/src/app/clusters/user-label-server/user-label-server.cpp +++ b/src/app/clusters/user-label-server/user-label-server.cpp @@ -20,7 +20,6 @@ * @brief Implementation for the User Label Server Cluster ***************************************************************************/ -#include #include #include #include diff --git a/src/app/common/templates/config-data.yaml b/src/app/common/templates/config-data.yaml index 0d725e6218310d..1ed85d69410f6c 100644 --- a/src/app/common/templates/config-data.yaml +++ b/src/app/common/templates/config-data.yaml @@ -1,5 +1,3 @@ -LegacyStructs: [] # Will be removed together with af-structs.h - WeakEnums: # Allow-list of enums that we generate as enums, not enum classes. # The goal is to drive this down to 0. diff --git a/src/app/common/templates/templates.json b/src/app/common/templates/templates.json index d03a81e11550bf..e58894c7644a7f 100644 --- a/src/app/common/templates/templates.json +++ b/src/app/common/templates/templates.json @@ -31,11 +31,6 @@ } ], "templates": [ - { - "path": "../../zap-templates/templates/app/af-structs.zapt", - "name": "ZCL af-structs header", - "output": "af-structs.h" - }, { "path": "../../zap-templates/templates/app/att-storage.zapt", "name": "ZCL att-storage header", diff --git a/src/app/util/generic-callbacks.h b/src/app/util/generic-callbacks.h index 0da0b07d17ca80..540b097e412b4e 100644 --- a/src/app/util/generic-callbacks.h +++ b/src/app/util/generic-callbacks.h @@ -17,7 +17,6 @@ #pragma once -#include #include #include #include diff --git a/src/app/util/im-client-callbacks.h b/src/app/util/im-client-callbacks.h index 0ecf06f273468e..489224a2685730 100644 --- a/src/app/util/im-client-callbacks.h +++ b/src/app/util/im-client-callbacks.h @@ -17,7 +17,6 @@ #pragma once -#include #include #include #include diff --git a/src/app/zap-templates/templates/app/CHIPClientCallbacks.zapt b/src/app/zap-templates/templates/app/CHIPClientCallbacks.zapt index 3cf8a28506f917..2f584a6e4638b0 100644 --- a/src/app/zap-templates/templates/app/CHIPClientCallbacks.zapt +++ b/src/app/zap-templates/templates/app/CHIPClientCallbacks.zapt @@ -4,7 +4,6 @@ #pragma once #include -#include #include #include #include diff --git a/src/app/zap-templates/templates/app/af-structs.zapt b/src/app/zap-templates/templates/app/af-structs.zapt deleted file mode 100644 index 1f42d91700e06c..00000000000000 --- a/src/app/zap-templates/templates/app/af-structs.zapt +++ /dev/null @@ -1,32 +0,0 @@ -{{> header}} - -// Prevent multiple inclusion -#pragma once - -#include - -#include -#include -#include -#include -#include - -#include "enums.h" - -{{#zcl_structs}} - -{{#if (isInConfigList (asUnderlyingType label) "LegacyStructs")}} -{{#if itemCnt}} -// Struct for {{label}} -typedef struct _{{asType label}} { -{{#zcl_struct_items}} -{{ident}}{{asUnderlyingZclType type}} {{asSymbol label}}; -{{/zcl_struct_items}} -} {{asUnderlyingType label}}; -{{else}} -// Void typedef for {{asUnderlyingType label}} which is empty. -// this will result in all the references to the data being as uint8_t* -typedef uint8_t {{asUnderlyingType label}}; -{{/if}} -{{/if}} -{{/zcl_structs}} diff --git a/src/app/zap-templates/templates/app/callback.zapt b/src/app/zap-templates/templates/app/callback.zapt index 307214d9d12cd7..5b887938e5d15c 100644 --- a/src/app/zap-templates/templates/app/callback.zapt +++ b/src/app/zap-templates/templates/app/callback.zapt @@ -3,7 +3,6 @@ // Prevent multiple inclusion #pragma once -#include #include #include #include diff --git a/src/app/zap-templates/templates/app/im-cluster-command-handler.zapt b/src/app/zap-templates/templates/app/im-cluster-command-handler.zapt index 9d6d3242bf8557..0d93ff0a53501e 100644 --- a/src/app/zap-templates/templates/app/im-cluster-command-handler.zapt +++ b/src/app/zap-templates/templates/app/im-cluster-command-handler.zapt @@ -3,7 +3,6 @@ #include #include -#include #include #include #include diff --git a/zzz_generated/app-common/app-common/zap-generated/af-structs.h b/zzz_generated/app-common/app-common/zap-generated/af-structs.h deleted file mode 100644 index 1d648ca289b391..00000000000000 --- a/zzz_generated/app-common/app-common/zap-generated/af-structs.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * - * Copyright (c) 2022 Project CHIP Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -// THIS FILE IS GENERATED BY ZAP - -// Prevent multiple inclusion -#pragma once - -#include - -#include -#include -#include -#include -#include - -#include "enums.h" diff --git a/zzz_generated/app-common/app-common/zap-generated/callback.h b/zzz_generated/app-common/app-common/zap-generated/callback.h index 3abc23c2ed8cde..1b1c6814a55ffc 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -20,7 +20,6 @@ // Prevent multiple inclusion #pragma once -#include #include #include #include diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h index 8bb05b8d22de2c..0f24b2f1f7cf73 100644 --- a/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h +++ b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h @@ -19,7 +19,6 @@ #pragma once -#include #include #include #include diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/darwin/controller-clusters/zap-generated/IMClusterCommandHandler.cpp index 5d2149739acdc4..29667fecca06b0 100644 --- a/zzz_generated/darwin/controller-clusters/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/darwin/controller-clusters/zap-generated/IMClusterCommandHandler.cpp @@ -20,7 +20,6 @@ #include #include -#include #include #include #include