diff --git a/swift-secure-enclave-tool-v2.swift b/swift-secure-enclave-tool-v2.swift
index d42ad0b..3963025 100644
--- a/swift-secure-enclave-tool-v2.swift
+++ b/swift-secure-enclave-tool-v2.swift
@@ -718,19 +718,6 @@ if (command == "generate_p256_ecdh_keypair") {
     exitOkWithJson(generateSecureEnclaveP256KeyPair(sign: false, request: request))
 }
 
-#if DISABLE_QPC
-#else
-if (command == "generate_mlkem768_ecdh_keypair") {
-    let request = parseGenerateSecureEnclaveKeyPairRequest()!;
-    exitOkWithJson(generateSecureEnclaveMlKemKeyPair(keyLen: 768, request: request))
-}
-
-if (command == "generate_mlkem1024_ecdh_keypair") {
-    let request = parseGenerateSecureEnclaveKeyPairRequest()!;
-    exitOkWithJson(generateSecureEnclaveMlKemKeyPair(keyLen: 1024, request: request))
-}
-#endif
-
 if (command == "recover_p256_ecsign_public_key") {
     let request = parseRecoverSecureEnclavePublicKeyRequest()!
     let response =  recoverSecureEnclaveP256PublicKey(request: request, sign: true)
@@ -743,21 +730,6 @@ if (command == "recover_p256_ecdh_public_key") {
     exitOkWithJson(response)
 }
 
-#if DISABLE_QPC
-#else
-if (command == "recover_mlkem768_public_key") {
-    let request = parseRecoverSecureEnclavePublicKeyRequest()!
-    let response =  recoverSecureEnclaveMlKemPublicKey(request: request, keyLen: 768)
-    exitOkWithJson(response)
-}
-
-if (command == "recover_mlkem1024_public_key") {
-    let request = parseRecoverSecureEnclavePublicKeyRequest()!
-    let response =  recoverSecureEnclaveMlKemPublicKey(request: request, keyLen: 1024)
-    exitOkWithJson(response)
-}
-#endif
-
 if (command == "compute_p256_ecsign") {
     let request = parseComputeP256EcSignRequest()!;
     let response =  computeSecureEnclaveP256Ecsign(request: request)
@@ -772,6 +744,28 @@ if (command == "compute_p256_ecdh") {
 
 #if DISABLE_QPC
 #else
+if (command == "generate_mlkem768_ecdh_keypair") {
+    let request = parseGenerateSecureEnclaveKeyPairRequest()!;
+    exitOkWithJson(generateSecureEnclaveMlKemKeyPair(keyLen: 768, request: request))
+}
+
+if (command == "generate_mlkem1024_ecdh_keypair") {
+    let request = parseGenerateSecureEnclaveKeyPairRequest()!;
+    exitOkWithJson(generateSecureEnclaveMlKemKeyPair(keyLen: 1024, request: request))
+}
+
+if (command == "recover_mlkem768_public_key") {
+    let request = parseRecoverSecureEnclavePublicKeyRequest()!
+    let response =  recoverSecureEnclaveMlKemPublicKey(request: request, keyLen: 768)
+    exitOkWithJson(response)
+}
+
+if (command == "recover_mlkem1024_public_key") {
+    let request = parseRecoverSecureEnclavePublicKeyRequest()!
+    let response =  recoverSecureEnclaveMlKemPublicKey(request: request, keyLen: 1024)
+    exitOkWithJson(response)
+}
+
 if (command == "compute_mlkem768_ecdh") {
     let request = parseComputeEcdhRequest()!;
     let response =  computeSecureEnclaveMlKemEcdh(request: request, keyLen: 768)