diff --git a/examples/all-clusters-app/all-clusters-common/include/static-supported-modes-manager.h b/examples/all-clusters-app/all-clusters-common/include/static-supported-modes-manager.h
index a8ef29863e9f0f..c52ac93becf66a 100644
--- a/examples/all-clusters-app/all-clusters-common/include/static-supported-modes-manager.h
+++ b/examples/all-clusters-app/all-clusters-common/include/static-supported-modes-manager.h
@@ -22,6 +22,8 @@
 #include <app/util/af.h>
 #include <cstring>
 
+#include <zap-generated/gen_config.h>
+
 namespace chip {
 namespace app {
 namespace Clusters {
diff --git a/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp b/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp
index 416915582d48ee..06d23d1ddf8f06 100644
--- a/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp
+++ b/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp
@@ -1,5 +1,7 @@
 #include <static-supported-modes-manager.h>
 
+#include <zap-generated/gen_config.h>
+
 using namespace std;
 using namespace chip;
 using namespace chip::app::Clusters;
diff --git a/examples/placeholder/linux/include/static-supported-modes-manager.h b/examples/placeholder/linux/include/static-supported-modes-manager.h
index a8ef29863e9f0f..c52ac93becf66a 100644
--- a/examples/placeholder/linux/include/static-supported-modes-manager.h
+++ b/examples/placeholder/linux/include/static-supported-modes-manager.h
@@ -22,6 +22,8 @@
 #include <app/util/af.h>
 #include <cstring>
 
+#include <zap-generated/gen_config.h>
+
 namespace chip {
 namespace app {
 namespace Clusters {
diff --git a/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp b/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp
index ac7bd3fb8285a2..750c6350d62073 100644
--- a/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp
+++ b/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp
@@ -20,6 +20,8 @@
 #include "../../java/ContentAppAttributeDelegate.h"
 #include <json/json.h>
 
+#include <zap-generated/gen_config.h>
+
 using namespace std;
 using namespace chip::app;
 using namespace chip::app::Clusters;
diff --git a/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp b/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp
index 402efef2e993c5..e59296f9d68c83 100644
--- a/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp
+++ b/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp
@@ -25,6 +25,8 @@
 #include <lib/support/JniReferences.h>
 #include <lib/support/JniTypeWrappers.h>
 
+#include <zap-generated/gen_config.h>
+
 using namespace std;
 using namespace chip;
 using namespace chip::app;
diff --git a/examples/tv-app/android/java/ChannelManager.cpp b/examples/tv-app/android/java/ChannelManager.cpp
index 1305aad809972f..4dd5915130f02a 100644
--- a/examples/tv-app/android/java/ChannelManager.cpp
+++ b/examples/tv-app/android/java/ChannelManager.cpp
@@ -26,6 +26,8 @@
 #include <lib/support/JniReferences.h>
 #include <lib/support/JniTypeWrappers.h>
 
+#include <zap-generated/gen_config.h>
+
 using namespace chip;
 using namespace chip::app;
 using namespace chip::app::Clusters::Channel;
diff --git a/examples/tv-app/android/java/KeypadInputManager.cpp b/examples/tv-app/android/java/KeypadInputManager.cpp
index f2e5a07979225c..49fa5841c06fc5 100644
--- a/examples/tv-app/android/java/KeypadInputManager.cpp
+++ b/examples/tv-app/android/java/KeypadInputManager.cpp
@@ -23,6 +23,8 @@
 #include <lib/support/CHIPJNIError.h>
 #include <lib/support/JniReferences.h>
 
+#include <zap-generated/gen_config.h>
+
 using namespace chip;
 using namespace chip::app::Clusters::KeypadInput;
 
diff --git a/examples/tv-app/android/java/LevelManager.cpp b/examples/tv-app/android/java/LevelManager.cpp
index bf5316d92c0bf0..aefcdd8cb56d95 100644
--- a/examples/tv-app/android/java/LevelManager.cpp
+++ b/examples/tv-app/android/java/LevelManager.cpp
@@ -24,6 +24,8 @@
 #include <lib/support/JniReferences.h>
 #include <lib/support/JniTypeWrappers.h>
 
+#include <zap-generated/gen_config.h>
+
 using namespace chip;
 
 static constexpr size_t kLevelManagerTableSize = EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT;
diff --git a/examples/tv-app/android/java/MediaPlaybackManager.cpp b/examples/tv-app/android/java/MediaPlaybackManager.cpp
index 9783d1ffdc4f48..effbc3b3a3060d 100644
--- a/examples/tv-app/android/java/MediaPlaybackManager.cpp
+++ b/examples/tv-app/android/java/MediaPlaybackManager.cpp
@@ -25,6 +25,8 @@
 #include <lib/support/JniReferences.h>
 #include <lib/support/JniTypeWrappers.h>
 
+#include <zap-generated/gen_config.h>
+
 #include "MediaPlaybackManager.h"
 
 using namespace chip;
diff --git a/examples/tv-app/android/java/OnOffManager.cpp b/examples/tv-app/android/java/OnOffManager.cpp
index 338a5c8bd8409e..101f7f256e6ba2 100644
--- a/examples/tv-app/android/java/OnOffManager.cpp
+++ b/examples/tv-app/android/java/OnOffManager.cpp
@@ -24,6 +24,8 @@
 #include <lib/support/JniReferences.h>
 #include <lib/support/JniTypeWrappers.h>
 
+#include <zap-generated/gen_config.h>
+
 using namespace chip;
 
 static constexpr size_t kOnffManagerTableSize = EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT;
diff --git a/examples/tv-app/linux/include/channel/ChannelManager.cpp b/examples/tv-app/linux/include/channel/ChannelManager.cpp
index d80267fb72b211..aaddbe964ff07d 100644
--- a/examples/tv-app/linux/include/channel/ChannelManager.cpp
+++ b/examples/tv-app/linux/include/channel/ChannelManager.cpp
@@ -19,6 +19,8 @@
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <vector>
 
+#include <zap-generated/gen_config.h>
+
 using namespace chip;
 using namespace chip::app;
 using namespace chip::app::Clusters::Channel;
diff --git a/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.cpp b/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.cpp
index 07e905cc60519a..6d28f954800ccd 100644
--- a/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.cpp
+++ b/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.cpp
@@ -19,6 +19,8 @@
 #include "ContentLauncherManager.h"
 #include <app-common/zap-generated/attributes/Accessors.h>
 
+#include <zap-generated/gen_config.h>
+
 using namespace std;
 using namespace chip::app;
 using namespace chip::app::Clusters;
diff --git a/examples/tv-app/linux/include/keypad-input/KeypadInputManager.cpp b/examples/tv-app/linux/include/keypad-input/KeypadInputManager.cpp
index 22b62db9496f91..6625162ec4dccc 100644
--- a/examples/tv-app/linux/include/keypad-input/KeypadInputManager.cpp
+++ b/examples/tv-app/linux/include/keypad-input/KeypadInputManager.cpp
@@ -19,6 +19,8 @@
 #include "KeypadInputManager.h"
 #include <app-common/zap-generated/attributes/Accessors.h>
 
+#include <zap-generated/gen_config.h>
+
 using namespace chip;
 using namespace chip::app::Clusters::KeypadInput;
 
diff --git a/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.cpp b/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.cpp
index 605345621eb000..8ce35f149b76ba 100644
--- a/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.cpp
+++ b/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.cpp
@@ -18,6 +18,8 @@
 #include "MediaPlaybackManager.h"
 #include <app-common/zap-generated/attributes/Accessors.h>
 
+#include <zap-generated/gen_config.h>
+
 using namespace std;
 using namespace chip::app::DataModel;
 using namespace chip::app::Clusters::MediaPlayback;
diff --git a/src/app/clusters/account-login-server/account-login-server.cpp b/src/app/clusters/account-login-server/account-login-server.cpp
index 39e05d54e41909..c1c7fa4ea993ed 100644
--- a/src/app/clusters/account-login-server/account-login-server.cpp
+++ b/src/app/clusters/account-login-server/account-login-server.cpp
@@ -33,6 +33,8 @@
 #if CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
 #include <app/app-platform/ContentAppPlatform.h>
 #endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
+       //
+#include <zap-generated/gen_config.h>
 
 using namespace chip;
 using namespace chip::app::Clusters;
diff --git a/src/app/clusters/application-basic-server/application-basic-server.cpp b/src/app/clusters/application-basic-server/application-basic-server.cpp
index e98a28c04dea6a..fc5eb9f2274286 100644
--- a/src/app/clusters/application-basic-server/application-basic-server.cpp
+++ b/src/app/clusters/application-basic-server/application-basic-server.cpp
@@ -33,6 +33,8 @@
 #include <app/util/attribute-storage.h>
 #include <platform/CHIPDeviceConfig.h>
 
+#include <zap-generated/gen_config.h>
+
 #include <list>
 
 using namespace chip;
diff --git a/src/app/clusters/application-launcher-server/application-launcher-server.cpp b/src/app/clusters/application-launcher-server/application-launcher-server.cpp
index ed3f01102bfe1e..8de2529b30d8fe 100644
--- a/src/app/clusters/application-launcher-server/application-launcher-server.cpp
+++ b/src/app/clusters/application-launcher-server/application-launcher-server.cpp
@@ -38,6 +38,8 @@
 #include <app/util/attribute-storage.h>
 #include <platform/CHIPDeviceConfig.h>
 
+#include <zap-generated/gen_config.h>
+
 using namespace chip;
 using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::ApplicationLauncher;
diff --git a/src/app/clusters/audio-output-server/audio-output-server.cpp b/src/app/clusters/audio-output-server/audio-output-server.cpp
index c28c3811a4c997..ef5f0bffa81d48 100644
--- a/src/app/clusters/audio-output-server/audio-output-server.cpp
+++ b/src/app/clusters/audio-output-server/audio-output-server.cpp
@@ -33,6 +33,8 @@
 #include <app/util/attribute-storage.h>
 #include <platform/CHIPDeviceConfig.h>
 
+#include <zap-generated/gen_config.h>
+
 using namespace chip;
 using namespace chip::app::Clusters::AudioOutput;
 using chip::Protocols::InteractionModel::Status;
diff --git a/src/app/clusters/channel-server/channel-server.cpp b/src/app/clusters/channel-server/channel-server.cpp
index 909daad853dd56..d30d2b6fbe774d 100644
--- a/src/app/clusters/channel-server/channel-server.cpp
+++ b/src/app/clusters/channel-server/channel-server.cpp
@@ -28,6 +28,8 @@
 #include <app/util/attribute-storage.h>
 #include <platform/CHIPDeviceConfig.h>
 
+#include <zap-generated/gen_config.h>
+
 using namespace chip;
 using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::Channel;
diff --git a/src/app/clusters/color-control-server/color-control-server.h b/src/app/clusters/color-control-server/color-control-server.h
index cae5d9829df301..688dc3b1de9ae0 100644
--- a/src/app/clusters/color-control-server/color-control-server.h
+++ b/src/app/clusters/color-control-server/color-control-server.h
@@ -24,6 +24,8 @@
 #include <app/util/basic-types.h>
 #include <protocols/interaction_model/StatusCode.h>
 
+#include <zap-generated/gen_config.h>
+
 /**********************************************************
  * Defines and Macros
  *********************************************************/
diff --git a/src/app/clusters/content-launch-server/content-launch-server.cpp b/src/app/clusters/content-launch-server/content-launch-server.cpp
index e1cbd1af2c888c..2860fef3c7a639 100644
--- a/src/app/clusters/content-launch-server/content-launch-server.cpp
+++ b/src/app/clusters/content-launch-server/content-launch-server.cpp
@@ -30,6 +30,8 @@
 #include <app/util/attribute-storage.h>
 #include <platform/CHIPDeviceConfig.h>
 
+#include <zap-generated/gen_config.h>
+
 #include <list>
 
 using namespace chip;
diff --git a/src/app/clusters/door-lock-server/door-lock-server.h b/src/app/clusters/door-lock-server/door-lock-server.h
index 3eeb79eba043e5..44d2af1ba168b8 100644
--- a/src/app/clusters/door-lock-server/door-lock-server.h
+++ b/src/app/clusters/door-lock-server/door-lock-server.h
@@ -31,6 +31,8 @@
 #include <app/util/config.h>
 #include <protocols/interaction_model/StatusCode.h>
 
+#include <zap-generated/gen_config.h>
+
 #ifndef DOOR_LOCK_SERVER_ENDPOINT
 #define DOOR_LOCK_SERVER_ENDPOINT 1
 #endif
diff --git a/src/app/clusters/keypad-input-server/keypad-input-server.cpp b/src/app/clusters/keypad-input-server/keypad-input-server.cpp
index bb90d940ba5223..a752f1f7c3b3c1 100644
--- a/src/app/clusters/keypad-input-server/keypad-input-server.cpp
+++ b/src/app/clusters/keypad-input-server/keypad-input-server.cpp
@@ -36,6 +36,8 @@
 #include <app/util/attribute-storage.h>
 #include <platform/CHIPDeviceConfig.h>
 
+#include <zap-generated/gen_config.h>
+
 using namespace chip;
 using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::KeypadInput;
diff --git a/src/app/clusters/level-control/level-control.cpp b/src/app/clusters/level-control/level-control.cpp
index a2b66e84a1881f..d0460185a6bd9e 100644
--- a/src/app/clusters/level-control/level-control.cpp
+++ b/src/app/clusters/level-control/level-control.cpp
@@ -33,6 +33,8 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/PlatformManager.h>
 
+#include <zap-generated/gen_config.h>
+
 #ifdef EMBER_AF_PLUGIN_SCENES
 #include <app/clusters/scenes/scenes.h>
 #endif // EMBER_AF_PLUGIN_SCENES
diff --git a/src/app/clusters/low-power-server/low-power-server.cpp b/src/app/clusters/low-power-server/low-power-server.cpp
index f7233651943365..cad5c5a8509835 100644
--- a/src/app/clusters/low-power-server/low-power-server.cpp
+++ b/src/app/clusters/low-power-server/low-power-server.cpp
@@ -31,6 +31,8 @@
 #include <platform/CHIPDeviceConfig.h>
 #include <protocols/interaction_model/StatusCode.h>
 
+#include <zap-generated/gen_config.h>
+
 using namespace chip;
 using namespace chip::app::Clusters::LowPower;
 
diff --git a/src/app/clusters/media-input-server/media-input-server.cpp b/src/app/clusters/media-input-server/media-input-server.cpp
index 6910d710ce3f38..e89be6f39bf005 100644
--- a/src/app/clusters/media-input-server/media-input-server.cpp
+++ b/src/app/clusters/media-input-server/media-input-server.cpp
@@ -32,6 +32,8 @@
 #include <app/util/attribute-storage.h>
 #include <platform/CHIPDeviceConfig.h>
 
+#include <zap-generated/gen_config.h>
+
 using namespace chip;
 using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::MediaInput;
diff --git a/src/app/clusters/media-playback-server/media-playback-server.cpp b/src/app/clusters/media-playback-server/media-playback-server.cpp
index bc6c3d91575850..9df89a11069775 100644
--- a/src/app/clusters/media-playback-server/media-playback-server.cpp
+++ b/src/app/clusters/media-playback-server/media-playback-server.cpp
@@ -36,6 +36,8 @@
 #include <app/util/attribute-storage.h>
 #include <platform/CHIPDeviceConfig.h>
 
+#include <zap-generated/gen_config.h>
+
 using namespace chip;
 using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::MediaPlayback;
diff --git a/src/app/clusters/on-off-server/on-off-server.h b/src/app/clusters/on-off-server/on-off-server.h
index 2bf8b091a8cc95..91fb7bbfae74af 100644
--- a/src/app/clusters/on-off-server/on-off-server.h
+++ b/src/app/clusters/on-off-server/on-off-server.h
@@ -23,6 +23,8 @@
 #include <app/util/af-types.h>
 #include <app/util/basic-types.h>
 
+#include <zap-generated/gen_config.h>
+
 using chip::app::Clusters::OnOff::OnOffFeature;
 
 /**********************************************************
diff --git a/src/app/clusters/ota-provider/ota-provider.cpp b/src/app/clusters/ota-provider/ota-provider.cpp
index c55641b7b4cbd8..d8e5e01332ecff 100644
--- a/src/app/clusters/ota-provider/ota-provider.cpp
+++ b/src/app/clusters/ota-provider/ota-provider.cpp
@@ -25,6 +25,8 @@
 #include <platform/CHIPDeviceConfig.h>
 #include <protocols/interaction_model/Constants.h>
 
+#include <zap-generated/gen_config.h>
+
 #include <lib/support/Span.h>
 
 #include "ota-provider-delegate.h"
diff --git a/src/app/clusters/target-navigator-server/target-navigator-server.cpp b/src/app/clusters/target-navigator-server/target-navigator-server.cpp
index 7d39a8c46c6d94..9a8a841af7690c 100644
--- a/src/app/clusters/target-navigator-server/target-navigator-server.cpp
+++ b/src/app/clusters/target-navigator-server/target-navigator-server.cpp
@@ -35,6 +35,8 @@
 #include <app/util/attribute-storage.h>
 #include <platform/CHIPDeviceConfig.h>
 
+#include <zap-generated/gen_config.h>
+
 using namespace chip;
 using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::TargetNavigator;
diff --git a/src/app/clusters/wake-on-lan-server/wake-on-lan-server.cpp b/src/app/clusters/wake-on-lan-server/wake-on-lan-server.cpp
index 4b3bfa6bd1b345..c0f2a80fd3c8d5 100644
--- a/src/app/clusters/wake-on-lan-server/wake-on-lan-server.cpp
+++ b/src/app/clusters/wake-on-lan-server/wake-on-lan-server.cpp
@@ -32,6 +32,8 @@
 #include <app/util/attribute-storage.h>
 #include <platform/CHIPDeviceConfig.h>
 
+#include <zap-generated/gen_config.h>
+
 using namespace chip;
 using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::WakeOnLan;
diff --git a/src/app/clusters/window-covering-server/window-covering-server.cpp b/src/app/clusters/window-covering-server/window-covering-server.cpp
index edb6f3940878ff..c4b7820f2bf699 100644
--- a/src/app/clusters/window-covering-server/window-covering-server.cpp
+++ b/src/app/clusters/window-covering-server/window-covering-server.cpp
@@ -30,6 +30,8 @@
 #include <lib/support/TypeTraits.h>
 #include <string.h>
 
+#include <zap-generated/gen_config.h>
+
 #ifdef EMBER_AF_PLUGIN_SCENES
 #include <app/clusters/scenes/scenes.h>
 #endif // EMBER_AF_PLUGIN_SCENES