diff --git a/modules/tauri/index.ts b/modules/tauri/index.ts
index 9d445922..60caffb9 100644
--- a/modules/tauri/index.ts
+++ b/modules/tauri/index.ts
@@ -1,5 +1,5 @@
 import { rm } from 'fs/promises'
-import { addImports, addPlugin, createResolver, defineNuxtModule, useNuxt } from '@nuxt/kit'
+import { addImports, addImportsSources, addPlugin, createResolver, defineNuxtModule, useNuxt } from '@nuxt/kit'
 
 export default defineNuxtModule({
   meta: {
@@ -38,6 +38,14 @@ export default defineNuxtModule({
       config.scanDirs = []
     })
 
+    addImportsSources({
+      from: 'h3',
+      imports: ['defineEventHandler', 'getQuery', 'getRouterParams', 'readBody', 'sendRedirect'] as Array<keyof typeof import('h3')>,
+    })
+
+    nuxt.options.imports.dirs = nuxt.options.imports.dirs || []
+    nuxt.options.imports.dirs.push(resolve('../../server/utils'))
+
     addImports({ name: 'useStorage', from: resolve('./runtime/storage') })
 
     addPlugin(resolve('./runtime/logging.client'))
diff --git a/server/api/[server]/clear.ts b/server/api/[server]/clear.ts
index af0a54ad..4727e950 100644
--- a/server/api/[server]/clear.ts
+++ b/server/api/[server]/clear.ts
@@ -1,5 +1,3 @@
-import { deleteApp } from '~~/server/shared'
-
 export default defineEventHandler(async (event) => {
   const { server } = getRouterParams(event)
   const { key } = getQuery(event)
diff --git a/server/api/[server]/login.ts b/server/api/[server]/login.ts
index 84b991da..35539c5e 100644
--- a/server/api/[server]/login.ts
+++ b/server/api/[server]/login.ts
@@ -1,6 +1,4 @@
 import { stringifyQuery } from 'ufo'
-import { createError, defineEventHandler, getRouterParams, readBody } from 'h3'
-import { getApp, getRedirectURI } from '~/server/shared'
 
 export default defineEventHandler(async (event) => {
   let { server } = getRouterParams(event)
diff --git a/server/api/[server]/oauth.ts b/server/api/[server]/oauth.ts
index ac1d555e..7f4df3d2 100644
--- a/server/api/[server]/oauth.ts
+++ b/server/api/[server]/oauth.ts
@@ -1,6 +1,4 @@
-import { stringifyQuery } from 'vue-router'
-import { createError, defineEventHandler, getQuery, getRouterParams, sendRedirect } from 'h3'
-import { getApp, getRedirectURI } from '~/server/shared'
+import { stringifyQuery } from 'ufo'
 
 export default defineEventHandler(async (event) => {
   const { origin } = getQuery(event) as { origin: string }
diff --git a/server/api/list-servers.ts b/server/api/list-servers.ts
index 5077a257..2a762acb 100644
--- a/server/api/list-servers.ts
+++ b/server/api/list-servers.ts
@@ -1,6 +1,3 @@
-import { defineEventHandler } from 'h3'
-import { listServers } from '~/server/shared'
-
 let servers: string[]
 
 export default defineEventHandler(async () => {
diff --git a/server/shared.ts b/server/utils/shared.ts
similarity index 97%
rename from server/shared.ts
rename to server/utils/shared.ts
index 304007a3..30adc583 100644
--- a/server/shared.ts
+++ b/server/utils/shared.ts
@@ -8,8 +8,8 @@ import { stringifyQuery } from 'ufo'
 import { $fetch } from 'ofetch'
 import type { Storage } from 'unstorage'
 
-import cached from './cache-driver'
-import kv from './cloudflare-driver'
+import cached from '../cache-driver'
+import kv from '../cloudflare-driver'
 
 // @ts-expect-error virtual import
 import { env } from '#build-info'