diff --git a/src/matrix/room/timeline/EventKey.js b/src/matrix/room/timeline/EventKey.js
index b4dce376..af01a7e5 100644
--- a/src/matrix/room/timeline/EventKey.js
+++ b/src/matrix/room/timeline/EventKey.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {KeyLimits} from "../../storage/common.js";
+import {KeyLimits} from "../../storage/common";
 
 // key for events in the timelineEvents store
 export class EventKey {
diff --git a/src/matrix/room/timeline/entries/FragmentBoundaryEntry.js b/src/matrix/room/timeline/entries/FragmentBoundaryEntry.js
index 3d4bd67b..0697fbdd 100644
--- a/src/matrix/room/timeline/entries/FragmentBoundaryEntry.js
+++ b/src/matrix/room/timeline/entries/FragmentBoundaryEntry.js
@@ -17,7 +17,7 @@ limitations under the License.
 import {BaseEntry} from "./BaseEntry";
 import {Direction} from "../Direction.js";
 import {isValidFragmentId} from "../common.js";
-import {KeyLimits} from "../../../storage/common.js";
+import {KeyLimits} from "../../../storage/common";
 
 export class FragmentBoundaryEntry extends BaseEntry {
     constructor(fragment, isFragmentStart, fragmentIdComparer) {
diff --git a/src/matrix/storage/common.js b/src/matrix/storage/common.ts
similarity index 100%
rename from src/matrix/storage/common.js
rename to src/matrix/storage/common.ts
diff --git a/src/matrix/storage/idb/Storage.js b/src/matrix/storage/idb/Storage.js
index 1f96e347..0a357dda 100644
--- a/src/matrix/storage/idb/Storage.js
+++ b/src/matrix/storage/idb/Storage.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import {Transaction} from "./Transaction.js";
-import { STORE_NAMES, StorageError } from "../common.js";
+import { STORE_NAMES, StorageError } from "../common";
 import { reqAsPromise } from "./utils.js";
 
 const WEBKITEARLYCLOSETXNBUG_BOGUS_KEY = "782rh281re38-boguskey";
diff --git a/src/matrix/storage/idb/Transaction.js b/src/matrix/storage/idb/Transaction.js
index bdcc45e3..ae0f75be 100644
--- a/src/matrix/storage/idb/Transaction.js
+++ b/src/matrix/storage/idb/Transaction.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import {txnAsPromise} from "./utils.js";
-import {StorageError} from "../common.js";
+import {StorageError} from "../common";
 import {Store} from "./Store.js";
 import {SessionStore} from "./stores/SessionStore.js";
 import {RoomSummaryStore} from "./stores/RoomSummaryStore.js";
diff --git a/src/matrix/storage/idb/error.js b/src/matrix/storage/idb/error.js
index 2ba6289f..0b9de95c 100644
--- a/src/matrix/storage/idb/error.js
+++ b/src/matrix/storage/idb/error.js
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { StorageError } from "../common.js";
+import { StorageError } from "../common";
 
 export class IDBError extends StorageError {
     constructor(message, source, cause) {
diff --git a/src/matrix/storage/idb/export.js b/src/matrix/storage/idb/export.js
index 8a7724a3..34dd8706 100644
--- a/src/matrix/storage/idb/export.js
+++ b/src/matrix/storage/idb/export.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import { iterateCursor, txnAsPromise } from "./utils.js";
-import { STORE_NAMES } from "../common.js";
+import { STORE_NAMES } from "../common";
 
 export async function exportSession(db) {
     const NOT_DONE = {done: false};
diff --git a/src/matrix/storage/idb/stores/PendingEventStore.js b/src/matrix/storage/idb/stores/PendingEventStore.js
index 455cad2c..385f3c9a 100644
--- a/src/matrix/storage/idb/stores/PendingEventStore.js
+++ b/src/matrix/storage/idb/stores/PendingEventStore.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import { encodeUint32, decodeUint32 } from "../utils.js";
-import {KeyLimits} from "../../common.js";
+import {KeyLimits} from "../../common";
 
 function encodeKey(roomId, queueIndex) {
     return `${roomId}|${encodeUint32(queueIndex)}`;
diff --git a/src/matrix/storage/idb/stores/TimelineEventStore.js b/src/matrix/storage/idb/stores/TimelineEventStore.js
index b4b204a8..664958e6 100644
--- a/src/matrix/storage/idb/stores/TimelineEventStore.js
+++ b/src/matrix/storage/idb/stores/TimelineEventStore.js
@@ -15,9 +15,9 @@ limitations under the License.
 */
 
 import {EventKey} from "../../../room/timeline/EventKey.js";
-import { StorageError } from "../../common.js";
+import { StorageError } from "../../common";
 import { encodeUint32 } from "../utils.js";
-import {KeyLimits} from "../../common.js";
+import {KeyLimits} from "../../common";
 
 function encodeKey(roomId, fragmentId, eventIndex) {
     return `${roomId}|${encodeUint32(fragmentId)}|${encodeUint32(eventIndex)}`;
diff --git a/src/matrix/storage/idb/stores/TimelineFragmentStore.js b/src/matrix/storage/idb/stores/TimelineFragmentStore.js
index 96ff441e..208b7300 100644
--- a/src/matrix/storage/idb/stores/TimelineFragmentStore.js
+++ b/src/matrix/storage/idb/stores/TimelineFragmentStore.js
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { StorageError } from "../../common.js";
-import {KeyLimits} from "../../common.js";
+import { StorageError } from "../../common";
+import {KeyLimits} from "../../common";
 import { encodeUint32 } from "../utils.js";
 
 function encodeKey(roomId, fragmentId) {
diff --git a/src/matrix/storage/idb/utils.js b/src/matrix/storage/idb/utils.js
index fbb82fc5..f90324cd 100644
--- a/src/matrix/storage/idb/utils.js
+++ b/src/matrix/storage/idb/utils.js
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 import { IDBRequestError } from "./error.js";
-import { StorageError } from "../common.js";
+import { StorageError } from "../common";
 
 let needsSyncPromise = false;
 
diff --git a/src/matrix/storage/memory/Storage.js b/src/matrix/storage/memory/Storage.js
index c1c0fe3c..a76c16f3 100644
--- a/src/matrix/storage/memory/Storage.js
+++ b/src/matrix/storage/memory/Storage.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import {Transaction} from "./Transaction.js";
-import { STORE_MAP, STORE_NAMES } from "../common.js";
+import { STORE_MAP, STORE_NAMES } from "../common";
 
 export class Storage {
 	constructor(initialStoreValues = {}) {