diff --git a/framework-crates/objc2-metal-kit/Cargo.modified.toml b/framework-crates/objc2-metal-kit/Cargo.modified.toml
deleted file mode 100644
index f3951f6b7..000000000
--- a/framework-crates/objc2-metal-kit/Cargo.modified.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[dependencies]
-# HACK: Work around header-translator not setting required features here
-objc2-quartz-core = { path = "../objc2-quartz-core", version = "0.2.2", default-features = false, optional = true, features = ["objc2-metal"] }
diff --git a/framework-crates/objc2-metal-kit/Cargo.toml b/framework-crates/objc2-metal-kit/Cargo.toml
index fdd31b045..71ad4b164 100644
--- a/framework-crates/objc2-metal-kit/Cargo.toml
+++ b/framework-crates/objc2-metal-kit/Cargo.toml
@@ -37,7 +37,11 @@ objc2-model-io = { path = "../objc2-model-io", version = "0.2.2", default-featur
     "MDLTexture",
     "MDLVertexDescriptor",
 ] }
-objc2-quartz-core = { path = "../objc2-quartz-core", version = "0.2.2", default-features = false, optional = true, features = ["objc2-metal"] }
+objc2-quartz-core = { path = "../objc2-quartz-core", version = "0.2.2", default-features = false, optional = true, features = [
+    "CALayer",
+    "CAMetalLayer",
+    "objc2-metal",
+] }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 objc2-app-kit = { path = "../objc2-app-kit", version = "0.2.2", default-features = false, optional = true, features = [
diff --git a/framework-crates/objc2-metal-performance-shaders/Cargo.modified.toml b/framework-crates/objc2-metal-performance-shaders/Cargo.modified.toml
deleted file mode 100644
index 50bdc1b22..000000000
--- a/framework-crates/objc2-metal-performance-shaders/Cargo.modified.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-# Workaround for MPSImageBatch, see translation-config.toml
-[features]
-MPSImage = ["objc2-foundation/NSArray"]
diff --git a/framework-crates/objc2-metal-performance-shaders/Cargo.toml b/framework-crates/objc2-metal-performance-shaders/Cargo.toml
index cd5f3dcfb..3ffb983c0 100644
--- a/framework-crates/objc2-metal-performance-shaders/Cargo.toml
+++ b/framework-crates/objc2-metal-performance-shaders/Cargo.toml
@@ -50,7 +50,6 @@ targets = [
 default = ["std"]
 std = ["alloc"]
 alloc = []
-MPSImage = ["objc2-foundation/NSArray"]
 block2 = ["dep:block2"]
 objc2-core-foundation = ["dep:objc2-core-foundation"]
 objc2-core-graphics = ["dep:objc2-core-graphics"]
@@ -213,6 +212,20 @@ MPSCoreTypes = [
     "objc2-metal/MTLTypes",
 ]
 MPSFunctionConstantIndices = []
+MPSImage = [
+    "objc2-foundation/NSArray",
+    "objc2-foundation/NSObject",
+    "objc2-foundation/NSRange",
+    "objc2-foundation/NSString",
+    "objc2-foundation/NSZone",
+    "objc2-metal/MTLAllocation",
+    "objc2-metal/MTLCommandBuffer",
+    "objc2-metal/MTLDevice",
+    "objc2-metal/MTLPixelFormat",
+    "objc2-metal/MTLResource",
+    "objc2-metal/MTLTexture",
+    "objc2-metal/MTLTypes",
+]
 MPSImageConversion = [
     "objc2-foundation/NSCoder",
     "objc2-foundation/NSObject",