diff --git a/src/app/server/DefaultEnhancedSetupFlowProvider.cpp b/src/app/server/DefaultEnhancedSetupFlowProvider.cpp
index b57c0381610e3c..821d247308b1c0 100644
--- a/src/app/server/DefaultEnhancedSetupFlowProvider.cpp
+++ b/src/app/server/DefaultEnhancedSetupFlowProvider.cpp
@@ -22,7 +22,6 @@
 
 #include <lib/core/CHIPConfig.h>
 #include <lib/support/CodeUtils.h>
-#include <platform/KeyValueStoreManager.h>
 
 CHIP_ERROR chip::app::DefaultEnhancedSetupFlowProvider::Init(TermsAndConditionsProvider * const inTermsAndConditionsProvider)
 {
diff --git a/src/app/server/DefaultTermsAndConditionsProvider.cpp b/src/app/server/DefaultTermsAndConditionsProvider.cpp
index 8897aedd204440..4a4a94e47520ea 100644
--- a/src/app/server/DefaultTermsAndConditionsProvider.cpp
+++ b/src/app/server/DefaultTermsAndConditionsProvider.cpp
@@ -23,7 +23,6 @@
 #include <lib/core/TLVTypes.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/DefaultStorageKeyAllocator.h>
-#include <platform/KeyValueStoreManager.h>
 
 namespace {
 constexpr chip::TLV::Tag kSerializationVersionTag            = chip::TLV::ContextTag(1);
diff --git a/src/platform/nxp/k32w/k32w0/K32W0Config.h b/src/platform/nxp/k32w/k32w0/K32W0Config.h
index 1ac0fb99926db9..e364c045c25b1c 100644
--- a/src/platform/nxp/k32w/k32w0/K32W0Config.h
+++ b/src/platform/nxp/k32w/k32w0/K32W0Config.h
@@ -39,7 +39,7 @@ namespace Internal {
 class K32WConfig
 {
 public:
-    using Key = struct RamStorageKey;
+    using Key = RamStorageKey;
 
     /* Storage for factory data settings. Retained during factory reset. */
     static RamStorage sFactoryStorage;