diff --git a/packages/dapp-toolkit/src/gateway/index.ts b/packages/dapp-toolkit/src/gateway/index.ts
new file mode 100644
index 00000000..ec626bfe
--- /dev/null
+++ b/packages/dapp-toolkit/src/gateway/index.ts
@@ -0,0 +1,3 @@
+export * from './gateway'
+export * from './gateway-api'
+export * from './types'
diff --git a/packages/dapp-toolkit/src/index.ts b/packages/dapp-toolkit/src/index.ts
index 692dba94..df42fe46 100644
--- a/packages/dapp-toolkit/src/index.ts
+++ b/packages/dapp-toolkit/src/index.ts
@@ -1,8 +1,8 @@
-export { Logger } from './helpers/logger'
 export { RadixDappToolkit } from './radix-dapp-toolkit'
 export { LocalStorageClient } from './storage/local-storage-client'
-export { RadixNetwork } from './gateway/types'
 export * from './state'
 export * from './schemas'
 export * from './_types'
 export * from './wallet-request'
+export * from './helpers'
+export * from './gateway'
diff --git a/packages/dapp-toolkit/tsup.config.ts b/packages/dapp-toolkit/tsup.config.ts
index 2db96c6a..f4ac53df 100644
--- a/packages/dapp-toolkit/tsup.config.ts
+++ b/packages/dapp-toolkit/tsup.config.ts
@@ -4,5 +4,5 @@ export default defineConfig({
   entry: ['src/index.ts'],
   dts: true,
   format: ['esm', 'cjs'],
-  noExternal: ['@radixdlt/connect-button'],
+  noExternal: ['@radixdlt/connect-button', 'radix-connect-common'],
 })