From 0e62b4f91e82595f622f03b3caebd96731a2689e Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@apple.com>
Date: Thu, 28 Oct 2021 00:37:04 -0400
Subject: [PATCH 1/2] Move the lib/core type includes from basic_types.h to
 DataModelTypes.h.

NodeId, GroupId, and VendorId declarations should come along when
including a header called DataModelTypes.h.
---
 src/app/util/basic-types.h    | 6 +-----
 src/lib/core/DataModelTypes.h | 4 ++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/util/basic-types.h b/src/app/util/basic-types.h
index 2988019403bdfd..97aebe690423c0 100644
--- a/src/app/util/basic-types.h
+++ b/src/app/util/basic-types.h
@@ -25,11 +25,7 @@
 
 #include <cstdint>
 
-#include <lib/core/GroupId.h>
-#include <lib/core/NodeId.h>
-
-// Pull in other core types
-#include <lib/core/CHIPVendorIdentifiers.hpp>
+// Pull in core types
 #include <lib/core/DataModelTypes.h>
 
 namespace chip {
diff --git a/src/lib/core/DataModelTypes.h b/src/lib/core/DataModelTypes.h
index d7d76c9c0ada04..79c5163bb59ae1 100644
--- a/src/lib/core/DataModelTypes.h
+++ b/src/lib/core/DataModelTypes.h
@@ -19,6 +19,10 @@
 
 #include <cstdint>
 
+#include <lib/core/CHIPVendorIdentifiers.hpp> // For VendorId
+#include <lib/core/GroupId.h>
+#include <lib/core/NodeId.h>
+
 namespace chip {
 
 typedef uint8_t ActionId;

From 109663df00f140c4765af31f773885d774e05303 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@apple.com>
Date: Thu, 28 Oct 2021 10:13:15 -0400
Subject: [PATCH 2/2] Add PasscodeId.h

Co-authored-by: Marc Lepage <67919234+mlepage-google@users.noreply.github.com>
---
 src/lib/core/DataModelTypes.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/core/DataModelTypes.h b/src/lib/core/DataModelTypes.h
index 79c5163bb59ae1..ef81e350c58559 100644
--- a/src/lib/core/DataModelTypes.h
+++ b/src/lib/core/DataModelTypes.h
@@ -22,6 +22,7 @@
 #include <lib/core/CHIPVendorIdentifiers.hpp> // For VendorId
 #include <lib/core/GroupId.h>
 #include <lib/core/NodeId.h>
+#include <lib/core/PasscodeId.h>
 
 namespace chip {