From f71070690603ce4585310c8fe45f3063276e36c9 Mon Sep 17 00:00:00 2001
From: Andrei Litvin <andy314@gmail.com>
Date: Thu, 29 Feb 2024 15:32:01 -0500
Subject: [PATCH 1/2] Clean up some includes in DataModelHandler Clean up
 includes and useless file comment.

Overall the naming of this file is somewhat questionable as it contains a single init call.
Still looking to determine if we should rename (we probably should).
---
 src/app/util/DataModelHandler.cpp |  7 -------
 src/app/util/DataModelHandler.h   | 12 ------------
 2 files changed, 19 deletions(-)

diff --git a/src/app/util/DataModelHandler.cpp b/src/app/util/DataModelHandler.cpp
index 8a37bd4cd7f5a9..6d44948f2a5ae0 100644
--- a/src/app/util/DataModelHandler.cpp
+++ b/src/app/util/DataModelHandler.cpp
@@ -14,16 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
-/**
- * @file
- *   This file implements the handler for data model messages.
- */
-
 #include <app/util/DataModelHandler.h>
 
 #include <app/util/attribute-storage.h>
-#include <app/util/util.h>
 #include <lib/support/logging/CHIPLogging.h>
 
 using namespace ::chip;
diff --git a/src/app/util/DataModelHandler.h b/src/app/util/DataModelHandler.h
index 025d9b56f76fe2..d1ad0c2a61c051 100644
--- a/src/app/util/DataModelHandler.h
+++ b/src/app/util/DataModelHandler.h
@@ -14,22 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
-/**
- * @file
- *   This file defines the API for the handler for data model messages.
- */
-
 #pragma once
 
-#include <messaging/ExchangeContext.h>
-#include <messaging/ExchangeMgr.h>
-#include <system/SystemPacketBuffer.h>
-#include <transport/raw/MessageHeader.h>
-
 /**
  * Initialize the data model internal code to be ready to send and receive
  * data model messages.
- *
  */
 void InitDataModelHandler();

From 14210387270b8999baaee4b63e38da5d01298d1f Mon Sep 17 00:00:00 2001
From: Andrei Litvin <andy314@gmail.com>
Date: Thu, 29 Feb 2024 15:39:21 -0500
Subject: [PATCH 2/2] Add back a missing header

---
 src/app/util/DataModelHandler.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/util/DataModelHandler.cpp b/src/app/util/DataModelHandler.cpp
index 6d44948f2a5ae0..6a4f7659bb3d33 100644
--- a/src/app/util/DataModelHandler.cpp
+++ b/src/app/util/DataModelHandler.cpp
@@ -17,6 +17,7 @@
 #include <app/util/DataModelHandler.h>
 
 #include <app/util/attribute-storage.h>
+#include <app/util/util.h>
 #include <lib/support/logging/CHIPLogging.h>
 
 using namespace ::chip;