diff --git a/packages/interface-ipfs-core/package.json b/packages/interface-ipfs-core/package.json
index b72247e152..36aaf167f0 100644
--- a/packages/interface-ipfs-core/package.json
+++ b/packages/interface-ipfs-core/package.json
@@ -13,10 +13,11 @@
     "ipfs-utils/src/files/glob-source": false
   },
   "scripts": {
+    "clean": "rimraf ./dist",
     "build": "aegir build",
     "lint": "aegir lint",
     "test": "echo 'No tests here'",
-    "dep-check": "aegir dep-check -i abort-controller -i ipfs-core-types"
+    "dep-check": "aegir dep-check -i abort-controller -i ipfs-core-types -i rimraf"
   },
   "files": [
     "src/",
@@ -80,6 +81,9 @@
     "sinon": "^11.1.1",
     "uint8arrays": "^3.0.0"
   },
+  "devDependencies": {
+    "rimraf": "^3.0.2"
+  },
   "contributors": [
     "Alan Shaw <alan.shaw@protocol.ai>",
     "Alan Shaw <alan@tableflip.io>",
diff --git a/packages/ipfs-cli/src/types.d.ts b/packages/ipfs-cli/src/types.ts
similarity index 85%
rename from packages/ipfs-cli/src/types.d.ts
rename to packages/ipfs-cli/src/types.ts
index 5552d1121c..cbf995e04c 100644
--- a/packages/ipfs-cli/src/types.d.ts
+++ b/packages/ipfs-cli/src/types.ts
@@ -1,4 +1,5 @@
-import { IPFS } from 'ipfs-core-types'
+import type { IPFS } from 'ipfs-core-types'
+import type { Multiaddr } from 'multiaddr'
 
 declare module '@hapi/hapi' {
   interface ServerInfo {
diff --git a/packages/ipfs-core-types/package.json b/packages/ipfs-core-types/package.json
index a93d88e456..89428a7a16 100644
--- a/packages/ipfs-core-types/package.json
+++ b/packages/ipfs-core-types/package.json
@@ -3,16 +3,30 @@
   "version": "0.7.0",
   "description": "IPFS interface definitions used by implementations for API compatibility.",
   "leadMaintainer": "Alex Potsides <alex@achingbrain.net>",
-  "types": "src/index.d.ts",
+  "types": "dist/src/index.d.ts",
   "homepage": "https://github.com/ipfs/js-ipfs/tree/master/packages/ipfs-core-types#readme",
   "bugs": "https://github.com/ipfs/js-ipfs/issues",
   "scripts": {
+    "clean": "rimraf ./dist",
     "lint": "aegir ts -p check && aegir lint",
     "test": "aegir ts -p check"
   },
   "files": [
-    "src"
+    "src",
+    "dist",
+    "!dist/*.tsbuildinfo"
   ],
+  "typesVersions": {
+    "*": {
+      "src/*": [
+        "dist/src/*",
+        "dist/src/*/index"
+      ],
+      "src/": [
+        "dist/src/index"
+      ]
+    }
+  },
   "eslintConfig": {
     "extends": "ipfs"
   },
@@ -33,7 +47,8 @@
     "multiformats": "^9.4.1"
   },
   "devDependencies": {
-    "aegir": "^35.0.2"
+    "aegir": "^35.0.2",
+    "rimraf": "^3.0.2"
   },
   "contributors": [
     "Irakli Gozalishvili <dev@gozala.io>"
diff --git a/packages/ipfs-core-types/src/bitswap/index.d.ts b/packages/ipfs-core-types/src/bitswap/index.ts
similarity index 100%
rename from packages/ipfs-core-types/src/bitswap/index.d.ts
rename to packages/ipfs-core-types/src/bitswap/index.ts
diff --git a/packages/ipfs-core-types/src/block/index.d.ts b/packages/ipfs-core-types/src/block/index.ts
similarity index 96%
rename from packages/ipfs-core-types/src/block/index.d.ts
rename to packages/ipfs-core-types/src/block/index.ts
index 46a3131291..47ffec896b 100644
--- a/packages/ipfs-core-types/src/block/index.d.ts
+++ b/packages/ipfs-core-types/src/block/index.ts
@@ -1,5 +1,5 @@
-import { AbortOptions, PreloadOptions } from '../utils'
-import { CID, CIDVersion } from 'multiformats/cid'
+import type { AbortOptions, PreloadOptions } from '../utils'
+import type { CID, CIDVersion } from 'multiformats/cid'
 
 export interface API<OptionExtension = {}> {
   /**
diff --git a/packages/ipfs-core-types/src/bootstrap/index.d.ts b/packages/ipfs-core-types/src/bootstrap/index.ts
similarity index 100%
rename from packages/ipfs-core-types/src/bootstrap/index.d.ts
rename to packages/ipfs-core-types/src/bootstrap/index.ts
diff --git a/packages/ipfs-core-types/src/config/index.d.ts b/packages/ipfs-core-types/src/config/index.ts
similarity index 98%
rename from packages/ipfs-core-types/src/config/index.d.ts
rename to packages/ipfs-core-types/src/config/index.ts
index 776f115a2b..879799c147 100644
--- a/packages/ipfs-core-types/src/config/index.d.ts
+++ b/packages/ipfs-core-types/src/config/index.ts
@@ -1,5 +1,5 @@
 import type { AbortOptions } from '../utils'
-import { API as ProfilesAPI } from './profiles'
+import type { API as ProfilesAPI } from './profiles'
 
 export interface API<OptionExtension = {}> {
   /**
diff --git a/packages/ipfs-core-types/src/config/profiles/index.d.ts b/packages/ipfs-core-types/src/config/profiles/index.ts
similarity index 100%
rename from packages/ipfs-core-types/src/config/profiles/index.d.ts
rename to packages/ipfs-core-types/src/config/profiles/index.ts
diff --git a/packages/ipfs-core-types/src/dag/index.d.ts b/packages/ipfs-core-types/src/dag/index.ts
similarity index 97%
rename from packages/ipfs-core-types/src/dag/index.d.ts
rename to packages/ipfs-core-types/src/dag/index.ts
index 523b8cc6c0..61a53b23c3 100644
--- a/packages/ipfs-core-types/src/dag/index.d.ts
+++ b/packages/ipfs-core-types/src/dag/index.ts
@@ -1,5 +1,5 @@
-import { AbortOptions, PreloadOptions, IPFSPath } from '../utils'
-import { CID, CIDVersion } from 'multiformats/cid'
+import type { AbortOptions, PreloadOptions, IPFSPath } from '../utils'
+import type { CID, CIDVersion } from 'multiformats/cid'
 
 export interface API<OptionExtension = {}> {
   /**
diff --git a/packages/ipfs-core-types/src/dht/index.d.ts b/packages/ipfs-core-types/src/dht/index.ts
similarity index 100%
rename from packages/ipfs-core-types/src/dht/index.d.ts
rename to packages/ipfs-core-types/src/dht/index.ts
diff --git a/packages/ipfs-core-types/src/diag/index.d.ts b/packages/ipfs-core-types/src/diag/index.ts
similarity index 100%
rename from packages/ipfs-core-types/src/diag/index.d.ts
rename to packages/ipfs-core-types/src/diag/index.ts
diff --git a/packages/ipfs-core-types/src/files/index.d.ts b/packages/ipfs-core-types/src/files/index.ts
similarity index 98%
rename from packages/ipfs-core-types/src/files/index.d.ts
rename to packages/ipfs-core-types/src/files/index.ts
index 1a9ce00efb..c30f59334f 100644
--- a/packages/ipfs-core-types/src/files/index.d.ts
+++ b/packages/ipfs-core-types/src/files/index.ts
@@ -1,6 +1,6 @@
-import { AbortOptions, IPFSPath } from '../utils'
-import { CID, CIDVersion } from 'multiformats/cid'
-import { Mtime, MtimeLike } from 'ipfs-unixfs'
+import type { AbortOptions, IPFSPath } from '../utils'
+import type { CID, CIDVersion } from 'multiformats/cid'
+import type { Mtime, MtimeLike } from 'ipfs-unixfs'
 import type { AddProgressFn } from '../root'
 
 export interface API<OptionExtension = {}> {
diff --git a/packages/ipfs-core-types/src/index.d.ts b/packages/ipfs-core-types/src/index.ts
similarity index 61%
rename from packages/ipfs-core-types/src/index.d.ts
rename to packages/ipfs-core-types/src/index.ts
index cfe625cd57..da304925fe 100644
--- a/packages/ipfs-core-types/src/index.d.ts
+++ b/packages/ipfs-core-types/src/index.ts
@@ -1,23 +1,23 @@
-import { API as RootAPI } from './root'
-import { API as BitswapAPI } from './bitswap'
-import { API as BlockAPI } from './block'
-import { API as BootstrapAPI } from './bootstrap'
-import { API as ConfigAPI } from './config'
-import { API as DAGAPI } from './dag'
-import { API as DHTAPI } from './dht'
-import { API as DiagAPI } from './diag'
-import { API as FilesAPI } from './files'
-import { API as KeyAPI } from './key'
-import { API as LogAPI } from './log'
-import { API as NameAPI } from './name'
-import { API as ObjectAPI } from './object'
-import { API as PinAPI } from './pin'
-import { API as PubsubAPI } from './pubsub'
-import { Refs, Local } from './refs'
-import { API as RepoAPI } from './repo'
-import { API as StatsAPI } from './stats'
-import { API as SwarmAPI } from './swarm'
-import { AbortOptions, Await, AwaitIterable } from './utils'
+import type { API as RootAPI } from './root'
+import type { API as BitswapAPI } from './bitswap'
+import type { API as BlockAPI } from './block'
+import type { API as BootstrapAPI } from './bootstrap'
+import type { API as ConfigAPI } from './config'
+import type { API as DAGAPI } from './dag'
+import type { API as DHTAPI } from './dht'
+import type { API as DiagAPI } from './diag'
+import type { API as FilesAPI } from './files'
+import type { API as KeyAPI } from './key'
+import type { API as LogAPI } from './log'
+import type { API as NameAPI } from './name'
+import type { API as ObjectAPI } from './object'
+import type { API as PinAPI } from './pin'
+import type { API as PubsubAPI } from './pubsub'
+import type { Refs, Local } from './refs'
+import type { API as RepoAPI } from './repo'
+import type { API as StatsAPI } from './stats'
+import type { API as SwarmAPI } from './swarm'
+import type { AbortOptions, Await, AwaitIterable } from './utils'
 import type { BlockCodec } from 'multiformats/codecs/interface'
 import type { MultibaseCodec } from 'multiformats/bases/interface'
 import type { MultihashHasher } from 'multiformats/hashes/interface'
diff --git a/packages/ipfs-core-types/src/key/index.d.ts b/packages/ipfs-core-types/src/key/index.ts
similarity index 100%
rename from packages/ipfs-core-types/src/key/index.d.ts
rename to packages/ipfs-core-types/src/key/index.ts
diff --git a/packages/ipfs-core-types/src/log/index.d.ts b/packages/ipfs-core-types/src/log/index.ts
similarity index 100%
rename from packages/ipfs-core-types/src/log/index.d.ts
rename to packages/ipfs-core-types/src/log/index.ts
diff --git a/packages/ipfs-core-types/src/name/index.d.ts b/packages/ipfs-core-types/src/name/index.ts
similarity index 98%
rename from packages/ipfs-core-types/src/name/index.d.ts
rename to packages/ipfs-core-types/src/name/index.ts
index a4f8b453ed..495c35f325 100644
--- a/packages/ipfs-core-types/src/name/index.d.ts
+++ b/packages/ipfs-core-types/src/name/index.ts
@@ -1,4 +1,4 @@
-import { CID } from 'multiformats/cid'
+import type { CID } from 'multiformats/cid'
 import type { AbortOptions } from '../utils'
 import type { API as PubsubAPI } from './pubsub'
 
diff --git a/packages/ipfs-core-types/src/name/pubsub/index.d.ts b/packages/ipfs-core-types/src/name/pubsub/index.ts
similarity index 100%
rename from packages/ipfs-core-types/src/name/pubsub/index.d.ts
rename to packages/ipfs-core-types/src/name/pubsub/index.ts
diff --git a/packages/ipfs-core-types/src/object/index.d.ts b/packages/ipfs-core-types/src/object/index.ts
similarity index 100%
rename from packages/ipfs-core-types/src/object/index.d.ts
rename to packages/ipfs-core-types/src/object/index.ts
diff --git a/packages/ipfs-core-types/src/object/patch/index.d.ts b/packages/ipfs-core-types/src/object/patch/index.ts
similarity index 100%
rename from packages/ipfs-core-types/src/object/patch/index.d.ts
rename to packages/ipfs-core-types/src/object/patch/index.ts
diff --git a/packages/ipfs-core-types/src/pin/index.d.ts b/packages/ipfs-core-types/src/pin/index.ts
similarity index 100%
rename from packages/ipfs-core-types/src/pin/index.d.ts
rename to packages/ipfs-core-types/src/pin/index.ts
diff --git a/packages/ipfs-core-types/src/pin/remote/index.d.ts b/packages/ipfs-core-types/src/pin/remote/index.ts
similarity index 92%
rename from packages/ipfs-core-types/src/pin/remote/index.d.ts
rename to packages/ipfs-core-types/src/pin/remote/index.ts
index 92c9d638cd..e5493e845d 100644
--- a/packages/ipfs-core-types/src/pin/remote/index.d.ts
+++ b/packages/ipfs-core-types/src/pin/remote/index.ts
@@ -1,7 +1,7 @@
-import { CID } from 'multiformats/cid'
-import { Multiaddr } from 'multiaddr'
-import { API as Service } from './service'
-import { AbortOptions } from '../../utils'
+import type { CID } from 'multiformats/cid'
+import type { Multiaddr } from 'multiaddr'
+import type { API as Service } from './service'
+import type { AbortOptions } from '../../utils'
 
 export interface API<OptionExtension = {}> {
   /**
diff --git a/packages/ipfs-core-types/src/pin/remote/service/index.d.ts b/packages/ipfs-core-types/src/pin/remote/service/index.ts
similarity index 96%
rename from packages/ipfs-core-types/src/pin/remote/service/index.d.ts
rename to packages/ipfs-core-types/src/pin/remote/service/index.ts
index 67de01322f..c510e35dfa 100644
--- a/packages/ipfs-core-types/src/pin/remote/service/index.d.ts
+++ b/packages/ipfs-core-types/src/pin/remote/service/index.ts
@@ -1,4 +1,4 @@
-import { AbortOptions } from '../../../utils'
+import type { AbortOptions } from '../../../utils'
 
 export interface API<OptionExtension = {}> {
   /**
diff --git a/packages/ipfs-core-types/src/pubsub/index.d.ts b/packages/ipfs-core-types/src/pubsub/index.ts
similarity index 100%
rename from packages/ipfs-core-types/src/pubsub/index.d.ts
rename to packages/ipfs-core-types/src/pubsub/index.ts
diff --git a/packages/ipfs-core-types/src/refs/index.d.ts b/packages/ipfs-core-types/src/refs/index.ts
similarity index 100%
rename from packages/ipfs-core-types/src/refs/index.d.ts
rename to packages/ipfs-core-types/src/refs/index.ts
diff --git a/packages/ipfs-core-types/src/repo/index.d.ts b/packages/ipfs-core-types/src/repo/index.ts
similarity index 95%
rename from packages/ipfs-core-types/src/repo/index.d.ts
rename to packages/ipfs-core-types/src/repo/index.ts
index 6a803a0418..d412dce448 100644
--- a/packages/ipfs-core-types/src/repo/index.d.ts
+++ b/packages/ipfs-core-types/src/repo/index.ts
@@ -1,5 +1,5 @@
 import type { AbortOptions } from '../utils'
-import { CID } from 'multiformats/cid'
+import type { CID } from 'multiformats/cid'
 
 export interface API<OptionExtension = {}> {
   /**
diff --git a/packages/ipfs-core-types/src/root.d.ts b/packages/ipfs-core-types/src/root.ts
similarity index 97%
rename from packages/ipfs-core-types/src/root.d.ts
rename to packages/ipfs-core-types/src/root.ts
index a827f548ab..c7399729fc 100644
--- a/packages/ipfs-core-types/src/root.d.ts
+++ b/packages/ipfs-core-types/src/root.ts
@@ -1,7 +1,7 @@
-import { AbortOptions, PreloadOptions, IPFSPath, ImportCandidateStream, ImportCandidate } from './utils'
-import { CID, CIDVersion } from 'multiformats/cid'
-import { Mtime } from 'ipfs-unixfs'
-import { Multiaddr } from 'multiaddr'
+import type { AbortOptions, PreloadOptions, IPFSPath, ImportCandidateStream, ImportCandidate } from './utils'
+import type { CID, CIDVersion } from 'multiformats/cid'
+import type { Mtime } from 'ipfs-unixfs'
+import type { Multiaddr } from 'multiaddr'
 
 export interface API<OptionExtension = {}> {
   /**
diff --git a/packages/ipfs-core-types/src/stats/index.d.ts b/packages/ipfs-core-types/src/stats/index.ts
similarity index 84%
rename from packages/ipfs-core-types/src/stats/index.d.ts
rename to packages/ipfs-core-types/src/stats/index.ts
index 3f8e66d942..43e5f24401 100644
--- a/packages/ipfs-core-types/src/stats/index.d.ts
+++ b/packages/ipfs-core-types/src/stats/index.ts
@@ -1,6 +1,6 @@
 import type { AbortOptions } from '../utils'
-import { API as BitswapAPI } from '../bitswap'
-import { API as RepoAPI } from '../repo'
+import type { API as BitswapAPI } from '../bitswap'
+import type { API as RepoAPI } from '../repo'
 
 export interface API<OptionExtension = {}> {
   bitswap: BitswapAPI<OptionExtension>['stat']
diff --git a/packages/ipfs-core-types/src/swarm/index.d.ts b/packages/ipfs-core-types/src/swarm/index.ts
similarity index 100%
rename from packages/ipfs-core-types/src/swarm/index.d.ts
rename to packages/ipfs-core-types/src/swarm/index.ts
diff --git a/packages/ipfs-core-types/src/utils.d.ts b/packages/ipfs-core-types/src/utils.ts
similarity index 96%
rename from packages/ipfs-core-types/src/utils.d.ts
rename to packages/ipfs-core-types/src/utils.ts
index cac2a120d6..5e8e238403 100644
--- a/packages/ipfs-core-types/src/utils.d.ts
+++ b/packages/ipfs-core-types/src/utils.ts
@@ -1,5 +1,5 @@
-import { CID } from 'multiformats/cid'
-import { Mtime, MtimeLike } from 'ipfs-unixfs'
+import type { CID } from 'multiformats/cid'
+import type { Mtime, MtimeLike } from 'ipfs-unixfs'
 
 export type Entry<Content extends AsyncIterable<Uint8Array>|Blob> =
   | FileEntry<Content>
diff --git a/packages/ipfs-core-utils/src/types.d.ts b/packages/ipfs-core-utils/src/types.ts
similarity index 57%
rename from packages/ipfs-core-utils/src/types.d.ts
rename to packages/ipfs-core-utils/src/types.ts
index 212d970062..172de902d9 100644
--- a/packages/ipfs-core-utils/src/types.d.ts
+++ b/packages/ipfs-core-utils/src/types.ts
@@ -1,6 +1,6 @@
-import { MultibaseCodec } from 'multiformats/bases/interface'
-import { BlockCodec } from 'multiformats/codecs/interface'
-import { MultihashHasher } from 'multiformats/hashes/interface'
+import type { MultibaseCodec } from 'multiformats/bases/interface'
+import type { BlockCodec } from 'multiformats/codecs/interface'
+import type { MultihashHasher } from 'multiformats/hashes/interface'
 
 export interface LoadBaseFn { (codeOrName: string): Promise<MultibaseCodec<any>> }
 export interface LoadCodecFn { (codeOrName: number | string): Promise<BlockCodec<any, any>> }
diff --git a/packages/ipfs-core/src/types.d.ts b/packages/ipfs-core/src/types.ts
similarity index 97%
rename from packages/ipfs-core/src/types.d.ts
rename to packages/ipfs-core/src/types.ts
index b612c79382..9e3e995580 100644
--- a/packages/ipfs-core/src/types.d.ts
+++ b/packages/ipfs-core/src/types.ts
@@ -1,11 +1,13 @@
 import type { KeyType } from 'libp2p-crypto'
 import type PeerId from 'peer-id'
 import type { Config as IPFSConfig } from 'ipfs-core-types/src/config'
-import type Libp2p, { Libp2pOptions } from 'libp2p'
+import type Libp2p from 'libp2p'
+import type { Libp2pOptions } from 'libp2p'
 
 import type { IPFSRepo } from 'ipfs-repo'
 import type { ProgressCallback as MigrationProgressCallback } from 'ipfs-repo-migrations'
-import type Network, { Options as NetworkOptions } from './components/network'
+import type Network from './components/network'
+import type { Options as NetworkOptions } from './components/network'
 
 import type { Datastore } from 'interface-datastore'
 
diff --git a/packages/ipfs-grpc-client/src/types.d.ts b/packages/ipfs-grpc-client/src/types.ts
similarity index 63%
rename from packages/ipfs-grpc-client/src/types.d.ts
rename to packages/ipfs-grpc-client/src/types.ts
index 082c6da0fc..54148ea7c8 100644
--- a/packages/ipfs-grpc-client/src/types.d.ts
+++ b/packages/ipfs-grpc-client/src/types.ts
@@ -1,6 +1,6 @@
-import { agent as HttpAgent } from 'http'
-import { agent as HttpsAgent } from 'https'
-import { Multiaddr } from 'multiaddr'
+import type { Agent as HttpAgent } from 'http'
+import type { Agent as HttpsAgent } from 'https'
+import type { Multiaddr } from 'multiaddr'
 
 export interface Options {
   url: string | URL | Multiaddr
diff --git a/packages/ipfs-grpc-server/src/types.d.ts b/packages/ipfs-grpc-server/src/types.ts
similarity index 89%
rename from packages/ipfs-grpc-server/src/types.d.ts
rename to packages/ipfs-grpc-server/src/types.ts
index 69ab04e844..e0a48a2b19 100644
--- a/packages/ipfs-grpc-server/src/types.d.ts
+++ b/packages/ipfs-grpc-server/src/types.ts
@@ -1,6 +1,6 @@
-import { Pushable } from 'it-pushable'
-import { EventEmitter } from 'events'
-import { Multiaddr } from 'multiaddr'
+import type { Pushable } from 'it-pushable'
+import type { EventEmitter } from 'events'
+import type { Multiaddr } from 'multiaddr'
 
 export interface Options {
   socket?: WebsocketServer
diff --git a/packages/ipfs-http-client/src/types.d.ts b/packages/ipfs-http-client/src/types.ts
similarity index 90%
rename from packages/ipfs-http-client/src/types.d.ts
rename to packages/ipfs-http-client/src/types.ts
index 8784c13302..776ac4a9b5 100644
--- a/packages/ipfs-http-client/src/types.d.ts
+++ b/packages/ipfs-http-client/src/types.ts
@@ -1,6 +1,6 @@
-import { Agent as HttpAgent } from 'http'
-import { Agent as HttpsAgent } from 'https'
-import { Multiaddr } from 'multiaddr'
+import type { Agent as HttpAgent } from 'http'
+import type { Agent as HttpsAgent } from 'https'
+import type { Multiaddr } from 'multiaddr'
 import type { BlockCodec } from 'multiformats/codecs/interface'
 import type { MultihashHasher } from 'multiformats/hashes/interface'
 import type { MultibaseCodec } from 'multiformats/bases/interface'
diff --git a/packages/ipfs-http-gateway/src/types.d.ts b/packages/ipfs-http-gateway/src/types.d.ts
deleted file mode 100644
index 8a24cf6a29..0000000000
--- a/packages/ipfs-http-gateway/src/types.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { IPFS } from 'ipfs-core-types'
-import { Request, Server } from '@hapi/hapi'
-import Multiaddr from 'multiaddrs'
-
-declare module '@hapi/hapi' {
-  interface ServerApplicationState {
-    ipfs: IPFS
-  }
-  interface ServerInfo {
-    ma: Multiaddr
-  }
-}
-
-export { Request, Server }
diff --git a/packages/ipfs-http-gateway/src/types.ts b/packages/ipfs-http-gateway/src/types.ts
new file mode 100644
index 0000000000..46715f6625
--- /dev/null
+++ b/packages/ipfs-http-gateway/src/types.ts
@@ -0,0 +1,14 @@
+import type { IPFS } from 'ipfs-core-types'
+import type { Request, Server } from '@hapi/hapi'
+import type { Multiaddr } from 'multiaddr'
+
+declare module '@hapi/hapi' {
+  interface ServerApplicationState {
+    ipfs: IPFS
+  }
+  interface ServerInfo {
+    ma: Multiaddr
+  }
+}
+
+export type { Request, Server }
diff --git a/packages/ipfs-http-server/src/types.d.ts b/packages/ipfs-http-server/src/types.ts
similarity index 75%
rename from packages/ipfs-http-server/src/types.d.ts
rename to packages/ipfs-http-server/src/types.ts
index 0841fe3c70..465dc949fb 100644
--- a/packages/ipfs-http-server/src/types.d.ts
+++ b/packages/ipfs-http-server/src/types.ts
@@ -1,7 +1,7 @@
-import { IPFS } from 'ipfs-core-types'
-import { Request, Server } from '@hapi/hapi'
-import Multiaddr from 'multiaddrs'
-import { Mtime } from 'ipfs-unixfs'
+import type { IPFS } from 'ipfs-core-types'
+import type { Request, Server } from '@hapi/hapi'
+import type { Multiaddr } from 'multiaddr'
+import type { Mtime } from 'ipfs-unixfs'
 
 declare module '@hapi/hapi' {
   interface ServerApplicationState {
@@ -15,7 +15,7 @@ declare module '@hapi/hapi' {
   }
 }
 
-export { Request, Server }
+export type { Request, Server }
 
 interface MultipartUpload {
   name: string
diff --git a/packages/ipfs-message-port-client/src/interface.d.ts b/packages/ipfs-message-port-client/src/interface.ts
similarity index 100%
rename from packages/ipfs-message-port-client/src/interface.d.ts
rename to packages/ipfs-message-port-client/src/interface.ts
diff --git a/packages/ipfs-message-port-protocol/src/data.d.ts b/packages/ipfs-message-port-protocol/src/data.ts
similarity index 100%
rename from packages/ipfs-message-port-protocol/src/data.d.ts
rename to packages/ipfs-message-port-protocol/src/data.ts
diff --git a/packages/ipfs-message-port-protocol/src/files.d.ts b/packages/ipfs-message-port-protocol/src/files.ts
similarity index 74%
rename from packages/ipfs-message-port-protocol/src/files.d.ts
rename to packages/ipfs-message-port-protocol/src/files.ts
index 1a3d7423a3..cd7b037ce1 100644
--- a/packages/ipfs-message-port-protocol/src/files.d.ts
+++ b/packages/ipfs-message-port-protocol/src/files.ts
@@ -1,5 +1,5 @@
-import { Mtime } from 'ipfs-unixfs'
-import { EncodedCID } from './cid'
+import type { Mtime } from 'ipfs-unixfs'
+import type { EncodedCID } from './cid'
 
 export interface EncodedStat {
   cid: EncodedCID
diff --git a/packages/ipfs-message-port-protocol/src/root.d.ts b/packages/ipfs-message-port-protocol/src/root.ts
similarity index 91%
rename from packages/ipfs-message-port-protocol/src/root.d.ts
rename to packages/ipfs-message-port-protocol/src/root.ts
index 5fcfaf8458..c8b5cb7251 100644
--- a/packages/ipfs-message-port-protocol/src/root.d.ts
+++ b/packages/ipfs-message-port-protocol/src/root.ts
@@ -1,6 +1,8 @@
 import type { Mtime } from 'ipfs-unixfs'
 import type { RemoteIterable } from './core'
-import type { FileType } from './data'
+import type { EncodedCID } from './cid'
+
+export type FileType = 'dir' | 'file'
 
 export type EncodedFileContent = ArrayBufferView | ArrayBuffer | Blob | string | RemoteIterable<ArrayBufferView> | RemoteIterable<ArrayBuffer>
 
diff --git a/packages/ipfs-message-port-protocol/src/rpc.d.ts b/packages/ipfs-message-port-protocol/src/rpc.ts
similarity index 100%
rename from packages/ipfs-message-port-protocol/src/rpc.d.ts
rename to packages/ipfs-message-port-protocol/src/rpc.ts