diff --git a/src/app/util/DataModelHandler.cpp b/src/app/util/DataModelHandler.cpp
index 8a37bd4cd7f5a9..6a4f7659bb3d33 100644
--- a/src/app/util/DataModelHandler.cpp
+++ b/src/app/util/DataModelHandler.cpp
@@ -14,12 +14,6 @@
  *    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>
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();