diff --git a/src/app/util/attribute-storage.cpp b/src/app/util/attribute-storage.cpp
index dee7a3b444f327..fe62dd8812d9bc 100644
--- a/src/app/util/attribute-storage.cpp
+++ b/src/app/util/attribute-storage.cpp
@@ -15,13 +15,12 @@
  *    limitations under the License.
  */
 
+#include <platform/CHIPDeviceLayer.h>
 #include "app/util/common.h"
 #include <app/AttributePersistenceProvider.h>
 #include <app/InteractionModelEngine.h>
 #include <app/reporting/reporting.h>
-#include <app/util/af.h>
 #include <app/util/attribute-storage.h>
-#include <app/util/config.h>
 #include <app/util/generic-callbacks.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
diff --git a/src/app/util/attribute-storage.h b/src/app/util/attribute-storage.h
index 0a49d9c6c6e28b..83ebd0950748a7 100644
--- a/src/app/util/attribute-storage.h
+++ b/src/app/util/attribute-storage.h
@@ -18,13 +18,13 @@
 #pragma once
 
 // #include PLATFORM_HEADER
+#include <platform/CHIPDeviceLayer.h>
 #include <app/AttributeAccessInterface.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/util/af.h>
 #include <app/util/config.h>
 #include <app/util/endpoint-config-api.h>
 #include <lib/support/CodeUtils.h>
-#include <platform/CHIPDeviceLayer.h>
 
 #if !defined(EMBER_SCRIPTED_TEST)
 #include <app/att-storage.h>