diff --git a/packages/better-auth/src/plugins/jwt/types.ts b/packages/better-auth/src/plugins/jwt/types.ts
index ef5df91aef..a89876ab92 100644
--- a/packages/better-auth/src/plugins/jwt/types.ts
+++ b/packages/better-auth/src/plugins/jwt/types.ts
@@ -1,6 +1,5 @@
-import type { Awaitable } from "@better-auth/core";
+import type { Awaitable, GenericEndpointContext } from "@better-auth/core";
 import type { JWTPayload } from "jose";
-import type { GenericEndpointContext } from "../..";
 import type { InferOptionSchema, Session, User } from "../../types";
 import type { schema } from "./schema";
 
diff --git a/packages/better-auth/src/types/models.ts b/packages/better-auth/src/types/models.ts
index 8205862979..a78823f6c3 100644
--- a/packages/better-auth/src/types/models.ts
+++ b/packages/better-auth/src/types/models.ts
@@ -2,7 +2,7 @@ import type { BetterAuthOptions, BetterAuthPlugin } from "@better-auth/core";
 import type {
 	InferDBFieldsFromOptionsInput,
 	InferDBFieldsFromPluginsInput,
-} from "../db";
+} from "@better-auth/core/db";
 import type { UnionToIntersection } from "./helper";
 
 export type AdditionalUserFieldsInput<Options extends BetterAuthOptions> =