From a35ee1bdbef5fb3d8773a129fe51b888726d7c94 Mon Sep 17 00:00:00 2001
From: Andrei Litvin <andy314@gmail.com>
Date: Fri, 21 Oct 2022 11:03:20 -0400
Subject: [PATCH 1/8] Fix duplicate light app gen (#23293)

* Special case NXP light app gen. Do not allow duplicate generation instructions

* Ran zap regen

* Restyle
---
 scripts/tools/zap_regen_all.py                | 55 ++++++++++++++-----
 .../nxp/zap-generated/endpoint_config.h       |  2 +-
 2 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/scripts/tools/zap_regen_all.py b/scripts/tools/zap_regen_all.py
index db647387e2e61d..61c8f6823663eb 100755
--- a/scripts/tools/zap_regen_all.py
+++ b/scripts/tools/zap_regen_all.py
@@ -21,11 +21,25 @@
 import sys
 import subprocess
 import logging
+from dataclasses import dataclass
 
 CHIP_ROOT_DIR = os.path.realpath(
     os.path.join(os.path.dirname(__file__), '../..'))
 
 
+@dataclass(eq=True, frozen=True)
+class ZapDistinctOutput:
+    """Defines the properties that determine if some output seems unique or 
+       not, for the purposes of detecting codegen overlap.
+
+       Not perfect, since separate templates may use the same file names, but
+       better than nothing.
+    """
+
+    input_template: str
+    output_directory: str
+
+
 class ZAPGenerateTarget:
     def __init__(self, zap_config, template=None, output_dir=None):
         self.script = './scripts/tools/zap/generate.py'
@@ -38,6 +52,9 @@ def __init__(self, zap_config, template=None, output_dir=None):
         else:
             self.output_dir = None
 
+    def distinct_output(self):
+        return ZapDistinctOutput(input_template=self.template, output_directory=self.output_dir)
+
     def log_command(self):
         """Log the command that will get run for this target
         """
@@ -135,10 +152,17 @@ def getGlobalTemplatesTargets():
         logging.info("Found example %s (via %s)" %
                      (example_name, str(filepath)))
 
+        generate_subdir = example_name
+
+        # Special casing lighting app because separate folders
+        if example_name == "lighting-app":
+            if 'nxp' in str(filepath):
+                generate_subdir = f"{example_name}/nxp"
+
         # The name zap-generated is to make includes clear by using
         # a name like <zap-generated/foo.h>
         output_dir = os.path.join(
-            'zzz_generated', example_name, 'zap-generated')
+            'zzz_generated', generate_subdir, 'zap-generated')
         targets.append(ZAPGenerateTarget(filepath, output_dir=output_dir))
 
     targets.append(ZAPGenerateTarget(
@@ -162,19 +186,6 @@ def getTestsTemplatesTargets(test_target):
         }
     }
 
-    # Place holder has apps within each build
-    for filepath in Path('./examples/placeholder').rglob('*.zap'):
-        example_name = filepath.as_posix()
-        example_name = example_name[example_name.index(
-            'apps/') + len('apps/'):]
-        example_name = example_name[:example_name.index('/')]
-
-        templates[example_name] = {
-            'zap': filepath,
-            'template': 'examples/placeholder/templates/templates.json',
-            'output_dir': os.path.join('zzz_generated', 'placeholder', example_name, 'zap-generated')
-        }
-
     targets = []
     for key, target in templates.items():
         if test_target == 'all' or test_target == key:
@@ -223,6 +234,22 @@ def getTargets(type, test_target):
     for target in targets:
         target.log_command()
 
+    # validate that every target as a DISTINCT directory (we had bugs here
+    # for various examples duplicating zap files)
+    distinct_outputs = set()
+    for target in targets:
+        o = target.distinct_output()
+
+        if o in distinct_outputs:
+            logging.error("Same output %r:" % o)
+            for t in targets:
+                if t.distinct_output() == o:
+                    logging.error("   %s" % t.zap_config)
+
+            raise Exception("Duplicate/overlapping output directory: %r" % o)
+
+        distinct_outputs.add(o)
+
     return targets
 
 
diff --git a/zzz_generated/lighting-app/nxp/zap-generated/endpoint_config.h b/zzz_generated/lighting-app/nxp/zap-generated/endpoint_config.h
index 7caf9b7ee0ce99..8273a657c31589 100644
--- a/zzz_generated/lighting-app/nxp/zap-generated/endpoint_config.h
+++ b/zzz_generated/lighting-app/nxp/zap-generated/endpoint_config.h
@@ -320,7 +320,7 @@
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) },                                 /* ClusterRevision */   \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Groups (server) */                                                                            \
-            { 0x00000000, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() },    /* name support */                                    \
+            { 0x00000000, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() },    /* NameSupport */                                     \
             { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */                                      \
             { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) },   /* ClusterRevision */                                 \
                                                                                                                                    \

From ee1f04e0a2d310599488718b28dfc50b47d8a9f1 Mon Sep 17 00:00:00 2001
From: Philipp Basler <philippbasler@gmail.com>
Date: Fri, 21 Oct 2022 18:45:40 +0200
Subject: [PATCH 2/8] Add 64 bit requirement to debian (#23283)

---
 docs/guides/BUILDING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guides/BUILDING.md b/docs/guides/BUILDING.md
index 00bf6d97a581f9..10fe92958e4b55 100644
--- a/docs/guides/BUILDING.md
+++ b/docs/guides/BUILDING.md
@@ -7,7 +7,7 @@ that generates inputs to [ninja](https://ninja-build.org/).
 Tested on:
 
 -   macOS 10.15
--   Debian 11
+-   Debian 11 (64 bit required)
 -   Ubuntu 22.04 LTS
 
 Build system features:

From a325034696d022f60bfa83781d2c703e5f02d88e Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <vnicolas@apple.com>
Date: Fri, 21 Oct 2022 18:46:01 +0200
Subject: [PATCH 3/8] [Matter.framework] Allow more platforms for the
 Matter.framework (#23281)

---
 .../Matter.xcodeproj/project.pbxproj          | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj
index 6e56afa28f948c..a1a54229b545b4 100644
--- a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj
+++ b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj
@@ -823,9 +823,9 @@
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-Wl,-unexported_symbol,\"__Z*\"";
 				SDKROOT = iphoneos;
-				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
+				SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvos appletvsimulator watchos watchsimulator";
 				SUPPORTS_TEXT_BASED_API = YES;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -897,7 +897,8 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.csa.matter;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
-				TARGETED_DEVICE_FAMILY = "1,2";
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 			};
 			name = Debug;
 		};
@@ -914,7 +915,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.chip.CHIPTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 			};
 			name = Debug;
 		};
@@ -969,9 +970,9 @@
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-Wl,-unexported_symbol,\"__Z*\"";
 				SDKROOT = iphoneos;
-				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
+				SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvos appletvsimulator watchos watchsimulator";
 				SUPPORTS_TEXT_BASED_API = YES;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1018,14 +1019,14 @@
 					"-Wformat-security",
 				);
 				OTHER_LDFLAGS = "";
-				"OTHER_LDFLAGS[arch=*]" = (
-					"-lnetwork",
+				"OTHER_LDFLAGS[sdk=*]" = (
+					"-framework",
+					CoreData,
 					"-framework",
 					Foundation,
 					"-framework",
 					CoreBluetooth,
-					"-framework",
-					CoreData,
+					"-lnetwork",
 					"-Wl,-unexported_symbol,\"__Z*\"",
 				);
 				"OTHER_LDFLAGS[sdk=macosx*]" = (
@@ -1044,8 +1045,9 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.csa.matter;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				SDKROOT = iphoneos;
 				STRIP_STYLE = "non-global";
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 			};
 			name = Release;
 		};
@@ -1063,7 +1065,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.chip.CHIPTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 			};
 			name = Release;
 		};

