diff --git a/packages/start-client/package.json b/packages/start-client/package.json
index c0e1fd415f9..f74214e0e14 100644
--- a/packages/start-client/package.json
+++ b/packages/start-client/package.json
@@ -64,9 +64,11 @@
   },
   "dependencies": {
     "@tanstack/react-router": "workspace:^",
+    "@tanstack/router-core": "workspace:^",
     "cookie-es": "^1.2.2",
     "jsesc": "^3.1.0",
     "tiny-invariant": "^1.3.3",
+    "tiny-warning": "^1.0.3",
     "vinxi": "^0.5.3"
   },
   "devDependencies": {
diff --git a/packages/start-client/src/createMiddleware.ts b/packages/start-client/src/createMiddleware.ts
index 7667c32ee0c..34c4920597c 100644
--- a/packages/start-client/src/createMiddleware.ts
+++ b/packages/start-client/src/createMiddleware.ts
@@ -11,7 +11,7 @@ import type {
   ResolveValidatorInput,
   ResolveValidatorOutput,
   SerializerStringify,
-} from '@tanstack/react-router'
+} from '@tanstack/router-core'
 
 export type AssignAllMiddleware<
   TMiddlewares,
diff --git a/packages/start-client/src/createServerFn.ts b/packages/start-client/src/createServerFn.ts
index 80e662c866e..e99af74fc88 100644
--- a/packages/start-client/src/createServerFn.ts
+++ b/packages/start-client/src/createServerFn.ts
@@ -1,9 +1,6 @@
-import {
-  invariant,
-  isNotFound,
-  isRedirect,
-  warning,
-} from '@tanstack/react-router'
+import { default as invariant } from 'tiny-invariant'
+import { default as warning } from 'tiny-warning'
+import { isNotFound, isRedirect } from '@tanstack/react-router'
 import { mergeHeaders } from './headers'
 import { globalMiddleware } from './registerGlobalMiddleware'
 import { startSerializer } from './serializer'
