diff --git a/src/SecurityManager.ts b/src/SecurityManager.ts
index f97dff786f..e8122b2dbf 100644
--- a/src/SecurityManager.ts
+++ b/src/SecurityManager.ts
@@ -7,8 +7,8 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { lazy } from "react";
-import { ICryptoCallbacks, SecretStorage } from "matrix-js-sdk/src/matrix";
-import { deriveRecoveryKeyFromPassphrase, decodeRecoveryKey } from "matrix-js-sdk/src/crypto-api";
+import { SecretStorage } from "matrix-js-sdk/src/matrix";
+import { deriveRecoveryKeyFromPassphrase, decodeRecoveryKey, CryptoCallbacks } from "matrix-js-sdk/src/crypto-api";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import Modal from "./Modal";
@@ -159,7 +159,7 @@ function cacheSecretStorageKey(
     }
 }
 
-export const crossSigningCallbacks: ICryptoCallbacks = {
+export const crossSigningCallbacks: CryptoCallbacks = {
     getSecretStorageKey,
     cacheSecretStorageKey,
 };
diff --git a/src/rageshake/submit-rageshake.ts b/src/rageshake/submit-rageshake.ts
index ec529336d1..0c00cc777a 100644
--- a/src/rageshake/submit-rageshake.ts
+++ b/src/rageshake/submit-rageshake.ts
@@ -9,7 +9,8 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { logger } from "matrix-js-sdk/src/logger";
-import { Method, MatrixClient, Crypto } from "matrix-js-sdk/src/matrix";
+import { Method, MatrixClient } from "matrix-js-sdk/src/matrix";
+import { CryptoApi } from "matrix-js-sdk/src/crypto-api";
 
 import type * as Pako from "pako";
 import { MatrixClientPeg } from "../MatrixClientPeg";
@@ -169,7 +170,7 @@ async function collectSynapseSpecific(client: MatrixClient, body: FormData): Pro
 /**
  * Collects crypto related information.
  */
-async function collectCryptoInfo(cryptoApi: Crypto.CryptoApi, body: FormData): Promise<void> {
+async function collectCryptoInfo(cryptoApi: CryptoApi, body: FormData): Promise<void> {
     body.append("crypto_version", cryptoApi.getVersion());
 
     const ownDeviceKeys = await cryptoApi.getOwnDeviceKeys();
@@ -198,7 +199,7 @@ async function collectCryptoInfo(cryptoApi: Crypto.CryptoApi, body: FormData): P
 /**
  * Collects information about secret storage and backup.
  */
-async function collectRecoveryInfo(client: MatrixClient, cryptoApi: Crypto.CryptoApi, body: FormData): Promise<void> {
+async function collectRecoveryInfo(client: MatrixClient, cryptoApi: CryptoApi, body: FormData): Promise<void> {
     const secretStorage = client.secretStorage;
     body.append("secret_storage_ready", String(await cryptoApi.isSecretStorageReady()));
     body.append("secret_storage_key_in_account", String(await secretStorage.hasKey()));
diff --git a/src/utils/device/dehydration.ts b/src/utils/device/dehydration.ts
index f18c4c5c7c..b27b3c54c2 100644
--- a/src/utils/device/dehydration.ts
+++ b/src/utils/device/dehydration.ts
@@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { logger } from "matrix-js-sdk/src/logger";
-import { Crypto } from "matrix-js-sdk/src/matrix";
+import { CryptoApi } from "matrix-js-sdk/src/crypto-api";
 
 import { MatrixClientPeg } from "../../MatrixClientPeg";
 
@@ -21,7 +21,7 @@ import { MatrixClientPeg } from "../../MatrixClientPeg";
  *
  * Dehydration can currently only be enabled by setting a flag in the .well-known file.
  */
-async function deviceDehydrationEnabled(crypto: Crypto.CryptoApi | undefined): Promise<boolean> {
+async function deviceDehydrationEnabled(crypto: CryptoApi | undefined): Promise<boolean> {
     if (!crypto) {
         return false;
     }
diff --git a/test/unit-tests/components/views/dialogs/security/ExportE2eKeysDialog-test.tsx b/test/unit-tests/components/views/dialogs/security/ExportE2eKeysDialog-test.tsx
index 6e8837c50d..df95482850 100644
--- a/test/unit-tests/components/views/dialogs/security/ExportE2eKeysDialog-test.tsx
+++ b/test/unit-tests/components/views/dialogs/security/ExportE2eKeysDialog-test.tsx
@@ -9,7 +9,8 @@ Please see LICENSE files in the repository root for full details.
 import React from "react";
 import { screen, fireEvent, render, waitFor, act } from "jest-matrix-react";
 import userEvent from "@testing-library/user-event";
-import { Crypto, IMegolmSessionData } from "matrix-js-sdk/src/matrix";
+import { IMegolmSessionData } from "matrix-js-sdk/src/matrix";
+import { CryptoApi } from "matrix-js-sdk/src/crypto-api";
 
 import * as MegolmExportEncryption from "../../../../../../src/utils/MegolmExportEncryption";
 import ExportE2eKeysDialog from "../../../../../../src/async-components/views/dialogs/security/ExportE2eKeysDialog";
@@ -62,7 +63,7 @@ describe("ExportE2eKeysDialog", () => {
         cli.getCrypto = () => {
             return {
                 exportRoomKeysAsJson,
-            } as unknown as Crypto.CryptoApi;
+            } as unknown as CryptoApi;
         };
 
         // Mock the result of encrypting the sessions. If we don't do this, the
diff --git a/test/unit-tests/components/views/dialogs/security/ImportE2eKeysDialog-test.tsx b/test/unit-tests/components/views/dialogs/security/ImportE2eKeysDialog-test.tsx
index 1b6200dcee..57f374c252 100644
--- a/test/unit-tests/components/views/dialogs/security/ImportE2eKeysDialog-test.tsx
+++ b/test/unit-tests/components/views/dialogs/security/ImportE2eKeysDialog-test.tsx
@@ -9,7 +9,7 @@ Please see LICENSE files in the repository root for full details.
 import React from "react";
 import { fireEvent, render, waitFor } from "jest-matrix-react";
 import userEvent from "@testing-library/user-event";
-import { Crypto } from "matrix-js-sdk/src/matrix";
+import { CryptoApi } from "matrix-js-sdk/src/crypto-api";
 
 import ImportE2eKeysDialog from "../../../../../../src/async-components/views/dialogs/security/ImportE2eKeysDialog";
 import * as MegolmExportEncryption from "../../../../../../src/utils/MegolmExportEncryption";
@@ -67,7 +67,7 @@ describe("ImportE2eKeysDialog", () => {
         cli.getCrypto = () => {
             return {
                 importRoomKeysAsJson,
-            } as unknown as Crypto.CryptoApi;
+            } as unknown as CryptoApi;
         };
 
         // Mock the result of decrypting the sessions, to avoid needing to