move include

Author: mkardous-silabs

src/app/InteractionModelEngine.h

@@ -25,6 +25,9 @@
 
 #pragma once
 
+// TODO(#32628): Remove the CHIPCore.h header when the esp32 build is correctly fixed (next two includes)
+#include <lib/core/CHIPCore.h>
+
 #include <access/AccessControl.h>
 #include <app/AppConfig.h>
 #include <app/AttributePathParams.h>

src/app/reporting/ReportScheduler.h

@@ -18,6 +18,9 @@
 
 #pragma once
 
+// TODO(#32628): Remove the CHIPCore.h header when the esp32 build is correctly fixed (next two includes)
+#include <lib/core/CHIPCore.h>
+
 #include <app/ReadHandler.h>
 #include <app/icd/server/ICDStateObserver.h>
 #include <lib/core/CHIPError.h>

src/app/tests/TestInteractionModelEngine.cpp

@@ -22,9 +22,6 @@
  *
  */
 
-// TODO(#32628): Remove the CHIPCore.h header when the esp32 build is correctly fixed
-#include <lib/core/CHIPCore.h>
-
 #include <app/AppConfig.h>
 #include <app/InteractionModelEngine.h>
 #include <app/reporting/tests/MockReportScheduler.h>

src/app/tests/TestReadInteraction.cpp

@@ -22,11 +22,6 @@
  *
  */
 
-// TODO(#32628): Remove the CHIPCore.h header when the esp32 build is correctly fixed (next two includes)
-#include <lib/core/CHIPCore.h>
-// add a line to avoid the reorder
-#include <app/reporting/ReportScheduler.h>
-
 #include "lib/support/CHIPMem.h"
 #include <access/examples/PermissiveAccessControlDelegate.h>
 #include <app/AttributeAccessInterface.h>