From 49e58168717f545847ac80646c574aad694ff131 Mon Sep 17 00:00:00 2001
From: Andrei Litvin <andreilitvin@google.com>
Date: Tue, 7 May 2024 14:07:15 -0400
Subject: [PATCH 1/2] Make sure to include ember defines for door lock.

Chef was using MATTER_DM_PLUGIN_DOOR_LOCK_SERVER without
including relevant headers (and assuming that data model
would transitively define them)

This does not work anymore, so include app config instead.
---
 examples/chef/common/clusters/door-lock/chef-doorlock-stubs.cpp | 1 +
 examples/chef/common/clusters/door-lock/chef-lock-endpoint.cpp  | 1 +
 examples/chef/common/clusters/door-lock/chef-lock-manager.cpp   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/examples/chef/common/clusters/door-lock/chef-doorlock-stubs.cpp b/examples/chef/common/clusters/door-lock/chef-doorlock-stubs.cpp
index 90b9fd017b0a01..5f9d3147513f52 100644
--- a/examples/chef/common/clusters/door-lock/chef-doorlock-stubs.cpp
+++ b/examples/chef/common/clusters/door-lock/chef-doorlock-stubs.cpp
@@ -17,6 +17,7 @@
  */
 
 #include <app/data-model/Nullable.h>
+#include <app/util/config.h>
 #include <lib/core/DataModelTypes.h>
 
 #ifdef MATTER_DM_PLUGIN_DOOR_LOCK_SERVER
diff --git a/examples/chef/common/clusters/door-lock/chef-lock-endpoint.cpp b/examples/chef/common/clusters/door-lock/chef-lock-endpoint.cpp
index c7fe5696d9ba74..b9de799796e0f1 100644
--- a/examples/chef/common/clusters/door-lock/chef-lock-endpoint.cpp
+++ b/examples/chef/common/clusters/door-lock/chef-lock-endpoint.cpp
@@ -17,6 +17,7 @@
  */
 
 #include <app-common/zap-generated/attributes/Accessors.h>
+#include <app/util/config.h>
 #include <cstring>
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/internal/CHIPDeviceLayerInternal.h>
diff --git a/examples/chef/common/clusters/door-lock/chef-lock-manager.cpp b/examples/chef/common/clusters/door-lock/chef-lock-manager.cpp
index 24505972fb8e41..8d16ac0dc581df 100644
--- a/examples/chef/common/clusters/door-lock/chef-lock-manager.cpp
+++ b/examples/chef/common/clusters/door-lock/chef-lock-manager.cpp
@@ -16,6 +16,7 @@
  *    limitations under the License.
  */
 #include <lib/support/logging/CHIPLogging.h>
+#include <app/util/config.h>
 
 #ifdef MATTER_DM_PLUGIN_DOOR_LOCK_SERVER
 #include "chef-lock-manager.h"

From 67b7693ced74c01452bfa2729eff8c04be469ccc Mon Sep 17 00:00:00 2001
From: Andrei Litvin <andreilitvin@google.com>
Date: Tue, 7 May 2024 14:24:21 -0400
Subject: [PATCH 2/2] Restyle

---
 examples/chef/common/clusters/door-lock/chef-lock-manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/chef/common/clusters/door-lock/chef-lock-manager.cpp b/examples/chef/common/clusters/door-lock/chef-lock-manager.cpp
index 8d16ac0dc581df..e6de049a06b236 100644
--- a/examples/chef/common/clusters/door-lock/chef-lock-manager.cpp
+++ b/examples/chef/common/clusters/door-lock/chef-lock-manager.cpp
@@ -15,8 +15,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#include <lib/support/logging/CHIPLogging.h>
 #include <app/util/config.h>
+#include <lib/support/logging/CHIPLogging.h>
 
 #ifdef MATTER_DM_PLUGIN_DOOR_LOCK_SERVER
 #include "chef-lock-manager.h"