diff --git a/package.json b/package.json
index 390211a1..6e735cc9 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "type": "module",
   "scripts": {
     "build": "pnpm -r build",
-    "build:all": "pnpm -r build && pnpm -r build:types && pnpm install && pnpm copy-files && cd example && pnpm build:fbtee",
+    "build:all": "pnpm -r build && pnpm install && pnpm copy-files && cd example && pnpm build:fbtee",
     "clean": "rm -rf packages/*/lib; cd example pnpm clean",
     "copy-files": "find packages/* -type d -maxdepth 0 -exec cp README.md LICENSE {} \\;",
     "dev": "cd example && pnpm build:fbtee && pnpm dev",
@@ -41,7 +41,6 @@
     "@types/react": "^19.0.0",
     "@types/react-dom": "^19.0.0",
     "@types/yargs": "^17.0.33",
-    "dts-bundle-generator": "^9.5.1",
     "eslint": "^8.0.0",
     "eslint-plugin-workspaces": "^0.10.1",
     "invariant": "^2.2.4",
diff --git a/packages/babel-fbtee/package.json b/packages/babel-fbtee/package.json
index adab744d..f575fc8e 100644
--- a/packages/babel-fbtee/package.json
+++ b/packages/babel-fbtee/package.json
@@ -23,8 +23,7 @@
     "fbtee": "lib/bin.js"
   },
   "scripts": {
-    "build": "tsup src/index.tsx src/bin.tsx -d lib --target=node22 --format=esm --clean --no-splitting",
-    "build:types": "dts-bundle-generator -o lib/index.d.ts src/index.tsx"
+    "build": "tsup src/index.tsx src/bin.tsx -d lib --target=node22 --format=esm --clean --no-splitting --dts"
   },
   "dependencies": {
     "@nkzw/babel-plugin-fbtee": "workspace:^",
diff --git a/packages/babel-plugin-fbtee-auto-import/package.json b/packages/babel-plugin-fbtee-auto-import/package.json
index 79c6e6bd..e2820f90 100644
--- a/packages/babel-plugin-fbtee-auto-import/package.json
+++ b/packages/babel-plugin-fbtee-auto-import/package.json
@@ -20,8 +20,7 @@
   "type": "module",
   "main": "lib/index.js",
   "scripts": {
-    "build": "tsup src/index.tsx -d lib --target=node22 --format=esm --clean --no-splitting",
-    "build:types": "dts-bundle-generator -o lib/index.d.ts src/index.tsx"
+    "build": "tsup src/index.tsx -d lib --target=node22 --format=esm --clean --no-splitting --dts"
   },
   "dependencies": {
     "@babel/core": "^7.26.0",
diff --git a/packages/babel-plugin-fbtee-runtime/package.json b/packages/babel-plugin-fbtee-runtime/package.json
index 2cf787d8..79f53584 100644
--- a/packages/babel-plugin-fbtee-runtime/package.json
+++ b/packages/babel-plugin-fbtee-runtime/package.json
@@ -20,8 +20,7 @@
   "type": "module",
   "main": "lib/index.js",
   "scripts": {
-    "build": "tsup src/index.tsx -d lib --target=node22 --format=esm --clean --no-splitting",
-    "build:types": "dts-bundle-generator -o lib/index.d.ts src/index.tsx"
+    "build": "tsup src/index.tsx -d lib --target=node22 --format=esm --clean --no-splitting --dts"
   },
   "dependencies": {
     "@babel/core": "^7.26.0",
diff --git a/packages/babel-plugin-fbtee/package.json b/packages/babel-plugin-fbtee/package.json
index 997d4fda..812fffcb 100644
--- a/packages/babel-plugin-fbtee/package.json
+++ b/packages/babel-plugin-fbtee/package.json
@@ -23,8 +23,7 @@
     "fbtee": "lib/bin.js"
   },
   "scripts": {
-    "build": "tsup src/index.tsx src/bin.tsx -d lib --target=node22 --format=esm --clean --no-splitting",
-    "build:types": "dts-bundle-generator -o lib/index.d.ts src/index.tsx"
+    "build": "tsup src/index.tsx src/bin.tsx -d lib --target=node22 --format=esm --clean --no-splitting --dts"
   },
   "dependencies": {
     "@babel/core": "^7.26.0",
diff --git a/packages/babel-plugin-fbtee/src/bin.tsx b/packages/babel-plugin-fbtee/src/bin.tsx
index 4222b08c..70660642 100644
--- a/packages/babel-plugin-fbtee/src/bin.tsx
+++ b/packages/babel-plugin-fbtee/src/bin.tsx
@@ -9,3 +9,5 @@ if (command === 'manifest') {
 } else if (command === 'collect') {
   import('./bin/collect.tsx');
 }
+
+export default {};
diff --git a/packages/babel-plugin-fbtee/src/index.tsx b/packages/babel-plugin-fbtee/src/index.tsx
index 82e71d79..93e73d1e 100644
--- a/packages/babel-plugin-fbtee/src/index.tsx
+++ b/packages/babel-plugin-fbtee/src/index.tsx
@@ -24,6 +24,7 @@ import { checkOption, errorAt } from './FbtUtil.tsx';
 import { FbtVariationType } from './translate/IntlVariations.tsx';
 import type { FbtTableKey, PatternHash, PatternString } from './Types.d.ts';
 
+export type { FbtTableKey, PatternHash, PatternString };
 export { SENTINEL } from './FbtConstants.tsx';
 export { default as fbtHashKey } from './fbtHashKey.tsx';
 export { mapLeaves } from './JSFbtUtil.tsx';
diff --git a/packages/fbtee/package.json b/packages/fbtee/package.json
index bbfe846c..09a11da1 100644
--- a/packages/fbtee/package.json
+++ b/packages/fbtee/package.json
@@ -20,8 +20,7 @@
   "type": "module",
   "main": "lib/index.js",
   "scripts": {
-    "build": "tsup src/index.tsx -d lib --target=node22 --format=esm --clean --no-splitting",
-    "build:types": "dts-bundle-generator -o lib/index.d.ts src/index.tsx"
+    "build": "tsup src/index.tsx -d lib --target=node22 --format=esm --clean --no-splitting --dts"
   },
   "dependencies": {
     "invariant": "^2.2.4"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3439bbf0..4a0d08c9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -77,9 +77,6 @@ importers:
       '@types/yargs':
         specifier: ^17.0.33
         version: 17.0.33
-      dts-bundle-generator:
-        specifier: ^9.5.1
-        version: 9.5.1
       eslint:
         specifier: ^8.0.0
         version: 8.57.1
@@ -1645,11 +1642,6 @@ packages:
     engines: {node: '>=12'}
     deprecated: Use your platform's native DOMException instead
 
-  dts-bundle-generator@9.5.1:
-    resolution: {integrity: sha512-DxpJOb2FNnEyOzMkG11sxO2dmxPjthoVWxfKqWYJ/bI/rT1rvTMktF5EKjAYrRZu6Z6t3NhOUZ0sZ5ZXevOfbA==}
-    engines: {node: '>=14.0.0'}
-    hasBin: true
-
   dunder-proto@1.0.0:
     resolution: {integrity: sha512-9+Sj30DIu+4KvHqMfLUGLFYL2PkURSYMVXJyXe92nFRvlYq5hBjLEhblKB+vkd/WVlUYMWigiY07T91Fkk0+4A==}
     engines: {node: '>= 0.4'}
@@ -5379,11 +5371,6 @@ snapshots:
     dependencies:
       webidl-conversions: 7.0.0
 
-  dts-bundle-generator@9.5.1:
-    dependencies:
-      typescript: 5.7.2
-      yargs: 17.7.2
-
   dunder-proto@1.0.0:
     dependencies:
       call-bind-apply-helpers: 1.0.1
diff --git a/tsconfig.json b/tsconfig.json
index d32e2f60..79f917a8 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,7 +4,7 @@
     "allowImportingTsExtensions": true,
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
-    "incremental": true,
+    "incremental": false,
     "isolatedModules": true,
     "jsx": "preserve",
     "lib": ["dom", "dom.iterable", "esnext"],