diff --git a/libp2p.nim b/libp2p.nim
index c53506a..4d6c4a9 100644
--- a/libp2p.nim
+++ b/libp2p.nim
@@ -17,11 +17,16 @@ import
           transports/transport,
           transports/tcptransport,
           protocols/secure/noise,
+          cid,
+          multihash,
+          multibase,
+          multicodec,
           errors,
           switch,
           peerid,
           peerinfo,
           multiaddress,
+          standard_setup,
           crypto/crypto]
 
 import bearssl
@@ -30,4 +35,5 @@ export
   minprotobuf, switch, peerid, peerinfo,
   connection, multiaddress, crypto, lpstream,
   bufferstream, bearssl, muxer, mplex, transport,
-  tcptransport, noise, errors
+  tcptransport, noise, errors, cid, multihash,
+  multicodec, standard_setup
diff --git a/libp2p/standard_setup.nim b/libp2p/standard_setup.nim
index 758d535..53b034a 100644
--- a/libp2p/standard_setup.nim
+++ b/libp2p/standard_setup.nim
@@ -1,10 +1,13 @@
-import options, tables
-import chronos
-import ../libp2p
+import
+  options, tables, chronos, bearssl,
+  switch, peerid, peerinfo, stream/connection, multiaddress,
+  crypto/crypto, transports/[transport, tcptransport],
+  muxers/[muxer, mplex/mplex],
+  protocols/[identify, secure/secure, secure/noise],
+  connmanager
 
-export libp2p
-
-import connmanager
+export
+  switch, peerid, peerinfo, connection, multiaddress, crypto
 
 type
   SecureProtocol* {.pure.} = enum