diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index e025564..e5afb69 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -96,7 +96,6 @@
                      --known-failure app/CommandHandler.h \
                      --known-failure app/CommandHandlerInterface.h \
                      --known-failure app/CommandSenderLegacyCallback.h \
-                     --known-failure app/CompatEnumNames.h \
                      --known-failure app/data-model/ListLargeSystemExtensions.h \
                      --known-failure app/EventHeader.h \
                      --known-failure app/EventLoggingTypes.h \
diff --git a/src/app/common/BUILD.gn b/src/app/common/BUILD.gn
index 1af268a..de7eef3 100644
--- a/src/app/common/BUILD.gn
+++ b/src/app/common/BUILD.gn
@@ -18,6 +18,19 @@
   include_dirs = [ "${chip_root}/zzz_generated/app-common" ]
 }
 
+source_set("ids") {
+  sources = [
+    "${chip_root}/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h",
+    "${chip_root}/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h",
+    "${chip_root}/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h",
+    "${chip_root}/zzz_generated/app-common/app-common/zap-generated/ids/Events.h",
+  ]
+
+  public_deps = [ "${chip_root}/src/app/util:types" ]
+
+  public_configs = [ ":includes" ]
+}
+
 static_library("cluster-objects") {
   output_name = "libClusterObjects"
 
@@ -27,6 +40,7 @@
   ]
 
   public_deps = [
+    ":ids",
     "${chip_root}/src/app:paths",
     "${chip_root}/src/app/data-model",
     "${chip_root}/src/app/util:types",
@@ -42,6 +56,7 @@
   sources = [
     "${chip_root}/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h",
     "${chip_root}/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h",
+    "CompatEnumNames.h",
   ]
 
   public_configs = [ ":includes" ]
diff --git a/src/app/CompatEnumNames.h b/src/app/common/CompatEnumNames.h
similarity index 100%
rename from src/app/CompatEnumNames.h
rename to src/app/common/CompatEnumNames.h
diff --git a/src/app/zap-templates/templates/app/cluster-enums.zapt b/src/app/zap-templates/templates/app/cluster-enums.zapt
index 612b3dd..17ce795 100644
--- a/src/app/zap-templates/templates/app/cluster-enums.zapt
+++ b/src/app/zap-templates/templates/app/cluster-enums.zapt
@@ -70,4 +70,4 @@
 } // namespace chip
 
 // Included at the end, so all our definitions above are available.
-#include <app/CompatEnumNames.h>
+#include <app/common/CompatEnumNames.h>
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
index 1a1afc1..42a54b9 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
@@ -4893,4 +4893,4 @@
 } // namespace chip
 
 // Included at the end, so all our definitions above are available.
-#include <app/CompatEnumNames.h>
+#include <app/common/CompatEnumNames.h>