Fix includes

project-chip · Jan 20, 2025 · a39551e · a39551e
1 parent 742dc89
commit a39551e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/src/app/InteractionModelEngine.cpp b/src/app/InteractionModelEngine.cpp
@@ -24,8 +24,6 @@
  */
 
 #include "InteractionModelEngine.h"
-#include "app/data-model-provider/MetadataList.h"
-#include "app/data-model/List.h"
 
 #include <cinttypes>
 
@@ -39,9 +37,11 @@
 #include <app/EventPathParams.h>
 #include <app/RequiredPrivilege.h>
 #include <app/data-model-provider/ActionReturnStatus.h>
+#include <app/data-model-provider/MetadataList.h>
 #include <app/data-model-provider/MetadataLookup.h>
 #include <app/data-model-provider/MetadataTypes.h>
 #include <app/data-model-provider/OperationTypes.h>
+#include <app/data-model/List.h>
 #include <app/util/IMClusterCommandHandler.h>
 #include <app/util/af-types.h>
 #include <app/util/endpoint-config-api.h>

diff --git a/src/app/clusters/descriptor/descriptor.cpp b/src/app/clusters/descriptor/descriptor.cpp
@@ -16,16 +16,16 @@
  */
 
 #include "descriptor.h"
-#include "app/data-model-provider/MetadataList.h"
-#include "app/data-model/List.h"
 
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/AttributeAccessInterface.h>
 #include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/InteractionModelEngine.h>
+#include <app/data-model-provider/MetadataList.h>
 #include <app/data-model-provider/MetadataTypes.h>
+#include <app/data-model/List.h>
 #include <app/util/attribute-storage.h>
 #include <app/util/endpoint-config-api.h>
 #include <lib/core/CHIPError.h>

diff --git a/src/app/data-model-provider/MetadataList.cpp b/src/app/data-model-provider/MetadataList.cpp
@@ -15,7 +15,6 @@
  */
 #include <app/data-model-provider/MetadataList.h>
 
-#include <cassert>
 #include <lib/core/CHIPError.h>
 #include <lib/support/CHIPMem.h>
 #include <lib/support/CodeUtils.h>

diff --git a/src/app/data-model-provider/MetadataLookup.cpp b/src/app/data-model-provider/MetadataLookup.cpp
@@ -13,9 +13,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#include "app/data-model-provider/MetadataList.h"
 #include <app/data-model-provider/MetadataLookup.h>
 
+#include <app/data-model-provider/MetadataList.h>
+
 namespace chip {
 namespace app {
 namespace DataModel {

diff --git a/src/app/data-model-provider/MetadataTypes.cpp b/src/app/data-model-provider/MetadataTypes.cpp
@@ -15,9 +15,10 @@
  *    limitations under the License.
  */
 
-#include "app/data-model-provider/MetadataList.h"
 #include <app/data-model-provider/MetadataTypes.h>
 
+#include <app/data-model-provider/MetadataList.h>
+
 namespace chip {
 namespace app {
 namespace DataModel {