diff --git a/shared/manifest.py b/shared/manifest.py
index 7a2e4314..4f653059 100644
--- a/shared/manifest.py
+++ b/shared/manifest.py
@@ -1,6 +1,6 @@
 # Freeze everything in this list.
 # - not optimized because we need asserts to work
-# - for specific boards, see manifest_mk[34].py and manifest_q1.py
+# - for specific boards, see manifest_{mk4,q1}.py and manifest_q1.py
 freeze_as_mpy('', [
 	'actions.py',
 	'address_explorer.py',
@@ -58,6 +58,12 @@ freeze_as_mpy('', [
 	'ownership.py',
 	'ccc.py',
 	'web2fa.py',
+	'psram.py',
+	'mk4.py',
+	'vdisk.py',
+	'nfc.py',
+	'ndef.py',
+	'trick_pins.py',
 ], opt=0)
 
 # Optimize data-like files, since no need to debug them.
diff --git a/shared/manifest_mk4.py b/shared/manifest_mk4.py
index 9b062d46..d69841a2 100644
--- a/shared/manifest_mk4.py
+++ b/shared/manifest_mk4.py
@@ -2,12 +2,6 @@
 freeze_as_mpy('', [
 	'ssd1306.py',
 	'mempad.py',
-	'psram.py',
-	'mk4.py',
-	'vdisk.py',
-	'nfc.py',
-	'ndef.py',
-	'trick_pins.py',
 	'ux_mk4.py',
 	'hsm.py',
 	'hsm_ux.py',
diff --git a/shared/manifest_q1.py b/shared/manifest_q1.py
index 5eb1ce01..d71e99e9 100644
--- a/shared/manifest_q1.py
+++ b/shared/manifest_q1.py
@@ -1,7 +1,5 @@
 # Q1 only files; would not be needed on Mk4
 freeze_as_mpy('', [
-	'psram.py',
-	'mk4.py',
 	'q1.py',
 	'keyboard.py',
 	'scanner.py',
@@ -10,10 +8,6 @@ freeze_as_mpy('', [
 	'lcd_display.py',
 	'st7788.py',
 	'gpu.py',
-	'vdisk.py',
-	'nfc.py',
-	'ndef.py',
-	'trick_pins.py',
 	'ux_q1.py',
 	'battery.py',
 	'notes.py',