@@ -16,7 +13,7 @@ import type {
   SerializerStringify,
   SerializerStringifyBy,
   Validator,
-} from '@tanstack/react-router'
+} from '@tanstack/router-core'
 import type {
   AnyMiddleware,
   AssignAllClientSendContext,
diff --git a/packages/start-client/src/serializer.ts b/packages/start-client/src/serializer.ts
index fb8154d1079..d9fd299b286 100644
--- a/packages/start-client/src/serializer.ts
+++ b/packages/start-client/src/serializer.ts
@@ -1,5 +1,5 @@
-import { isPlainObject } from '@tanstack/react-router'
-import type { StartSerializer } from '@tanstack/react-router'
+import { isPlainObject } from '@tanstack/router-core'
+import type { StartSerializer } from '@tanstack/router-core'
 
 export const startSerializer: StartSerializer = {
   stringify: (value: any) =>
diff --git a/packages/start-client/src/ssr-client.tsx b/packages/start-client/src/ssr-client.tsx
index 2855f8b88a3..a5490f7b23f 100644
--- a/packages/start-client/src/ssr-client.tsx
+++ b/packages/start-client/src/ssr-client.tsx
@@ -1,4 +1,4 @@
-import { isPlainObject } from '@tanstack/react-router'
+import { isPlainObject } from '@tanstack/router-core'
 
 import invariant from 'tiny-invariant'
 
@@ -6,11 +6,11 @@ import { startSerializer } from './serializer'
 import type {
   AnyRouter,
   ControllablePromise,
-  DeferredPromiseState,
   MakeRouteMatch,
-  Manifest,
 } from '@tanstack/react-router'
 
+import type { DeferredPromiseState, Manifest } from '@tanstack/router-core'
+
 declare global {
   interface Window {
     __TSR_SSR__?: StartSsrGlobal
diff --git a/packages/start-client/src/tests/createServerFn.test-d.tsx b/packages/start-client/src/tests/createServerFn.test-d.tsx
index e2a98a809c6..44148e94337 100644
--- a/packages/start-client/src/tests/createServerFn.test-d.tsx
+++ b/packages/start-client/src/tests/createServerFn.test-d.tsx
@@ -1,7 +1,7 @@
 import { expectTypeOf, test } from 'vitest'
 import { createServerFn } from '../createServerFn'
 import { createMiddleware } from '../createMiddleware'
-import type { Constrain, Validator } from '@tanstack/react-router'
+import type { Constrain, Validator } from '@tanstack/router-core'
 
 test('createServerFn method with autocomplete', () => {
   createServerFn().handler((options) => {
diff --git a/packages/start-client/src/tests/createServerMiddleware.test-d.ts b/packages/start-client/src/tests/createServerMiddleware.test-d.ts
index 8264ccd0f17..22caa76e3d9 100644
--- a/packages/start-client/src/tests/createServerMiddleware.test-d.ts
+++ b/packages/start-client/src/tests/createServerMiddleware.test-d.ts
@@ -1,6 +1,6 @@
 import { expectTypeOf, test } from 'vitest'
 import { createMiddleware } from '../createMiddleware'
-import type { Constrain, Validator } from '@tanstack/react-router'
+import type { Constrain, Validator } from '@tanstack/router-core'
 
 test('createServeMiddleware removes middleware after middleware,', () => {
   const middleware = createMiddleware()
diff --git a/packages/start-server-functions-fetcher/package.json b/packages/start-server-functions-fetcher/package.json
index 22edeb0aeb7..109a5916d36 100644
--- a/packages/start-server-functions-fetcher/package.json
+++ b/packages/start-server-functions-fetcher/package.json
@@ -63,6 +63,7 @@
   },
   "dependencies": {
     "@tanstack/react-router": "workspace:^",
+    "@tanstack/router-core": "workspace:^",
     "@tanstack/start-client": "workspace:^"
   },
   "devDependencies": {
diff --git a/packages/start-server-functions-fetcher/src/index.tsx b/packages/start-server-functions-fetcher/src/index.ts
similarity index 96%
rename from packages/start-server-functions-fetcher/src/index.tsx
rename to packages/start-server-functions-fetcher/src/index.ts
index 3a2c7fe33bd..19e7d923135 100644
--- a/packages/start-server-functions-fetcher/src/index.tsx
+++ b/packages/start-server-functions-fetcher/src/index.ts
@@ -1,9 +1,5 @@
-import {
-  encode,
-  isNotFound,
-  isPlainObject,
-  isRedirect,
-} from '@tanstack/react-router'
+import { isNotFound, isRedirect } from '@tanstack/react-router'
+import { encode, isPlainObject } from '@tanstack/router-core'
 import { startSerializer } from '@tanstack/start-client'
 import type { MiddlewareClientFnOptions } from '@tanstack/start-client'
 
diff --git a/packages/start-server-functions-fetcher/tsconfig.json b/packages/start-server-functions-fetcher/tsconfig.json
index 51dda9abf2a..0484835e6b5 100644
--- a/packages/start-server-functions-fetcher/tsconfig.json
+++ b/packages/start-server-functions-fetcher/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "jsx": "react-jsx",
     "module": "esnext"
   },
   "include": ["src", "vite.config.ts"]
diff --git a/packages/start-server-functions-fetcher/vite.config.ts b/packages/start-server-functions-fetcher/vite.config.ts
index 9cdf6497eeb..5d2b71ac133 100644
--- a/packages/start-server-functions-fetcher/vite.config.ts
+++ b/packages/start-server-functions-fetcher/vite.config.ts
@@ -16,7 +16,7 @@ const config = defineConfig({
 export default mergeConfig(
   config,
   tanstackViteConfig({
-    entry: './src/index.tsx',
+    entry: './src/index.ts',
     srcDir: './src',
   }),
 )
diff --git a/packages/start-server-functions-handler/src/index.tsx b/packages/start-server-functions-handler/src/index.ts
similarity index 100%
rename from packages/start-server-functions-handler/src/index.tsx
rename to packages/start-server-functions-handler/src/index.ts
diff --git a/packages/start-server-functions-handler/tsconfig.json b/packages/start-server-functions-handler/tsconfig.json
index 51dda9abf2a..0484835e6b5 100644
--- a/packages/start-server-functions-handler/tsconfig.json
+++ b/packages/start-server-functions-handler/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "jsx": "react-jsx",
     "module": "esnext"
   },
   "include": ["src", "vite.config.ts"]
diff --git a/packages/start-server-functions-handler/vite.config.ts b/packages/start-server-functions-handler/vite.config.ts
index 4251f087016..09a96c3c0af 100644
--- a/packages/start-server-functions-handler/vite.config.ts
+++ b/packages/start-server-functions-handler/vite.config.ts
@@ -16,7 +16,7 @@ const config = defineConfig({
 export default mergeConfig(
   config,
   tanstackViteConfig({
-    entry: './src/index.tsx',
+    entry: './src/index.ts',
     srcDir: './src',
     externalDeps: ['tsr:server-fn-manifest'],
   }),
diff --git a/packages/start-server/package.json b/packages/start-server/package.json
index b335c860775..a389f051ec2 100644
--- a/packages/start-server/package.json
+++ b/packages/start-server/package.json
@@ -62,8 +62,11 @@
     "node": ">=12"
   },
   "dependencies": {
+    "@tanstack/history": "workspace:^",
     "@tanstack/react-router": "workspace:^",
+    "@tanstack/router-core": "workspace:^",
     "@tanstack/start-client": "workspace:^",
+    "tiny-warning": "^1.0.3",
     "h3": "1.13.0",
     "isbot": "^5.1.22",
     "jsesc": "^3.1.0",
diff --git a/packages/start-server/src/createRequestHandler.ts b/packages/start-server/src/createRequestHandler.ts
index b657ed20cf2..26cdd5582e8 100644
--- a/packages/start-server/src/createRequestHandler.ts
+++ b/packages/start-server/src/createRequestHandler.ts
@@ -1,4 +1,4 @@
-import { createMemoryHistory } from '@tanstack/react-router'
+import { createMemoryHistory } from '@tanstack/history'
 import { mergeHeaders } from '@tanstack/start-client'
 import { attachRouterServerSsrUtils, dehydrateRouter } from './ssr-server'
 import type { HandlerCallback } from './handlerCallback'
diff --git a/packages/start-server/src/createStartHandler.ts b/packages/start-server/src/createStartHandler.ts
index e06c7fffc65..b5554b39804 100644
--- a/packages/start-server/src/createStartHandler.ts
+++ b/packages/start-server/src/createStartHandler.ts
@@ -1,4 +1,4 @@
-import { createMemoryHistory } from '@tanstack/react-router'
+import { createMemoryHistory } from '@tanstack/history'
 import { mergeHeaders } from '@tanstack/start-client'
 import { eventHandler, getResponseHeaders, toWebRequest } from 'h3'
 import { attachRouterServerSsrUtils, dehydrateRouter } from './ssr-server'
diff --git a/packages/start-server/src/ssr-server.ts b/packages/start-server/src/ssr-server.ts
index b17e658f767..4ad9738807a 100644
--- a/packages/start-server/src/ssr-server.ts
+++ b/packages/start-server/src/ssr-server.ts
@@ -1,11 +1,11 @@
+import { default as warning } from 'tiny-warning'
 import {
   TSR_DEFERRED_PROMISE,
   defer,
   isPlainArray,
   isPlainObject,
   pick,
-  warning,
-} from '@tanstack/react-router'
+} from '@tanstack/router-core'
 import jsesc from 'jsesc'
 import { startSerializer } from '@tanstack/start-client'
 import minifiedTsrBootStrapScript from './tsrScript?script-string'
@@ -15,12 +15,8 @@ import type {
   ResolvePromiseState,
   SsrMatch,
 } from '@tanstack/start-client'
-import type {
-  AnyRouteMatch,
-  AnyRouter,
-  DeferredPromise,
-  Manifest,
-} from '@tanstack/react-router'
+import type { AnyRouteMatch, AnyRouter } from '@tanstack/react-router'
+import type { DeferredPromise, Manifest } from '@tanstack/router-core'
 
 export type ServerExtractedEntry =
   | ServerExtractedStream
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 957836a1901..7de64c37de7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5273,6 +5273,9 @@ importers:
       '@tanstack/react-router':
         specifier: workspace:*
         version: link:../react-router
+      '@tanstack/router-core':
+        specifier: workspace:*
+        version: link:../router-core
       cookie-es:
         specifier: ^1.2.2
         version: 1.2.2
@@ -5288,6 +5291,9 @@ importers:
       tiny-invariant:
         specifier: ^1.3.3
         version: 1.3.3
+      tiny-warning:
+        specifier: ^1.0.3
+        version: 1.0.3
       vinxi:
         specifier: ^0.5.3
         version: 0.5.3(@types/node@22.13.4)(db0@0.2.3)(ioredis@5.4.2)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0)
@@ -5417,9 +5423,15 @@ importers:
 
   packages/start-server:
     dependencies:
+      '@tanstack/history':
+        specifier: workspace:*
+        version: link:../history
       '@tanstack/react-router':
         specifier: workspace:*
         version: link:../react-router
+      '@tanstack/router-core':
+        specifier: workspace:*
+        version: link:../router-core
       '@tanstack/start-client':
         specifier: workspace:*
         version: link:../start-client
@@ -5432,6 +5444,9 @@ importers:
       jsesc:
         specifier: ^3.1.0
         version: 3.1.0
+      tiny-warning:
+        specifier: ^1.0.3
+        version: 1.0.3
       unctx:
         specifier: ^2.4.1
         version: 2.4.1
@@ -5473,6 +5488,9 @@ importers:
       '@tanstack/react-router':
         specifier: workspace:*
         version: link:../react-router
+      '@tanstack/router-core':
+        specifier: workspace:*
+        version: link:../router-core
       '@tanstack/start-client':
         specifier: workspace:*
         version: link:../start-client