diff --git a/components/account/AccountFollowButton.vue b/components/account/AccountFollowButton.vue
index 3ecd3c2071..9fb3265b41 100644
--- a/components/account/AccountFollowButton.vue
+++ b/components/account/AccountFollowButton.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
-import { toggleFollowAccount, useRelationship } from '~~/composables/masto/relationship'
 
 const { account, command, context, ...props } = defineProps<{
   account: mastodon.v1.Account
diff --git a/components/account/AccountHoverWrapper.vue b/components/account/AccountHoverWrapper.vue
index e91f6ad163..b5d2bc9dbf 100644
--- a/components/account/AccountHoverWrapper.vue
+++ b/components/account/AccountHoverWrapper.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
-import { fetchAccountByHandle } from '~/composables/cache'
 
 type WatcherType = [acc?: mastodon.v1.Account | null, h?: string, v?: boolean]
 
diff --git a/components/account/AccountMoreButton.vue b/components/account/AccountMoreButton.vue
index 7b2fe6728b..2a0727ee77 100644
--- a/components/account/AccountMoreButton.vue
+++ b/components/account/AccountMoreButton.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
-import { toggleBlockAccount, toggleBlockDomain, toggleMuteAccount } from '~~/composables/masto/relationship'
 
 const { account } = defineProps<{
   account: mastodon.v1.Account
diff --git a/components/aria/AriaAnnouncer.vue b/components/aria/AriaAnnouncer.vue
index d3b132464d..a0a49fb6c2 100644
--- a/components/aria/AriaAnnouncer.vue
+++ b/components/aria/AriaAnnouncer.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { LocaleObject } from '@nuxtjs/i18n'
-import type { AriaAnnounceType, AriaLive } from '~/composables/aria'
 
 const router = useRouter()
 const { t, locale, locales } = useI18n()
diff --git a/components/aria/AriaLog.vue b/components/aria/AriaLog.vue
index f99a3cae89..ace190f808 100644
--- a/components/aria/AriaLog.vue
+++ b/components/aria/AriaLog.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import type { AriaLive } from '~/composables/aria'
-
 // tsc complaining when using $defineProps
 withDefaults(defineProps<{
   title: string
diff --git a/components/aria/AriaStatus.vue b/components/aria/AriaStatus.vue
index c04a47134e..eb7f698428 100644
--- a/components/aria/AriaStatus.vue
+++ b/components/aria/AriaStatus.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import type { AriaLive } from '~/composables/aria'
-
 // tsc complaining when using $defineProps
 withDefaults(defineProps<{
   ariaLive?: AriaLive
diff --git a/components/command/CommandItem.vue b/components/command/CommandItem.vue
index 67c1af90da..cc5c9b52be 100644
--- a/components/command/CommandItem.vue
+++ b/components/command/CommandItem.vue
@@ -1,6 +1,4 @@
 <script lang="ts" setup>
-import type { ResolvedCommand } from '~/composables/command'
-
 const {
   cmd,
   index,
diff --git a/components/command/CommandPanel.vue b/components/command/CommandPanel.vue
index dd2115a7f6..91b4550674 100644
--- a/components/command/CommandPanel.vue
+++ b/components/command/CommandPanel.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
-import type { SearchResult as SearchResultType } from '~/composables/masto/search'
-import type { CommandScope, QueryResult, QueryResultItem } from '~/composables/command'
+type SearchResultType = SearchResult
 
 const emit = defineEmits<{
   (event: 'close'): void
diff --git a/components/modal/ModalContainer.vue b/components/modal/ModalContainer.vue
index 2d0124db06..a9744dd7a5 100644
--- a/components/modal/ModalContainer.vue
+++ b/components/modal/ModalContainer.vue
@@ -1,19 +1,6 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
 import type { ConfirmDialogChoice } from '~/types'
-import {
-  isCommandPanelOpen,
-  isConfirmDialogOpen,
-  isEditHistoryDialogOpen,
-  isErrorDialogOpen,
-  isFavouritedBoostedByDialogOpen,
-  isKeyboardShortcutsDialogOpen,
-  isMediaPreviewOpen,
-  isPreviewHelpOpen,
-  isPublishDialogOpen,
-  isReportDialogOpen,
-  isSigninDialogOpen,
-} from '~/composables/dialog'
 
 const isMac = useIsMac()
 
diff --git a/components/nav/NavBottom.vue b/components/nav/NavBottom.vue
index 145759cb6f..1aa053037c 100644
--- a/components/nav/NavBottom.vue
+++ b/components/nav/NavBottom.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { Component } from 'vue'
-import type { NavButtonName } from '../../composables/settings'
 
 import { STORAGE_KEY_BOTTOM_NAV_BUTTONS } from '~/constants'
 
diff --git a/components/report/ReportModal.vue b/components/report/ReportModal.vue
index f540454c62..d003470704 100644
--- a/components/report/ReportModal.vue
+++ b/components/report/ReportModal.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
-import { toggleBlockAccount, toggleFollowAccount, toggleMuteAccount, useRelationship } from '~~/composables/masto/relationship'
 
 const { account, status } = defineProps<{
   account: mastodon.v1.Account
diff --git a/components/search/SearchResult.vue b/components/search/SearchResult.vue
index fb7d339f2e..e78f60ddcb 100644
--- a/components/search/SearchResult.vue
+++ b/components/search/SearchResult.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import type { SearchResult } from '~/composables/masto/search'
-
 defineProps<{
   result: SearchResult
   active: boolean
diff --git a/components/settings/SettingsBottomNav.vue b/components/settings/SettingsBottomNav.vue
index e75a415484..410353eef5 100644
--- a/components/settings/SettingsBottomNav.vue
+++ b/components/settings/SettingsBottomNav.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import type { NavButtonName } from '~/composables/settings'
 import { STORAGE_KEY_BOTTOM_NAV_BUTTONS } from '~/constants'
 
 interface NavButton {
diff --git a/components/settings/SettingsColorMode.vue b/components/settings/SettingsColorMode.vue
index a7ad444edc..57346f3ad1 100644
--- a/components/settings/SettingsColorMode.vue
+++ b/components/settings/SettingsColorMode.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import type { ColorMode } from '~/composables/settings'
-
 const colorMode = useColorMode()
 
 function setColorMode(mode: ColorMode) {
diff --git a/components/settings/SettingsFontSize.vue b/components/settings/SettingsFontSize.vue
index ad85be0fd0..0e04815ba3 100644
--- a/components/settings/SettingsFontSize.vue
+++ b/components/settings/SettingsFontSize.vue
@@ -1,6 +1,5 @@
 <script lang="ts" setup>
 import { DEFAULT_FONT_SIZE } from '~/constants'
-import type { FontSize } from '~/composables/settings'
 
 const userSettings = useUserSettings()
 
diff --git a/components/settings/SettingsThemeColors.vue b/components/settings/SettingsThemeColors.vue
index 6caceb10f7..fe0b75a472 100644
--- a/components/settings/SettingsThemeColors.vue
+++ b/components/settings/SettingsThemeColors.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import type { ThemeColors } from '~/composables/settings'
-
 const themes = await import('~/constants/themes.json').then(r => r.default) as [string, ThemeColors][]
 const settings = useUserSettings()
 
diff --git a/components/status/StatusActionsMore.vue b/components/status/StatusActionsMore.vue
index e6f1be5a3d..af076dff88 100644
--- a/components/status/StatusActionsMore.vue
+++ b/components/status/StatusActionsMore.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
-import { toggleBlockAccount, toggleMuteAccount, useRelationship } from '~~/composables/masto/relationship'
 
 const props = defineProps<{
   status: mastodon.v1.Status
diff --git a/components/status/StatusFavouritedBoostedBy.vue b/components/status/StatusFavouritedBoostedBy.vue
index 379ab31623..1b6315dc8b 100644
--- a/components/status/StatusFavouritedBoostedBy.vue
+++ b/components/status/StatusFavouritedBoostedBy.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import { favouritedBoostedByStatusId } from '~/composables/dialog'
-
 const type = ref<'favourited-by' | 'boosted-by'>('favourited-by')
 
 const { client } = useMasto()
diff --git a/components/status/StatusReplyingTo.vue b/components/status/StatusReplyingTo.vue
index 0fa7cfd7f0..8a31f2874b 100644
--- a/components/status/StatusReplyingTo.vue
+++ b/components/status/StatusReplyingTo.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
-import { fetchAccountById } from '~/composables/cache'
 
 type WatcherType = [status?: mastodon.v1.Status, v?: boolean]
 
diff --git a/components/tiptap/TiptapEmojiList.vue b/components/tiptap/TiptapEmojiList.vue
index d1b5726ac7..da97aa3ed8 100644
--- a/components/tiptap/TiptapEmojiList.vue
+++ b/components/tiptap/TiptapEmojiList.vue
@@ -1,9 +1,6 @@
 <script setup lang="ts">
 import { getEmojiMatchesInText } from '@iconify/utils/lib/emoji/replace/find'
-import type { CustomEmoji, Emoji } from '~/composables/tiptap/suggestion'
-import { isCustomEmoji } from '~/composables/tiptap/suggestion'
 import { emojiFilename, emojiPrefix, emojiRegEx } from '~~/config/emojis'
-import type { CommandHandler } from '~/composables/command'
 
 const { items, command } = defineProps<{
   items: (CustomEmoji | Emoji)[]
diff --git a/components/tiptap/TiptapHashtagList.vue b/components/tiptap/TiptapHashtagList.vue
index 5ae2492322..eac96d9761 100644
--- a/components/tiptap/TiptapHashtagList.vue
+++ b/components/tiptap/TiptapHashtagList.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
-import type { CommandHandler } from '~/composables/command'
 
 const { items, command } = defineProps<{
   items: mastodon.v1.Tag[]
diff --git a/components/tiptap/TiptapMentionList.vue b/components/tiptap/TiptapMentionList.vue
index d55eec5fba..c1c7647b00 100644
--- a/components/tiptap/TiptapMentionList.vue
+++ b/components/tiptap/TiptapMentionList.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
-import type { CommandHandler } from '~/composables/command'
 
 const { items, command } = defineProps<{
   items: mastodon.v1.Account[]
diff --git a/composables/command.ts b/composables/command.ts
index 838e3d17f0..dabbd1ce38 100644
--- a/composables/command.ts
+++ b/composables/command.ts
@@ -2,7 +2,6 @@ import type { ComputedRef } from 'vue'
 import { defineStore } from 'pinia'
 import Fuse from 'fuse.js'
 import type { LocaleObject } from '@nuxtjs/i18n'
-import type { SearchResult } from '~/composables/masto/search'
 
 // @unocss-include
 
diff --git a/composables/push-notifications/createPushSubscription.ts b/composables/push-notifications/createPushSubscription.ts
index 2cfa27f46c..a45d1604f7 100644
--- a/composables/push-notifications/createPushSubscription.ts
+++ b/composables/push-notifications/createPushSubscription.ts
@@ -1,10 +1,4 @@
 import type { mastodon } from 'masto'
-import type {
-  CreatePushNotification,
-  PushManagerSubscriptionInfo,
-  RequiredUserLogin,
-} from '~/composables/push-notifications/types'
-import { PushSubscriptionError } from '~/composables/push-notifications/types'
 
 export async function createPushSubscription(
   user: RequiredUserLogin,
@@ -42,7 +36,7 @@ export async function createPushSubscription(
       )
     })
     .catch((error) => {
-      let useError: PushSubscriptionError | Error = error
+      let useError: typeof PushSubscriptionError | Error = error
       if (error.code === 11 && error.name === 'InvalidStateError')
         useError = new PushSubscriptionError('too_many_registrations', 'Too many registrations')
       else if (error.code === 20 && error.name === 'AbortError')
diff --git a/composables/push-notifications/usePushManager.ts b/composables/push-notifications/usePushManager.ts
index 82566dbb1c..d5568cb1e9 100644
--- a/composables/push-notifications/usePushManager.ts
+++ b/composables/push-notifications/usePushManager.ts
@@ -1,11 +1,5 @@
 import type { mastodon } from 'masto'
 
-import type {
-  CreatePushNotification,
-  PushNotificationPolicy,
-  PushNotificationRequest,
-  SubscriptionResult,
-} from '~/composables/push-notifications/types'
 import { STORAGE_KEY_NOTIFICATION, STORAGE_KEY_NOTIFICATION_POLICY } from '~/constants'
 
 const supportsPushNotifications = typeof window !== 'undefined'
diff --git a/composables/tiptap/suggestion.ts b/composables/tiptap/suggestion.ts
index a5c8d0b53d..83c07ebbe7 100644
--- a/composables/tiptap/suggestion.ts
+++ b/composables/tiptap/suggestion.ts
@@ -6,7 +6,6 @@ import { PluginKey } from 'prosemirror-state'
 import type { Component } from 'vue'
 import type { Emoji, EmojiMartData } from '@emoji-mart/data'
 import type { mastodon } from 'masto'
-import { currentCustomEmojis, updateCustomEmojis } from '~/composables/emojis'
 import TiptapMentionList from '~/components/tiptap/TiptapMentionList.vue'
 import TiptapHashtagList from '~/components/tiptap/TiptapHashtagList.vue'
 import TiptapEmojiList from '~/components/tiptap/TiptapEmojiList.vue'
diff --git a/composables/users.ts b/composables/users.ts
index 3ef5d41011..18a9e71f0c 100644
--- a/composables/users.ts
+++ b/composables/users.ts
@@ -14,8 +14,6 @@ import {
   STORAGE_KEY_SERVERS,
   STORAGE_KEY_USERS,
 } from '~/constants'
-import type { PushNotificationPolicy, PushNotificationRequest } from '~/composables/push-notifications/types'
-import { useAsyncIDBKeyval } from '~/composables/idb'
 
 const mock = process.mock
 
diff --git a/layouts/default.vue b/layouts/default.vue
index ecf6c106fd..012b685926 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -1,6 +1,4 @@
 <script lang="ts" setup>
-import { usePreferences } from '~/composables/settings'
-
 const route = useRoute()
 const info = useBuildInfo()
 
diff --git a/nuxt.config.ts b/nuxt.config.ts
index f18bfc20a1..4cec6d25a4 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -71,10 +71,11 @@ export default defineNuxtConfig({
   },
   imports: {
     dirs: [
-      './composables/masto',
-      './composables/push-notifications',
+      './composables/masto/*',
+      './composables/push-notifications/*',
       './composables/settings',
-      './composables/tiptap/index.ts',
+      './composables/tiptap/*',
+      './composables/idb',
     ],
     imports: [{
       name: 'useI18n',
diff --git a/plugins/magic-keys.client.ts b/plugins/magic-keys.client.ts
index 841283448d..af1823f73d 100644
--- a/plugins/magic-keys.client.ts
+++ b/plugins/magic-keys.client.ts
@@ -1,6 +1,4 @@
 import type { RouteLocationRaw } from 'vue-router'
-import { useMagicSequence } from '~/composables/magickeys'
-import { currentUser, getInstanceDomain } from '~/composables/users'
 
 export default defineNuxtPlugin(({ $scrollToTop }) => {
   const keys = useMagicKeys()
diff --git a/plugins/setup-global-effects.client.ts b/plugins/setup-global-effects.client.ts
index 832dc262d1..7b6d17df5c 100644
--- a/plugins/setup-global-effects.client.ts
+++ b/plugins/setup-global-effects.client.ts
@@ -1,4 +1,3 @@
-import type { OldFontSize } from '~/composables/settings'
 import { oldFontSizeMap } from '~/constants/options'
 import { DEFAULT_FONT_SIZE } from '~/constants'
 
diff --git a/scripts/avatars.ts b/scripts/avatars.ts
index 6ab4707134..697c4d0d91 100644
--- a/scripts/avatars.ts
+++ b/scripts/avatars.ts
@@ -2,7 +2,6 @@ import { Buffer } from 'node:buffer'
 import { join, resolve } from 'pathe'
 import fs from 'fs-extra'
 import { ofetch } from 'ofetch'
-import { elkTeamMembers } from '../composables/about'
 
 const avatarsDir = resolve('./public/avatars/')
 
diff --git a/scripts/generate-themes.ts b/scripts/generate-themes.ts
index ffcc196ef7..494c97861d 100644
--- a/scripts/generate-themes.ts
+++ b/scripts/generate-themes.ts
@@ -1,5 +1,4 @@
 import chroma from 'chroma-js'
-import type { ThemeColors } from '~/composables/settings'
 
 // #cc7d24 -> hcl(67.14,62.19,59.56)
 export const themesColor = Array.from(
diff --git a/tests/nuxt/content-rich.test.ts b/tests/nuxt/content-rich.test.ts
index 22f20d1ebd..1a7042d0ba 100644
--- a/tests/nuxt/content-rich.test.ts
+++ b/tests/nuxt/content-rich.test.ts
@@ -3,8 +3,6 @@ import { renderToString } from 'vue/server-renderer'
 import { format } from 'prettier'
 import type { mastodon } from 'masto'
 import { mockComponent } from '@nuxt/test-utils/runtime'
-import { contentToVNode } from '~/composables/content-render'
-import type { ContentParseOptions } from '~/composables/content-parse'
 
 beforeEach(() => {
   publicServer.value = useRuntimeConfig().public.defaultServer
diff --git a/tests/nuxt/html-parse.test.ts b/tests/nuxt/html-parse.test.ts
index 4ef691b467..cc3634a675 100644
--- a/tests/nuxt/html-parse.test.ts
+++ b/tests/nuxt/html-parse.test.ts
@@ -1,7 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import { format } from 'prettier'
 import { render as renderTree } from 'ultrahtml'
-import type { ContentParseOptions } from '~/composables/content-parse'
 
 describe('html-parse', () => {
   it('empty', async () => {