From 559c7d5c4dc0aa0ff7554baabaaba60b0abb4ffd Mon Sep 17 00:00:00 2001
From: Andrei Litvin <andy314@gmail.com>
Date: Fri, 21 Oct 2022 13:38:11 -0400
Subject: [PATCH 4/8] Compile time code generation - add relevant code to all
 example builds (plus one sample codegen moved) (#23247)

* Compile time code generation.

Picked PluginApplicationCallbacks because it is simple and added
it to a compile-time generated list.

The main exercise for this is to make sure we can inject the
appropriate calls to compile time generation to all examples.
It is not yet perfect as it only involves include directories,
however it does a "if it compiles it works, otherwise it fails
to compile" approach.

Uses codegen.py rather than ZAP for this particular file. For
other files, we may chose to use ZAP however for that we have
to:
  - ensure it is stand-alone runnable (likely as an installable app)
  - figure out any multi-processing conflicts as cmake/gn WILL run
    build steps in parallel and zap shares a common DB.

* Remove PluginApplicationCallbacks.zapt

* Restyle

* Add idl to build instructions

* Disable pylint for now. It looks like pylint is a lot more strict than expected and this was triggered only if we have dependencies

* Ensure we run codegen so sanitizer can find generated files

* Revert telink changes after master merge: no need for separate codegen anymore as telink now uses standard data model methods

* Ensure all needed codegen is done (for clang tidy at least). Tested in linux, may need to adjust darwin

* Code review comment: centralize the generator/string for known generators

* Undo undesired file creation

* Adjust the run_codegen_targets a bit

* Undo shellharden: it breaks the script

* Add exception on shellharden on run_codegen_targets

* Fix clang tidy location for darwin: it uses out/default not out/sanitizers

* Add a server cluster to the several_clusters unit test, to validate that we generate server callbacks to

* Make bridge generate ONLY client clusters as it reuses the same name of generation

* Separate client and server headers for bridge codegen

* Resolve bridge: clients have default names, Server headers are separate. This is until we figure out real names

* Fix build rules

* Do not lint test matter files for spec compliance

* Github runners do not use bash by default. Make the conditionals different for lint skipping

* Fix operator for lint exception check

* Undo typo
---
 .github/workflows/build.yaml                  |  8 ++
 .github/workflows/lint.yml                    |  7 ++
 .restyled.yaml                                |  1 +
 build/chip/chip_codegen.cmake                 | 70 +++++++++++++++
 build/chip/esp32/esp32_codegen.cmake          | 45 ++++++++++
 .../esp32/main/CMakeLists.txt                 |  8 +-
 .../esp32/main/CMakeLists.txt                 |  8 +-
 examples/bridge-app/esp32/main/CMakeLists.txt |  6 ++
 examples/chef/esp32/main/CMakeLists.txt       |  7 +-
 .../dynamic-bridge-app/bridge-common/BUILD.gn |  3 +-
 .../esp32/main/CMakeLists.txt                 |  7 +-
 .../lighting-app/esp32/main/CMakeLists.txt    |  8 +-
 examples/lock-app/esp32/main/CMakeLists.txt   | 13 ++-
 .../esp32/main/CMakeLists.txt                 |  6 +-
 .../esp32/main/CMakeLists.txt                 |  6 +-
 .../pigweed-app/esp32/main/CMakeLists.txt     |  4 +-
 .../esp32/main/CMakeLists.txt                 |  9 +-
 scripts/codegen.py                            | 31 +------
 scripts/idl/BUILD.gn                          | 18 ++--
 scripts/idl/generators/bridge/__init__.py     |  9 +-
 scripts/idl/generators/cpp/__init__.py        |  0
 .../PluginApplicationCallbacksHeader.jinja    |  9 ++
 .../generators/cpp/application/__init__.py    | 61 +++++++++++++
 scripts/idl/generators/registry.py            | 59 ++++++++++++
 scripts/idl/test_generators.py                |  6 +-
 scripts/idl/tests/available_tests.yaml        | 15 ++--
 .../idl/tests/inputs/several_clusters.matter  | 20 +++++
 .../{DemoCluster.h => DemoClusterServer.h}    |  0
 .../{DemoCluster.h => DemoClusterServer.h}    |  0
 .../bridge/BridgeClustersImpl.h               |  9 ++
 .../bridge/{First.h => FirstServer.h}         |  0
 .../bridge/{Second.h => SecondServer.h}       |  0
 .../outputs/several_clusters/bridge/Third.h   |  5 +-
 .../several_clusters/bridge/ThirdServer.h     | 29 ++++++
 .../cpp-app/PluginApplicationCallbacks.h      | 10 +++
 .../bridge/{MyCluster.h => MyClusterServer.h} |  0
 scripts/run_codegen_targets.sh                | 56 ++++++++++++
 src/app/chip_data_model.cmake                 | 31 ++++++-
 src/app/chip_data_model.gni                   | 24 +++++
 src/app/util/util.cpp                         |  4 +-
 src/app/zap-templates/app-templates.json      |  5 --
 .../callbacks/PluginApplicationCallbacks.zapt |  8 --
 .../PluginApplicationCallbacks.h              | 88 ------------------
 .../PluginApplicationCallbacks.h              | 83 -----------------
 .../PluginApplicationCallbacks.h              | 50 -----------
 .../PluginApplicationCallbacks.h              | 51 -----------
 .../PluginApplicationCallbacks.h              | 45 ----------
 .../PluginApplicationCallbacks.h              | 49 ----------
 .../PluginApplicationCallbacks.h              | 52 -----------
 .../PluginApplicationCallbacks.h              | 51 -----------
 .../PluginApplicationCallbacks.h              | 52 -----------
 .../PluginApplicationCallbacks.h              | 48 ----------
 .../PluginApplicationCallbacks.h              | 50 -----------
 .../PluginApplicationCallbacks.h              | 53 -----------
 .../PluginApplicationCallbacks.h              | 50 -----------
 .../PluginApplicationCallbacks.h              | 50 -----------
 .../PluginApplicationCallbacks.h              | 50 -----------
 .../PluginApplicationCallbacks.h              | 51 -----------
 .../PluginApplicationCallbacks.h              | 52 -----------
 .../PluginApplicationCallbacks.h              | 50 -----------
 .../PluginApplicationCallbacks.h              | 50 -----------
 .../PluginApplicationCallbacks.h              | 50 -----------
 .../PluginApplicationCallbacks.h              | 50 -----------
 .../PluginApplicationCallbacks.h              | 55 ------------
 .../PluginApplicationCallbacks.h              | 50 -----------
 .../PluginApplicationCallbacks.h              | 48 ----------
 .../PluginApplicationCallbacks.h              | 89 -------------------
 .../PluginApplicationCallbacks.h              | 50 -----------
 .../PluginApplicationCallbacks.h              | 52 -----------
 .../PluginApplicationCallbacks.h              | 41 ---------
 .../PluginApplicationCallbacks.h              | 51 -----------
 .../PluginApplicationCallbacks.h              | 49 ----------
 .../PluginApplicationCallbacks.h              | 30 -------
 .../PluginApplicationCallbacks.h              | 38 --------
 .../PluginApplicationCallbacks.h              | 42 ---------
 .../PluginApplicationCallbacks.h              | 71 ---------------
 .../PluginApplicationCallbacks.h              | 71 ---------------
 .../PluginApplicationCallbacks.h              | 45 ----------
 .../PluginApplicationCallbacks.h              | 43 ---------
 .../PluginApplicationCallbacks.h              | 43 ---------
 .../PluginApplicationCallbacks.h              | 51 -----------
 .../PluginApplicationCallbacks.h              | 64 -------------
 .../PluginApplicationCallbacks.h              | 67 --------------
 .../PluginApplicationCallbacks.h              | 49 ----------
 84 files changed, 548 insertions(+), 2301 deletions(-)
 create mode 100644 build/chip/chip_codegen.cmake
 create mode 100644 build/chip/esp32/esp32_codegen.cmake
 create mode 100644 scripts/idl/generators/cpp/__init__.py
 create mode 100644 scripts/idl/generators/cpp/application/PluginApplicationCallbacksHeader.jinja
 create mode 100644 scripts/idl/generators/cpp/application/__init__.py
 create mode 100644 scripts/idl/generators/registry.py
 rename scripts/idl/tests/outputs/cluster_struct_attribute/bridge/{DemoCluster.h => DemoClusterServer.h} (100%)
 rename scripts/idl/tests/outputs/global_struct_attribute/bridge/{DemoCluster.h => DemoClusterServer.h} (100%)
 rename scripts/idl/tests/outputs/several_clusters/bridge/{First.h => FirstServer.h} (100%)
 rename scripts/idl/tests/outputs/several_clusters/bridge/{Second.h => SecondServer.h} (100%)
 create mode 100644 scripts/idl/tests/outputs/several_clusters/bridge/ThirdServer.h
 create mode 100644 scripts/idl/tests/outputs/several_clusters/cpp-app/PluginApplicationCallbacks.h
 rename scripts/idl/tests/outputs/simple_attribute/bridge/{MyCluster.h => MyClusterServer.h} (100%)
 create mode 100755 scripts/run_codegen_targets.sh
 delete mode 100644 src/app/zap-templates/templates/app/callbacks/PluginApplicationCallbacks.zapt
 delete mode 100644 zzz_generated/all-clusters-app/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/all-clusters-minimal-app/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/bridge-app/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/contact-sensor-app/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/controller-clusters/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/dynamic-bridge-app/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/light-switch-app/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/lighting-app/nxp/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/lighting-app/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/lock-app/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/log-source-app/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/ota-provider-app/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/ota-requestor-app/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/placeholder/app1/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/placeholder/app2/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/pump-app/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/pump-controller-app/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/temperature-measurement-app/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/thermostat/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/tv-app/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/tv-casting-app/zap-generated/PluginApplicationCallbacks.h
 delete mode 100644 zzz_generated/window-app/zap-generated/PluginApplicationCallbacks.h

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a2cbe7d1fbfdf7..1773ffc4f07ea4 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -210,6 +210,10 @@ jobs:
                         BUILD_TYPE=sanitizers scripts/build/gn_gen.sh --args="$GN_ARGS" --export-compile-commands
                         BUILD_TYPE=sanitizers scripts/tests/gn_tests.sh
                     done
+            - name: Ensure codegen is done for sanitize
+              timeout-minutes: 45
+              run: |
+                  ./scripts/run_in_build_env.sh "./scripts/run_codegen_targets.sh out/sanitizers"
             - name: Clang-tidy validation
               timeout-minutes: 45
               run: |
@@ -401,6 +405,10 @@ jobs:
                       scripts/run_in_build_env.sh "ninja -C ./out/$BUILD_TYPE"
                       BUILD_TYPE=$BUILD_TYPE scripts/tests/gn_tests.sh
                   done
+            - name: Ensure codegen is done for sanitize
+              timeout-minutes: 45
+              run: |
+                  ./scripts/run_in_build_env.sh "./scripts/run_codegen_targets.sh out/default"
             - name: Clang-tidy validation
               timeout-minutes: 45
               run: |
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 6c980a2dbd1445..9eebd41beb3384 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -97,6 +97,13 @@ jobs:
                      if [ "$idl_file" = './examples/thermostat/thermostat-common/thermostat.matter' ]; then continue; fi
                      if [ "$idl_file" = './examples/window-app/common/window-app.matter' ]; then continue; fi
 
+                     # Test files are intentionally small and not spec-compilant, just parse-compliant
+                     if [ "$idl_file" = "./scripts/idl/tests/inputs/cluster_struct_attribute.matter" ]; then continue; fi
+                     if [ "$idl_file" = "./scripts/idl/tests/inputs/global_struct_attribute.matter" ]; then continue; fi
+                     if [ "$idl_file" = "./scripts/idl/tests/inputs/optional_argument.matter" ]; then continue; fi
+                     if [ "$idl_file" = "./scripts/idl/tests/inputs/several_clusters.matter" ]; then continue; fi
+                     if [ "$idl_file" = "./scripts/idl/tests/inputs/simple_attribute.matter" ]; then continue; fi
+
                      ./scripts/run_in_build_env.sh "./scripts/idl_lint.py --log-level warn $idl_file" >/dev/null || exit 1
                  done
 
diff --git a/.restyled.yaml b/.restyled.yaml
index 195765b70a34d4..f9bdfd3966b85f 100644
--- a/.restyled.yaml
+++ b/.restyled.yaml
@@ -74,6 +74,7 @@ exclude:
     - "examples/chef/zzz_generated/**/*"
     - "examples/platform/nxp/k32w/k32w0/scripts/demo_generated_certs/**/*"
     - "integrations/cloudbuild/*.yaml" # uglier long command line content
+    - "scripts/run_codegen_targets.sh" # shellharden breaks for loops over command outputs
 
 
 changed_paths:
diff --git a/build/chip/chip_codegen.cmake b/build/chip/chip_codegen.cmake
new file mode 100644
index 00000000000000..d0c20c0bd99976
--- /dev/null
+++ b/build/chip/chip_codegen.cmake
@@ -0,0 +1,70 @@
+# Run chip code generation. 
+#
+# Example usage:
+#   chip_codegen("app"
+#      INPUT     "some_file.matter"
+#      GENERATOR "bridge"
+#      OUTPUTS
+#            "bridge/OnOff.h"
+#            "bridge/LevelControl.h"
+#            "bridge/Switch.h"
+#            # ... more outputs
+#     OUTPUT_PATH  DIR_NAME_VAR
+#     OUTPUT_FILES  FILE_NAMES_VAR
+#   )
+#
+# Arguments:
+#   INPUT     - the name of the ".matter" file to use for generation
+#   GENERATOR - generator to use for codegen.py
+#   OUTPUTS   - EXPECTED output names. MUST match actual outputs
+# 
+#   OUTPUT_PATH  - [OUT] output variable will contain the directory where the
+#                  files will be generated
+#   OUTPUT_FILES - [OUT] output variable will contain the path of generated files.
+#                  suitable to be added within a build target
+#
+function(chip_codegen TARGET_NAME)
+    cmake_parse_arguments(ARG 
+         "" 
+         "INPUT;GENERATOR;OUTPUT_PATH;OUTPUT_FILES" 
+         "OUTPUTS" 
+         ${ARGN}
+    )
+
+    set(GEN_FOLDER "${CMAKE_BINARY_DIR}/gen/${TARGET_NAME}/${ARG_GENERATOR}")
+
+    string(REPLACE ";" "\n" OUTPUT_AS_NEWLINES "${ARG_OUTPUTS}")
+
+    file(MAKE_DIRECTORY "${GEN_FOLDER}")
+    file(GENERATE
+        OUTPUT "${GEN_FOLDER}/expected.outputs"
+        CONTENT "${OUTPUT_AS_NEWLINES}"
+    )
+
+
+    set(OUT_NAMES)
+    foreach(NAME IN LISTS ARG_OUTPUTS)
+        list(APPEND OUT_NAMES "${GEN_FOLDER}/${NAME}")
+    endforeach()
+
+    # Python is expected to be in the path
+    #
+    # find_package(Python3 REQUIRED)
+    add_custom_command(
+        OUTPUT "${OUT_NAMES}"
+        COMMAND "${CHIP_ROOT}/scripts/codegen.py"
+        ARGS "--generator" "${ARG_GENERATOR}"
+             "--output-dir" "${GEN_FOLDER}"
+             "--expected-outputs" "${GEN_FOLDER}/expected.outputs"
+             "${ARG_INPUT}"
+        DEPENDS
+            "${ARG_INPUT}"
+        VERBATIM
+    )
+
+    add_custom_target(${TARGET_NAME} DEPENDS "${OUT_NAMES}")
+
+    # Forward outputs to the parent
+    set(${ARG_OUTPUT_FILES} "${OUT_NAMES}" PARENT_SCOPE)
+    set(${ARG_OUTPUT_PATH} "${GEN_FOLDER}" PARENT_SCOPE)
+endfunction()
diff --git a/build/chip/esp32/esp32_codegen.cmake b/build/chip/esp32/esp32_codegen.cmake
new file mode 100644
index 00000000000000..8d454e369dc75c
--- /dev/null
+++ b/build/chip/esp32/esp32_codegen.cmake
@@ -0,0 +1,45 @@
+#
+#    Copyright (c) 2022 Project CHIP Authors
+#    All rights reserved.
+#
+#    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.
+#
+
+
+
+macro(chip_app_component_codegen IDL_NAME)
+  include("${CHIP_ROOT}/build/chip/chip_codegen.cmake")
+
+  # The IDF build system performs a two-pass expansion to determine
+  # component expansion. The first pass runs in script-mode
+  # to determine idf_component_register REQUIRES and PRIV_REQUIRES.
+  #
+  # We can only set up code generation during the 2nd pass
+  #
+  # see https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/build-system.html
+  if (NOT CMAKE_BUILD_EARLY_EXPANSION)
+  
+    chip_codegen(app-codegen
+      INPUT     "${IDL_NAME}"
+      GENERATOR "cpp-app"
+      OUTPUTS
+            "app/PluginApplicationCallbacks.h"
+      OUTPUT_PATH   APP_GEN_DIR
+      OUTPUT_FILES  APP_GEN_FILES
+    )
+
+    target_include_directories(${COMPONENT_LIB} PUBLIC "${APP_GEN_DIR}")
+
+    add_dependencies(${COMPONENT_LIB} app-codegen)
+  endif()
+endmacro()
diff --git a/examples/all-clusters-app/esp32/main/CMakeLists.txt b/examples/all-clusters-app/esp32/main/CMakeLists.txt
index f25a2b351094d5..11445b48bd0df4 100644
--- a/examples/all-clusters-app/esp32/main/CMakeLists.txt
+++ b/examples/all-clusters-app/esp32/main/CMakeLists.txt
@@ -14,7 +14,6 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
-
 # (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
 # The list of src and include dirs must be in sync with that in all-clusters-app/esp32/main/component.mk
 set(PRIV_INCLUDE_DIRS_LIST
@@ -137,6 +136,12 @@ idf_component_register(PRIV_INCLUDE_DIRS ${PRIV_INCLUDE_DIRS_LIST}
                        EXCLUDE_SRCS ${EXCLUDE_SRCS_LIST}
                        PRIV_REQUIRES ${PRIV_REQUIRES_LIST})
 
+get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
+
+include("${CHIP_ROOT}/build/chip/esp32/esp32_codegen.cmake")
+
+chip_app_component_codegen("${CHIP_ROOT}/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter")
+
 set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
 target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
 target_compile_options(${COMPONENT_LIB} PUBLIC
@@ -145,7 +150,6 @@ target_compile_options(${COMPONENT_LIB} PUBLIC
 
 if (CONFIG_ENABLE_PW_RPC)
 
-get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
 
 set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
 include(${PIGWEED_ROOT}/pw_build/pigweed.cmake)
diff --git a/examples/all-clusters-minimal-app/esp32/main/CMakeLists.txt b/examples/all-clusters-minimal-app/esp32/main/CMakeLists.txt
index 2ae36b439e00a1..376f85bc368378 100644
--- a/examples/all-clusters-minimal-app/esp32/main/CMakeLists.txt
+++ b/examples/all-clusters-minimal-app/esp32/main/CMakeLists.txt
@@ -128,6 +128,12 @@ idf_component_register(PRIV_INCLUDE_DIRS ${PRIV_INCLUDE_DIRS_LIST}
                        SRC_DIRS ${SRC_DIRS_LIST}
                        PRIV_REQUIRES ${PRIV_REQUIRES_LIST})
 
+get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
+
+include("${CHIP_ROOT}/build/chip/esp32/esp32_codegen.cmake")
+
+chip_app_component_codegen("${CHIP_ROOT}/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter")
+
 set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
 target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
 target_compile_options(${COMPONENT_LIB} PUBLIC
@@ -136,8 +142,6 @@ target_compile_options(${COMPONENT_LIB} PUBLIC
 
 if (CONFIG_ENABLE_PW_RPC)
 
-get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
-
 set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
 include(${PIGWEED_ROOT}/pw_build/pigweed.cmake)
 include(${PIGWEED_ROOT}/pw_protobuf_compiler/proto.cmake)
diff --git a/examples/bridge-app/esp32/main/CMakeLists.txt b/examples/bridge-app/esp32/main/CMakeLists.txt
index 81eae85be11da9..9ed6f0f1410c68 100644
--- a/examples/bridge-app/esp32/main/CMakeLists.txt
+++ b/examples/bridge-app/esp32/main/CMakeLists.txt
@@ -54,6 +54,12 @@ idf_component_register(PRIV_INCLUDE_DIRS
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/providers"
                       PRIV_REQUIRES chip QRCode bt)
 
+get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
+
+include("${CHIP_ROOT}/build/chip/esp32/esp32_codegen.cmake")
+
+chip_app_component_codegen("${CHIP_ROOT}/examples/bridge-app/bridge-common/bridge-app.matter")
+
 set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 14)
 target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
 target_compile_options(${COMPONENT_LIB} PUBLIC
diff --git a/examples/chef/esp32/main/CMakeLists.txt b/examples/chef/esp32/main/CMakeLists.txt
index e7def1a4efb05f..2f02250d10ab76 100644
--- a/examples/chef/esp32/main/CMakeLists.txt
+++ b/examples/chef/esp32/main/CMakeLists.txt
@@ -16,7 +16,7 @@
 #
 # (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
 
-get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_LIST_DIR}/../../../.. REALPATH)
+get_filename_component(CHIP_ROOT ../third_party/connectedhomeip REALPATH)
 get_filename_component(CHEF ${CMAKE_CURRENT_SOURCE_DIR}/../../ REALPATH)
 get_filename_component(GEN_DIR ${CHEF}/out/${SAMPLE_NAME}/zap-generated REALPATH)
 
@@ -107,6 +107,9 @@ idf_component_register(PRIV_INCLUDE_DIRS
                       PRIV_REQUIRES chip nvs_flash bt console esp32_mbedtls QRCode tft screen-framework spidriver
                       SRC_DIRS ${SRC_DIRS_LIST})
 
+include("${CHIP_ROOT}/build/chip/esp32/esp32_codegen.cmake")
+chip_app_component_codegen("${CHEF}/devices/${SAMPLE_NAME}.matter")
+
 set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
 target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
 target_compile_options(${COMPONENT_LIB} PUBLIC
@@ -115,8 +118,6 @@ target_compile_options(${COMPONENT_LIB} PUBLIC
 
 if (CONFIG_ENABLE_PW_RPC)
 
-get_filename_component(CHIP_ROOT ../third_party/connectedhomeip REALPATH)
-
 set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
 include(${PIGWEED_ROOT}/pw_build/pigweed.cmake)
 include(${PIGWEED_ROOT}/pw_protobuf_compiler/proto.cmake)
diff --git a/examples/dynamic-bridge-app/bridge-common/BUILD.gn b/examples/dynamic-bridge-app/bridge-common/BUILD.gn
index 22fc176dcd69d6..584e172b654b7c 100644
--- a/examples/dynamic-bridge-app/bridge-common/BUILD.gn
+++ b/examples/dynamic-bridge-app/bridge-common/BUILD.gn
@@ -22,6 +22,7 @@ chip_data_model("dynamic-bridge-common") {
 
   zap_pregenerated_dir =
       "${chip_root}/zzz_generated/dynamic-bridge-app/zap-generated"
+
   is_server = true
 
   # TODO: the definition of DYNAMIC_ENDPOINT_COUNT needs find a common home!
@@ -30,7 +31,7 @@ chip_data_model("dynamic-bridge-common") {
 
 if (chip_enable_pw_rpc) {
   import("//build_overrides/pigweed.gni")
-  import("$dir_pw_protobuf_compiler/proto.gni")
+  IMPORT("$dir_pw_protobuf_compiler/proto.gni")
 
   pw_proto_library("bridge_service") {
     sources = [ "protos/bridge_service.proto" ]
diff --git a/examples/light-switch-app/esp32/main/CMakeLists.txt b/examples/light-switch-app/esp32/main/CMakeLists.txt
index 8402283ee623e2..5d4e4dbdce2f08 100644
--- a/examples/light-switch-app/esp32/main/CMakeLists.txt
+++ b/examples/light-switch-app/esp32/main/CMakeLists.txt
@@ -14,8 +14,8 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
 
+# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
 idf_component_register(PRIV_INCLUDE_DIRS
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/light-switch-app"
                       "${CMAKE_CURRENT_LIST_DIR}/include"
@@ -61,6 +61,11 @@ idf_component_register(PRIV_INCLUDE_DIRS
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/groups-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/group-key-mgmt-server"
                       PRIV_REQUIRES chip QRCode bt app_update)
+get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
+
+include("${CHIP_ROOT}/build/chip/esp32/esp32_codegen.cmake")
+
+chip_app_component_codegen("${CHIP_ROOT}/examples/light-switch-app/light-switch-common/light-switch-app.matter")
 
 set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
 target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
diff --git a/examples/lighting-app/esp32/main/CMakeLists.txt b/examples/lighting-app/esp32/main/CMakeLists.txt
index ff9fac181e2e5d..61953e1c2a0d34 100644
--- a/examples/lighting-app/esp32/main/CMakeLists.txt
+++ b/examples/lighting-app/esp32/main/CMakeLists.txt
@@ -17,12 +17,13 @@
 # (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
 
 set(PRIV_INCLUDE_DIRS_LIST
+                      "${APP_GEN_DIR}"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/lighting-app"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/providers"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/lighting-app/lighting-common/include"
                       "${CMAKE_CURRENT_LIST_DIR}/include"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32"
-) 
+)
 set(SRC_DIRS_LIST
                       "${CMAKE_CURRENT_LIST_DIR}"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/app-common/app-common/zap-generated/attributes"
@@ -90,6 +91,11 @@ endif (CONFIG_ENABLE_PW_RPC)
 idf_component_register(PRIV_INCLUDE_DIRS ${PRIV_INCLUDE_DIRS_LIST}
                        SRC_DIRS ${SRC_DIRS_LIST}
                        PRIV_REQUIRES ${PRIV_REQUIRES_LIST})
+get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
+
+include("${CHIP_ROOT}/build/chip/esp32/esp32_codegen.cmake")
+
+chip_app_component_codegen("${CHIP_ROOT}/examples/lighting-app/lighting-common/lighting-app.matter")
 
 set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
 target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
diff --git a/examples/lock-app/esp32/main/CMakeLists.txt b/examples/lock-app/esp32/main/CMakeLists.txt
index 189014129af2bd..eee6f6926d5d32 100644
--- a/examples/lock-app/esp32/main/CMakeLists.txt
+++ b/examples/lock-app/esp32/main/CMakeLists.txt
@@ -16,6 +16,8 @@
 #
 # (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
 
+get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
+
 if (CONFIG_ENABLE_PW_RPC)
 idf_component_register(INCLUDE_DIRS
                      "${CMAKE_CURRENT_LIST_DIR}"
@@ -67,8 +69,7 @@ idf_component_register(INCLUDE_DIRS
                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/identify-server"
                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/groups-server"
                      PRIV_REQUIRES bt chip QRCode)
-
-get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
+add_dependencies(${COMPONENT_LIB} app-codegen)
 
 set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
 include(${PIGWEED_ROOT}/pw_build/pigweed.cmake)
@@ -186,6 +187,8 @@ idf_component_register(PRIV_INCLUDE_DIRS
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/groups-server"
                       PRIV_REQUIRES chip QRCode bt)
 
+add_dependencies(${COMPONENT_LIB} app-codegen)
+
 set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
 target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
 target_compile_options(${COMPONENT_LIB} PUBLIC
@@ -193,3 +196,9 @@ target_compile_options(${COMPONENT_LIB} PUBLIC
 )
 
 endif (CONFIG_ENABLE_PW_RPC)
+
+get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
+
+include("${CHIP_ROOT}/build/chip/esp32/esp32_codegen.cmake")
+
+chip_app_component_codegen("${CHIP_ROOT}/examples/lock-app/lock-common/lock-app.matter")
diff --git a/examples/ota-provider-app/esp32/main/CMakeLists.txt b/examples/ota-provider-app/esp32/main/CMakeLists.txt
index 468fdce04c0f46..e5a6cf7327fcd6 100644
--- a/examples/ota-provider-app/esp32/main/CMakeLists.txt
+++ b/examples/ota-provider-app/esp32/main/CMakeLists.txt
@@ -16,7 +16,7 @@
 #
 #
 # (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-idf_component_register(PRIV_INCLUDE_DIRS 
+idf_component_register(PRIV_INCLUDE_DIRS
                       "${CMAKE_CURRENT_LIST_DIR}/include"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/ota-provider-app/"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/ota-provider-app"
@@ -59,6 +59,10 @@ idf_component_register(PRIV_INCLUDE_DIRS
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/ota-provider-app/ota-provider-common/BdxOtaSender.cpp"
                       PRIV_REQUIRES chip QRCode bt console spiffs)
 
+get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
+include("${CHIP_ROOT}/build/chip/esp32/esp32_codegen.cmake")
+chip_app_component_codegen("${CHIP_ROOT}/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter")
+
 spiffs_create_partition_image(img_storage ${CMAKE_SOURCE_DIR}/spiffs_image FLASH_IN_PROJECT)
 set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 14)
 target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
diff --git a/examples/ota-requestor-app/esp32/main/CMakeLists.txt b/examples/ota-requestor-app/esp32/main/CMakeLists.txt
index 1ab96247f242e8..a0633511cfaded 100644
--- a/examples/ota-requestor-app/esp32/main/CMakeLists.txt
+++ b/examples/ota-requestor-app/esp32/main/CMakeLists.txt
@@ -16,6 +16,8 @@
 #
 #
 # (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
+get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
+
 set(PRIV_INCLUDE_DIRS_LIST
                       "${CMAKE_CURRENT_LIST_DIR}/include"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src"
@@ -86,6 +88,9 @@ idf_component_register(PRIV_INCLUDE_DIRS ${PRIV_INCLUDE_DIRS_LIST}
                        SRC_DIRS ${SRC_DIRS_LIST}
                        PRIV_REQUIRES ${PRIV_REQUIRES_LIST})
 
+include("${CHIP_ROOT}/build/chip/esp32/esp32_codegen.cmake")
+chip_app_component_codegen("${CHIP_ROOT}/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter")
+
 set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
 target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
 target_compile_options(${COMPONENT_LIB} PUBLIC
@@ -94,7 +99,6 @@ target_compile_options(${COMPONENT_LIB} PUBLIC
 
 if (CONFIG_ENABLE_PW_RPC)
 
-get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
 
 set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
 include(${PIGWEED_ROOT}/pw_build/pigweed.cmake)
diff --git a/examples/pigweed-app/esp32/main/CMakeLists.txt b/examples/pigweed-app/esp32/main/CMakeLists.txt
index 4e89e02e117101..c23dfe3a8de84c 100644
--- a/examples/pigweed-app/esp32/main/CMakeLists.txt
+++ b/examples/pigweed-app/esp32/main/CMakeLists.txt
@@ -14,7 +14,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-idf_component_register(INCLUDE_DIRS 
+idf_component_register(INCLUDE_DIRS
                      "${CMAKE_CURRENT_LIST_DIR}"
                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/pw_sys_io/public"
                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32"
@@ -22,7 +22,7 @@ idf_component_register(INCLUDE_DIRS
                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed/esp32"
                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/lib/support"
                      "${IDF_PATH}/components/freertos/include/freertos"
-                    
+
                       SRC_DIRS
                      "${CMAKE_CURRENT_LIST_DIR}"
                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32"
diff --git a/examples/temperature-measurement-app/esp32/main/CMakeLists.txt b/examples/temperature-measurement-app/esp32/main/CMakeLists.txt
index d2d1826b8d5d78..dce457d2448346 100644
--- a/examples/temperature-measurement-app/esp32/main/CMakeLists.txt
+++ b/examples/temperature-measurement-app/esp32/main/CMakeLists.txt
@@ -15,7 +15,9 @@
 #    limitations under the License.
 #
 #
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
+
+get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
+
 set(PRIV_INCLUDE_DIRS_LIST
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/temperature-measurement-app/"
                       "${CMAKE_CURRENT_LIST_DIR}/include"
@@ -78,6 +80,9 @@ idf_component_register(PRIV_INCLUDE_DIRS ${PRIV_INCLUDE_DIRS_LIST}
                        SRC_DIRS ${SRC_DIRS_LIST}
                        PRIV_REQUIRES ${PRIV_REQUIRES_LIST})
 
+include("${CHIP_ROOT}/build/chip/esp32/esp32_codegen.cmake")
+chip_app_component_codegen("${CHIP_ROOT}/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter")
+
 set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
 target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
 target_compile_options(${COMPONENT_LIB} PUBLIC
@@ -86,8 +91,6 @@ target_compile_options(${COMPONENT_LIB} PUBLIC
 
 if (CONFIG_ENABLE_PW_RPC)
 
-get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
-
 set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
 include(${PIGWEED_ROOT}/pw_build/pigweed.cmake)
 include(${PIGWEED_ROOT}/pw_protobuf_compiler/proto.cmake)
diff --git a/scripts/codegen.py b/scripts/codegen.py
index bcbba6833a49b4..da81b06210d933 100755
--- a/scripts/codegen.py
+++ b/scripts/codegen.py
@@ -27,26 +27,7 @@
     from idl.matter_idl_parser import CreateParser
 
 from idl.generators import FileSystemGeneratorStorage, GeneratorStorage
-from idl.generators.java import JavaGenerator
-from idl.generators.bridge import BridgeGenerator
-
-
-class CodeGeneratorTypes(enum.Enum):
-    """
-    Represents every generator type supported by codegen and maps
-    the simple enum value (user friendly and can be a command line input)
-    into underlying generators.
-    """
-    JAVA = enum.auto()
-    BRIDGE = enum.auto()
-
-    def CreateGenerator(self, *args, **kargs):
-        if self == CodeGeneratorTypes.JAVA:
-            return JavaGenerator(*args, **kargs)
-        elif self == CodeGeneratorTypes.BRIDGE:
-            return BridgeGenerator(*args, **kargs)
-        else:
-            raise Error("Unknown code generator type")
+from idl.generators.registry import CodeGenerator, GENERATORS
 
 
 class ListGeneratedFilesStorage(GeneratorStorage):
@@ -73,11 +54,6 @@ def write_new_data(self, relative_path: str, content: str):
     'fatal': logging.FATAL,
 }
 
-__GENERATORS__ = {
-    'java': CodeGeneratorTypes.JAVA,
-    'bridge': CodeGeneratorTypes.BRIDGE,
-}
-
 
 @click.command()
 @click.option(
@@ -88,7 +64,7 @@ def write_new_data(self, relative_path: str, content: str):
 @click.option(
     '--generator',
     default='JAVA',
-    type=click.Choice(__GENERATORS__.keys(), case_sensitive=False),
+    type=click.Choice(GENERATORS.keys(), case_sensitive=False),
     help='What code generator to run')
 @click.option(
     '--output-dir',
@@ -129,8 +105,7 @@ def main(log_level, generator, output_dir, dry_run, name_only, expected_outputs,
         storage = FileSystemGeneratorStorage(output_dir)
 
     logging.info("Running code generator %s" % generator)
-    generator = __GENERATORS__[
-        generator].CreateGenerator(storage, idl=idl_tree)
+    generator = CodeGenerator.FromString(generator).Create(storage, idl=idl_tree)
     generator.render(dry_run)
 
     if expected_outputs:
diff --git a/scripts/idl/BUILD.gn b/scripts/idl/BUILD.gn
index 1903aa573be359..359f50e89d4159 100644
--- a/scripts/idl/BUILD.gn
+++ b/scripts/idl/BUILD.gn
@@ -30,6 +30,7 @@ pw_python_package("idl") {
     "generators/bridge/BridgeClustersGlobalStructs.jinja",
     "generators/java/ChipClustersCpp.jinja",
     "generators/java/ChipClustersRead.jinja",
+    "generators/cpp/application/PluginApplicationCallbacksHeader.jinja",
 
     # Unit test data
     "tests/available_tests.yaml",
@@ -40,21 +41,22 @@ pw_python_package("idl") {
     "tests/inputs/simple_attribute.matter",
     "tests/outputs/cluster_struct_attribute/bridge/BridgeClustersImpl.h",
     "tests/outputs/cluster_struct_attribute/bridge/BridgeGlobalStructs.h",
-    "tests/outputs/cluster_struct_attribute/bridge/DemoCluster.h",
+    "tests/outputs/cluster_struct_attribute/bridge/DemoClusterServer.h",
     "tests/outputs/cluster_struct_attribute/jni/DemoClusterClient-ReadImpl.cpp",
     "tests/outputs/cluster_struct_attribute/jni/DemoClusterClient-InvokeSubscribeImpl.cpp",
     "tests/outputs/global_struct_attribute/bridge/BridgeClustersImpl.h",
     "tests/outputs/global_struct_attribute/bridge/BridgeGlobalStructs.h",
-    "tests/outputs/global_struct_attribute/bridge/DemoCluster.h",
+    "tests/outputs/global_struct_attribute/bridge/DemoClusterServer.h",
     "tests/outputs/global_struct_attribute/jni/DemoClusterClient-ReadImpl.cpp",
     "tests/outputs/global_struct_attribute/jni/DemoClusterClient-InvokeSubscribeImpl.cpp",
     "tests/outputs/optional_argument/jni/MyClusterClient-ReadImpl.cpp",
     "tests/outputs/optional_argument/jni/MyClusterClient-InvokeSubscribeImpl.cpp",
     "tests/outputs/several_clusters/bridge/BridgeClustersImpl.h",
     "tests/outputs/several_clusters/bridge/BridgeGlobalStructs.h",
-    "tests/outputs/several_clusters/bridge/First.h",
-    "tests/outputs/several_clusters/bridge/Second.h",
+    "tests/outputs/several_clusters/bridge/FirstServer.h",
+    "tests/outputs/several_clusters/bridge/SecondServer.h",
     "tests/outputs/several_clusters/bridge/Third.h",
+    "tests/outputs/several_clusters/bridge/ThirdServer.h",
     "tests/outputs/several_clusters/jni/FirstClient-ReadImpl.cpp",
     "tests/outputs/several_clusters/jni/SecondClient-ReadImpl.cpp",
     "tests/outputs/several_clusters/jni/ThirdClient-ReadImpl.cpp",
@@ -63,7 +65,7 @@ pw_python_package("idl") {
     "tests/outputs/several_clusters/jni/ThirdClient-InvokeSubscribeImpl.cpp",
     "tests/outputs/simple_attribute/bridge/BridgeClustersImpl.h",
     "tests/outputs/simple_attribute/bridge/BridgeGlobalStructs.h",
-    "tests/outputs/simple_attribute/bridge/MyCluster.h",
+    "tests/outputs/simple_attribute/bridge/MyClusterServer.h",
     "tests/outputs/simple_attribute/jni/MyClusterClient-ReadImpl.cpp",
     "tests/outputs/simple_attribute/jni/MyClusterClient-InvokeSubscribeImpl.cpp",
   ]
@@ -72,6 +74,8 @@ pw_python_package("idl") {
     "__init__.py",
     "generators/__init__.py",
     "generators/bridge/__init__.py",
+    "generators/cpp/__init__.py",
+    "generators/cpp/application/__init__.py",
     "generators/filters.py",
     "generators/java/__init__.py",
     "generators/types.py",
@@ -91,4 +95,8 @@ pw_python_package("idl") {
     "test_generators.py",
     "test_xml_parser.py",
   ]
+
+  # TODO: at a future time consider enabling all (* or missing) here to get
+  #       pylint checking these files
+  static_analysis = []
 }
diff --git a/scripts/idl/generators/bridge/__init__.py b/scripts/idl/generators/bridge/__init__.py
index 5d0bace9faf431..7e993dd965b66e 100644
--- a/scripts/idl/generators/bridge/__init__.py
+++ b/scripts/idl/generators/bridge/__init__.py
@@ -18,7 +18,7 @@
 import re
 
 from idl.generators import CodeGenerator, GeneratorStorage
-from idl.matter_idl_types import (Idl, Field, Attribute, Cluster)
+from idl.matter_idl_types import Idl, Field, Attribute, Cluster, ClusterSide
 from idl import matter_idl_types
 from idl.generators.types import (ParseDataType, BasicString, BasicInteger, FundamentalType,
                                   IdlType, IdlEnumType, IdlBitmapType, TypeLookupContext)
@@ -165,9 +165,14 @@ def internal_render_all(self):
             if not is_dynamic_cluster(cluster, self.idl):
                 continue
 
+            if cluster.side != ClusterSide.SERVER:
+                output_file_name = "bridge/%sServer.h" % cluster.name
+            else:
+                output_file_name = "bridge/%s.h" % cluster.name
+
             self.internal_render_one_output(
                 template_path="bridge/BridgeClustersCpp.jinja",
-                output_file_name="bridge/%s.h" % cluster.name,
+                output_file_name=output_file_name,
                 vars={
                     'cluster': cluster,
                     'idl': self.idl,
diff --git a/scripts/idl/generators/cpp/__init__.py b/scripts/idl/generators/cpp/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/scripts/idl/generators/cpp/application/PluginApplicationCallbacksHeader.jinja b/scripts/idl/generators/cpp/application/PluginApplicationCallbacksHeader.jinja
new file mode 100644
index 00000000000000..83e3dbf4c15a8a
--- /dev/null
+++ b/scripts/idl/generators/cpp/application/PluginApplicationCallbacksHeader.jinja
@@ -0,0 +1,9 @@
+#pragma once
+
+#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
+
+#define MATTER_PLUGINS_INIT \
+{%- for cluster in clusters | sort(attribute='name') %}
+    Matter{{ cluster.name }}Plugin{{ cluster.side | clusterSideString }}InitCallback();{{ " \\" if not loop.last else ""}}
+{%- endfor %}
+
diff --git a/scripts/idl/generators/cpp/application/__init__.py b/scripts/idl/generators/cpp/application/__init__.py
new file mode 100644
index 00000000000000..40a4bb26b0b34b
--- /dev/null
+++ b/scripts/idl/generators/cpp/application/__init__.py
@@ -0,0 +1,61 @@
+# 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.
+
+from idl.generators import CodeGenerator, GeneratorStorage
+from idl.matter_idl_types import Idl, ClusterSide, Field, Attribute, Cluster, FieldQuality, Command, DataType
+from idl import matter_idl_types
+from idl.generators.types import ParseDataType, BasicString, BasicInteger, FundamentalType, IdlType, IdlEnumType, IdlBitmapType, TypeLookupContext
+from typing import Union, List, Set
+from stringcase import capitalcase
+
+import enum
+import logging
+
+
+def clusterSideString(side: ClusterSide):
+    if side == ClusterSide.CLIENT:
+        return "Client"
+    elif side == ClusterSide.SERVER:
+        return "Server"
+    else:
+        raise Exception("Unknown cluster side %r" % (side, ))
+
+
+class CppApplicationGenerator(CodeGenerator):
+    """
+    Generation of cpp code for application implementation for matter.
+    """
+
+    def __init__(self, storage: GeneratorStorage, idl: Idl):
+        """
+        Inintialization is specific for java generation and will add
+        filters as required by the java .jinja templates to function.
+        """
+        super().__init__(storage, idl)
+
+        self.jinja_env.filters['clusterSideString'] = clusterSideString
+
+    def internal_render_all(self):
+        """
+        Renders the cpp and header files required for applications
+        """
+
+        # Header containing a macro to initialize all cluster plugins
+        self.internal_render_one_output(
+            template_path="cpp/application/PluginApplicationCallbacksHeader.jinja",
+            output_file_name="app/PluginApplicationCallbacks.h",
+            vars={
+                'clusters': self.idl.clusters,
+            }
+        )
diff --git a/scripts/idl/generators/registry.py b/scripts/idl/generators/registry.py
new file mode 100644
index 00000000000000..8feeb2c48d1124
--- /dev/null
+++ b/scripts/idl/generators/registry.py
@@ -0,0 +1,59 @@
+# 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.
+
+import enum
+
+from idl.generators.java import JavaGenerator
+from idl.generators.bridge import BridgeGenerator
+from idl.generators.cpp.application import CppApplicationGenerator
+
+
+class CodeGenerator(enum.Enum):
+    """
+    Represents every generator type supported by codegen and maps
+    the simple enum value (user friendly and can be a command line input)
+    into underlying generators.
+    """
+    JAVA = enum.auto()
+    BRIDGE = enum.auto()
+    CPP_APPLICATION = enum.auto()
+
+    def Create(self, *args, **kargs):
+        if self == CodeGenerator.JAVA:
+            return JavaGenerator(*args, **kargs)
+        elif self == CodeGenerator.BRIDGE:
+            return BridgeGenerator(*args, **kargs)
+        elif self == CodeGenerator.CPP_APPLICATION:
+            return CppApplicationGenerator(*args, **kargs)
+        else:
+            raise NameError("Unknown code generator type")
+
+    @staticmethod
+    def FromString(name):
+        global GENERATORS
+
+        if name.lower() in GENERATORS:
+            return GENERATORS[name.lower()]
+        else:
+            raise NameError("Unknown code generator type '%s'" % name)
+
+
+# Contains all known code generators along with a string
+# to uniquely identify them when running command line tools or
+# executing tests
+GENERATORS = {
+    'java': CodeGenerator.JAVA,
+    'bridge': CodeGenerator.BRIDGE,
+    'cpp-app': CodeGenerator.CPP_APPLICATION,
+}
diff --git a/scripts/idl/test_generators.py b/scripts/idl/test_generators.py
index 88b929e0fcbe5d..730bfdbc610762 100755
--- a/scripts/idl/test_generators.py
+++ b/scripts/idl/test_generators.py
@@ -33,6 +33,7 @@
 from idl.matter_idl_types import Idl
 from idl.generators.java import JavaGenerator
 from idl.generators.bridge import BridgeGenerator
+from idl.generators.cpp.application import CppApplicationGenerator
 from idl.generators import GeneratorStorage
 
 
@@ -86,6 +87,7 @@ def get_existing_data(self, relative_path: str):
 
     def write_new_data(self, relative_path: str, content: str):
         if REGENERATE_GOLDEN_IMAGES:
+            print("RE-GENERATING %r" % relative_path)
             # Expect writing only on regeneration
             with open(self.get_existing_data_path(relative_path), 'wt') as golden:
                 golden.write(content)
@@ -96,7 +98,7 @@ def write_new_data(self, relative_path: str, content: str):
 
         # This will display actual diffs in the output files
         self.checker.assertEqual(
-            self.get_existing_data(relative_path), content)
+            self.get_existing_data(relative_path), content, "Content of %s" % relative_path)
 
         # Even if no diff, to be build system friendly, we do NOT expect any
         # actual data writes.
@@ -119,6 +121,8 @@ def _create_generator(self, storage: GeneratorStorage, idl: Idl):
             return JavaGenerator(storage, idl)
         if self.generator_name.lower() == 'bridge':
             return BridgeGenerator(storage, idl)
+        if self.generator_name.lower() == 'cpp-app':
+            return CppApplicationGenerator(storage, idl)
         else:
             raise Exception("Unknown generator for testing: %s",
                             self.generator_name.lower())
diff --git a/scripts/idl/tests/available_tests.yaml b/scripts/idl/tests/available_tests.yaml
index 3fb20e2a482b87..a6d78a346e7f8e 100644
--- a/scripts/idl/tests/available_tests.yaml
+++ b/scripts/idl/tests/available_tests.yaml
@@ -39,21 +39,26 @@ bridge:
     inputs/simple_attribute.matter:
         bridge/BridgeClustersImpl.h: outputs/simple_attribute/bridge/BridgeClustersImpl.h
         bridge/BridgeGlobalStructs.h: outputs/simple_attribute/bridge/BridgeGlobalStructs.h
-        bridge/MyCluster.h: outputs/simple_attribute/bridge/MyCluster.h
+        bridge/MyClusterServer.h: outputs/simple_attribute/bridge/MyClusterServer.h
 
     inputs/global_struct_attribute.matter:
         bridge/BridgeClustersImpl.h: outputs/global_struct_attribute/bridge/BridgeClustersImpl.h
         bridge/BridgeGlobalStructs.h: outputs/global_struct_attribute/bridge/BridgeGlobalStructs.h
-        bridge/DemoCluster.h: outputs/global_struct_attribute/bridge/DemoCluster.h
+        bridge/DemoClusterServer.h: outputs/global_struct_attribute/bridge/DemoClusterServer.h
 
     inputs/cluster_struct_attribute.matter:
         bridge/BridgeClustersImpl.h: outputs/cluster_struct_attribute/bridge/BridgeClustersImpl.h
         bridge/BridgeGlobalStructs.h: outputs/cluster_struct_attribute/bridge/BridgeGlobalStructs.h
-        bridge/DemoCluster.h: outputs/cluster_struct_attribute/bridge/DemoCluster.h
+        bridge/DemoClusterServer.h: outputs/cluster_struct_attribute/bridge/DemoClusterServer.h
 
     inputs/several_clusters.matter:
         bridge/BridgeClustersImpl.h: outputs/several_clusters/bridge/BridgeClustersImpl.h
         bridge/BridgeGlobalStructs.h: outputs/several_clusters/bridge/BridgeGlobalStructs.h
-        bridge/First.h: outputs/several_clusters/bridge/First.h
-        bridge/Second.h: outputs/several_clusters/bridge/Second.h
+        bridge/FirstServer.h: outputs/several_clusters/bridge/FirstServer.h
+        bridge/SecondServer.h: outputs/several_clusters/bridge/SecondServer.h
+        bridge/ThirdServer.h: outputs/several_clusters/bridge/ThirdServer.h
         bridge/Third.h: outputs/several_clusters/bridge/Third.h
+
+cpp-app:
+    inputs/several_clusters.matter:
+        app/PluginApplicationCallbacks.h: outputs/several_clusters/cpp-app/PluginApplicationCallbacks.h
diff --git a/scripts/idl/tests/inputs/several_clusters.matter b/scripts/idl/tests/inputs/several_clusters.matter
index 3c56b1a628f449..a9963a3e3bcee0 100644
--- a/scripts/idl/tests/inputs/several_clusters.matter
+++ b/scripts/idl/tests/inputs/several_clusters.matter
@@ -14,3 +14,23 @@ client cluster Third = 3 {
 
     attribute MyEnum someEnum = 10;
 }
+
+server cluster Third = 3 {
+    enum MyEnum : enum8 {
+      kUnknown = 0;
+      kKnown = 100;
+    }
+
+    attribute MyEnum someEnum = 10;
+    readonly attribute int16u clusterRevision = 65533;
+}
+
+endpoint 0 {
+  device type rootdevice = 22;
+  binding cluster Second;
+
+  server cluster Third {
+    ram attribute someEnum;
+    ram attribute clusterRevision default = 2;
+  }
+}
diff --git a/scripts/idl/tests/outputs/cluster_struct_attribute/bridge/DemoCluster.h b/scripts/idl/tests/outputs/cluster_struct_attribute/bridge/DemoClusterServer.h
similarity index 100%
rename from scripts/idl/tests/outputs/cluster_struct_attribute/bridge/DemoCluster.h
rename to scripts/idl/tests/outputs/cluster_struct_attribute/bridge/DemoClusterServer.h
diff --git a/scripts/idl/tests/outputs/global_struct_attribute/bridge/DemoCluster.h b/scripts/idl/tests/outputs/global_struct_attribute/bridge/DemoClusterServer.h
similarity index 100%
rename from scripts/idl/tests/outputs/global_struct_attribute/bridge/DemoCluster.h
rename to scripts/idl/tests/outputs/global_struct_attribute/bridge/DemoClusterServer.h
diff --git a/scripts/idl/tests/outputs/several_clusters/bridge/BridgeClustersImpl.h b/scripts/idl/tests/outputs/several_clusters/bridge/BridgeClustersImpl.h
index 16dafc39a900f4..e94ca747c56970 100644
--- a/scripts/idl/tests/outputs/several_clusters/bridge/BridgeClustersImpl.h
+++ b/scripts/idl/tests/outputs/several_clusters/bridge/BridgeClustersImpl.h
@@ -4,6 +4,7 @@
 #include "bridge/First.h"
 #include "bridge/Second.h"
 #include "bridge/Third.h"
+#include "bridge/Third.h"
 
 namespace clusters {
 
@@ -39,6 +40,14 @@ struct ClusterInfo
       return new(mem) ThirdCluster();
     },
   },
+  {
+    3,
+    "Third",
+    sizeof(ThirdCluster),
+    [](void *mem) -> GeneratedCluster* {
+      return new(mem) ThirdCluster();
+    },
+  },
 };
 
 }
diff --git a/scripts/idl/tests/outputs/several_clusters/bridge/First.h b/scripts/idl/tests/outputs/several_clusters/bridge/FirstServer.h
similarity index 100%
rename from scripts/idl/tests/outputs/several_clusters/bridge/First.h
rename to scripts/idl/tests/outputs/several_clusters/bridge/FirstServer.h
diff --git a/scripts/idl/tests/outputs/several_clusters/bridge/Second.h b/scripts/idl/tests/outputs/several_clusters/bridge/SecondServer.h
similarity index 100%
rename from scripts/idl/tests/outputs/several_clusters/bridge/Second.h
rename to scripts/idl/tests/outputs/several_clusters/bridge/SecondServer.h
diff --git a/scripts/idl/tests/outputs/several_clusters/bridge/Third.h b/scripts/idl/tests/outputs/several_clusters/bridge/Third.h
index 3779b80fa8a264..48e8c4537e4799 100644
--- a/scripts/idl/tests/outputs/several_clusters/bridge/Third.h
+++ b/scripts/idl/tests/outputs/several_clusters/bridge/Third.h
@@ -8,7 +8,8 @@ struct ThirdCluster : public GeneratedCluster
 {
 
   ThirdCluster() :
-      mSomeEnum(chip::CharSpan("someEnum"), 10, ATTRIBUTE_MASK_WRITABLE, ZCL_ENUM8_ATTRIBUTE_TYPE, 1)
+      mSomeEnum(chip::CharSpan("someEnum"), 10, ATTRIBUTE_MASK_WRITABLE, ZCL_ENUM8_ATTRIBUTE_TYPE, 1),
+      mClusterRevision(chip::CharSpan("clusterRevision"), 65533, 0, ZCL_INT16U_ATTRIBUTE_TYPE, 2, ZCL_THIRD_CLUSTER_REVISION)
   {
   }
 
@@ -19,11 +20,13 @@ struct ThirdCluster : public GeneratedCluster
   {
     return std::vector<AttributeInterface*>({
       static_cast<AttributeInterface*>(&mSomeEnum),
+      static_cast<AttributeInterface*>(&mClusterRevision),
     });
   }
 
 
   Attribute<uint8_t> mSomeEnum;
+  Attribute<uint16_t> mClusterRevision;
 };
 
 }
diff --git a/scripts/idl/tests/outputs/several_clusters/bridge/ThirdServer.h b/scripts/idl/tests/outputs/several_clusters/bridge/ThirdServer.h
new file mode 100644
index 00000000000000..3779b80fa8a264
--- /dev/null
+++ b/scripts/idl/tests/outputs/several_clusters/bridge/ThirdServer.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include "BridgeGlobalStructs.h"
+#include "third_party/connectedhomeip/examples/dynamic-bridge-app/linux/include/GeneratedClusters.h"
+
+namespace clusters {
+struct ThirdCluster : public GeneratedCluster
+{
+
+  ThirdCluster() :
+      mSomeEnum(chip::CharSpan("someEnum"), 10, ATTRIBUTE_MASK_WRITABLE, ZCL_ENUM8_ATTRIBUTE_TYPE, 1)
+  {
+  }
+
+  static constexpr uint32_t kClusterId =3;
+  chip::ClusterId GetClusterId() override { return kClusterId; }
+
+  std::vector<AttributeInterface*> GetAttributes() override
+  {
+    return std::vector<AttributeInterface*>({
+      static_cast<AttributeInterface*>(&mSomeEnum),
+    });
+  }
+
+
+  Attribute<uint8_t> mSomeEnum;
+};
+
+}
diff --git a/scripts/idl/tests/outputs/several_clusters/cpp-app/PluginApplicationCallbacks.h b/scripts/idl/tests/outputs/several_clusters/cpp-app/PluginApplicationCallbacks.h
new file mode 100644
index 00000000000000..00041de30d3ea9
--- /dev/null
+++ b/scripts/idl/tests/outputs/several_clusters/cpp-app/PluginApplicationCallbacks.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
+
+#define MATTER_PLUGINS_INIT \
+    MatterFirstPluginClientInitCallback(); \
+    MatterSecondPluginClientInitCallback(); \
+    MatterThirdPluginClientInitCallback(); \
+    MatterThirdPluginServerInitCallback();
+
diff --git a/scripts/idl/tests/outputs/simple_attribute/bridge/MyCluster.h b/scripts/idl/tests/outputs/simple_attribute/bridge/MyClusterServer.h
similarity index 100%
rename from scripts/idl/tests/outputs/simple_attribute/bridge/MyCluster.h
rename to scripts/idl/tests/outputs/simple_attribute/bridge/MyClusterServer.h
diff --git a/scripts/run_codegen_targets.sh b/scripts/run_codegen_targets.sh
new file mode 100755
index 00000000000000..5f8bcd5d51f138
--- /dev/null
+++ b/scripts/run_codegen_targets.sh
@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+#
+# 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 script runs all targets taht are generating code
+# in the given output directory
+# CHIP_ROOT with a build environment activated.
+
+set -e
+
+OUT_DIR="$1"
+
+if [ ! -d "$OUT_DIR" ]; then
+    echo "Input directory '$OUT_DIR' does not exist. "
+    echo "USAGE: $0 <build_dir>"
+    exit 1
+fi
+
+# Code generation for build config files and asn1. Captures things like:
+#
+# gen_additional_data_payload_buildconfig
+# gen_app_buildconfig
+# gen_asn1oid
+# gen_ble_buildconfig
+# ...
+#
+# Most are buildconfig rules, but asn1oid is special
+for name in $(ninja -C "$OUT_DIR" -t targets | grep -E '^gen_' | sed 's/: .*//'); do
+    echo "Generating $name ..."
+    ninja -C "$OUT_DIR" "$name"
+done
+
+# Code generation (based on zap/matter)
+for name in $(ninja -C "$OUT_DIR" -t targets | grep -E '_codegen:' | sed 's/: .*//'); do
+    echo "Generating $name ..."
+    ninja -C "$OUT_DIR" "$name"
+done
+
+# Linus targets: dbus generate hdeaders
+for name in $(ninja -C "$OUT_DIR" -t targets | grep -E 'dbus.*codegen:' | sed 's/: .*//'); do
+    echo "Generating $name ..."
+    ninja -C "$OUT_DIR" "$name"
+done
diff --git a/src/app/chip_data_model.cmake b/src/app/chip_data_model.cmake
index 72a62b3b2d9e26..355eaf27a5babc 100644
--- a/src/app/chip_data_model.cmake
+++ b/src/app/chip_data_model.cmake
@@ -16,7 +16,15 @@
 
 set(CHIP_APP_BASE_DIR ${CMAKE_CURRENT_LIST_DIR})
 
-#
+if (NOT CHIP_ROOT)
+    # TODO: these are WORKAROUNDS and should be removed
+    if(DEFINED ameba_matter_root)
+        SET(CHIP_ROOT "${ameba_matter_root}")
+    endif()
+endif()
+
+include("${CHIP_ROOT}/build/chip/chip_codegen.cmake")
+
 # Configure ${APP_TARGET} with source files associated with ${CLUSTER} cluster
 #
 function(chip_configure_cluster APP_TARGET CLUSTER)
@@ -52,9 +60,11 @@ endfunction()
 #   INCLUDE_SERVER  Include source files from src/app/server directory
 #   ZAP_FILE        Path to the ZAP file, used to determine the list of clusters
 #                   supported by the application.
+#   IDL             .matter IDL file to use for codegen. Inferred from ZAP_FILE
+#                   if not provided
 #
 function(chip_configure_data_model APP_TARGET)
-    cmake_parse_arguments(ARG "INCLUDE_SERVER" "ZAP_FILE;GEN_DIR" "" ${ARGN})
+    cmake_parse_arguments(ARG "INCLUDE_SERVER" "ZAP_FILE;GEN_DIR;IDL" "" ${ARGN})
 
     if (ARG_INCLUDE_SERVER)
         target_sources(${APP_TARGET} PRIVATE
@@ -72,6 +82,23 @@ function(chip_configure_data_model APP_TARGET)
 
     if (ARG_ZAP_FILE)
         chip_configure_zap_file(${APP_TARGET} ${ARG_ZAP_FILE})
+        if (NOT ARG_IDL)
+            string(REPLACE ".zap" ".matter" ARG_IDL ${ARG_ZAP_FILE})
+        endif()
+    endif()
+
+    if (ARG_IDL)
+        chip_codegen(${APP_TARGET}-codegen
+          INPUT     "${ARG_IDL}"
+          GENERATOR "cpp-app"
+          OUTPUTS
+                "app/PluginApplicationCallbacks.h"
+          OUTPUT_PATH   APP_GEN_DIR
+          OUTPUT_FILES  APP_GEN_FILES
+        )
+
+        target_include_directories(${APP_TARGET} PRIVATE "${APP_GEN_DIR}")
+        add_dependencies(${APP_TARGET} ${APP_TARGET}-codegen)
     endif()
 
     target_sources(${APP_TARGET} PRIVATE
diff --git a/src/app/chip_data_model.gni b/src/app/chip_data_model.gni
index b2b50687503dc5..4c065d8e7298f9 100644
--- a/src/app/chip_data_model.gni
+++ b/src/app/chip_data_model.gni
@@ -14,6 +14,7 @@
 
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
+import("${chip_root}/build/chip/chip_codegen.gni")
 import("${chip_root}/src/platform/python.gni")
 
 import("${chip_root}/src/lib/core/core.gni")
@@ -31,11 +32,31 @@ _zap_cluster_list_script = get_path_info("zap_cluster_list.py", "abspath")
 #  zap_file
 #    Path to the ZAP input file.
 #
+#  idl
+#    Path to the .matter IDL corresponding to the zap file. This is for
+#    dependencies on build-time code generation.
+#
 # Forwards all the remaining variables to the source_set.
 #
 template("chip_data_model") {
   _data_model_name = target_name
 
+  if (defined(invoker.idl)) {
+    _idl = invoker.idl
+  } else {
+    # Assume that IDL name is the same as the zap file name, but instead of
+    # '.zap' use '.matter' as extension. This is currently the case in the
+    # sample apps, but may change in the future
+    print("AUTO-DETECTING input matter IDL file.")
+    _idl = string_replace(invoker.zap_file, ".zap", ".matter")
+  }
+
+  chip_codegen("${_data_model_name}_codegen") {
+    input = _idl
+    generator = "cpp-app"
+    outputs = [ "app/PluginApplicationCallbacks.h" ]
+  }
+
   config("${_data_model_name}_config") {
     include_dirs = []
 
@@ -60,6 +81,8 @@ template("chip_data_model") {
       sources = []
     }
 
+    sources += get_target_outputs(":${_data_model_name}_codegen")
+
     sources += [
       "${_app_root}/clusters/barrier-control-server/barrier-control-server.h",
       "${_app_root}/clusters/basic/basic.h",
@@ -163,6 +186,7 @@ template("chip_data_model") {
     }
 
     public_deps += [
+      ":${_data_model_name}_codegen",
       "${chip_root}/src/app",
       "${chip_root}/src/app/common:cluster-objects",
       "${chip_root}/src/controller",
diff --git a/src/app/util/util.cpp b/src/app/util/util.cpp
index aa8d3cade68113..1ba17a0e935967 100644
--- a/src/app/util/util.cpp
+++ b/src/app/util/util.cpp
@@ -25,7 +25,9 @@
 #include <app/util/af-event.h>
 #include <app/util/af.h>
 #include <app/util/ember-compatibility-functions.h>
-#include <zap-generated/PluginApplicationCallbacks.h>
+
+// TODO: figure out a clear path for compile-time codegen
+#include <app/PluginApplicationCallbacks.h>
 
 #ifdef EMBER_AF_PLUGIN_GROUPS_SERVER
 #include <app/clusters/groups-server/groups-server.h>
diff --git a/src/app/zap-templates/app-templates.json b/src/app/zap-templates/app-templates.json
index b79bb4f13e7266..ecc7aa080c9066 100644
--- a/src/app/zap-templates/app-templates.json
+++ b/src/app/zap-templates/app-templates.json
@@ -41,11 +41,6 @@
         }
     ],
     "templates": [
-        {
-            "path": "templates/app/callbacks/PluginApplicationCallbacks.zapt",
-            "name": "Matter Application Callbacks header",
-            "output": "PluginApplicationCallbacks.h"
-        },
         {
             "path": "templates/app/callback-stub-src.zapt",
             "name": "ZCL callback-stub source",
diff --git a/src/app/zap-templates/templates/app/callbacks/PluginApplicationCallbacks.zapt b/src/app/zap-templates/templates/app/callbacks/PluginApplicationCallbacks.zapt
deleted file mode 100644
index 68e471da9a4e32..00000000000000
--- a/src/app/zap-templates/templates/app/callbacks/PluginApplicationCallbacks.zapt
+++ /dev/null
@@ -1,8 +0,0 @@
-{{> header}}
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT {{#all_user_clusters}}Matter{{asUpperCamelCase name}}Plugin{{asUpperCamelCase side}}InitCallback(); {{/all_user_clusters}}
-
diff --git a/zzz_generated/all-clusters-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/all-clusters-app/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index 841c63fdb69b0e..00000000000000
--- a/zzz_generated/all-clusters-app/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,88 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterScenesPluginServerInitCallback();                                                                                        \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterOnOffSwitchConfigurationPluginServerInitCallback();                                                                      \
-    MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterBinaryInputBasicPluginServerInitCallback();                                                                              \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginServerInitCallback();                                                                                       \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterActionsPluginServerInitCallback();                                                                                       \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterUnitLocalizationPluginServerInitCallback();                                                                              \
-    MatterPowerSourceConfigurationPluginServerInitCallback();                                                                      \
-    MatterPowerSourcePluginServerInitCallback();                                                                                   \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterBooleanStatePluginServerInitCallback();                                                                                  \
-    MatterModeSelectPluginServerInitCallback();                                                                                    \
-    MatterDoorLockPluginServerInitCallback();                                                                                      \
-    MatterWindowCoveringPluginServerInitCallback();                                                                                \
-    MatterBarrierControlPluginServerInitCallback();                                                                                \
-    MatterPumpConfigurationAndControlPluginServerInitCallback();                                                                   \
-    MatterThermostatPluginServerInitCallback();                                                                                    \
-    MatterFanControlPluginServerInitCallback();                                                                                    \
-    MatterThermostatUserInterfaceConfigurationPluginServerInitCallback();                                                          \
-    MatterColorControlPluginServerInitCallback();                                                                                  \
-    MatterIlluminanceMeasurementPluginServerInitCallback();                                                                        \
-    MatterTemperatureMeasurementPluginServerInitCallback();                                                                        \
-    MatterPressureMeasurementPluginServerInitCallback();                                                                           \
-    MatterFlowMeasurementPluginServerInitCallback();                                                                               \
-    MatterRelativeHumidityMeasurementPluginServerInitCallback();                                                                   \
-    MatterOccupancySensingPluginServerInitCallback();                                                                              \
-    MatterWakeOnLanPluginServerInitCallback();                                                                                     \
-    MatterChannelPluginServerInitCallback();                                                                                       \
-    MatterTargetNavigatorPluginServerInitCallback();                                                                               \
-    MatterMediaPlaybackPluginServerInitCallback();                                                                                 \
-    MatterMediaInputPluginServerInitCallback();                                                                                    \
-    MatterLowPowerPluginServerInitCallback();                                                                                      \
-    MatterKeypadInputPluginServerInitCallback();                                                                                   \
-    MatterContentLauncherPluginServerInitCallback();                                                                               \
-    MatterAudioOutputPluginServerInitCallback();                                                                                   \
-    MatterApplicationLauncherPluginServerInitCallback();                                                                           \
-    MatterApplicationBasicPluginServerInitCallback();                                                                              \
-    MatterAccountLoginPluginServerInitCallback();                                                                                  \
-    MatterElectricalMeasurementPluginServerInitCallback();                                                                         \
-    MatterTestClusterPluginServerInitCallback();                                                                                   \
-    MatterFaultInjectionPluginServerInitCallback();
diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/all-clusters-minimal-app/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index 67219dcd814857..00000000000000
--- a/zzz_generated/all-clusters-minimal-app/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,83 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterScenesPluginServerInitCallback();                                                                                        \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginServerInitCallback();                                                                                       \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterActionsPluginServerInitCallback();                                                                                       \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterUnitLocalizationPluginServerInitCallback();                                                                              \
-    MatterPowerSourceConfigurationPluginServerInitCallback();                                                                      \
-    MatterPowerSourcePluginServerInitCallback();                                                                                   \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterBooleanStatePluginServerInitCallback();                                                                                  \
-    MatterModeSelectPluginServerInitCallback();                                                                                    \
-    MatterDoorLockPluginServerInitCallback();                                                                                      \
-    MatterWindowCoveringPluginServerInitCallback();                                                                                \
-    MatterPumpConfigurationAndControlPluginServerInitCallback();                                                                   \
-    MatterThermostatPluginServerInitCallback();                                                                                    \
-    MatterFanControlPluginServerInitCallback();                                                                                    \
-    MatterThermostatUserInterfaceConfigurationPluginServerInitCallback();                                                          \
-    MatterColorControlPluginServerInitCallback();                                                                                  \
-    MatterIlluminanceMeasurementPluginServerInitCallback();                                                                        \
-    MatterTemperatureMeasurementPluginServerInitCallback();                                                                        \
-    MatterPressureMeasurementPluginServerInitCallback();                                                                           \
-    MatterFlowMeasurementPluginServerInitCallback();                                                                               \
-    MatterRelativeHumidityMeasurementPluginServerInitCallback();                                                                   \
-    MatterOccupancySensingPluginServerInitCallback();                                                                              \
-    MatterWakeOnLanPluginServerInitCallback();                                                                                     \
-    MatterChannelPluginServerInitCallback();                                                                                       \
-    MatterTargetNavigatorPluginServerInitCallback();                                                                               \
-    MatterMediaPlaybackPluginServerInitCallback();                                                                                 \
-    MatterMediaInputPluginServerInitCallback();                                                                                    \
-    MatterLowPowerPluginServerInitCallback();                                                                                      \
-    MatterKeypadInputPluginServerInitCallback();                                                                                   \
-    MatterContentLauncherPluginServerInitCallback();                                                                               \
-    MatterAudioOutputPluginServerInitCallback();                                                                                   \
-    MatterApplicationLauncherPluginServerInitCallback();                                                                           \
-    MatterApplicationBasicPluginServerInitCallback();                                                                              \
-    MatterAccountLoginPluginServerInitCallback();                                                                                  \
-    MatterTestClusterPluginServerInitCallback();
diff --git a/zzz_generated/bridge-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/bridge-app/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index f0368e6a64bb30..00000000000000
--- a/zzz_generated/bridge-app/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,50 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterAccessControlPluginClientInitCallback();                                                                                 \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterActionsPluginServerInitCallback();                                                                                       \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterUnitLocalizationPluginServerInitCallback();                                                                              \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterTemperatureMeasurementPluginServerInitCallback();
diff --git a/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index 849a9383fbb82a..00000000000000
--- a/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,51 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterScenesPluginServerInitCallback();                                                                                        \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterOccupancySensingPluginClientInitCallback();
diff --git a/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index c5040d9a82f202..00000000000000
--- a/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,45 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterColorControlPluginServerInitCallback();
diff --git a/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index 7cb20885eb6939..00000000000000
--- a/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,49 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterBooleanStatePluginServerInitCallback();
diff --git a/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index 8e4985e7e7ffe2..00000000000000
--- a/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,52 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterScenesPluginServerInitCallback();                                                                                        \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterOccupancySensingPluginClientInitCallback();
diff --git a/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index abae6af8e5565f..00000000000000
--- a/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,51 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterScenesPluginClientInitCallback();                                                                                        \
-    MatterScenesPluginServerInitCallback();                                                                                        \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterDoorLockPluginServerInitCallback();
diff --git a/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index bf63aaa09358f9..00000000000000
--- a/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,52 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterScenesPluginServerInitCallback();                                                                                        \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterColorControlPluginServerInitCallback();
diff --git a/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index af43a6aa723484..00000000000000
--- a/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,48 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterFanControlPluginServerInitCallback();
diff --git a/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index 42b72ac388d102..00000000000000
--- a/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,50 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginClientInitCallback();                                                                                        \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterFlowMeasurementPluginServerInitCallback();
diff --git a/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index 3b886f35afccba..00000000000000
--- a/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,53 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterScenesPluginServerInitCallback();                                                                                        \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterThermostatPluginClientInitCallback();                                                                                    \
-    MatterFanControlPluginServerInitCallback();
diff --git a/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index 1e97ffe07f4f74..00000000000000
--- a/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,50 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginClientInitCallback();                                                                                        \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterRelativeHumidityMeasurementPluginServerInitCallback();
diff --git a/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index b1e270d7769ea5..00000000000000
--- a/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,50 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginClientInitCallback();                                                                                        \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterIlluminanceMeasurementPluginServerInitCallback();
diff --git a/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index e505e9f530832f..00000000000000
--- a/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,50 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginClientInitCallback();                                                                                        \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterOccupancySensingPluginServerInitCallback();
diff --git a/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index 0f24b2860e7f91..00000000000000
--- a/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,51 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterScenesPluginServerInitCallback();                                                                                        \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();
diff --git a/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index 3edd89a53f2702..00000000000000
--- a/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,52 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterScenesPluginClientInitCallback();                                                                                        \
-    MatterScenesPluginServerInitCallback();                                                                                        \
-    MatterOnOffPluginClientInitCallback();                                                                                         \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();
diff --git a/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index e3d4c729a40830..00000000000000
--- a/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,50 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterScenesPluginServerInitCallback();                                                                                        \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();
diff --git a/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index d636a4c8114913..00000000000000
--- a/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,50 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginClientInitCallback();                                                                                        \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterPressureMeasurementPluginServerInitCallback();
diff --git a/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index a2d936c47deef9..00000000000000
--- a/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,50 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();
diff --git a/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index f1ee9047b7ee0e..00000000000000
--- a/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,50 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginClientInitCallback();                                                                                        \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterTemperatureMeasurementPluginServerInitCallback();
diff --git a/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index f487ddad4445ef..00000000000000
--- a/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,55 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterScenesPluginServerInitCallback();                                                                                        \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterThermostatPluginServerInitCallback();                                                                                    \
-    MatterFanControlPluginClientInitCallback();                                                                                    \
-    MatterThermostatUserInterfaceConfigurationPluginServerInitCallback();                                                          \
-    MatterTemperatureMeasurementPluginClientInitCallback();                                                                        \
-    MatterRelativeHumidityMeasurementPluginClientInitCallback();                                                                   \
-    MatterOccupancySensingPluginClientInitCallback();
diff --git a/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index ad47ce921a578f..00000000000000
--- a/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,50 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterScenesPluginServerInitCallback();                                                                                        \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterWindowCoveringPluginServerInitCallback();
diff --git a/zzz_generated/contact-sensor-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/contact-sensor-app/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index 70685cfb3b2ee4..00000000000000
--- a/zzz_generated/contact-sensor-app/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,48 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterBooleanStatePluginServerInitCallback();                                                                                  \
-    MatterOccupancySensingPluginServerInitCallback();
diff --git a/zzz_generated/controller-clusters/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/controller-clusters/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index 0b55a4004fc6ec..00000000000000
--- a/zzz_generated/controller-clusters/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,89 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginClientInitCallback();                                                                                      \
-    MatterGroupsPluginClientInitCallback();                                                                                        \
-    MatterScenesPluginClientInitCallback();                                                                                        \
-    MatterOnOffPluginClientInitCallback();                                                                                         \
-    MatterOnOffSwitchConfigurationPluginClientInitCallback();                                                                      \
-    MatterLevelControlPluginClientInitCallback();                                                                                  \
-    MatterBinaryInputBasicPluginClientInitCallback();                                                                              \
-    MatterDescriptorPluginClientInitCallback();                                                                                    \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterAccessControlPluginClientInitCallback();                                                                                 \
-    MatterActionsPluginClientInitCallback();                                                                                       \
-    MatterBasicPluginClientInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginClientInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginClientInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginClientInitCallback();                                                                        \
-    MatterUnitLocalizationPluginClientInitCallback();                                                                              \
-    MatterPowerSourceConfigurationPluginClientInitCallback();                                                                      \
-    MatterPowerSourcePluginClientInitCallback();                                                                                   \
-    MatterGeneralCommissioningPluginClientInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginClientInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginClientInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginClientInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginClientInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginClientInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginClientInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginClientInitCallback();                                                                    \
-    MatterBridgedDeviceBasicPluginClientInitCallback();                                                                            \
-    MatterSwitchPluginClientInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginClientInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginClientInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginClientInitCallback();                                                                            \
-    MatterFixedLabelPluginClientInitCallback();                                                                                    \
-    MatterUserLabelPluginClientInitCallback();                                                                                     \
-    MatterBooleanStatePluginClientInitCallback();                                                                                  \
-    MatterModeSelectPluginClientInitCallback();                                                                                    \
-    MatterDoorLockPluginClientInitCallback();                                                                                      \
-    MatterWindowCoveringPluginClientInitCallback();                                                                                \
-    MatterBarrierControlPluginClientInitCallback();                                                                                \
-    MatterPumpConfigurationAndControlPluginClientInitCallback();                                                                   \
-    MatterThermostatPluginClientInitCallback();                                                                                    \
-    MatterFanControlPluginClientInitCallback();                                                                                    \
-    MatterThermostatUserInterfaceConfigurationPluginClientInitCallback();                                                          \
-    MatterColorControlPluginClientInitCallback();                                                                                  \
-    MatterBallastConfigurationPluginClientInitCallback();                                                                          \
-    MatterIlluminanceMeasurementPluginClientInitCallback();                                                                        \
-    MatterTemperatureMeasurementPluginClientInitCallback();                                                                        \
-    MatterPressureMeasurementPluginClientInitCallback();                                                                           \
-    MatterFlowMeasurementPluginClientInitCallback();                                                                               \
-    MatterRelativeHumidityMeasurementPluginClientInitCallback();                                                                   \
-    MatterOccupancySensingPluginClientInitCallback();                                                                              \
-    MatterWakeOnLanPluginClientInitCallback();                                                                                     \
-    MatterChannelPluginClientInitCallback();                                                                                       \
-    MatterTargetNavigatorPluginClientInitCallback();                                                                               \
-    MatterMediaPlaybackPluginClientInitCallback();                                                                                 \
-    MatterMediaInputPluginClientInitCallback();                                                                                    \
-    MatterLowPowerPluginClientInitCallback();                                                                                      \
-    MatterKeypadInputPluginClientInitCallback();                                                                                   \
-    MatterContentLauncherPluginClientInitCallback();                                                                               \
-    MatterAudioOutputPluginClientInitCallback();                                                                                   \
-    MatterApplicationLauncherPluginClientInitCallback();                                                                           \
-    MatterApplicationBasicPluginClientInitCallback();                                                                              \
-    MatterAccountLoginPluginClientInitCallback();                                                                                  \
-    MatterElectricalMeasurementPluginClientInitCallback();                                                                         \
-    MatterTestClusterPluginClientInitCallback();
diff --git a/zzz_generated/dynamic-bridge-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/dynamic-bridge-app/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index f0368e6a64bb30..00000000000000
--- a/zzz_generated/dynamic-bridge-app/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,50 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterAccessControlPluginClientInitCallback();                                                                                 \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterActionsPluginServerInitCallback();                                                                                       \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterUnitLocalizationPluginServerInitCallback();                                                                              \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterTemperatureMeasurementPluginServerInitCallback();
diff --git a/zzz_generated/light-switch-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/light-switch-app/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index 856d83e27c638e..00000000000000
--- a/zzz_generated/light-switch-app/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,52 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginClientInitCallback();                                                                                      \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterScenesPluginClientInitCallback();                                                                                        \
-    MatterOnOffPluginClientInitCallback();                                                                                         \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginServerInitCallback();                                                                                       \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterColorControlPluginClientInitCallback();
diff --git a/zzz_generated/lighting-app/nxp/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/lighting-app/nxp/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index 0cfb01937c9d9f..00000000000000
--- a/zzz_generated/lighting-app/nxp/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,41 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();
diff --git a/zzz_generated/lighting-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/lighting-app/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index fddb4d6e6cb042..00000000000000
--- a/zzz_generated/lighting-app/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,51 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterColorControlPluginServerInitCallback();                                                                                  \
-    MatterOccupancySensingPluginServerInitCallback();
diff --git a/zzz_generated/lock-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/lock-app/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index 529bd99d404d59..00000000000000
--- a/zzz_generated/lock-app/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,49 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterPowerSourceConfigurationPluginServerInitCallback();                                                                      \
-    MatterPowerSourcePluginServerInitCallback();                                                                                   \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterDoorLockPluginServerInitCallback();
diff --git a/zzz_generated/log-source-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/log-source-app/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index 6ba8ead67775f7..00000000000000
--- a/zzz_generated/log-source-app/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,30 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginClientInitCallback();                                                                                \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterOperationalCredentialsPluginServerInitCallback();
diff --git a/zzz_generated/ota-provider-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/ota-provider-app/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index ab1922e3b8547b..00000000000000
--- a/zzz_generated/ota-provider-app/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,38 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterAccessControlPluginClientInitCallback();                                                                                 \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginServerInitCallback();                                                                     \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();
diff --git a/zzz_generated/ota-requestor-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/ota-requestor-app/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index 33a985a874c373..00000000000000
--- a/zzz_generated/ota-requestor-app/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,42 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();
diff --git a/zzz_generated/placeholder/app1/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/placeholder/app1/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index aa0b14313ab21e..00000000000000
--- a/zzz_generated/placeholder/app1/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,71 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterScenesPluginServerInitCallback();                                                                                        \
-    MatterOnOffPluginClientInitCallback();                                                                                         \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterActionsPluginServerInitCallback();                                                                                       \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterPowerSourceConfigurationPluginServerInitCallback();                                                                      \
-    MatterPowerSourcePluginServerInitCallback();                                                                                   \
-    MatterGeneralCommissioningPluginClientInitCallback();                                                                          \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginClientInitCallback();                                                                                        \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginClientInitCallback();                                                                        \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterBooleanStatePluginServerInitCallback();                                                                                  \
-    MatterModeSelectPluginClientInitCallback();                                                                                    \
-    MatterModeSelectPluginServerInitCallback();                                                                                    \
-    MatterWindowCoveringPluginServerInitCallback();                                                                                \
-    MatterPumpConfigurationAndControlPluginServerInitCallback();                                                                   \
-    MatterThermostatPluginServerInitCallback();                                                                                    \
-    MatterThermostatUserInterfaceConfigurationPluginClientInitCallback();                                                          \
-    MatterThermostatUserInterfaceConfigurationPluginServerInitCallback();                                                          \
-    MatterColorControlPluginServerInitCallback();                                                                                  \
-    MatterIlluminanceMeasurementPluginServerInitCallback();                                                                        \
-    MatterTemperatureMeasurementPluginClientInitCallback();                                                                        \
-    MatterTemperatureMeasurementPluginServerInitCallback();                                                                        \
-    MatterPressureMeasurementPluginServerInitCallback();                                                                           \
-    MatterFlowMeasurementPluginServerInitCallback();                                                                               \
-    MatterRelativeHumidityMeasurementPluginClientInitCallback();                                                                   \
-    MatterRelativeHumidityMeasurementPluginServerInitCallback();                                                                   \
-    MatterTargetNavigatorPluginClientInitCallback();                                                                               \
-    MatterTargetNavigatorPluginServerInitCallback();                                                                               \
-    MatterKeypadInputPluginClientInitCallback();                                                                                   \
-    MatterKeypadInputPluginServerInitCallback();                                                                                   \
-    MatterContentLauncherPluginClientInitCallback();                                                                               \
-    MatterContentLauncherPluginServerInitCallback();                                                                               \
-    MatterApplicationBasicPluginClientInitCallback();                                                                              \
-    MatterApplicationBasicPluginServerInitCallback();
diff --git a/zzz_generated/placeholder/app2/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/placeholder/app2/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index aa0b14313ab21e..00000000000000
--- a/zzz_generated/placeholder/app2/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,71 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterScenesPluginServerInitCallback();                                                                                        \
-    MatterOnOffPluginClientInitCallback();                                                                                         \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterActionsPluginServerInitCallback();                                                                                       \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterPowerSourceConfigurationPluginServerInitCallback();                                                                      \
-    MatterPowerSourcePluginServerInitCallback();                                                                                   \
-    MatterGeneralCommissioningPluginClientInitCallback();                                                                          \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginClientInitCallback();                                                                                        \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginClientInitCallback();                                                                        \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterBooleanStatePluginServerInitCallback();                                                                                  \
-    MatterModeSelectPluginClientInitCallback();                                                                                    \
-    MatterModeSelectPluginServerInitCallback();                                                                                    \
-    MatterWindowCoveringPluginServerInitCallback();                                                                                \
-    MatterPumpConfigurationAndControlPluginServerInitCallback();                                                                   \
-    MatterThermostatPluginServerInitCallback();                                                                                    \
-    MatterThermostatUserInterfaceConfigurationPluginClientInitCallback();                                                          \
-    MatterThermostatUserInterfaceConfigurationPluginServerInitCallback();                                                          \
-    MatterColorControlPluginServerInitCallback();                                                                                  \
-    MatterIlluminanceMeasurementPluginServerInitCallback();                                                                        \
-    MatterTemperatureMeasurementPluginClientInitCallback();                                                                        \
-    MatterTemperatureMeasurementPluginServerInitCallback();                                                                        \
-    MatterPressureMeasurementPluginServerInitCallback();                                                                           \
-    MatterFlowMeasurementPluginServerInitCallback();                                                                               \
-    MatterRelativeHumidityMeasurementPluginClientInitCallback();                                                                   \
-    MatterRelativeHumidityMeasurementPluginServerInitCallback();                                                                   \
-    MatterTargetNavigatorPluginClientInitCallback();                                                                               \
-    MatterTargetNavigatorPluginServerInitCallback();                                                                               \
-    MatterKeypadInputPluginClientInitCallback();                                                                                   \
-    MatterKeypadInputPluginServerInitCallback();                                                                                   \
-    MatterContentLauncherPluginClientInitCallback();                                                                               \
-    MatterContentLauncherPluginServerInitCallback();                                                                               \
-    MatterApplicationBasicPluginClientInitCallback();                                                                              \
-    MatterApplicationBasicPluginServerInitCallback();
diff --git a/zzz_generated/pump-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/pump-app/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index 3e61d2b69546fa..00000000000000
--- a/zzz_generated/pump-app/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,45 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginServerInitCallback();                                                                                       \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterPumpConfigurationAndControlPluginServerInitCallback();                                                                   \
-    MatterTemperatureMeasurementPluginServerInitCallback();                                                                        \
-    MatterPressureMeasurementPluginServerInitCallback();                                                                           \
-    MatterFlowMeasurementPluginServerInitCallback();                                                                               \
-    MatterOccupancySensingPluginClientInitCallback();
diff --git a/zzz_generated/pump-controller-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/pump-controller-app/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index a8bc9fe9f3b492..00000000000000
--- a/zzz_generated/pump-controller-app/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,43 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterOnOffPluginClientInitCallback();                                                                                         \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginServerInitCallback();                                                                                       \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterPumpConfigurationAndControlPluginClientInitCallback();                                                                   \
-    MatterTemperatureMeasurementPluginClientInitCallback();                                                                        \
-    MatterPressureMeasurementPluginClientInitCallback();                                                                           \
-    MatterFlowMeasurementPluginClientInitCallback();
diff --git a/zzz_generated/temperature-measurement-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/temperature-measurement-app/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index 8392297e883ed4..00000000000000
--- a/zzz_generated/temperature-measurement-app/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,43 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterUnitLocalizationPluginServerInitCallback();                                                                              \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterTemperatureMeasurementPluginServerInitCallback();
diff --git a/zzz_generated/thermostat/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/thermostat/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index fc1f15a7696df2..00000000000000
--- a/zzz_generated/thermostat/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,51 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginClientInitCallback();                                                                                      \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterScenesPluginServerInitCallback();                                                                                        \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginServerInitCallback();                                                                                       \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterUnitLocalizationPluginServerInitCallback();                                                                              \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterThermostatPluginServerInitCallback();
diff --git a/zzz_generated/tv-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/tv-app/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index 638b057baa7436..00000000000000
--- a/zzz_generated/tv-app/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,64 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginClientInitCallback();                                                                                       \
-    MatterBindingPluginServerInitCallback();                                                                                       \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginServerInitCallback();                                                                     \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterUnitLocalizationPluginServerInitCallback();                                                                              \
-    MatterGeneralCommissioningPluginClientInitCallback();                                                                          \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginClientInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginClientInitCallback();                                                                        \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterRelativeHumidityMeasurementPluginServerInitCallback();                                                                   \
-    MatterWakeOnLanPluginServerInitCallback();                                                                                     \
-    MatterChannelPluginServerInitCallback();                                                                                       \
-    MatterTargetNavigatorPluginServerInitCallback();                                                                               \
-    MatterMediaPlaybackPluginServerInitCallback();                                                                                 \
-    MatterMediaInputPluginServerInitCallback();                                                                                    \
-    MatterLowPowerPluginServerInitCallback();                                                                                      \
-    MatterKeypadInputPluginServerInitCallback();                                                                                   \
-    MatterContentLauncherPluginServerInitCallback();                                                                               \
-    MatterAudioOutputPluginServerInitCallback();                                                                                   \
-    MatterApplicationLauncherPluginServerInitCallback();                                                                           \
-    MatterApplicationBasicPluginServerInitCallback();                                                                              \
-    MatterAccountLoginPluginServerInitCallback();
diff --git a/zzz_generated/tv-casting-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/tv-casting-app/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index d7963d5e5abad2..00000000000000
--- a/zzz_generated/tv-casting-app/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,67 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterScenesPluginServerInitCallback();                                                                                        \
-    MatterOnOffPluginClientInitCallback();                                                                                         \
-    MatterOnOffPluginServerInitCallback();                                                                                         \
-    MatterLevelControlPluginClientInitCallback();                                                                                  \
-    MatterLevelControlPluginServerInitCallback();                                                                                  \
-    MatterBinaryInputBasicPluginServerInitCallback();                                                                              \
-    MatterDescriptorPluginClientInitCallback();                                                                                    \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterBindingPluginServerInitCallback();                                                                                       \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginServerInitCallback();                                                                     \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterUnitLocalizationPluginServerInitCallback();                                                                              \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterDiagnosticLogsPluginServerInitCallback();                                                                                \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterSwitchPluginServerInitCallback();                                                                                        \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterBarrierControlPluginServerInitCallback();                                                                                \
-    MatterWakeOnLanPluginServerInitCallback();                                                                                     \
-    MatterChannelPluginClientInitCallback();                                                                                       \
-    MatterTargetNavigatorPluginClientInitCallback();                                                                               \
-    MatterMediaPlaybackPluginClientInitCallback();                                                                                 \
-    MatterMediaInputPluginClientInitCallback();                                                                                    \
-    MatterKeypadInputPluginClientInitCallback();                                                                                   \
-    MatterContentLauncherPluginClientInitCallback();                                                                               \
-    MatterAudioOutputPluginClientInitCallback();                                                                                   \
-    MatterApplicationLauncherPluginClientInitCallback();                                                                           \
-    MatterApplicationBasicPluginClientInitCallback();                                                                              \
-    MatterAccountLoginPluginClientInitCallback();
diff --git a/zzz_generated/window-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/window-app/zap-generated/PluginApplicationCallbacks.h
deleted file mode 100644
index 15053dcb75be49..00000000000000
--- a/zzz_generated/window-app/zap-generated/PluginApplicationCallbacks.h
+++ /dev/null
@@ -1,49 +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
-
-#pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
-
-#define MATTER_PLUGINS_INIT                                                                                                        \
-    MatterIdentifyPluginServerInitCallback();                                                                                      \
-    MatterGroupsPluginServerInitCallback();                                                                                        \
-    MatterScenesPluginServerInitCallback();                                                                                        \
-    MatterDescriptorPluginServerInitCallback();                                                                                    \
-    MatterAccessControlPluginServerInitCallback();                                                                                 \
-    MatterBasicPluginServerInitCallback();                                                                                         \
-    MatterOtaSoftwareUpdateProviderPluginClientInitCallback();                                                                     \
-    MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();                                                                    \
-    MatterLocalizationConfigurationPluginServerInitCallback();                                                                     \
-    MatterTimeFormatLocalizationPluginServerInitCallback();                                                                        \
-    MatterUnitLocalizationPluginServerInitCallback();                                                                              \
-    MatterPowerSourcePluginServerInitCallback();                                                                                   \
-    MatterGeneralCommissioningPluginServerInitCallback();                                                                          \
-    MatterNetworkCommissioningPluginServerInitCallback();                                                                          \
-    MatterGeneralDiagnosticsPluginServerInitCallback();                                                                            \
-    MatterSoftwareDiagnosticsPluginServerInitCallback();                                                                           \
-    MatterThreadNetworkDiagnosticsPluginServerInitCallback();                                                                      \
-    MatterWiFiNetworkDiagnosticsPluginServerInitCallback();                                                                        \
-    MatterEthernetNetworkDiagnosticsPluginServerInitCallback();                                                                    \
-    MatterAdministratorCommissioningPluginServerInitCallback();                                                                    \
-    MatterOperationalCredentialsPluginServerInitCallback();                                                                        \
-    MatterGroupKeyManagementPluginServerInitCallback();                                                                            \
-    MatterFixedLabelPluginServerInitCallback();                                                                                    \
-    MatterUserLabelPluginServerInitCallback();                                                                                     \
-    MatterWindowCoveringPluginServerInitCallback();

From 131b8c9effdf24ee54a60c81e3511e17f48f0231 Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <vnicolas@apple.com>
Date: Sat, 22 Oct 2022 00:15:40 +0200
Subject: [PATCH 5/8] [Dnssd] Sort IPs by scores for commissionable node
 discovery (#23292)

---
 .../AddressResolve_DefaultImpl.cpp            | 94 ++-----------------
 .../AddressResolve_DefaultImpl.h              |  3 +-
 src/lib/dnssd/BUILD.gn                        |  2 +
 src/lib/dnssd/Discovery_ImplPlatform.cpp      |  3 +
 src/lib/dnssd/IPAddressSorter.cpp             | 91 ++++++++++++++++++
 src/lib/dnssd/IPAddressSorter.h               | 66 +++++++++++++
 src/lib/dnssd/IncrementalResolve.cpp          |  3 +
 7 files changed, 173 insertions(+), 89 deletions(-)
 create mode 100644 src/lib/dnssd/IPAddressSorter.cpp
 create mode 100644 src/lib/dnssd/IPAddressSorter.h

diff --git a/src/lib/address_resolve/AddressResolve_DefaultImpl.cpp b/src/lib/address_resolve/AddressResolve_DefaultImpl.cpp
index 505ae0733df3eb..0bc8000138addf 100644
--- a/src/lib/address_resolve/AddressResolve_DefaultImpl.cpp
+++ b/src/lib/address_resolve/AddressResolve_DefaultImpl.cpp
@@ -24,88 +24,6 @@ namespace {
 
 static constexpr System::Clock::Timeout kInvalidTimeout{ System::Clock::Timeout::max() };
 
-// IP addess "suitability"
-//   - Larger value means "more suitable"
-//   - Enum ordered ascending for easier read. Note however that order of
-//     checks MUST match in ScoreIpAddress below.
-enum class IpScore : unsigned
-{
-    kInvalid = 0, // No address available
-
-    // "Other" IPv6 include:
-    //   - invalid addresses (have seen router bugs during interop testing)
-    //   - embedded IPv4 (::/80)
-    kOtherIpv6 = 1,
-    kIpv4      = 2, // Not Matter SPEC, so low priority
-#ifdef __APPLE__
-    kUniqueLocal                   = 3, // ULA. Thread devices use this
-    kGlobalUnicast                 = 4, // Maybe routable, not local subnet
-    kUniqueLocalWithSharedPrefix   = 5, // Prefix seems to match a local interface
-    kGlobalUnicastWithSharedPrefix = 6, // Prefix seems to match a local interface
-    kLinkLocal                     = 7, // Valid only on an interface
-#else
-    kLinkLocal                     = 3, // Valid only on an interface
-    kUniqueLocal                   = 4, // ULA. Thread devices use this
-    kGlobalUnicast                 = 5, // Maybe routable, not local subnet
-    kUniqueLocalWithSharedPrefix   = 6, // Prefix seems to match a local interface
-    kGlobalUnicastWithSharedPrefix = 7, // Prefix seems to match a local interface
-#endif // __APPLE__
-};
-
-constexpr unsigned ScoreValue(IpScore score)
-{
-    return static_cast<unsigned>(score);
-}
-
-/**
- * Gives a score for an IP address, generally related to "how good" the address
- * is and how likely it is for it to be reachable.
- */
-IpScore ScoreIpAddress(const Inet::IPAddress & ip, Inet::InterfaceId interfaceId)
-{
-    if (ip.IsIPv6())
-    {
-#ifdef __APPLE__
-        if (ip.IsIPv6LinkLocal())
-        {
-            return IpScore::kLinkLocal;
-        }
-#endif // __APPLE__
-
-        if (interfaceId.MatchLocalIPv6Subnet(ip))
-        {
-            if (ip.IsIPv6GlobalUnicast())
-            {
-                return IpScore::kGlobalUnicastWithSharedPrefix;
-            }
-            if (ip.IsIPv6ULA())
-            {
-                return IpScore::kUniqueLocalWithSharedPrefix;
-            }
-        }
-        if (ip.IsIPv6GlobalUnicast())
-        {
-            return IpScore::kGlobalUnicast;
-        }
-
-        if (ip.IsIPv6ULA())
-        {
-            return IpScore::kUniqueLocal;
-        }
-
-#ifndef __APPLE__
-        if (ip.IsIPv6LinkLocal())
-        {
-            return IpScore::kLinkLocal;
-        }
-#endif // __APPLE__
-
-        return IpScore::kOtherIpv6;
-    }
-
-    return IpScore::kIpv4;
-}
-
 } // namespace
 
 void NodeLookupHandle::ResetForLookup(System::Clock::Timestamp now, const NodeLookupRequest & request)
@@ -113,7 +31,7 @@ void NodeLookupHandle::ResetForLookup(System::Clock::Timestamp now, const NodeLo
     mRequestStartTime = now;
     mRequest          = request;
     mBestResult       = ResolveResult();
-    mBestAddressScore = ScoreValue(IpScore::kInvalid);
+    mBestAddressScore = Dnssd::IPAddressSorter::IpScore::kInvalid;
 }
 
 void NodeLookupHandle::LookupResult(const ResolveResult & result)
@@ -123,8 +41,8 @@ void NodeLookupHandle::LookupResult(const ResolveResult & result)
     result.address.ToString(addr_string);
 #endif
 
-    unsigned newScore = ScoreValue(ScoreIpAddress(result.address.GetIPAddress(), result.address.GetInterface()));
-    if (newScore > mBestAddressScore)
+    auto newScore = Dnssd::IPAddressSorter::ScoreIpAddress(result.address.GetIPAddress(), result.address.GetInterface());
+    if (to_underlying(newScore) > to_underlying(mBestAddressScore))
     {
         mBestResult       = result;
         mBestAddressScore = newScore;
@@ -140,11 +58,11 @@ void NodeLookupHandle::LookupResult(const ResolveResult & result)
         }
 
 #if CHIP_PROGRESS_LOGGING
-        ChipLogProgress(Discovery, "%s: new best score: %u", addr_string, mBestAddressScore);
+        ChipLogProgress(Discovery, "%s: new best score: %u", addr_string, to_underlying(mBestAddressScore));
     }
     else
     {
-        ChipLogProgress(Discovery, "%s: score has not improved: %u", addr_string, newScore);
+        ChipLogProgress(Discovery, "%s: score has not improved: %u", addr_string, to_underlying(newScore));
 #endif
     }
 }
@@ -180,7 +98,7 @@ NodeLookupAction NodeLookupHandle::NextAction(System::Clock::Timestamp now)
     }
 
     // Minimal time to search reached. If any IP available, ready to return it.
-    if (mBestAddressScore > ScoreValue(IpScore::kInvalid))
+    if (mBestAddressScore != Dnssd::IPAddressSorter::IpScore::kInvalid)
     {
         return NodeLookupAction::Success(mBestResult);
     }
diff --git a/src/lib/address_resolve/AddressResolve_DefaultImpl.h b/src/lib/address_resolve/AddressResolve_DefaultImpl.h
index c05bdfc7f93f62..bb3114a8b1d085 100644
--- a/src/lib/address_resolve/AddressResolve_DefaultImpl.h
+++ b/src/lib/address_resolve/AddressResolve_DefaultImpl.h
@@ -17,6 +17,7 @@
 #pragma once
 
 #include <lib/address_resolve/AddressResolve.h>
+#include <lib/dnssd/IPAddressSorter.h>
 #include <lib/dnssd/Resolver.h>
 #include <system/TimeSource.h>
 #include <transport/raw/PeerAddress.h>
@@ -123,7 +124,7 @@ class NodeLookupHandle : public NodeLookupHandleBase
     System::Clock::Timestamp mRequestStartTime;
     NodeLookupRequest mRequest; // active request to process
     AddressResolve::ResolveResult mBestResult;
-    unsigned mBestAddressScore = 0;
+    Dnssd::IPAddressSorter::IpScore mBestAddressScore;
 };
 
 class Resolver : public ::chip::AddressResolve::Resolver, public Dnssd::OperationalResolveDelegate
diff --git a/src/lib/dnssd/BUILD.gn b/src/lib/dnssd/BUILD.gn
index 280921a3ca8b8a..e723dd54466600 100644
--- a/src/lib/dnssd/BUILD.gn
+++ b/src/lib/dnssd/BUILD.gn
@@ -31,6 +31,8 @@ static_library("dnssd") {
 
   sources = [
     "Advertiser.h",
+    "IPAddressSorter.cpp",
+    "IPAddressSorter.h",
     "Resolver.h",
     "ServiceNaming.cpp",
     "ServiceNaming.h",
diff --git a/src/lib/dnssd/Discovery_ImplPlatform.cpp b/src/lib/dnssd/Discovery_ImplPlatform.cpp
index 6a6bc64aea3e77..a5feca89881854 100644
--- a/src/lib/dnssd/Discovery_ImplPlatform.cpp
+++ b/src/lib/dnssd/Discovery_ImplPlatform.cpp
@@ -22,6 +22,7 @@
 #include <crypto/RandUtils.h>
 #include <lib/core/CHIPConfig.h>
 #include <lib/core/CHIPSafeCasts.h>
+#include <lib/dnssd/IPAddressSorter.h>
 #include <lib/dnssd/ServiceNaming.h>
 #include <lib/dnssd/TxtFields.h>
 #include <lib/dnssd/platform/Dnssd.h>
@@ -53,6 +54,8 @@ static void HandleNodeResolve(void * context, DnssdService * result, const Span<
 
     nodeData.resolutionData.interfaceId = result->mInterface;
 
+    IPAddressSorter::Sort(addresses, result->mInterface);
+
     size_t addressesFound = 0;
     for (auto & ip : addresses)
     {
diff --git a/src/lib/dnssd/IPAddressSorter.cpp b/src/lib/dnssd/IPAddressSorter.cpp
new file mode 100644
index 00000000000000..36bd2b109b3ab2
--- /dev/null
+++ b/src/lib/dnssd/IPAddressSorter.cpp
@@ -0,0 +1,91 @@
+/*
+ *
+ *    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.
+ */
+
+#include <lib/dnssd/IPAddressSorter.h>
+#include <lib/support/SortUtils.h>
+
+namespace chip {
+namespace Dnssd {
+namespace IPAddressSorter {
+
+void Sort(Inet::IPAddress * addresses, size_t count, Inet::InterfaceId interfaceId)
+{
+    Sorting::BubbleSort(addresses, count, [interfaceId](const Inet::IPAddress & a, const Inet::IPAddress & b) -> bool {
+        auto scoreA = to_underlying(ScoreIpAddress(a, interfaceId));
+        auto scoreB = to_underlying(ScoreIpAddress(b, interfaceId));
+        return scoreA > scoreB;
+    });
+}
+
+void Sort(const Span<Inet::IPAddress> & addresses, Inet::InterfaceId interfaceId)
+{
+    Sorting::BubbleSort(addresses.begin(), addresses.size(),
+                        [interfaceId](const Inet::IPAddress & a, const Inet::IPAddress & b) -> bool {
+                            auto scoreA = to_underlying(ScoreIpAddress(a, interfaceId));
+                            auto scoreB = to_underlying(ScoreIpAddress(b, interfaceId));
+                            return scoreA > scoreB;
+                        });
+}
+
+IpScore ScoreIpAddress(const Inet::IPAddress & ip, Inet::InterfaceId interfaceId)
+{
+    if (ip.IsIPv6())
+    {
+#ifdef __APPLE__
+        if (ip.IsIPv6LinkLocal())
+        {
+            return IpScore::kLinkLocal;
+        }
+#endif // __APPLE__
+
+        if (interfaceId.MatchLocalIPv6Subnet(ip))
+        {
+            if (ip.IsIPv6GlobalUnicast())
+            {
+                return IpScore::kGlobalUnicastWithSharedPrefix;
+            }
+            if (ip.IsIPv6ULA())
+            {
+                return IpScore::kUniqueLocalWithSharedPrefix;
+            }
+        }
+        if (ip.IsIPv6GlobalUnicast())
+        {
+            return IpScore::kGlobalUnicast;
+        }
+
+        if (ip.IsIPv6ULA())
+        {
+            return IpScore::kUniqueLocal;
+        }
+
+#ifndef __APPLE__
+        if (ip.IsIPv6LinkLocal())
+        {
+            return IpScore::kLinkLocal;
+        }
+#endif // __APPLE__
+
+        return IpScore::kOtherIpv6;
+    }
+
+    return IpScore::kIpv4;
+}
+
+} // namespace IPAddressSorter
+} // namespace Dnssd
+} // namespace chip
diff --git a/src/lib/dnssd/IPAddressSorter.h b/src/lib/dnssd/IPAddressSorter.h
new file mode 100644
index 00000000000000..cbd7ec5d2fecc6
--- /dev/null
+++ b/src/lib/dnssd/IPAddressSorter.h
@@ -0,0 +1,66 @@
+/*
+ *
+ *    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.
+ */
+#pragma once
+
+#include <inet/IPAddress.h>
+#include <lib/support/Span.h>
+
+namespace chip {
+namespace Dnssd {
+namespace IPAddressSorter {
+
+// IP addess "suitability"
+//   - Larger value means "more suitable"
+//   - Enum ordered ascending for easier read. Note however that order of
+//     checks MUST match in ScoreIpAddress below.
+enum class IpScore : unsigned
+{
+    kInvalid = 0, // No address available
+
+    // "Other" IPv6 include:
+    //   - invalid addresses (have seen router bugs during interop testing)
+    //   - embedded IPv4 (::/80)
+    kOtherIpv6 = 1,
+    kIpv4      = 2, // Not Matter SPEC, so low priority
+#ifdef __APPLE__
+    kUniqueLocal                   = 3, // ULA. Thread devices use this
+    kGlobalUnicast                 = 4, // Maybe routable, not local subnet
+    kUniqueLocalWithSharedPrefix   = 5, // Prefix seems to match a local interface
+    kGlobalUnicastWithSharedPrefix = 6, // Prefix seems to match a local interface
+    kLinkLocal                     = 7, // Valid only on an interface
+#else
+    kLinkLocal                     = 3, // Valid only on an interface
+    kUniqueLocal                   = 4, // ULA. Thread devices use this
+    kGlobalUnicast                 = 5, // Maybe routable, not local subnet
+    kUniqueLocalWithSharedPrefix   = 6, // Prefix seems to match a local interface
+    kGlobalUnicastWithSharedPrefix = 7, // Prefix seems to match a local interface
+#endif // __APPLE__
+};
+
+void Sort(Inet::IPAddress * addresses, size_t count, Inet::InterfaceId interfaceId);
+
+void Sort(const Span<Inet::IPAddress> & addresses, Inet::InterfaceId interfaceId);
+
+/**
+ * Gives a score for an IP address, generally related to "how good" the address
+ * is and how likely it is for it to be reachable.
+ */
+IpScore ScoreIpAddress(const Inet::IPAddress & ip, Inet::InterfaceId interfaceId);
+
+} // namespace IPAddressSorter
+} // namespace Dnssd
+} // namespace chip
diff --git a/src/lib/dnssd/IncrementalResolve.cpp b/src/lib/dnssd/IncrementalResolve.cpp
index 5934ef6d06d981..bfea53353c3036 100644
--- a/src/lib/dnssd/IncrementalResolve.cpp
+++ b/src/lib/dnssd/IncrementalResolve.cpp
@@ -16,6 +16,7 @@
  */
 #include <lib/dnssd/IncrementalResolve.h>
 
+#include <lib/dnssd/IPAddressSorter.h>
 #include <lib/dnssd/ServiceNaming.h>
 #include <lib/dnssd/TxtFields.h>
 #include <lib/dnssd/minimal_mdns/Logging.h>
@@ -352,6 +353,8 @@ CHIP_ERROR IncrementalResolver::Take(DiscoveredNodeData & outputData)
 {
     VerifyOrReturnError(IsActiveCommissionParse(), CHIP_ERROR_INCORRECT_STATE);
 
+    IPAddressSorter::Sort(mCommonResolutionData.ipAddress, mCommonResolutionData.numIPs, mCommonResolutionData.interfaceId);
+
     outputData.resolutionData = mCommonResolutionData;
     outputData.commissionData = mSpecificResolutionData.Get<CommissionNodeData>();
 

From 3c11013b5ede7a1055797053b60569f9843de130 Mon Sep 17 00:00:00 2001
From: Andrei Litvin <andy314@gmail.com>
Date: Fri, 21 Oct 2022 18:40:56 -0400
Subject: [PATCH 6/8] Remove PluginCallbacks.h header, remove ClientInit
 callbacks (weak linkage) (#23299)

* Remove `PluginCallbacks` generated file.

This file is not really needed by anything except advance
declaration by PluginApplicationCallbachs.h. We can codegen the
callbacks in that file.

* Remove ClientInitCallback
---
 .../PluginApplicationCallbacksHeader.jinja    |  10 +-
 .../generators/cpp/application/__init__.py    |  11 +-
 .../cpp-app/PluginApplicationCallbacks.h      |   6 +-
 src/app/common/templates/templates.json       |   5 -
 src/app/util/attribute-storage.cpp            |   1 -
 .../app/callbacks/PluginCallbacks.zapt        |   8 -
 .../zap-generated/callbacks/PluginCallbacks.h | 163 ------------------
 7 files changed, 11 insertions(+), 193 deletions(-)
 delete mode 100644 src/app/zap-templates/templates/app/callbacks/PluginCallbacks.zapt
 delete mode 100644 zzz_generated/app-common/app-common/zap-generated/callbacks/PluginCallbacks.h

diff --git a/scripts/idl/generators/cpp/application/PluginApplicationCallbacksHeader.jinja b/scripts/idl/generators/cpp/application/PluginApplicationCallbacksHeader.jinja
index 83e3dbf4c15a8a..2e31426b3d05fc 100644
--- a/scripts/idl/generators/cpp/application/PluginApplicationCallbacksHeader.jinja
+++ b/scripts/idl/generators/cpp/application/PluginApplicationCallbacksHeader.jinja
@@ -1,9 +1,13 @@
 #pragma once
 
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
+{%- for cluster in clusters | serverClustersOnly | sort(attribute='name') %}
+void Matter{{ cluster.name }}PluginServerInitCallback();
+{%- endfor %}
 
 #define MATTER_PLUGINS_INIT \
-{%- for cluster in clusters | sort(attribute='name') %}
-    Matter{{ cluster.name }}Plugin{{ cluster.side | clusterSideString }}InitCallback();{{ " \\" if not loop.last else ""}}
+{%- for cluster in clusters | serverClustersOnly | sort(attribute='name') %}
+    Matter{{ cluster.name }}PluginServerInitCallback();{{ " \\" if not loop.last else ""}}
+{%- else %}
+    (void)0; /* No server side clusters */
 {%- endfor %}
 
diff --git a/scripts/idl/generators/cpp/application/__init__.py b/scripts/idl/generators/cpp/application/__init__.py
index 40a4bb26b0b34b..efb264dd0f9324 100644
--- a/scripts/idl/generators/cpp/application/__init__.py
+++ b/scripts/idl/generators/cpp/application/__init__.py
@@ -23,13 +23,8 @@
 import logging
 
 
-def clusterSideString(side: ClusterSide):
-    if side == ClusterSide.CLIENT:
-        return "Client"
-    elif side == ClusterSide.SERVER:
-        return "Server"
-    else:
-        raise Exception("Unknown cluster side %r" % (side, ))
+def serverClustersOnly(clusters: List[Cluster]) -> List[Cluster]:
+    return [c for c in clusters if c.side == ClusterSide.SERVER]
 
 
 class CppApplicationGenerator(CodeGenerator):
@@ -44,7 +39,7 @@ def __init__(self, storage: GeneratorStorage, idl: Idl):
         """
         super().__init__(storage, idl)
 
-        self.jinja_env.filters['clusterSideString'] = clusterSideString
+        self.jinja_env.filters['serverClustersOnly'] = serverClustersOnly
 
     def internal_render_all(self):
         """
diff --git a/scripts/idl/tests/outputs/several_clusters/cpp-app/PluginApplicationCallbacks.h b/scripts/idl/tests/outputs/several_clusters/cpp-app/PluginApplicationCallbacks.h
index 00041de30d3ea9..620b4159b1350c 100644
--- a/scripts/idl/tests/outputs/several_clusters/cpp-app/PluginApplicationCallbacks.h
+++ b/scripts/idl/tests/outputs/several_clusters/cpp-app/PluginApplicationCallbacks.h
@@ -1,10 +1,6 @@
 #pragma once
-
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
+void MatterThirdPluginServerInitCallback();
 
 #define MATTER_PLUGINS_INIT \
-    MatterFirstPluginClientInitCallback(); \
-    MatterSecondPluginClientInitCallback(); \
-    MatterThirdPluginClientInitCallback(); \
     MatterThirdPluginServerInitCallback();
 
diff --git a/src/app/common/templates/templates.json b/src/app/common/templates/templates.json
index 23838583aea61b..ea4ae8f0a22417 100644
--- a/src/app/common/templates/templates.json
+++ b/src/app/common/templates/templates.json
@@ -78,11 +78,6 @@
             "name": "ZCL print-cluster header",
             "output": "print-cluster.h"
         },
-        {
-            "path": "../../zap-templates/templates/app/callbacks/PluginCallbacks.zapt",
-            "name": "Matter Callbacks header",
-            "output": "callbacks/PluginCallbacks.h"
-        },
         {
             "path": "../../zap-templates/templates/app/attributes/Accessors.zapt",
             "name": "Attributes Accessors header",
diff --git a/src/app/util/attribute-storage.cpp b/src/app/util/attribute-storage.cpp
index a3803a8cfbd58c..6f037518f8d80d 100644
--- a/src/app/util/attribute-storage.cpp
+++ b/src/app/util/attribute-storage.cpp
@@ -27,7 +27,6 @@
 
 #include <app-common/zap-generated/attribute-type.h>
 #include <app-common/zap-generated/callback.h>
-#include <app-common/zap-generated/callbacks/PluginCallbacks.h>
 #include <app-common/zap-generated/ids/Attributes.h>
 
 using namespace chip;
diff --git a/src/app/zap-templates/templates/app/callbacks/PluginCallbacks.zapt b/src/app/zap-templates/templates/app/callbacks/PluginCallbacks.zapt
deleted file mode 100644
index 1b425da3b4ea78..00000000000000
--- a/src/app/zap-templates/templates/app/callbacks/PluginCallbacks.zapt
+++ /dev/null
@@ -1,8 +0,0 @@
-{{> header}}
-
-#pragma once
-
-{{#zcl_clusters}}
-void __attribute__((weak))  Matter{{asUpperCamelCase label}}PluginClientInitCallback() {}
-void Matter{{asUpperCamelCase label}}PluginServerInitCallback();
-{{/zcl_clusters}}
diff --git a/zzz_generated/app-common/app-common/zap-generated/callbacks/PluginCallbacks.h b/zzz_generated/app-common/app-common/zap-generated/callbacks/PluginCallbacks.h
deleted file mode 100644
index fbc1968cc73d06..00000000000000
--- a/zzz_generated/app-common/app-common/zap-generated/callbacks/PluginCallbacks.h
+++ /dev/null
@@ -1,163 +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
-
-#pragma once
-
-void __attribute__((weak)) MatterIdentifyPluginClientInitCallback() {}
-void MatterIdentifyPluginServerInitCallback();
-void __attribute__((weak)) MatterGroupsPluginClientInitCallback() {}
-void MatterGroupsPluginServerInitCallback();
-void __attribute__((weak)) MatterScenesPluginClientInitCallback() {}
-void MatterScenesPluginServerInitCallback();
-void __attribute__((weak)) MatterOnOffPluginClientInitCallback() {}
-void MatterOnOffPluginServerInitCallback();
-void __attribute__((weak)) MatterOnOffSwitchConfigurationPluginClientInitCallback() {}
-void MatterOnOffSwitchConfigurationPluginServerInitCallback();
-void __attribute__((weak)) MatterLevelControlPluginClientInitCallback() {}
-void MatterLevelControlPluginServerInitCallback();
-void __attribute__((weak)) MatterBinaryInputBasicPluginClientInitCallback() {}
-void MatterBinaryInputBasicPluginServerInitCallback();
-void __attribute__((weak)) MatterPulseWidthModulationPluginClientInitCallback() {}
-void MatterPulseWidthModulationPluginServerInitCallback();
-void __attribute__((weak)) MatterDescriptorPluginClientInitCallback() {}
-void MatterDescriptorPluginServerInitCallback();
-void __attribute__((weak)) MatterBindingPluginClientInitCallback() {}
-void MatterBindingPluginServerInitCallback();
-void __attribute__((weak)) MatterAccessControlPluginClientInitCallback() {}
-void MatterAccessControlPluginServerInitCallback();
-void __attribute__((weak)) MatterActionsPluginClientInitCallback() {}
-void MatterActionsPluginServerInitCallback();
-void __attribute__((weak)) MatterBasicPluginClientInitCallback() {}
-void MatterBasicPluginServerInitCallback();
-void __attribute__((weak)) MatterOtaSoftwareUpdateProviderPluginClientInitCallback() {}
-void MatterOtaSoftwareUpdateProviderPluginServerInitCallback();
-void __attribute__((weak)) MatterOtaSoftwareUpdateRequestorPluginClientInitCallback() {}
-void MatterOtaSoftwareUpdateRequestorPluginServerInitCallback();
-void __attribute__((weak)) MatterLocalizationConfigurationPluginClientInitCallback() {}
-void MatterLocalizationConfigurationPluginServerInitCallback();
-void __attribute__((weak)) MatterTimeFormatLocalizationPluginClientInitCallback() {}
-void MatterTimeFormatLocalizationPluginServerInitCallback();
-void __attribute__((weak)) MatterUnitLocalizationPluginClientInitCallback() {}
-void MatterUnitLocalizationPluginServerInitCallback();
-void __attribute__((weak)) MatterPowerSourceConfigurationPluginClientInitCallback() {}
-void MatterPowerSourceConfigurationPluginServerInitCallback();
-void __attribute__((weak)) MatterPowerSourcePluginClientInitCallback() {}
-void MatterPowerSourcePluginServerInitCallback();
-void __attribute__((weak)) MatterGeneralCommissioningPluginClientInitCallback() {}
-void MatterGeneralCommissioningPluginServerInitCallback();
-void __attribute__((weak)) MatterNetworkCommissioningPluginClientInitCallback() {}
-void MatterNetworkCommissioningPluginServerInitCallback();
-void __attribute__((weak)) MatterDiagnosticLogsPluginClientInitCallback() {}
-void MatterDiagnosticLogsPluginServerInitCallback();
-void __attribute__((weak)) MatterGeneralDiagnosticsPluginClientInitCallback() {}
-void MatterGeneralDiagnosticsPluginServerInitCallback();
-void __attribute__((weak)) MatterSoftwareDiagnosticsPluginClientInitCallback() {}
-void MatterSoftwareDiagnosticsPluginServerInitCallback();
-void __attribute__((weak)) MatterThreadNetworkDiagnosticsPluginClientInitCallback() {}
-void MatterThreadNetworkDiagnosticsPluginServerInitCallback();
-void __attribute__((weak)) MatterWiFiNetworkDiagnosticsPluginClientInitCallback() {}
-void MatterWiFiNetworkDiagnosticsPluginServerInitCallback();
-void __attribute__((weak)) MatterEthernetNetworkDiagnosticsPluginClientInitCallback() {}
-void MatterEthernetNetworkDiagnosticsPluginServerInitCallback();
-void __attribute__((weak)) MatterTimeSynchronizationPluginClientInitCallback() {}
-void MatterTimeSynchronizationPluginServerInitCallback();
-void __attribute__((weak)) MatterBridgedDeviceBasicPluginClientInitCallback() {}
-void MatterBridgedDeviceBasicPluginServerInitCallback();
-void __attribute__((weak)) MatterSwitchPluginClientInitCallback() {}
-void MatterSwitchPluginServerInitCallback();
-void __attribute__((weak)) MatterAdministratorCommissioningPluginClientInitCallback() {}
-void MatterAdministratorCommissioningPluginServerInitCallback();
-void __attribute__((weak)) MatterOperationalCredentialsPluginClientInitCallback() {}
-void MatterOperationalCredentialsPluginServerInitCallback();
-void __attribute__((weak)) MatterGroupKeyManagementPluginClientInitCallback() {}
-void MatterGroupKeyManagementPluginServerInitCallback();
-void __attribute__((weak)) MatterFixedLabelPluginClientInitCallback() {}
-void MatterFixedLabelPluginServerInitCallback();
-void __attribute__((weak)) MatterUserLabelPluginClientInitCallback() {}
-void MatterUserLabelPluginServerInitCallback();
-void __attribute__((weak)) MatterProxyConfigurationPluginClientInitCallback() {}
-void MatterProxyConfigurationPluginServerInitCallback();
-void __attribute__((weak)) MatterProxyDiscoveryPluginClientInitCallback() {}
-void MatterProxyDiscoveryPluginServerInitCallback();
-void __attribute__((weak)) MatterProxyValidPluginClientInitCallback() {}
-void MatterProxyValidPluginServerInitCallback();
-void __attribute__((weak)) MatterBooleanStatePluginClientInitCallback() {}
-void MatterBooleanStatePluginServerInitCallback();
-void __attribute__((weak)) MatterModeSelectPluginClientInitCallback() {}
-void MatterModeSelectPluginServerInitCallback();
-void __attribute__((weak)) MatterDoorLockPluginClientInitCallback() {}
-void MatterDoorLockPluginServerInitCallback();
-void __attribute__((weak)) MatterWindowCoveringPluginClientInitCallback() {}
-void MatterWindowCoveringPluginServerInitCallback();
-void __attribute__((weak)) MatterBarrierControlPluginClientInitCallback() {}
-void MatterBarrierControlPluginServerInitCallback();
-void __attribute__((weak)) MatterPumpConfigurationAndControlPluginClientInitCallback() {}
-void MatterPumpConfigurationAndControlPluginServerInitCallback();
-void __attribute__((weak)) MatterThermostatPluginClientInitCallback() {}
-void MatterThermostatPluginServerInitCallback();
-void __attribute__((weak)) MatterFanControlPluginClientInitCallback() {}
-void MatterFanControlPluginServerInitCallback();
-void __attribute__((weak)) MatterThermostatUserInterfaceConfigurationPluginClientInitCallback() {}
-void MatterThermostatUserInterfaceConfigurationPluginServerInitCallback();
-void __attribute__((weak)) MatterColorControlPluginClientInitCallback() {}
-void MatterColorControlPluginServerInitCallback();
-void __attribute__((weak)) MatterBallastConfigurationPluginClientInitCallback() {}
-void MatterBallastConfigurationPluginServerInitCallback();
-void __attribute__((weak)) MatterIlluminanceMeasurementPluginClientInitCallback() {}
-void MatterIlluminanceMeasurementPluginServerInitCallback();
-void __attribute__((weak)) MatterTemperatureMeasurementPluginClientInitCallback() {}
-void MatterTemperatureMeasurementPluginServerInitCallback();
-void __attribute__((weak)) MatterPressureMeasurementPluginClientInitCallback() {}
-void MatterPressureMeasurementPluginServerInitCallback();
-void __attribute__((weak)) MatterFlowMeasurementPluginClientInitCallback() {}
-void MatterFlowMeasurementPluginServerInitCallback();
-void __attribute__((weak)) MatterRelativeHumidityMeasurementPluginClientInitCallback() {}
-void MatterRelativeHumidityMeasurementPluginServerInitCallback();
-void __attribute__((weak)) MatterOccupancySensingPluginClientInitCallback() {}
-void MatterOccupancySensingPluginServerInitCallback();
-void __attribute__((weak)) MatterWakeOnLanPluginClientInitCallback() {}
-void MatterWakeOnLanPluginServerInitCallback();
-void __attribute__((weak)) MatterChannelPluginClientInitCallback() {}
-void MatterChannelPluginServerInitCallback();
-void __attribute__((weak)) MatterTargetNavigatorPluginClientInitCallback() {}
-void MatterTargetNavigatorPluginServerInitCallback();
-void __attribute__((weak)) MatterMediaPlaybackPluginClientInitCallback() {}
-void MatterMediaPlaybackPluginServerInitCallback();
-void __attribute__((weak)) MatterMediaInputPluginClientInitCallback() {}
-void MatterMediaInputPluginServerInitCallback();
-void __attribute__((weak)) MatterLowPowerPluginClientInitCallback() {}
-void MatterLowPowerPluginServerInitCallback();
-void __attribute__((weak)) MatterKeypadInputPluginClientInitCallback() {}
-void MatterKeypadInputPluginServerInitCallback();
-void __attribute__((weak)) MatterContentLauncherPluginClientInitCallback() {}
-void MatterContentLauncherPluginServerInitCallback();
-void __attribute__((weak)) MatterAudioOutputPluginClientInitCallback() {}
-void MatterAudioOutputPluginServerInitCallback();
-void __attribute__((weak)) MatterApplicationLauncherPluginClientInitCallback() {}
-void MatterApplicationLauncherPluginServerInitCallback();
-void __attribute__((weak)) MatterApplicationBasicPluginClientInitCallback() {}
-void MatterApplicationBasicPluginServerInitCallback();
-void __attribute__((weak)) MatterAccountLoginPluginClientInitCallback() {}
-void MatterAccountLoginPluginServerInitCallback();
-void __attribute__((weak)) MatterElectricalMeasurementPluginClientInitCallback() {}
-void MatterElectricalMeasurementPluginServerInitCallback();
-void __attribute__((weak)) MatterTestClusterPluginClientInitCallback() {}
-void MatterTestClusterPluginServerInitCallback();
-void __attribute__((weak)) MatterFaultInjectionPluginClientInitCallback() {}
-void MatterFaultInjectionPluginServerInitCallback();

From f47f95eedf41abe540b1f55cca701e1fb80f03d9 Mon Sep 17 00:00:00 2001
From: Arkadiusz Bokowy <a.bokowy@samsung.com>
Date: Sat, 22 Oct 2022 00:41:18 +0200
Subject: [PATCH 7/8] Show CHIP app selector when staring Linux/Darwin debugger
 (#23274)

* Show CHIP app selector when staring Linux debugger

* Add run application for Darwin hosts
---
 .devcontainer/devcontainer.json |  3 +-
 .vscode/extensions.json         |  3 +-
 .vscode/launch.json             | 54 +++++++++++++++++++++------------
 3 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 0d0bea51bb06eb..6847480b51a5b9 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -31,13 +31,12 @@
         "esbenp.prettier-vscode",
         "foxundermoon.shell-format",
         "github.vscode-pull-request-github",
-        "knisterpeter.vscode-github",
         "maelvalais.autoconf",
         "marus25.cortex-debug",
         "ms-azuretools.vscode-docker",
         "msedge-dev.gnls",
-        "npclaudiu.vscode-gn",
         "redhat.vscode-yaml",
+        "vadimcn.vscode-lldb",
         "xaver.clang-format",
         "yuichinukiyama.vscode-preview-server",
         "yzhang.markdown-all-in-one"
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 6ce0339c697719..352fb19ae65035 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -12,13 +12,12 @@
         "esbenp.prettier-vscode",
         "foxundermoon.shell-format",
         "github.vscode-pull-request-github",
-        "knisterpeter.vscode-github",
         "maelvalais.autoconf",
         "marus25.cortex-debug",
         "ms-azuretools.vscode-docker",
         "msedge-dev.gnls",
-        "npclaudiu.vscode-gn",
         "redhat.vscode-yaml",
+        "vadimcn.vscode-lldb",
         "xaver.clang-format",
         "yuichinukiyama.vscode-preview-server",
         "yzhang.markdown-all-in-one"
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 77739937fc05a0..a9999b9e43517f 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -10,6 +10,22 @@
             "request": "attach",
             "pid": "${command:pickProcess}"
         },
+        {
+            "name": "Run application (Darwin x64)",
+            "type": "lldb",
+            "request": "launch",
+            "program": "${workspaceFolder}/out/${input:outAppDarwin}",
+            "args": [],
+            "cwd": "${workspaceFolder}"
+        },
+        {
+            "name": "Run application (Linux x64)",
+            "type": "lldb",
+            "request": "launch",
+            "program": "${workspaceFolder}/out/${input:outAppLinux}",
+            "args": [],
+            "cwd": "${workspaceFolder}"
+        },
         {
             "name": "QRCode Tests",
             "type": "cppdbg",
@@ -70,26 +86,6 @@
                 }
             ]
         },
-        {
-            "name": "LightingApp (Linux)",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "${workspaceFolder}/out/lighting-app/chip-lighting-app",
-            "args": [],
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}",
-            "environment": [],
-            "externalConsole": false,
-            "MIMode": "gdb",
-            "preLaunchTask": "Build Lighting App (Linux)",
-            "setupCommands": [
-                {
-                    "description": "Enable pretty-printing for gdb",
-                    "text": "-enable-pretty-printing",
-                    "ignoreFailures": true
-                }
-            ]
-        },
         {
             "name": "LightingApp (Tizen) [remote]",
             "type": "cppdbg",
@@ -423,6 +419,24 @@
         }
     ],
     "inputs": [
+        {
+            "type": "command",
+            "id": "outAppDarwin",
+            "command": "shellCommand.execute",
+            "args": {
+                "command": "find ${workspaceFolder}/out/darwin-x64-* -maxdepth 2 -perm +111 -name 'chip-*' |sort |sed 's$${workspaceFolder}/out/$$'",
+                "description": "Select the application to run"
+            }
+        },
+        {
+            "type": "command",
+            "id": "outAppLinux",
+            "command": "shellCommand.execute",
+            "args": {
+                "command": "find ${workspaceFolder}/out/linux-x64-* -maxdepth 2 -executable -name 'chip-*' |sort |sed 's$${workspaceFolder}/out/$$'",
+                "description": "Select the application to run"
+            }
+        },
         {
             "type": "pickString",
             "id": "mbedDebugProfile",

From 0854eb32ff96ee51892eaeb808b9947cc21fe398 Mon Sep 17 00:00:00 2001
From: Arkadiusz Bokowy <a.bokowy@samsung.com>
Date: Sat, 22 Oct 2022 00:41:43 +0200
Subject: [PATCH 8/8] Remove not used CHIP time service config defines (#23289)

Co-authored-by: Andrei Litvin <andy314@gmail.com>
---
 .../main/include/CHIPProjectConfig.h          |  8 ---
 .../psoc6/include/CHIPProjectConfig.h         |  8 ---
 .../nxp/mw320/include/CHIPProjectConfig.h     |  8 ---
 .../main/include/CHIPProjectConfig.h          |  8 ---
 .../psoc6/include/CHIPProjectConfig.h         |  8 ---
 .../chef/efr32/include/CHIPProjectConfig.h    |  8 ---
 .../k32w/k32w0/include/CHIPProjectConfig.h    |  8 ---
 .../efr32/include/CHIPProjectConfig.h         |  8 ---
 .../bl602/include/CHIPProjectConfig.h         |  8 ---
 .../bl702/include/CHIPProjectConfig.h         |  8 ---
 .../efr32/include/CHIPProjectConfig.h         |  8 ---
 .../genio/include/CHIPProjectConfig.h         |  8 ---
 .../psoc6/include/CHIPProjectConfig.h         |  8 ---
 .../k32w/k32w0/include/CHIPProjectConfig.h    |  8 ---
 .../qpg/include/CHIPProjectConfig.h           |  8 ---
 .../main/include/CHIPProjectConfig.h          |  8 ---
 .../cc32xx/main/include/CHIPProjectConfig.h   |  8 ---
 .../efr32/include/CHIPProjectConfig.h         |  8 ---
 .../psoc6/include/CHIPProjectConfig.h         |  8 ---
 .../k32w/k32w0/include/CHIPProjectConfig.h    |  8 ---
 .../lock-app/qpg/include/CHIPProjectConfig.h  |  8 ---
 .../include/CHIPProjectConfig.h               |  8 ---
 .../efr32/include/CHIPProjectConfig.h         |  8 ---
 .../psoc6/include/CHIPProjectConfig.h         |  8 ---
 .../qpg/include/CHIPProjectConfig.h           |  8 ---
 .../efr32/include/CHIPProjectConfig.h         |  8 ---
 .../main/include/CHIPProjectConfig.h          |  8 ---
 .../main/include/CHIPProjectConfig.h          |  8 ---
 .../include/CHIPProjectConfig.h               |  8 ---
 .../shell/efr32/include/CHIPProjectConfig.h   |  8 ---
 .../shell/genio/include/CHIPProjectConfig.h   |  8 ---
 .../k32w/k32w0/include/CHIPProjectConfig.h    |  8 ---
 .../shell/qpg/include/CHIPProjectConfig.h     |  8 ---
 .../efr32/include/CHIPProjectConfig.h         |  8 ---
 .../efr32/include/CHIPProjectConfig.h         |  8 ---
 src/include/platform/CHIPDeviceConfig.h       | 50 -------------------
 src/platform/Ameba/CHIPDevicePlatformConfig.h |  2 -
 src/platform/Beken/CHIPDevicePlatformConfig.h |  2 -
 .../Darwin/CHIPDevicePlatformConfig.h         |  2 -
 src/platform/EFR32/CHIPDevicePlatformConfig.h |  2 -
 src/platform/ESP32/CHIPDevicePlatformConfig.h |  4 --
 src/platform/Linux/CHIPDevicePlatformConfig.h |  2 -
 src/platform/Tizen/CHIPDevicePlatformConfig.h |  2 -
 .../Zephyr/CHIPDevicePlatformConfig.h         |  2 -
 .../android/CHIPDevicePlatformConfig.h        |  2 -
 .../BL602/CHIPDevicePlatformConfig.h          |  2 -
 src/platform/mbed/CHIPDevicePlatformConfig.h  |  2 -
 .../mt793x/CHIPDevicePlatformConfig.h         |  1 -
 .../nrfconnect/CHIPDevicePlatformConfig.h     |  2 -
 .../nxp/k32w/k32w0/CHIPDevicePlatformConfig.h |  2 -
 .../nxp/mw320/CHIPDevicePlatformConfig.h      |  2 -
 src/platform/qpg/CHIPDevicePlatformConfig.h   |  2 -
 .../telink/CHIPDevicePlatformConfig.h         |  2 -
 src/platform/webos/CHIPDevicePlatformConfig.h |  2 -
 .../efr32/include/CHIPProjectConfig.h         |  8 ---
 55 files changed, 375 deletions(-)

diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h b/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
index a7d7e9beb24e73..4d50a5a05c08d9 100644
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
+++ b/examples/all-clusters-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
@@ -72,14 +72,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote CHIP Time service
- * using the CHIP Time Sync protocol.
- */
-// #define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 1
-
 /**
  * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE
  *
diff --git a/examples/all-clusters-app/infineon/psoc6/include/CHIPProjectConfig.h b/examples/all-clusters-app/infineon/psoc6/include/CHIPProjectConfig.h
index 0a5cd4efec0794..5f07adf949abe6 100644
--- a/examples/all-clusters-app/infineon/psoc6/include/CHIPProjectConfig.h
+++ b/examples/all-clusters-app/infineon/psoc6/include/CHIPProjectConfig.h
@@ -90,14 +90,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote Chip Time service
- * using the Chip Time Sync protocol.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 /**
  * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
  *
diff --git a/examples/all-clusters-app/nxp/mw320/include/CHIPProjectConfig.h b/examples/all-clusters-app/nxp/mw320/include/CHIPProjectConfig.h
index ee38302054d87e..ff5a389db20a1c 100644
--- a/examples/all-clusters-app/nxp/mw320/include/CHIPProjectConfig.h
+++ b/examples/all-clusters-app/nxp/mw320/include/CHIPProjectConfig.h
@@ -158,14 +158,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 0
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote CHIP Time service
- * using the CHIP Time Sync protocol.
- */
-//#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 1
-
 /**
  * CHIP_CONFIG_MAX_BINDINGS
  *
diff --git a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
index a7d7e9beb24e73..4d50a5a05c08d9 100644
--- a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
+++ b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
@@ -72,14 +72,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote CHIP Time service
- * using the CHIP Time Sync protocol.
- */
-// #define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 1
-
 /**
  * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE
  *
diff --git a/examples/all-clusters-minimal-app/infineon/psoc6/include/CHIPProjectConfig.h b/examples/all-clusters-minimal-app/infineon/psoc6/include/CHIPProjectConfig.h
index 001bb12db20f0c..a371e16de2d7c0 100644
--- a/examples/all-clusters-minimal-app/infineon/psoc6/include/CHIPProjectConfig.h
+++ b/examples/all-clusters-minimal-app/infineon/psoc6/include/CHIPProjectConfig.h
@@ -90,14 +90,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote Chip Time service
- * using the Chip Time Sync protocol.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 /**
  * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
  *
diff --git a/examples/chef/efr32/include/CHIPProjectConfig.h b/examples/chef/efr32/include/CHIPProjectConfig.h
index 814a55fe253fdb..1b74c802fd4f09 100644
--- a/examples/chef/efr32/include/CHIPProjectConfig.h
+++ b/examples/chef/efr32/include/CHIPProjectConfig.h
@@ -86,14 +86,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote Chip Time service
- * using the Chip Time Sync protocol.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 /**
  * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
  *
diff --git a/examples/contact-sensor-app/nxp/k32w/k32w0/include/CHIPProjectConfig.h b/examples/contact-sensor-app/nxp/k32w/k32w0/include/CHIPProjectConfig.h
index 101f959f6d5c72..5b8a75a6347454 100644
--- a/examples/contact-sensor-app/nxp/k32w/k32w0/include/CHIPProjectConfig.h
+++ b/examples/contact-sensor-app/nxp/k32w/k32w0/include/CHIPProjectConfig.h
@@ -151,14 +151,6 @@
 #define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME "NXP Demo App"
 #endif
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote CHIP Time service
- * using the CHIP Time Sync protocol.
- */
-// #define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 1
-
 /**
  * CHIP_DEVICE_CONFIG_BLE_FAST_ADVERTISING_TIMEOUT
  *
diff --git a/examples/light-switch-app/efr32/include/CHIPProjectConfig.h b/examples/light-switch-app/efr32/include/CHIPProjectConfig.h
index 5904b776cd601d..94c82dcbb0281d 100644
--- a/examples/light-switch-app/efr32/include/CHIPProjectConfig.h
+++ b/examples/light-switch-app/efr32/include/CHIPProjectConfig.h
@@ -97,14 +97,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote Chip Time service
- * using the Chip Time Sync protocol.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 /**
  * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
  *
diff --git a/examples/lighting-app/bouffalolab/bl602/include/CHIPProjectConfig.h b/examples/lighting-app/bouffalolab/bl602/include/CHIPProjectConfig.h
index 746bef6f595222..d36ef3e7326b4d 100644
--- a/examples/lighting-app/bouffalolab/bl602/include/CHIPProjectConfig.h
+++ b/examples/lighting-app/bouffalolab/bl602/include/CHIPProjectConfig.h
@@ -128,14 +128,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote Chip Time service
- * using the Chip Time Sync protocol.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 /**
  * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
  *
diff --git a/examples/lighting-app/bouffalolab/bl702/include/CHIPProjectConfig.h b/examples/lighting-app/bouffalolab/bl702/include/CHIPProjectConfig.h
index 03b04373f01fbf..94c79e3364084a 100644
--- a/examples/lighting-app/bouffalolab/bl702/include/CHIPProjectConfig.h
+++ b/examples/lighting-app/bouffalolab/bl702/include/CHIPProjectConfig.h
@@ -108,14 +108,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote Chip Time service
- * using the Chip Time Sync protocol.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 /**
  * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
  *
diff --git a/examples/lighting-app/efr32/include/CHIPProjectConfig.h b/examples/lighting-app/efr32/include/CHIPProjectConfig.h
index 60a8d1ea0f471d..4b3d8f571c9057 100644
--- a/examples/lighting-app/efr32/include/CHIPProjectConfig.h
+++ b/examples/lighting-app/efr32/include/CHIPProjectConfig.h
@@ -97,14 +97,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote Chip Time service
- * using the Chip Time Sync protocol.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 /**
  * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
  *
diff --git a/examples/lighting-app/genio/include/CHIPProjectConfig.h b/examples/lighting-app/genio/include/CHIPProjectConfig.h
index f5f52250532463..d9cd599ba8f3fb 100644
--- a/examples/lighting-app/genio/include/CHIPProjectConfig.h
+++ b/examples/lighting-app/genio/include/CHIPProjectConfig.h
@@ -89,14 +89,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote Chip Time service
- * using the Chip Time Sync protocol.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 /**
  * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
  *
diff --git a/examples/lighting-app/infineon/psoc6/include/CHIPProjectConfig.h b/examples/lighting-app/infineon/psoc6/include/CHIPProjectConfig.h
index 6dc6ec3b282109..a6354316e26de0 100644
--- a/examples/lighting-app/infineon/psoc6/include/CHIPProjectConfig.h
+++ b/examples/lighting-app/infineon/psoc6/include/CHIPProjectConfig.h
@@ -102,14 +102,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote Chip Time service
- * using the Chip Time Sync protocol.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 /**
  * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
  *
diff --git a/examples/lighting-app/nxp/k32w/k32w0/include/CHIPProjectConfig.h b/examples/lighting-app/nxp/k32w/k32w0/include/CHIPProjectConfig.h
index e10bf8522eaf0b..11b539c5a67aff 100644
--- a/examples/lighting-app/nxp/k32w/k32w0/include/CHIPProjectConfig.h
+++ b/examples/lighting-app/nxp/k32w/k32w0/include/CHIPProjectConfig.h
@@ -152,14 +152,6 @@
 #define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME "NXP Demo App"
 #endif
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote CHIP Time service
- * using the CHIP Time Sync protocol.
- */
-// #define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 1
-
 /**
  * CHIP_DEVICE_CONFIG_BLE_FAST_ADVERTISING_TIMEOUT
  *
diff --git a/examples/lighting-app/qpg/include/CHIPProjectConfig.h b/examples/lighting-app/qpg/include/CHIPProjectConfig.h
index 63b3c719c37100..4b1bb140a4cb9e 100644
--- a/examples/lighting-app/qpg/include/CHIPProjectConfig.h
+++ b/examples/lighting-app/qpg/include/CHIPProjectConfig.h
@@ -98,14 +98,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote Chip Time service
- * using the Chip Time Sync protocol.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 /**
  * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
  *
diff --git a/examples/lock-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h b/examples/lock-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
index 41408256519952..5e4fd0215c517a 100644
--- a/examples/lock-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
+++ b/examples/lock-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
@@ -74,14 +74,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote CHIP Time service
- * using the CHIP Time Sync protocol.
- */
-// #define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 1
-
 /**
  * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE
  *
diff --git a/examples/lock-app/cc32xx/main/include/CHIPProjectConfig.h b/examples/lock-app/cc32xx/main/include/CHIPProjectConfig.h
index d5187cc43a5d49..ca62337985d252 100644
--- a/examples/lock-app/cc32xx/main/include/CHIPProjectConfig.h
+++ b/examples/lock-app/cc32xx/main/include/CHIPProjectConfig.h
@@ -112,14 +112,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 0
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote CHIP Time service
- * using the CHIP Time Sync protocol.
- */
-//#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 1
-
 /**
  * CHIP_CONFIG_EVENT_LOGGING_UTC_TIMESTAMPS
  *
diff --git a/examples/lock-app/efr32/include/CHIPProjectConfig.h b/examples/lock-app/efr32/include/CHIPProjectConfig.h
index 9980ca347d507b..6e8342dc0f7a99 100644
--- a/examples/lock-app/efr32/include/CHIPProjectConfig.h
+++ b/examples/lock-app/efr32/include/CHIPProjectConfig.h
@@ -98,14 +98,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote Chip Time service
- * using the Chip Time Sync protocol.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 /**
  * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
  *
diff --git a/examples/lock-app/infineon/psoc6/include/CHIPProjectConfig.h b/examples/lock-app/infineon/psoc6/include/CHIPProjectConfig.h
index b069e13284c07d..f24b7b73241926 100644
--- a/examples/lock-app/infineon/psoc6/include/CHIPProjectConfig.h
+++ b/examples/lock-app/infineon/psoc6/include/CHIPProjectConfig.h
@@ -89,14 +89,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote Chip Time service
- * using the Chip Time Sync protocol.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 /**
  * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
  *
diff --git a/examples/lock-app/nxp/k32w/k32w0/include/CHIPProjectConfig.h b/examples/lock-app/nxp/k32w/k32w0/include/CHIPProjectConfig.h
index cca7403d37767f..d5c00c46cb1868 100644
--- a/examples/lock-app/nxp/k32w/k32w0/include/CHIPProjectConfig.h
+++ b/examples/lock-app/nxp/k32w/k32w0/include/CHIPProjectConfig.h
@@ -152,14 +152,6 @@
 #define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME "NXP Demo App"
 #endif
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote CHIP Time service
- * using the CHIP Time Sync protocol.
- */
-// #define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 1
-
 /**
  * CHIP_DEVICE_CONFIG_BLE_FAST_ADVERTISING_TIMEOUT
  *
diff --git a/examples/lock-app/qpg/include/CHIPProjectConfig.h b/examples/lock-app/qpg/include/CHIPProjectConfig.h
index 6977241a195b00..a218b8d17cf828 100644
--- a/examples/lock-app/qpg/include/CHIPProjectConfig.h
+++ b/examples/lock-app/qpg/include/CHIPProjectConfig.h
@@ -87,14 +87,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote Chip Time service
- * using the Chip Time Sync protocol.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 /**
  * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
  *
diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/include/CHIPProjectConfig.h b/examples/persistent-storage/cc13x2x7_26x2x7/include/CHIPProjectConfig.h
index 393250a5a04844..2a15a30a7f4c02 100644
--- a/examples/persistent-storage/cc13x2x7_26x2x7/include/CHIPProjectConfig.h
+++ b/examples/persistent-storage/cc13x2x7_26x2x7/include/CHIPProjectConfig.h
@@ -100,14 +100,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote CHIP Time service
- * using the CHIP Time Sync protocol.
- */
-// #define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 1
-
 /**
  * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE
  *
diff --git a/examples/persistent-storage/efr32/include/CHIPProjectConfig.h b/examples/persistent-storage/efr32/include/CHIPProjectConfig.h
index 3e44c4d3308c6e..4502afd537724f 100644
--- a/examples/persistent-storage/efr32/include/CHIPProjectConfig.h
+++ b/examples/persistent-storage/efr32/include/CHIPProjectConfig.h
@@ -81,14 +81,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote Chip Time service
- * using the Chip Time Sync protocol.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 /**
  * CHIP_DEVICE_CONFIG_USE_TEST_SERIAL_NUMBER
  *
diff --git a/examples/persistent-storage/infineon/psoc6/include/CHIPProjectConfig.h b/examples/persistent-storage/infineon/psoc6/include/CHIPProjectConfig.h
index 3b4b86c14a9e92..b93e564d65042a 100644
--- a/examples/persistent-storage/infineon/psoc6/include/CHIPProjectConfig.h
+++ b/examples/persistent-storage/infineon/psoc6/include/CHIPProjectConfig.h
@@ -79,14 +79,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote Chip Time service
- * using the Chip Time Sync protocol.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 /**
  * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
  *
diff --git a/examples/persistent-storage/qpg/include/CHIPProjectConfig.h b/examples/persistent-storage/qpg/include/CHIPProjectConfig.h
index e3de1e833ec4c6..5daea2fa09101a 100644
--- a/examples/persistent-storage/qpg/include/CHIPProjectConfig.h
+++ b/examples/persistent-storage/qpg/include/CHIPProjectConfig.h
@@ -85,14 +85,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote Chip Time service
- * using the Chip Time Sync protocol.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 /**
  * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
  *
diff --git a/examples/pigweed-app/efr32/include/CHIPProjectConfig.h b/examples/pigweed-app/efr32/include/CHIPProjectConfig.h
index 4bf2b06020dc06..9c6a21703649ac 100644
--- a/examples/pigweed-app/efr32/include/CHIPProjectConfig.h
+++ b/examples/pigweed-app/efr32/include/CHIPProjectConfig.h
@@ -91,14 +91,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote Chip Time service
- * using the Chip Time Sync protocol.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 /**
  * CHIP_DEVICE_CONFIG_USE_TEST_SERIAL_NUMBER
  *
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h b/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
index 72cf56e6c06545..5cb1c4369f9dd7 100644
--- a/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
+++ b/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
@@ -67,14 +67,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote CHIP Time service
- * using the CHIP Time Sync protocol.
- */
-// #define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 1
-
 /**
  * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE
  *
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h b/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
index 9eb1e8a7fb05de..aca4a63dc9798f 100644
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
+++ b/examples/pump-controller-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
@@ -67,14 +67,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote CHIP Time service
- * using the CHIP Time Sync protocol.
- */
-// #define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 1
-
 /**
  * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE
  *
diff --git a/examples/shell/cc13x2x7_26x2x7/include/CHIPProjectConfig.h b/examples/shell/cc13x2x7_26x2x7/include/CHIPProjectConfig.h
index 10f39015f988f7..e7cf8a0ad56c5b 100644
--- a/examples/shell/cc13x2x7_26x2x7/include/CHIPProjectConfig.h
+++ b/examples/shell/cc13x2x7_26x2x7/include/CHIPProjectConfig.h
@@ -68,14 +68,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote CHIP Time service
- * using the CHIP Time Sync protocol.
- */
-//#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 1
-
 /**
  * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE
  *
diff --git a/examples/shell/efr32/include/CHIPProjectConfig.h b/examples/shell/efr32/include/CHIPProjectConfig.h
index 98d23fc7afa32d..bd5c6355cae55a 100644
--- a/examples/shell/efr32/include/CHIPProjectConfig.h
+++ b/examples/shell/efr32/include/CHIPProjectConfig.h
@@ -94,14 +94,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote Chip Time service
- * using the Chip Time Sync protocol.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 /**
  * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
  *
diff --git a/examples/shell/genio/include/CHIPProjectConfig.h b/examples/shell/genio/include/CHIPProjectConfig.h
index 62af9bb3d76a78..a5c27bc48cb994 100644
--- a/examples/shell/genio/include/CHIPProjectConfig.h
+++ b/examples/shell/genio/include/CHIPProjectConfig.h
@@ -84,14 +84,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 0
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote Chip Time service
- * using the Chip Time Sync protocol.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 /**
  * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
  *
diff --git a/examples/shell/nxp/k32w/k32w0/include/CHIPProjectConfig.h b/examples/shell/nxp/k32w/k32w0/include/CHIPProjectConfig.h
index 0d36467b3c07b9..bcb7d017560dc2 100644
--- a/examples/shell/nxp/k32w/k32w0/include/CHIPProjectConfig.h
+++ b/examples/shell/nxp/k32w/k32w0/include/CHIPProjectConfig.h
@@ -100,14 +100,6 @@
 #define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME "NXP Demo App"
 #endif
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote CHIP Time service
- * using the CHIP Time Sync protocol.
- */
-// #define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 1
-
 /**
  * @def CHIP_CONFIG_ENABLE_SERVER_IM_EVENT
  *
diff --git a/examples/shell/qpg/include/CHIPProjectConfig.h b/examples/shell/qpg/include/CHIPProjectConfig.h
index 8656d8ae542fbf..c99b06a9562d27 100644
--- a/examples/shell/qpg/include/CHIPProjectConfig.h
+++ b/examples/shell/qpg/include/CHIPProjectConfig.h
@@ -91,14 +91,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote Chip Time service
- * using the Chip Time Sync protocol.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 /**
  * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
  *
diff --git a/examples/thermostat/efr32/include/CHIPProjectConfig.h b/examples/thermostat/efr32/include/CHIPProjectConfig.h
index 5904b776cd601d..94c82dcbb0281d 100644
--- a/examples/thermostat/efr32/include/CHIPProjectConfig.h
+++ b/examples/thermostat/efr32/include/CHIPProjectConfig.h
@@ -97,14 +97,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote Chip Time service
- * using the Chip Time Sync protocol.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 /**
  * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
  *
diff --git a/examples/window-app/efr32/include/CHIPProjectConfig.h b/examples/window-app/efr32/include/CHIPProjectConfig.h
index 4621081b6d9d3d..23c653c12b396e 100644
--- a/examples/window-app/efr32/include/CHIPProjectConfig.h
+++ b/examples/window-app/efr32/include/CHIPProjectConfig.h
@@ -96,14 +96,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote Chip Time service
- * using the Chip Time Sync protocol.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 /**
  * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER
  *
diff --git a/src/include/platform/CHIPDeviceConfig.h b/src/include/platform/CHIPDeviceConfig.h
index 2eca4e43012810..cd9d78b48922ab 100644
--- a/src/include/platform/CHIPDeviceConfig.h
+++ b/src/include/platform/CHIPDeviceConfig.h
@@ -549,56 +549,6 @@
 #define CHIP_DEVICE_CONFIG_BLE_ADVERTISING_INTERVAL_CHANGE_TIME 30000
 #endif
 
-// -------------------- Time Sync Configuration --------------------
-
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote chip Time service
- * using the chip Time Sync protocol.
- */
-#ifndef CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-#endif
-
-/**
- * CHIP_DEVICE_CONFIG_CHIP_TIME_SERVICE_ENDPOINT_ID
- *
- * Specifies the service endpoint id of the chip Time Sync service to be used to synchronize time.
- *
- * This value is only meaningful if CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC has
- * been enabled.
- */
-#ifndef CHIP_DEVICE_CONFIG_CHIP_TIME_SERVICE_ENDPOINT_ID
-#define CHIP_DEVICE_CONFIG_CHIP_TIME_SERVICE_ENDPOINT_ID 0x18B4300200000005ULL
-#endif
-
-/**
- * CHIP_DEVICE_CONFIG_DEFAULT_TIME_SYNC_INTERVAL
- *
- * Specifies the minimum interval (in seconds) at which the device should synchronize its real time
- * clock with the configured chip Time Sync server.
- *
- * This value is only meaningful if CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC has
- * been enabled.
- */
-#ifndef CHIP_DEVICE_CONFIG_DEFAULT_TIME_SYNC_INTERVAL
-#define CHIP_DEVICE_CONFIG_DEFAULT_TIME_SYNC_INTERVAL 180
-#endif
-
-/**
- * CHIP_DEVICE_CONFIG_TIME_SYNC_TIMEOUT
- *
- * Specifies the maximum amount of time (in milliseconds) to wait for a response from a
- * chip Time Sync server.
- *
- * This value is only meaningful if CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC has
- * been enabled.
- */
-#ifndef CHIP_DEVICE_CONFIG_TIME_SYNC_TIMEOUT
-#define CHIP_DEVICE_CONFIG_TIME_SYNC_TIMEOUT 10000
-#endif
-
 // -------------------- Service Provisioning Configuration --------------------
 
 /**
diff --git a/src/platform/Ameba/CHIPDevicePlatformConfig.h b/src/platform/Ameba/CHIPDevicePlatformConfig.h
index bddca5e26a9001..0fc64199ec0704 100644
--- a/src/platform/Ameba/CHIPDevicePlatformConfig.h
+++ b/src/platform/Ameba/CHIPDevicePlatformConfig.h
@@ -34,8 +34,6 @@
 
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 // ========== Platform-specific Configuration =========
 
 // These are configuration options that are unique to the platform.
diff --git a/src/platform/Beken/CHIPDevicePlatformConfig.h b/src/platform/Beken/CHIPDevicePlatformConfig.h
index e0d60d4bb0c942..78050497555796 100755
--- a/src/platform/Beken/CHIPDevicePlatformConfig.h
+++ b/src/platform/Beken/CHIPDevicePlatformConfig.h
@@ -36,8 +36,6 @@
 
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 // ========== Platform-specific Configuration =========
 
 // These are configuration options that are unique to the platform.
diff --git a/src/platform/Darwin/CHIPDevicePlatformConfig.h b/src/platform/Darwin/CHIPDevicePlatformConfig.h
index 6d0306b5ed829e..b25c7afbf7e920 100644
--- a/src/platform/Darwin/CHIPDevicePlatformConfig.h
+++ b/src/platform/Darwin/CHIPDevicePlatformConfig.h
@@ -34,8 +34,6 @@
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 #endif
 
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 // ========== Platform-specific Configuration =========
 
 // These are configuration options that are unique to Darwin platforms.
diff --git a/src/platform/EFR32/CHIPDevicePlatformConfig.h b/src/platform/EFR32/CHIPDevicePlatformConfig.h
index aacb441d2ad787..47c97eab4de37e 100644
--- a/src/platform/EFR32/CHIPDevicePlatformConfig.h
+++ b/src/platform/EFR32/CHIPDevicePlatformConfig.h
@@ -46,8 +46,6 @@
 
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 #if defined(SL_WIFI)
 
 #ifndef CHIP_DEVICE_CONFIG_ENABLE_IPV4
diff --git a/src/platform/ESP32/CHIPDevicePlatformConfig.h b/src/platform/ESP32/CHIPDevicePlatformConfig.h
index 2186b37e201bc1..d1d8479c6e71bb 100644
--- a/src/platform/ESP32/CHIPDevicePlatformConfig.h
+++ b/src/platform/ESP32/CHIPDevicePlatformConfig.h
@@ -81,10 +81,6 @@
 #define CHIP_DEVICE_CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MIN CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MIN
 #define CHIP_DEVICE_CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MAX CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MAX
 #define CHIP_DEVICE_CONFIG_CHIPOBLE_SINGLE_CONNECTION CONFIG_CHIPOBLE_SINGLE_CONNECTION
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
-#define CHIP_DEVICE_CONFIG_CHIP_TIME_SERVICE_ENDPOINT_ID CONFIG_CHIP_TIME_SERVICE_ENDPOINT_ID
-#define CHIP_DEVICE_CONFIG_DEFAULT_TIME_SYNC_INTERVAL CONFIG_DEFAULT_TIME_SYNC_INTERVAL
-#define CHIP_DEVICE_CONFIG_TIME_SYNC_TIMEOUT CONFIG_TIME_SYNC_TIMEOUT
 #define CHIP_DEVICE_CONFIG_SERVICE_PROVISIONING_ENDPOINT_ID CONFIG_SERVICE_PROVISIONING_ENDPOINT_ID
 #define CHIP_DEVICE_CONFIG_SERVICE_PROVISIONING_CONNECTIVITY_TIMEOUT CONFIG_SERVICE_PROVISIONING_CONNECTIVITY_TIMEOUT
 #define CHIP_DEVICE_CONFIG_SERVICE_PROVISIONING_REQUEST_TIMEOUT CONFIG_SERVICE_PROVISIONING_REQUEST_TIMEOUT
diff --git a/src/platform/Linux/CHIPDevicePlatformConfig.h b/src/platform/Linux/CHIPDevicePlatformConfig.h
index 78cd07d33a7564..53b7b05b615d71 100644
--- a/src/platform/Linux/CHIPDevicePlatformConfig.h
+++ b/src/platform/Linux/CHIPDevicePlatformConfig.h
@@ -41,8 +41,6 @@
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 0
 #endif
 
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 // ========== Platform-specific Configuration =========
 
 // These are configuration options that are unique to Linux platforms.
diff --git a/src/platform/Tizen/CHIPDevicePlatformConfig.h b/src/platform/Tizen/CHIPDevicePlatformConfig.h
index 76febdb9762cd8..cf54ede61d5909 100644
--- a/src/platform/Tizen/CHIPDevicePlatformConfig.h
+++ b/src/platform/Tizen/CHIPDevicePlatformConfig.h
@@ -47,8 +47,6 @@
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 #endif
 
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 // ========== Platform-specific Configuration =========
 
 // These are configuration options that are unique to Tizen platforms.
diff --git a/src/platform/Zephyr/CHIPDevicePlatformConfig.h b/src/platform/Zephyr/CHIPDevicePlatformConfig.h
index 9a13d719794333..72192ad1361d4c 100644
--- a/src/platform/Zephyr/CHIPDevicePlatformConfig.h
+++ b/src/platform/Zephyr/CHIPDevicePlatformConfig.h
@@ -50,8 +50,6 @@
 
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE CONFIG_BT
 
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 // ========== Platform-specific Configuration =========
 
 // These are configuration options that are unique to Zephyr platforms.
diff --git a/src/platform/android/CHIPDevicePlatformConfig.h b/src/platform/android/CHIPDevicePlatformConfig.h
index 8753721015ff0a..a5d8b18a22863f 100644
--- a/src/platform/android/CHIPDevicePlatformConfig.h
+++ b/src/platform/android/CHIPDevicePlatformConfig.h
@@ -41,8 +41,6 @@
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 0
 #endif
 
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 #define CHIP_DEVICE_CONFIG_ENABLE_UNPROVISIONED_MDNS 1
 
 // ========== Platform-specific Configuration =========
diff --git a/src/platform/bouffalolab/BL602/CHIPDevicePlatformConfig.h b/src/platform/bouffalolab/BL602/CHIPDevicePlatformConfig.h
index a8d041d9e443c1..7e6b56f57e3fed 100644
--- a/src/platform/bouffalolab/BL602/CHIPDevicePlatformConfig.h
+++ b/src/platform/bouffalolab/BL602/CHIPDevicePlatformConfig.h
@@ -40,8 +40,6 @@
 
 //#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 #define CHIP_DEVICE_CONFIG_PERSISTED_STORAGE_CRIT_EIDC_KEY 2
 #define CHIP_DEVICE_CONFIG_PERSISTED_STORAGE_PROD_EIDC_KEY 3
 #define CHIP_DEVICE_CONFIG_PERSISTED_STORAGE_INFO_EIDC_KEY 4
diff --git a/src/platform/mbed/CHIPDevicePlatformConfig.h b/src/platform/mbed/CHIPDevicePlatformConfig.h
index 7ae08288bbe76d..95b7c94b4c74ae 100644
--- a/src/platform/mbed/CHIPDevicePlatformConfig.h
+++ b/src/platform/mbed/CHIPDevicePlatformConfig.h
@@ -27,8 +27,6 @@
 
 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD 0
 
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 #ifndef CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 #endif // CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
diff --git a/src/platform/mt793x/CHIPDevicePlatformConfig.h b/src/platform/mt793x/CHIPDevicePlatformConfig.h
index 808c37bf3417b2..9e082811317902 100644
--- a/src/platform/mt793x/CHIPDevicePlatformConfig.h
+++ b/src/platform/mt793x/CHIPDevicePlatformConfig.h
@@ -49,7 +49,6 @@
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 #endif
 
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
 #define CHIP_DEVICE_CONFIG_PERSISTED_STORAGE_GLOBAL_EIDC_KEY 2
 
 // ========== Platform-specific Configuration =========
diff --git a/src/platform/nrfconnect/CHIPDevicePlatformConfig.h b/src/platform/nrfconnect/CHIPDevicePlatformConfig.h
index 7e0b8af9fd0883..3813c860725a56 100644
--- a/src/platform/nrfconnect/CHIPDevicePlatformConfig.h
+++ b/src/platform/nrfconnect/CHIPDevicePlatformConfig.h
@@ -94,8 +94,6 @@
 
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE CONFIG_BT
 
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 // ========== Platform-specific Configuration =========
 
 // These are configuration options that are unique to Zephyr platforms.
diff --git a/src/platform/nxp/k32w/k32w0/CHIPDevicePlatformConfig.h b/src/platform/nxp/k32w/k32w0/CHIPDevicePlatformConfig.h
index 91281fff0cd51c..1bb919687d6079 100644
--- a/src/platform/nxp/k32w/k32w0/CHIPDevicePlatformConfig.h
+++ b/src/platform/nxp/k32w/k32w0/CHIPDevicePlatformConfig.h
@@ -37,8 +37,6 @@
 #define CHIP_DEVICE_CHIP0BLE_DEBUG 0
 #endif
 
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 // ========== Platform-specific Configuration =========
 
 // These are configuration options that are unique to the K32W platform.
diff --git a/src/platform/nxp/mw320/CHIPDevicePlatformConfig.h b/src/platform/nxp/mw320/CHIPDevicePlatformConfig.h
index c5e64c054a4a06..7c087f7361e069 100644
--- a/src/platform/nxp/mw320/CHIPDevicePlatformConfig.h
+++ b/src/platform/nxp/mw320/CHIPDevicePlatformConfig.h
@@ -35,8 +35,6 @@
 
 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD 0
 
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 #define CHIP_DEVICE_CONFIG_PERSISTED_STORAGE_CRIT_EIDC_KEY 2
 #define CHIP_DEVICE_CONFIG_PERSISTED_STORAGE_PROD_EIDC_KEY 3
 #define CHIP_DEVICE_CONFIG_PERSISTED_STORAGE_INFO_EIDC_KEY 4
diff --git a/src/platform/qpg/CHIPDevicePlatformConfig.h b/src/platform/qpg/CHIPDevicePlatformConfig.h
index d546b0a5bdcb6e..7e9d51ba1b9f05 100644
--- a/src/platform/qpg/CHIPDevicePlatformConfig.h
+++ b/src/platform/qpg/CHIPDevicePlatformConfig.h
@@ -37,8 +37,6 @@
 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_COMMISSIONABLE_DISCOVERY 1
 #endif
 
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 // ========== Platform-specific Configuration =========
 
 // These are configuration options that are unique to the platform.
diff --git a/src/platform/telink/CHIPDevicePlatformConfig.h b/src/platform/telink/CHIPDevicePlatformConfig.h
index 64e099981552b2..8241a10bc534f8 100644
--- a/src/platform/telink/CHIPDevicePlatformConfig.h
+++ b/src/platform/telink/CHIPDevicePlatformConfig.h
@@ -52,8 +52,6 @@
 
 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD CONFIG_NET_L2_OPENTHREAD
 
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 // ========== Platform-specific Configuration =========
 
 // These are configuration options that are unique to Zephyr platforms.
diff --git a/src/platform/webos/CHIPDevicePlatformConfig.h b/src/platform/webos/CHIPDevicePlatformConfig.h
index eb5de503df06ae..88a9bc647e25ff 100644
--- a/src/platform/webos/CHIPDevicePlatformConfig.h
+++ b/src/platform/webos/CHIPDevicePlatformConfig.h
@@ -41,8 +41,6 @@
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 0
 #endif
 
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 // ========== Platform-specific Configuration =========
 
 // These are configuration options that are unique to webOS platforms.
diff --git a/src/test_driver/efr32/include/CHIPProjectConfig.h b/src/test_driver/efr32/include/CHIPProjectConfig.h
index 032c45ce5b2e4b..04b0577e94ced3 100644
--- a/src/test_driver/efr32/include/CHIPProjectConfig.h
+++ b/src/test_driver/efr32/include/CHIPProjectConfig.h
@@ -82,14 +82,6 @@
  */
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 
-/**
- * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
- *
- * Enables synchronizing the device's real time clock with a remote Chip Time service
- * using the Chip Time Sync protocol.
- */
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
-
 /**
  * CHIP_DEVICE_CONFIG_USE_TEST_SERIAL_NUMBER
  *