diff --git a/api/src/global.d.ts b/api/src/global.d.ts
index 17568c39..f27907b7 100644
--- a/api/src/global.d.ts
+++ b/api/src/global.d.ts
@@ -6,6 +6,9 @@
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
+import '../types/event-emitter';
+import '../types/express-session';
+
 declare global {
   type HyphenToUnderscore<S extends string> = S extends `${infer P}-${infer Q}`
     ? `${P}_${HyphenToUnderscore<Q>}`
@@ -13,4 +16,4 @@ declare global {
 }
 
 // eslint-disable-next-line prettier/prettier
-export { };
+export {};
diff --git a/api/tsconfig.json b/api/tsconfig.json
index fb2d6c51..c03a67ea 100644
--- a/api/tsconfig.json
+++ b/api/tsconfig.json
@@ -26,7 +26,6 @@
     }
   },
   "include": [
-    "types/**/*.d.ts",
     "src/global.d.ts",
     "src/**/*.ts",
     "src/**/*.json",
diff --git a/api/types/event-emitter.d.ts b/api/types/event-emitter.d.ts
index c545427d..7a75969b 100644
--- a/api/types/event-emitter.d.ts
+++ b/api/types/event-emitter.d.ts
@@ -8,7 +8,12 @@
 
 import { type OnEventOptions } from '@nestjs/event-emitter/dist/interfaces';
 import type { Listener, OnOptions } from 'eventemitter2';
-import type { Document, Query } from 'mongoose';
+import type {
+  Document,
+  Query,
+  TFilterQuery,
+  THydratedDocument,
+} from 'mongoose';
 import { type Socket } from 'socket.io';
 
 import { type BotStats } from '@/analytics/schemas/bot-stats.schema';
@@ -44,7 +49,6 @@ import { type Permission } from '@/user/schemas/permission.schema';
 import { type Role } from '@/user/schemas/role.schema';
 import { type User } from '@/user/schemas/user.schema';
 import { EHook, type DeleteResult } from '@/utils/generics/base-repository';
-import { TFilterQuery, THydratedDocument } from '@/utils/types/filter.types';
 
 import '@nestjs/event-emitter';
 /**
diff --git a/api/types/express-session.d.ts b/api/types/express-session.d.ts
index 7039765a..0111ae0e 100644
--- a/api/types/express-session.d.ts
+++ b/api/types/express-session.d.ts
@@ -6,7 +6,7 @@
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { SubscriberStub } from './chat/schemas/subscriber.schema';
+import { SubscriberStub } from '@/chat/schemas/subscriber.schema';
 
 declare module 'express-session' {
   interface SessionUser {