diff --git a/spec/search/becca_mocking.ts b/spec/search/becca_mocking.ts
index 76ee955f6..0c65f16b6 100644
--- a/spec/search/becca_mocking.ts
+++ b/spec/search/becca_mocking.ts
@@ -3,7 +3,7 @@ import BBranch from "../../src/becca/entities/bbranch.js";
 import BAttribute from "../../src/becca/entities/battribute.js";
 import becca from "../../src/becca/becca.js";
 import randtoken from "rand-token";
-import SearchResult from "../../src/services/search/search_result.js";
+import type SearchResult from "../../src/services/search/search_result.js";
 import type { NoteType } from "../../src/becca/entities/rows.js";
 randtoken.generator({ source: "crypto" });
 
diff --git a/spec/search/parser.spec.ts b/spec/search/parser.spec.ts
index 09c7ce06b..76e557067 100644
--- a/spec/search/parser.spec.ts
+++ b/spec/search/parser.spec.ts
@@ -1,6 +1,6 @@
 import AndExp from "../../src/services/search/expressions/and.js";
 import AttributeExistsExp from "../../src/services/search/expressions/attribute_exists.js";
-import Expression from "../../src/services/search/expressions/expression.js";
+import type Expression from "../../src/services/search/expressions/expression.js";
 import LabelComparisonExp from "../../src/services/search/expressions/label_comparison.js";
 import NotExp from "../../src/services/search/expressions/not.js";
 import NoteContentFulltextExp from "../../src/services/search/expressions/note_content_fulltext.js";
diff --git a/spec/support/etapi.ts b/spec/support/etapi.ts
index 3e6e1ac98..d653707d5 100644
--- a/spec/support/etapi.ts
+++ b/spec/support/etapi.ts
@@ -1,4 +1,4 @@
-import child_process from "child_process";
+import type child_process from "child_process";
 
 let etapiAuthToken: string | undefined;
 
diff --git a/src/becca/becca-interface.ts b/src/becca/becca-interface.ts
index 6497dad7d..cdee5d1cd 100644
--- a/src/becca/becca-interface.ts
+++ b/src/becca/becca-interface.ts
@@ -1,17 +1,17 @@
 import sql from "../services/sql.js";
 import NoteSet from "../services/search/note_set.js";
 import NotFoundError from "../errors/not_found_error.js";
-import BOption from "./entities/boption.js";
-import BNote from "./entities/bnote.js";
-import BEtapiToken from "./entities/betapi_token.js";
-import BAttribute from "./entities/battribute.js";
-import BBranch from "./entities/bbranch.js";
+import type BOption from "./entities/boption.js";
+import type BNote from "./entities/bnote.js";
+import type BEtapiToken from "./entities/betapi_token.js";
+import type BAttribute from "./entities/battribute.js";
+import type BBranch from "./entities/bbranch.js";
 import BRevision from "./entities/brevision.js";
 import BAttachment from "./entities/battachment.js";
 import type { AttachmentRow, BlobRow, RevisionRow } from "./entities/rows.js";
 import BBlob from "./entities/bblob.js";
 import BRecentNote from "./entities/brecent_note.js";
-import AbstractBeccaEntity from "./entities/abstract_becca_entity.js";
+import type AbstractBeccaEntity from "./entities/abstract_becca_entity.js";
 
 interface AttachmentOpts {
     includeContentLength?: boolean;
diff --git a/src/becca/becca_loader.ts b/src/becca/becca_loader.ts
index a461828ac..8397b2dec 100644
--- a/src/becca/becca_loader.ts
+++ b/src/becca/becca_loader.ts
@@ -12,7 +12,7 @@ import BEtapiToken from "./entities/betapi_token.js";
 import cls from "../services/cls.js";
 import entityConstructor from "../becca/entity_constructor.js";
 import type { AttributeRow, BranchRow, EtapiTokenRow, NoteRow, OptionRow } from "./entities/rows.js";
-import AbstractBeccaEntity from "./entities/abstract_becca_entity.js";
+import type AbstractBeccaEntity from "./entities/abstract_becca_entity.js";
 import ws from "../services/ws.js";
 
 const beccaLoaded = new Promise<void>(async (res, rej) => {
diff --git a/src/becca/entities/abstract_becca_entity.ts b/src/becca/entities/abstract_becca_entity.ts
index b964a2d43..a36132f3a 100644
--- a/src/becca/entities/abstract_becca_entity.ts
+++ b/src/becca/entities/abstract_becca_entity.ts
@@ -9,7 +9,7 @@ import cls from "../../services/cls.js";
 import log from "../../services/log.js";
 import protectedSessionService from "../../services/protected_session.js";
 import blobService from "../../services/blob.js";
-import Becca, { type ConstructorData } from "../becca-interface.js";
+import type { default as Becca, ConstructorData } from "../becca-interface.js";
 import becca from "../becca.js";
 
 interface ContentOpts {
diff --git a/src/becca/entities/battachment.ts b/src/becca/entities/battachment.ts
index 1e47fc9bf..9461647af 100644
--- a/src/becca/entities/battachment.ts
+++ b/src/becca/entities/battachment.ts
@@ -7,8 +7,8 @@ import sql from "../../services/sql.js";
 import protectedSessionService from "../../services/protected_session.js";
 import log from "../../services/log.js";
 import type { AttachmentRow } from "./rows.js";
-import BNote from "./bnote.js";
-import BBranch from "./bbranch.js";
+import type BNote from "./bnote.js";
+import type BBranch from "./bbranch.js";
 import noteService from "../../services/notes.js";
 
 const attachmentRoleToNoteTypeMapping = {
diff --git a/src/becca/entities/bnote.ts b/src/becca/entities/bnote.ts
index d83a263ff..acc432127 100644
--- a/src/becca/entities/bnote.ts
+++ b/src/becca/entities/bnote.ts
@@ -15,7 +15,7 @@ import dayjs from "dayjs";
 import utc from "dayjs/plugin/utc.js";
 import eventService from "../../services/events.js";
 import type { AttachmentRow, AttributeType, NoteRow, NoteType, RevisionRow } from "./rows.js";
-import BBranch from "./bbranch.js";
+import type BBranch from "./bbranch.js";
 import BAttribute from "./battribute.js";
 import type { NotePojo } from "../becca-interface.js";
 import searchService from "../../services/search/services/search.js";
diff --git a/src/becca/entity_constructor.ts b/src/becca/entity_constructor.ts
index 83c5bd62c..18f7a14c7 100644
--- a/src/becca/entity_constructor.ts
+++ b/src/becca/entity_constructor.ts
@@ -1,5 +1,5 @@
 import type { ConstructorData } from "./becca-interface.js";
-import AbstractBeccaEntity from "./entities/abstract_becca_entity.js";
+import type AbstractBeccaEntity from "./entities/abstract_becca_entity.js";
 import BAttachment from "./entities/battachment.js";
 import BAttribute from "./entities/battribute.js";
 import BBlob from "./entities/bblob.js";
diff --git a/src/becca/similarity.ts b/src/becca/similarity.ts
index 5313419d6..66af0ac61 100644
--- a/src/becca/similarity.ts
+++ b/src/becca/similarity.ts
@@ -3,7 +3,7 @@ import log from "../services/log.js";
 import beccaService from "./becca_service.js";
 import dateUtils from "../services/date_utils.js";
 import { JSDOM } from "jsdom";
-import BNote from "./entities/bnote.js";
+import type BNote from "./entities/bnote.js";
 
 const DEBUG = false;
 
diff --git a/src/etapi/app_info.ts b/src/etapi/app_info.ts
index ec5b781c2..ab6deb9dd 100644
--- a/src/etapi/app_info.ts
+++ b/src/etapi/app_info.ts
@@ -1,4 +1,4 @@
-import { Router } from "express";
+import type { Router } from "express";
 import appInfo from "../services/app_info.js";
 import eu from "./etapi_utils.js";
 
diff --git a/src/etapi/attachments.ts b/src/etapi/attachments.ts
index 5d3ce57e4..0404e11a1 100644
--- a/src/etapi/attachments.ts
+++ b/src/etapi/attachments.ts
@@ -3,7 +3,7 @@ import eu from "./etapi_utils.js";
 import mappers from "./mappers.js";
 import v from "./validators.js";
 import utils from "../services/utils.js";
-import { Router } from "express";
+import type { Router } from "express";
 import type { AttachmentRow } from "../becca/entities/rows.js";
 import type { ValidatorMap } from "./etapi-interface.js";
 
diff --git a/src/etapi/attributes.ts b/src/etapi/attributes.ts
index 3b9cf3451..91a441117 100644
--- a/src/etapi/attributes.ts
+++ b/src/etapi/attributes.ts
@@ -3,7 +3,7 @@ import eu from "./etapi_utils.js";
 import mappers from "./mappers.js";
 import attributeService from "../services/attributes.js";
 import v from "./validators.js";
-import { Router } from "express";
+import type { Router } from "express";
 import type { AttributeRow } from "../becca/entities/rows.js";
 import type { ValidatorMap } from "./etapi-interface.js";
 
diff --git a/src/etapi/backup.ts b/src/etapi/backup.ts
index 3b9f3f874..d73bf1a33 100644
--- a/src/etapi/backup.ts
+++ b/src/etapi/backup.ts
@@ -1,4 +1,4 @@
-import { Router } from "express";
+import type { Router } from "express";
 
 import eu from "./etapi_utils.js";
 import backupService from "../services/backup.js";
diff --git a/src/etapi/branches.ts b/src/etapi/branches.ts
index 59f87c3c8..7263b3161 100644
--- a/src/etapi/branches.ts
+++ b/src/etapi/branches.ts
@@ -1,4 +1,4 @@
-import { Router } from "express";
+import type { Router } from "express";
 
 import becca from "../becca/becca.js";
 import eu from "./etapi_utils.js";
diff --git a/src/etapi/mappers.ts b/src/etapi/mappers.ts
index 33cd2c29f..735e767c2 100644
--- a/src/etapi/mappers.ts
+++ b/src/etapi/mappers.ts
@@ -1,7 +1,7 @@
-import BAttachment from "../becca/entities/battachment.js";
-import BAttribute from "../becca/entities/battribute.js";
-import BBranch from "../becca/entities/bbranch.js";
-import BNote from "../becca/entities/bnote.js";
+import type BAttachment from "../becca/entities/battachment.js";
+import type BAttribute from "../becca/entities/battribute.js";
+import type BBranch from "../becca/entities/bbranch.js";
+import type BNote from "../becca/entities/bnote.js";
 
 function mapNoteToPojo(note: BNote) {
     return {
diff --git a/src/etapi/notes.ts b/src/etapi/notes.ts
index 05b120195..5ab1727b9 100644
--- a/src/etapi/notes.ts
+++ b/src/etapi/notes.ts
@@ -9,7 +9,7 @@ import searchService from "../services/search/services/search.js";
 import SearchContext from "../services/search/search_context.js";
 import zipExportService from "../services/export/zip.js";
 import zipImportService from "../services/import/zip.js";
-import { type Request, Router } from "express";
+import type { Request, Router } from "express";
 import type { ParsedQs } from "qs";
 import type { NoteParams } from "../services/note-interface.js";
 import type { SearchParams } from "../services/search/services/types.js";
diff --git a/src/etapi/spec.ts b/src/etapi/spec.ts
index 5e27be949..925ff51a6 100644
--- a/src/etapi/spec.ts
+++ b/src/etapi/spec.ts
@@ -1,4 +1,4 @@
-import { Router } from "express";
+import type { Router } from "express";
 
 import fs from "fs";
 import path from "path";
diff --git a/src/etapi/special_notes.ts b/src/etapi/special_notes.ts
index 14626710d..23411c987 100644
--- a/src/etapi/special_notes.ts
+++ b/src/etapi/special_notes.ts
@@ -2,7 +2,7 @@ import specialNotesService from "../services/special_notes.js";
 import dateNotesService from "../services/date_notes.js";
 import eu from "./etapi_utils.js";
 import mappers from "./mappers.js";
-import { Router } from "express";
+import type { Router } from "express";
 
 const getDateInvalidError = (date: string) => new eu.EtapiError(400, "DATE_INVALID", `Date "${date}" is not valid.`);
 const getMonthInvalidError = (month: string) => new eu.EtapiError(400, "MONTH_INVALID", `Month "${month}" is not valid.`);
diff --git a/src/public/app/components/app_context.ts b/src/public/app/components/app_context.ts
index ea11d2ea4..15e9b8910 100644
--- a/src/public/app/components/app_context.ts
+++ b/src/public/app/components/app_context.ts
@@ -14,15 +14,15 @@ import MainTreeExecutors from "./main_tree_executors.js";
 import toast from "../services/toast.js";
 import ShortcutComponent from "./shortcut_component.js";
 import { t, initLocale } from "../services/i18n.js";
-import NoteDetailWidget from "../widgets/note_detail.js";
+import type NoteDetailWidget from "../widgets/note_detail.js";
 import type { ResolveOptions } from "../widgets/dialogs/delete_notes.js";
 import type { PromptDialogOptions } from "../widgets/dialogs/prompt.js";
 import type { ConfirmWithMessageOptions, ConfirmWithTitleOptions } from "../widgets/dialogs/confirm.js";
 import type { Node } from "../services/tree.js";
-import LoadResults from "../services/load_results.js";
+import type LoadResults from "../services/load_results.js";
 import type { Attribute } from "../services/attribute_parser.js";
-import NoteTreeWidget from "../widgets/note_tree.js";
-import NoteContext, { type GetTextEditorCallback } from "./note_context.js";
+import type NoteTreeWidget from "../widgets/note_tree.js";
+import type { default as NoteContext, GetTextEditorCallback } from "./note_context.js";
 
 interface Layout {
     getRootWidget: (appContext: AppContext) => RootWidget;
diff --git a/src/public/app/components/entrypoints.ts b/src/public/app/components/entrypoints.ts
index b62cfdeb3..5ba9e3bd8 100644
--- a/src/public/app/components/entrypoints.ts
+++ b/src/public/app/components/entrypoints.ts
@@ -10,7 +10,7 @@ import bundleService from "../services/bundle.js";
 import froca from "../services/froca.js";
 import linkService from "../services/link.js";
 import { t } from "../services/i18n.js";
-import FNote from "../entities/fnote.js";
+import type FNote from "../entities/fnote.js";
 
 // TODO: Move somewhere else nicer.
 export type SqlExecuteResults = unknown[];
diff --git a/src/public/app/components/note_context.ts b/src/public/app/components/note_context.ts
index 2bd1981cc..e5b649e56 100644
--- a/src/public/app/components/note_context.ts
+++ b/src/public/app/components/note_context.ts
@@ -8,7 +8,7 @@ import froca from "../services/froca.js";
 import hoistedNoteService from "../services/hoisted_note.js";
 import options from "../services/options.js";
 import type { ViewScope } from "../services/link.js";
-import FNote from "../entities/fnote.js";
+import type FNote from "../entities/fnote.js";
 
 interface SetNoteOpts {
     triggerSwitchEvent?: unknown;
diff --git a/src/public/app/entities/fnote.ts b/src/public/app/entities/fnote.ts
index ed42257e1..9759f8b07 100644
--- a/src/public/app/entities/fnote.ts
+++ b/src/public/app/entities/fnote.ts
@@ -5,8 +5,8 @@ import froca from "../services/froca.js";
 import protectedSessionHolder from "../services/protected_session_holder.js";
 import cssClassManager from "../services/css_class_manager.js";
 import type { Froca } from "../services/froca-interface.js";
-import FAttachment from "./fattachment.js";
-import FAttribute, { type AttributeType } from "./fattribute.js";
+import type FAttachment from "./fattachment.js";
+import type { default as FAttribute, AttributeType } from "./fattribute.js";
 import utils from "../services/utils.js";
 
 const LABEL = "label";
diff --git a/src/public/app/layouts/mobile_layout.ts b/src/public/app/layouts/mobile_layout.ts
index 0f31199fd..64e698998 100644
--- a/src/public/app/layouts/mobile_layout.ts
+++ b/src/public/app/layouts/mobile_layout.ts
@@ -27,7 +27,7 @@ import ClassicEditorToolbar from "../widgets/ribbon_widgets/classic_editor_toolb
 import SidebarContainer from "../widgets/mobile_widgets/sidebar_container.js";
 import AboutDialog from "../widgets/dialogs/about.js";
 import HelpDialog from "../widgets/dialogs/help.js";
-import AppContext from "../components/app_context.js";
+import type AppContext from "../components/app_context.js";
 import TabRowWidget from "../widgets/tab_row.js";
 import JumpToNoteDialog from "../widgets/dialogs/jump_to_note.js";
 
diff --git a/src/public/app/menus/launcher_context_menu.ts b/src/public/app/menus/launcher_context_menu.ts
index d61e0e372..8c2b157cd 100644
--- a/src/public/app/menus/launcher_context_menu.ts
+++ b/src/public/app/menus/launcher_context_menu.ts
@@ -5,7 +5,7 @@ import dialogService from "../services/dialog.js";
 import server from "../services/server.js";
 import { t } from "../services/i18n.js";
 import type { SelectMenuItemEventListener } from "../components/events.js";
-import NoteTreeWidget from "../widgets/note_tree.js";
+import type NoteTreeWidget from "../widgets/note_tree.js";
 import type { FilteredCommandNames, ContextMenuCommandData } from "../components/app_context.js";
 
 type LauncherCommandNames = FilteredCommandNames<ContextMenuCommandData>;
@@ -58,7 +58,7 @@ export default class LauncherContextMenu implements SelectMenuItemEventListener<
 
             { title: t("launcher_context_menu.reset"), command: "resetLauncher", uiIcon: "bx bx-reset destructive-action-icon", enabled: canBeReset }
         ];
-        return items.filter((row) => row !== null);
+        return items.filter((row) => row !== null) as MenuItem<LauncherCommandNames>[];
     }
 
     async selectMenuItemHandler({ command }: MenuCommandItem<LauncherCommandNames>) {
diff --git a/src/public/app/menus/tree_context_menu.ts b/src/public/app/menus/tree_context_menu.ts
index be7983faa..650432828 100644
--- a/src/public/app/menus/tree_context_menu.ts
+++ b/src/public/app/menus/tree_context_menu.ts
@@ -9,8 +9,8 @@ import server from "../services/server.js";
 import toastService from "../services/toast.js";
 import dialogService from "../services/dialog.js";
 import { t } from "../services/i18n.js";
-import NoteTreeWidget from "../widgets/note_tree.js";
-import FAttachment from "../entities/fattachment.js";
+import type NoteTreeWidget from "../widgets/note_tree.js";
+import type FAttachment from "../entities/fattachment.js";
 import type { SelectMenuItemEventListener } from "../components/events.js";
 
 // TODO: Deduplicate once client/server is well split.
@@ -196,7 +196,7 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree
                 enabled: notSearch && noSelectedNotes
             }
         ];
-        return items.filter((row) => row !== null);
+        return items.filter((row) => row !== null) as MenuItem<TreeCommandNames>[];
     }
 
     async selectMenuItemHandler({ command, type, templateNoteId }: MenuCommandItem<TreeCommandNames>) {
diff --git a/src/public/app/services/attribute_renderer.ts b/src/public/app/services/attribute_renderer.ts
index a686b7098..6c7b9412d 100644
--- a/src/public/app/services/attribute_renderer.ts
+++ b/src/public/app/services/attribute_renderer.ts
@@ -1,7 +1,7 @@
 import ws from "./ws.js";
 import froca from "./froca.js";
-import FAttribute from "../entities/fattribute.js";
-import FNote from "../entities/fnote.js";
+import type FAttribute from "../entities/fattribute.js";
+import type FNote from "../entities/fnote.js";
 
 async function renderAttribute(attribute: FAttribute, renderIsInheritable: boolean) {
     const isInheritable = renderIsInheritable && attribute.isInheritable ? `(inheritable)` : "";
diff --git a/src/public/app/services/attributes.ts b/src/public/app/services/attributes.ts
index b594630c5..767d8c3af 100644
--- a/src/public/app/services/attributes.ts
+++ b/src/public/app/services/attributes.ts
@@ -1,6 +1,6 @@
 import server from "./server.js";
 import froca from "./froca.js";
-import FNote from "../entities/fnote.js";
+import type FNote from "../entities/fnote.js";
 import type { AttributeRow } from "./load_results.js";
 
 async function addLabel(noteId: string, name: string, value: string = "") {
diff --git a/src/public/app/services/bulk_action.ts b/src/public/app/services/bulk_action.ts
index 615e1c6eb..66922ef62 100644
--- a/src/public/app/services/bulk_action.ts
+++ b/src/public/app/services/bulk_action.ts
@@ -14,7 +14,7 @@ import AddLabelBulkAction from "../widgets/bulk_actions/label/add_label.js";
 import AddRelationBulkAction from "../widgets/bulk_actions/relation/add_relation.js";
 import RenameNoteBulkAction from "../widgets/bulk_actions/note/rename_note.js";
 import { t } from "./i18n.js";
-import FNote from "../entities/fnote.js";
+import type FNote from "../entities/fnote.js";
 
 const ACTION_GROUPS = [
     {
diff --git a/src/public/app/services/froca-interface.ts b/src/public/app/services/froca-interface.ts
index c678e220b..8d0077989 100644
--- a/src/public/app/services/froca-interface.ts
+++ b/src/public/app/services/froca-interface.ts
@@ -1,8 +1,8 @@
-import FAttachment from "../entities/fattachment.js";
-import FAttribute from "../entities/fattribute.js";
-import FBlob from "../entities/fblob.js";
-import FBranch from "../entities/fbranch.js";
-import FNote from "../entities/fnote.js";
+import type FAttachment from "../entities/fattachment.js";
+import type FAttribute from "../entities/fattribute.js";
+import type FBlob from "../entities/fblob.js";
+import type FBranch from "../entities/fbranch.js";
+import type FNote from "../entities/fnote.js";
 
 export interface Froca {
     notes: Record<string, FNote>;
diff --git a/src/public/app/services/froca_updater.ts b/src/public/app/services/froca_updater.ts
index 89de8c5b7..f10720de4 100644
--- a/src/public/app/services/froca_updater.ts
+++ b/src/public/app/services/froca_updater.ts
@@ -6,7 +6,7 @@ import noteAttributeCache from "./note_attribute_cache.js";
 import FBranch, { type FBranchRow } from "../entities/fbranch.js";
 import FAttribute, { type FAttributeRow } from "../entities/fattribute.js";
 import FAttachment, { type FAttachmentRow } from "../entities/fattachment.js";
-import FNote, { type FNoteRow } from "../entities/fnote.js";
+import type { default as FNote, FNoteRow } from "../entities/fnote.js";
 import type { EntityChange } from "../server_types.js";
 
 async function processEntityChanges(entityChanges: EntityChange[]) {
diff --git a/src/public/app/services/frontend_script_api.ts b/src/public/app/services/frontend_script_api.ts
index acdff7444..a8160bbff 100644
--- a/src/public/app/services/frontend_script_api.ts
+++ b/src/public/app/services/frontend_script_api.ts
@@ -15,11 +15,11 @@ import BasicWidget from "../widgets/basic_widget.js";
 import SpacedUpdate from "./spaced_update.js";
 import shortcutService from "./shortcuts.js";
 import dialogService from "./dialog.js";
-import FNote from "../entities/fnote.js";
+import type FNote from "../entities/fnote.js";
 import { t } from "./i18n.js";
-import NoteContext from "../components/note_context.js";
-import NoteDetailWidget from "../widgets/note_detail.js";
-import Component from "../components/component.js";
+import type NoteContext from "../components/note_context.js";
+import type NoteDetailWidget from "../widgets/note_detail.js";
+import type Component from "../components/component.js";
 
 /**
  * A whole number
diff --git a/src/public/app/services/hoisted_note.ts b/src/public/app/services/hoisted_note.ts
index 53d62c081..597de9467 100644
--- a/src/public/app/services/hoisted_note.ts
+++ b/src/public/app/services/hoisted_note.ts
@@ -2,7 +2,7 @@ import appContext from "../components/app_context.js";
 import treeService, { type Node } from "./tree.js";
 import dialogService from "./dialog.js";
 import froca from "./froca.js";
-import NoteContext from "../components/note_context.js";
+import type NoteContext from "../components/note_context.js";
 import { t } from "./i18n.js";
 
 function getHoistedNoteId() {
diff --git a/src/public/app/services/keyboard_actions.ts b/src/public/app/services/keyboard_actions.ts
index bdd13e28b..dfa888620 100644
--- a/src/public/app/services/keyboard_actions.ts
+++ b/src/public/app/services/keyboard_actions.ts
@@ -1,7 +1,7 @@
 import server from "./server.js";
 import appContext, { type CommandNames } from "../components/app_context.js";
 import shortcutService from "./shortcuts.js";
-import Component from "../components/component.js";
+import type Component from "../components/component.js";
 
 const keyboardActionRepo: Record<string, Action> = {};
 
diff --git a/src/public/app/services/note_attribute_cache.ts b/src/public/app/services/note_attribute_cache.ts
index ae3993cfb..18980036f 100644
--- a/src/public/app/services/note_attribute_cache.ts
+++ b/src/public/app/services/note_attribute_cache.ts
@@ -1,4 +1,4 @@
-import FAttribute from "../entities/fattribute.js";
+import type FAttribute from "../entities/fattribute.js";
 
 /**
  * The purpose of this class is to cache the list of attributes for notes.
diff --git a/src/public/app/services/note_create.ts b/src/public/app/services/note_create.ts
index a7fd5ec76..b85c8277b 100644
--- a/src/public/app/services/note_create.ts
+++ b/src/public/app/services/note_create.ts
@@ -6,8 +6,8 @@ import froca from "./froca.js";
 import treeService from "./tree.js";
 import toastService from "./toast.js";
 import { t } from "./i18n.js";
-import FNote from "../entities/fnote.js";
-import FBranch from "../entities/fbranch.js";
+import type FNote from "../entities/fnote.js";
+import type FBranch from "../entities/fbranch.js";
 import type { ChooseNoteTypeResponse } from "../widgets/dialogs/note_type_chooser.js";
 
 interface CreateNoteOpts {
diff --git a/src/public/app/services/note_list_renderer.ts b/src/public/app/services/note_list_renderer.ts
index e6e305689..2e6652b0f 100644
--- a/src/public/app/services/note_list_renderer.ts
+++ b/src/public/app/services/note_list_renderer.ts
@@ -5,7 +5,7 @@ import attributeRenderer from "./attribute_renderer.js";
 import libraryLoader from "./library_loader.js";
 import treeService from "./tree.js";
 import utils from "./utils.js";
-import FNote from "../entities/fnote.js";
+import type FNote from "../entities/fnote.js";
 
 const TPL = `
 <div class="note-list">
diff --git a/src/public/app/services/note_tooltip.ts b/src/public/app/services/note_tooltip.ts
index f456d7a63..32f79c73d 100644
--- a/src/public/app/services/note_tooltip.ts
+++ b/src/public/app/services/note_tooltip.ts
@@ -5,7 +5,7 @@ import utils from "./utils.js";
 import attributeRenderer from "./attribute_renderer.js";
 import contentRenderer from "./content_renderer.js";
 import appContext from "../components/app_context.js";
-import FNote from "../entities/fnote.js";
+import type FNote from "../entities/fnote.js";
 import { t } from "./i18n.js";
 
 function setupGlobalTooltip() {
diff --git a/src/public/app/services/protected_session_holder.ts b/src/public/app/services/protected_session_holder.ts
index e4171f389..647c2f51d 100644
--- a/src/public/app/services/protected_session_holder.ts
+++ b/src/public/app/services/protected_session_holder.ts
@@ -1,4 +1,4 @@
-import FNote from "../entities/fnote.js";
+import type FNote from "../entities/fnote.js";
 import server from "./server.js";
 
 function enableProtectedSession() {
diff --git a/src/public/app/services/render.ts b/src/public/app/services/render.ts
index 0eb02c7a7..bec5cb514 100644
--- a/src/public/app/services/render.ts
+++ b/src/public/app/services/render.ts
@@ -1,6 +1,6 @@
 import server from "./server.js";
 import bundleService, { type Bundle } from "./bundle.js";
-import FNote from "../entities/fnote.js";
+import type FNote from "../entities/fnote.js";
 
 async function render(note: FNote, $el: JQuery<HTMLElement>) {
     const relations = note.getRelations("renderNote");
diff --git a/src/public/app/widgets/attribute_widgets/attribute_editor.ts b/src/public/app/widgets/attribute_widgets/attribute_editor.ts
index 0119bcd3b..622da6ca9 100644
--- a/src/public/app/widgets/attribute_widgets/attribute_editor.ts
+++ b/src/public/app/widgets/attribute_widgets/attribute_editor.ts
@@ -3,17 +3,17 @@ import NoteContextAwareWidget from "../note_context_aware_widget.js";
 import noteAutocompleteService from "../../services/note_autocomplete.js";
 import server from "../../services/server.js";
 import contextMenuService from "../../menus/context_menu.js";
-import attributeParser from "../../services/attribute_parser.js";
+import attributeParser, { type Attribute } from "../../services/attribute_parser.js";
 import libraryLoader from "../../services/library_loader.js";
 import froca from "../../services/froca.js";
 import attributeRenderer from "../../services/attribute_renderer.js";
 import noteCreateService from "../../services/note_create.js";
 import attributeService from "../../services/attributes.js";
 import linkService from "../../services/link.js";
-import AttributeDetailWidget from "./attribute_detail.js";
+import type AttributeDetailWidget from "./attribute_detail.js";
 import type { CommandData, EventData, EventListener, FilteredCommandNames } from "../../components/app_context.js";
-import FAttribute, { type AttributeType } from "../../entities/fattribute.js";
-import FNote from "../../entities/fnote.js";
+import type { default as FAttribute, AttributeType } from "../../entities/fattribute.js";
+import type FNote from "../../entities/fnote.js";
 
 const HELP_TEXT = `
 <p>${t("attribute_editor.help_text_body1")}</p>
@@ -417,7 +417,7 @@ export default class AttributeEditorWidget extends NoteContextAwareWidget implem
                 return null;
             }
 
-            let matchedAttr = null;
+            let matchedAttr: Attribute | null = null;
 
             for (const attr of parsedAttrs) {
                 if (attr.startIndex && clickIndex > attr.startIndex && attr.endIndex && clickIndex <= attr.endIndex) {
diff --git a/src/public/app/widgets/bulk_actions/abstract_bulk_action.ts b/src/public/app/widgets/bulk_actions/abstract_bulk_action.ts
index 436f8fbd8..eb24bbd4d 100644
--- a/src/public/app/widgets/bulk_actions/abstract_bulk_action.ts
+++ b/src/public/app/widgets/bulk_actions/abstract_bulk_action.ts
@@ -2,7 +2,7 @@ import { t } from "../../services/i18n.js";
 import server from "../../services/server.js";
 import ws from "../../services/ws.js";
 import utils from "../../services/utils.js";
-import FAttribute from "../../entities/fattribute.js";
+import type FAttribute from "../../entities/fattribute.js";
 
 interface ActionDefinition {
     script: string;
diff --git a/src/public/app/widgets/containers/container.ts b/src/public/app/widgets/containers/container.ts
index 56fe050a0..679fa11a8 100644
--- a/src/public/app/widgets/containers/container.ts
+++ b/src/public/app/widgets/containers/container.ts
@@ -1,4 +1,4 @@
-import Component, { TypedComponent } from "../../components/component.js";
+import type { default as Component, TypedComponent } from "../../components/component.js";
 import BasicWidget, { TypedBasicWidget } from "../basic_widget.js";
 
 export default class Container<T extends TypedComponent<any>> extends TypedBasicWidget<T> {
diff --git a/src/public/app/widgets/containers/flex_container.ts b/src/public/app/widgets/containers/flex_container.ts
index 62660a4ee..274284775 100644
--- a/src/public/app/widgets/containers/flex_container.ts
+++ b/src/public/app/widgets/containers/flex_container.ts
@@ -1,4 +1,4 @@
-import { TypedComponent } from "../../components/component.js";
+import type { TypedComponent } from "../../components/component.js";
 import Container from "./container.js";
 
 export type FlexDirection = "row" | "column";
diff --git a/src/public/app/widgets/containers/launcher.ts b/src/public/app/widgets/containers/launcher.ts
index 41024073a..86fbabb96 100644
--- a/src/public/app/widgets/containers/launcher.ts
+++ b/src/public/app/widgets/containers/launcher.ts
@@ -11,7 +11,7 @@ import utils from "../../services/utils.js";
 import TodayLauncher from "../buttons/launcher/today_launcher.js";
 import HistoryNavigationButton from "../buttons/history_navigation.js";
 import QuickSearchLauncherWidget from "../quick_search_launcher.js";
-import FNote from "../../entities/fnote.js";
+import type FNote from "../../entities/fnote.js";
 import type { CommandNames } from "../../components/app_context.js";
 
 interface InnerWidget extends BasicWidget {
diff --git a/src/public/app/widgets/containers/right_pane_container.ts b/src/public/app/widgets/containers/right_pane_container.ts
index 4325935fe..c7632769b 100644
--- a/src/public/app/widgets/containers/right_pane_container.ts
+++ b/src/public/app/widgets/containers/right_pane_container.ts
@@ -1,6 +1,6 @@
 import FlexContainer from "./flex_container.js";
 import splitService from "../../services/resizer.js";
-import RightPanelWidget from "../right_panel_widget.js";
+import type RightPanelWidget from "../right_panel_widget.js";
 
 export default class RightPaneContainer extends FlexContainer<RightPanelWidget> {
     private rightPaneHidden: boolean;
diff --git a/src/public/app/widgets/highlights_list.ts b/src/public/app/widgets/highlights_list.ts
index 8b8fb06de..a9be2ddfa 100644
--- a/src/public/app/widgets/highlights_list.ts
+++ b/src/public/app/widgets/highlights_list.ts
@@ -12,7 +12,7 @@ import options from "../services/options.js";
 import OnClickButtonWidget from "./buttons/onclick_button.js";
 import appContext, { type EventData } from "../components/app_context.js";
 import libraryLoader from "../services/library_loader.js";
-import FNote from "../entities/fnote.js";
+import type FNote from "../entities/fnote.js";
 
 const TPL = `<div class="highlights-list-widget">
     <style>
diff --git a/src/public/app/widgets/mobile_widgets/sidebar_container.ts b/src/public/app/widgets/mobile_widgets/sidebar_container.ts
index cbb56e901..b01d5ff12 100644
--- a/src/public/app/widgets/mobile_widgets/sidebar_container.ts
+++ b/src/public/app/widgets/mobile_widgets/sidebar_container.ts
@@ -1,6 +1,6 @@
 import type { EventData } from "../../components/app_context.js";
 import type { Screen } from "../../components/mobile_screen_switcher.js";
-import BasicWidget from "../basic_widget.js";
+import type BasicWidget from "../basic_widget.js";
 import FlexContainer, { type FlexDirection } from "../containers/flex_container.js";
 
 const DRAG_STATE_NONE = 0;
diff --git a/src/public/app/widgets/note_context_aware_widget.ts b/src/public/app/widgets/note_context_aware_widget.ts
index a9b0be97f..4684c3079 100644
--- a/src/public/app/widgets/note_context_aware_widget.ts
+++ b/src/public/app/widgets/note_context_aware_widget.ts
@@ -1,7 +1,7 @@
 import BasicWidget from "./basic_widget.js";
 import appContext, { type EventData } from "../components/app_context.js";
-import FNote from "../entities/fnote.js";
-import NoteContext from "../components/note_context.js";
+import type FNote from "../entities/fnote.js";
+import type NoteContext from "../components/note_context.js";
 
 /**
  * This widget allows for changing and updating depending on the active note.
diff --git a/src/public/app/widgets/right_panel_widget.ts b/src/public/app/widgets/right_panel_widget.ts
index db1219686..47cd3ced7 100644
--- a/src/public/app/widgets/right_panel_widget.ts
+++ b/src/public/app/widgets/right_panel_widget.ts
@@ -1,5 +1,5 @@
-import BasicWidget from "./basic_widget.js";
-import AbstractButtonWidget from "./buttons/abstract_button.js";
+import type BasicWidget from "./basic_widget.js";
+import type AbstractButtonWidget from "./buttons/abstract_button.js";
 import NoteContextAwareWidget from "./note_context_aware_widget.js";
 
 const WIDGET_TPL = `
diff --git a/src/public/app/widgets/type_widgets/options/options_widget.ts b/src/public/app/widgets/type_widgets/options/options_widget.ts
index 00ddc63e7..fb4d9c0c3 100644
--- a/src/public/app/widgets/type_widgets/options/options_widget.ts
+++ b/src/public/app/widgets/type_widgets/options/options_widget.ts
@@ -1,6 +1,6 @@
 import type { FilterOptionsByType, OptionDefinitions, OptionMap, OptionNames } from "../../../../../services/options_interface.js";
 import type { EventData, EventListener } from "../../../components/app_context.js";
-import FNote from "../../../entities/fnote.js";
+import type FNote from "../../../entities/fnote.js";
 import { t } from "../../../services/i18n.js";
 import server from "../../../services/server.js";
 import toastService from "../../../services/toast.js";
diff --git a/src/routes/api/clipper.ts b/src/routes/api/clipper.ts
index 08fd2bc94..e2b5baba1 100644
--- a/src/routes/api/clipper.ts
+++ b/src/routes/api/clipper.ts
@@ -16,7 +16,7 @@ import path from "path";
 import htmlSanitizer from "../../services/html_sanitizer.js";
 import attributeFormatter from "../../services/attribute_formatter.js";
 import jsdom from "jsdom";
-import BNote from "../../becca/entities/bnote.js";
+import type BNote from "../../becca/entities/bnote.js";
 import ValidationError from "../../errors/validation_error.js";
 const { JSDOM } = jsdom;
 
diff --git a/src/routes/api/files.ts b/src/routes/api/files.ts
index 38987e3b2..7ec4a9b3c 100644
--- a/src/routes/api/files.ts
+++ b/src/routes/api/files.ts
@@ -12,8 +12,8 @@ import ws from "../../services/ws.js";
 import becca from "../../becca/becca.js";
 import ValidationError from "../../errors/validation_error.js";
 import type { Request, Response } from "express";
-import BNote from "../../becca/entities/bnote.js";
-import BAttachment from "../../becca/entities/battachment.js";
+import type BNote from "../../becca/entities/bnote.js";
+import type BAttachment from "../../becca/entities/battachment.js";
 
 function updateFile(req: Request) {
     const note = becca.getNoteOrThrow(req.params.noteId);
diff --git a/src/routes/api/image.ts b/src/routes/api/image.ts
index 55cea89a1..d2d943486 100644
--- a/src/routes/api/image.ts
+++ b/src/routes/api/image.ts
@@ -4,8 +4,8 @@ import imageService from "../../services/image.js";
 import becca from "../../becca/becca.js";
 import fs from "fs";
 import type { Request, Response } from "express";
-import BNote from "../../becca/entities/bnote.js";
-import BRevision from "../../becca/entities/brevision.js";
+import type BNote from "../../becca/entities/bnote.js";
+import type BRevision from "../../becca/entities/brevision.js";
 import { RESOURCE_DIR } from "../../services/resource_dir.js";
 
 function returnImageFromNote(req: Request, res: Response) {
diff --git a/src/routes/api/import.ts b/src/routes/api/import.ts
index 661cf3bb9..bb46f8990 100644
--- a/src/routes/api/import.ts
+++ b/src/routes/api/import.ts
@@ -12,7 +12,7 @@ import log from "../../services/log.js";
 import TaskContext from "../../services/task_context.js";
 import ValidationError from "../../errors/validation_error.js";
 import type { Request } from "express";
-import BNote from "../../becca/entities/bnote.js";
+import type BNote from "../../becca/entities/bnote.js";
 
 async function importNotesToBranch(req: Request) {
     const { parentNoteId } = req.params;
diff --git a/src/routes/api/note_map.ts b/src/routes/api/note_map.ts
index 960938717..b08c03d1f 100644
--- a/src/routes/api/note_map.ts
+++ b/src/routes/api/note_map.ts
@@ -2,8 +2,8 @@
 
 import becca from "../../becca/becca.js";
 import { JSDOM } from "jsdom";
-import BNote from "../../becca/entities/bnote.js";
-import BAttribute from "../../becca/entities/battribute.js";
+import type BNote from "../../becca/entities/bnote.js";
+import type BAttribute from "../../becca/entities/battribute.js";
 import type { Request } from "express";
 
 function buildDescendantCountMap(noteIdsToCount: string[]) {
diff --git a/src/routes/api/notes.ts b/src/routes/api/notes.ts
index b155a95bd..9f1dc5e41 100644
--- a/src/routes/api/notes.ts
+++ b/src/routes/api/notes.ts
@@ -11,7 +11,7 @@ import becca from "../../becca/becca.js";
 import ValidationError from "../../errors/validation_error.js";
 import blobService from "../../services/blob.js";
 import type { Request } from "express";
-import BBranch from "../../becca/entities/bbranch.js";
+import type BBranch from "../../becca/entities/bbranch.js";
 import type { AttributeRow } from "../../becca/entities/rows.js";
 
 function getNote(req: Request) {
diff --git a/src/routes/api/revisions.ts b/src/routes/api/revisions.ts
index 0df082199..e65d20113 100644
--- a/src/routes/api/revisions.ts
+++ b/src/routes/api/revisions.ts
@@ -10,9 +10,9 @@ import becca from "../../becca/becca.js";
 import blobService from "../../services/blob.js";
 import eraseService from "../../services/erase.js";
 import type { Request, Response } from "express";
-import BRevision from "../../becca/entities/brevision.js";
-import BNote from "../../becca/entities/bnote.js";
-import { type NotePojo } from "../../becca/becca-interface.js";
+import type BRevision from "../../becca/entities/brevision.js";
+import type BNote from "../../becca/entities/bnote.js";
+import type { NotePojo } from "../../becca/becca-interface.js";
 
 interface NotePath {
     noteId: string;
diff --git a/src/routes/api/search.ts b/src/routes/api/search.ts
index b8d153c16..31627ba0a 100644
--- a/src/routes/api/search.ts
+++ b/src/routes/api/search.ts
@@ -9,7 +9,7 @@ import bulkActionService from "../../services/bulk_actions.js";
 import cls from "../../services/cls.js";
 import attributeFormatter from "../../services/attribute_formatter.js";
 import ValidationError from "../../errors/validation_error.js";
-import SearchResult from "../../services/search/search_result.js";
+import type SearchResult from "../../services/search/search_result.js";
 
 function searchFromNote(req: Request): SearchNoteResult {
     const note = becca.getNoteOrThrow(req.params.noteId);
diff --git a/src/routes/api/tree.ts b/src/routes/api/tree.ts
index fb2d4f2ef..d90470993 100644
--- a/src/routes/api/tree.ts
+++ b/src/routes/api/tree.ts
@@ -4,7 +4,7 @@ import becca from "../../becca/becca.js";
 import log from "../../services/log.js";
 import NotFoundError from "../../errors/not_found_error.js";
 import type { Request } from "express";
-import BNote from "../../becca/entities/bnote.js";
+import type BNote from "../../becca/entities/bnote.js";
 
 function getNotesAndBranchesAndAttributes(_noteIds: string[] | Set<string>) {
     const noteIds = new Set(_noteIds);
diff --git a/src/routes/assets.ts b/src/routes/assets.ts
index e5dccaf20..6cf0202a0 100644
--- a/src/routes/assets.ts
+++ b/src/routes/assets.ts
@@ -3,7 +3,7 @@ import path from "path";
 import { fileURLToPath } from "url";
 import express from "express";
 import env from "../services/env.js";
-import serveStatic from "serve-static";
+import type serveStatic from "serve-static";
 
 const persistentCacheStatic = (root: string, options?: serveStatic.ServeStaticOptions<express.Response<any, Record<string, any>>>) => {
     if (!env.isDev()) {
diff --git a/src/routes/index.ts b/src/routes/index.ts
index 5115630a0..7b75c6009 100644
--- a/src/routes/index.ts
+++ b/src/routes/index.ts
@@ -12,7 +12,7 @@ import packageJson from "../../package.json" with { type: "json" };
 import assetPath from "../services/asset_path.js";
 import appPath from "../services/app_path.js";
 import type { Request, Response } from "express";
-import BNote from "../becca/entities/bnote.js";
+import type BNote from "../becca/entities/bnote.js";
 
 function index(req: Request, res: Response) {
     const options = optionService.getOptionMap();
diff --git a/src/services/attributes.ts b/src/services/attributes.ts
index dc70ff75f..43332280e 100644
--- a/src/services/attributes.ts
+++ b/src/services/attributes.ts
@@ -6,7 +6,7 @@ import becca from "../becca/becca.js";
 import BAttribute from "../becca/entities/battribute.js";
 import attributeFormatter from "./attribute_formatter.js";
 import BUILTIN_ATTRIBUTES from "./builtin_attributes.js";
-import BNote from "../becca/entities/bnote.js";
+import type BNote from "../becca/entities/bnote.js";
 import type { AttributeRow } from "../becca/entities/rows.js";
 
 const ATTRIBUTE_TYPES = new Set(["label", "relation"]);
diff --git a/src/services/backend_script_api.ts b/src/services/backend_script_api.ts
index ca34ddbfd..42b56033f 100644
--- a/src/services/backend_script_api.ts
+++ b/src/services/backend_script_api.ts
@@ -23,16 +23,16 @@ import exportService from "./export/zip.js";
 import syncMutex from "./sync_mutex.js";
 import backupService from "./backup.js";
 import optionsService from "./options.js";
-import BNote from "../becca/entities/bnote.js";
-import AbstractBeccaEntity from "../becca/entities/abstract_becca_entity.js";
-import BBranch from "../becca/entities/bbranch.js";
-import BAttribute from "../becca/entities/battribute.js";
-import BAttachment from "../becca/entities/battachment.js";
-import BRevision from "../becca/entities/brevision.js";
-import BEtapiToken from "../becca/entities/betapi_token.js";
-import BOption from "../becca/entities/boption.js";
+import type BNote from "../becca/entities/bnote.js";
+import type AbstractBeccaEntity from "../becca/entities/abstract_becca_entity.js";
+import type BBranch from "../becca/entities/bbranch.js";
+import type BAttribute from "../becca/entities/battribute.js";
+import type BAttachment from "../becca/entities/battachment.js";
+import type BRevision from "../becca/entities/brevision.js";
+import type BEtapiToken from "../becca/entities/betapi_token.js";
+import type BOption from "../becca/entities/boption.js";
 import type { AttributeRow } from "../becca/entities/rows.js";
-import Becca from "../becca/becca-interface.js";
+import type Becca from "../becca/becca-interface.js";
 import type { NoteParams } from "./note-interface.js";
 import type { ApiParams } from "./backend_script_api_interface.js";
 
diff --git a/src/services/backend_script_api_interface.ts b/src/services/backend_script_api_interface.ts
index 55cfe0a36..4dce6e6a4 100644
--- a/src/services/backend_script_api_interface.ts
+++ b/src/services/backend_script_api_interface.ts
@@ -1,6 +1,6 @@
 import type { Request, Response } from "express";
-import AbstractBeccaEntity from "../becca/entities/abstract_becca_entity.js";
-import BNote from "../becca/entities/bnote.js";
+import type AbstractBeccaEntity from "../becca/entities/abstract_becca_entity.js";
+import type BNote from "../becca/entities/bnote.js";
 
 export interface ApiParams {
     startNote?: BNote | null;
diff --git a/src/services/branches.ts b/src/services/branches.ts
index 6665903bf..af40ac27d 100644
--- a/src/services/branches.ts
+++ b/src/services/branches.ts
@@ -1,6 +1,6 @@
 import treeService from "./tree.js";
 import sql from "./sql.js";
-import BBranch from "../becca/entities/bbranch.js";
+import type BBranch from "../becca/entities/bbranch.js";
 
 function moveBranchToNote(branchToMove: BBranch, targetParentNoteId: string) {
     if (branchToMove.parentNoteId === targetParentNoteId) {
diff --git a/src/services/bulk_actions.ts b/src/services/bulk_actions.ts
index 3e9b06b4e..1c57c6cd5 100644
--- a/src/services/bulk_actions.ts
+++ b/src/services/bulk_actions.ts
@@ -4,7 +4,7 @@ import cloningService from "./cloning.js";
 import branchService from "./branches.js";
 import { randomString } from "./utils.js";
 import eraseService from "./erase.js";
-import BNote from "../becca/entities/bnote.js";
+import type BNote from "../becca/entities/bnote.js";
 
 interface Action {
     labelName: string;
diff --git a/src/services/date_notes.ts b/src/services/date_notes.ts
index e6659b3fd..5e8710b86 100644
--- a/src/services/date_notes.ts
+++ b/src/services/date_notes.ts
@@ -8,7 +8,7 @@ import protectedSessionService from "./protected_session.js";
 import searchService from "../services/search/services/search.js";
 import SearchContext from "../services/search/search_context.js";
 import hoistedNoteService from "./hoisted_note.js";
-import BNote from "../becca/entities/bnote.js";
+import type BNote from "../becca/entities/bnote.js";
 import { t } from "i18next";
 
 const CALENDAR_ROOT_LABEL = "calendarRoot";
diff --git a/src/services/export/opml.ts b/src/services/export/opml.ts
index bf02899aa..74d2b2c4e 100644
--- a/src/services/export/opml.ts
+++ b/src/services/export/opml.ts
@@ -2,8 +2,8 @@
 
 import { getContentDisposition, stripTags } from "../utils.js";
 import becca from "../../becca/becca.js";
-import TaskContext from "../task_context.js";
-import BBranch from "../../becca/entities/bbranch.js";
+import type TaskContext from "../task_context.js";
+import type BBranch from "../../becca/entities/bbranch.js";
 import type { Response } from "express";
 
 function exportToOpml(taskContext: TaskContext, branch: BBranch, version: string, res: Response) {
diff --git a/src/services/export/single.ts b/src/services/export/single.ts
index 2c7b8a83f..d5cd562ea 100644
--- a/src/services/export/single.ts
+++ b/src/services/export/single.ts
@@ -5,8 +5,8 @@ import html from "html";
 import { getContentDisposition, escapeHtml } from "../utils.js";
 import mdService from "./md.js";
 import becca from "../../becca/becca.js";
-import TaskContext from "../task_context.js";
-import BBranch from "../../becca/entities/bbranch.js";
+import type TaskContext from "../task_context.js";
+import type BBranch from "../../becca/entities/bbranch.js";
 import type { Response } from "express";
 
 function exportSingleNote(taskContext: TaskContext, branch: BBranch, format: "html" | "markdown", res: Response) {
diff --git a/src/services/export/zip.ts b/src/services/export/zip.ts
index 3f0093cd0..bcf07c876 100644
--- a/src/services/export/zip.ts
+++ b/src/services/export/zip.ts
@@ -18,7 +18,7 @@ import ValidationError from "../../errors/validation_error.js";
 import type NoteMeta from "../meta/note_meta.js";
 import type AttachmentMeta from "../meta/attachment_meta.js";
 import type AttributeMeta from "../meta/attribute_meta.js";
-import BBranch from "../../becca/entities/bbranch.js";
+import type BBranch from "../../becca/entities/bbranch.js";
 import type { Response } from "express";
 import { RESOURCE_DIR } from "../resource_dir.js";
 
diff --git a/src/services/handlers.ts b/src/services/handlers.ts
index 053f84d0f..2630e2519 100644
--- a/src/services/handlers.ts
+++ b/src/services/handlers.ts
@@ -6,8 +6,8 @@ import becca from "../becca/becca.js";
 import BAttribute from "../becca/entities/battribute.js";
 import hiddenSubtreeService from "./hidden_subtree.js";
 import oneTimeTimer from "./one_time_timer.js";
-import BNote from "../becca/entities/bnote.js";
-import AbstractBeccaEntity from "../becca/entities/abstract_becca_entity.js";
+import type BNote from "../becca/entities/bnote.js";
+import type AbstractBeccaEntity from "../becca/entities/abstract_becca_entity.js";
 import type { DefinitionObject } from "./promoted_attribute_definition_interface.js";
 
 type Handler = (definition: DefinitionObject, note: BNote, targetNote: BNote) => void;
diff --git a/src/services/import/enex.ts b/src/services/import/enex.ts
index 0699b0376..9ac064109 100644
--- a/src/services/import/enex.ts
+++ b/src/services/import/enex.ts
@@ -9,8 +9,8 @@ import imageService from "../image.js";
 import protectedSessionService from "../protected_session.js";
 import htmlSanitizer from "../html_sanitizer.js";
 import sanitizeAttributeName from "../sanitize_attribute_name.js";
-import TaskContext from "../task_context.js";
-import BNote from "../../becca/entities/bnote.js";
+import type TaskContext from "../task_context.js";
+import type BNote from "../../becca/entities/bnote.js";
 import type { File } from "./common.js";
 import type { AttributeType } from "../../becca/entities/rows.js";
 
diff --git a/src/services/import/opml.ts b/src/services/import/opml.ts
index dc7496951..cdc01011f 100644
--- a/src/services/import/opml.ts
+++ b/src/services/import/opml.ts
@@ -4,8 +4,8 @@ import noteService from "../../services/notes.js";
 import xml2js from "xml2js";
 import protectedSessionService from "../protected_session.js";
 import htmlSanitizer from "../html_sanitizer.js";
-import TaskContext from "../task_context.js";
-import BNote from "../../becca/entities/bnote.js";
+import type TaskContext from "../task_context.js";
+import type BNote from "../../becca/entities/bnote.js";
 const parseString = xml2js.parseString;
 
 interface OpmlXml {
diff --git a/src/services/import/single.ts b/src/services/import/single.ts
index ceea7dede..9356300f4 100644
--- a/src/services/import/single.ts
+++ b/src/services/import/single.ts
@@ -1,7 +1,7 @@
 "use strict";
 
-import BNote from "../../becca/entities/bnote.js";
-import TaskContext from "../task_context.js";
+import type BNote from "../../becca/entities/bnote.js";
+import type TaskContext from "../task_context.js";
 
 import noteService from "../../services/notes.js";
 import imageService from "../../services/image.js";
diff --git a/src/services/import/zip.ts b/src/services/import/zip.ts
index e552ef7d1..61534fed3 100644
--- a/src/services/import/zip.ts
+++ b/src/services/import/zip.ts
@@ -15,11 +15,11 @@ import htmlSanitizer from "../html_sanitizer.js";
 import becca from "../../becca/becca.js";
 import BAttachment from "../../becca/entities/battachment.js";
 import markdownService from "./markdown.js";
-import TaskContext from "../task_context.js";
-import BNote from "../../becca/entities/bnote.js";
+import type TaskContext from "../task_context.js";
+import type BNote from "../../becca/entities/bnote.js";
 import type NoteMeta from "../meta/note_meta.js";
 import type AttributeMeta from "../meta/attribute_meta.js";
-import { Stream } from "stream";
+import type { Stream } from "stream";
 import { ALLOWED_NOTE_TYPES, type NoteType } from "../../becca/entities/rows.js";
 
 interface MetaFile {
diff --git a/src/services/notes.ts b/src/services/notes.ts
index 518166e3a..d0a699984 100644
--- a/src/services/notes.ts
+++ b/src/services/notes.ts
@@ -24,7 +24,7 @@ import fs from "fs";
 import ws from "./ws.js";
 import html2plaintext from "html2plaintext";
 import type { AttachmentRow, AttributeRow, BranchRow, NoteRow } from "../becca/entities/rows.js";
-import TaskContext from "./task_context.js";
+import type TaskContext from "./task_context.js";
 import type { NoteParams } from "./note-interface.js";
 import imageService from "./image.js";
 import { t } from "i18next";
diff --git a/src/services/revisions.ts b/src/services/revisions.ts
index 3688f9e5f..1265d4927 100644
--- a/src/services/revisions.ts
+++ b/src/services/revisions.ts
@@ -4,7 +4,7 @@ import log from "./log.js";
 import sql from "./sql.js";
 import protectedSessionService from "./protected_session.js";
 import dateUtils from "./date_utils.js";
-import BNote from "../becca/entities/bnote.js";
+import type BNote from "../becca/entities/bnote.js";
 
 function protectRevisions(note: BNote) {
     if (!protectedSessionService.isProtectedSessionAvailable()) {
diff --git a/src/services/scheduler.ts b/src/services/scheduler.ts
index 73ab8832a..17edfe6f1 100644
--- a/src/services/scheduler.ts
+++ b/src/services/scheduler.ts
@@ -6,7 +6,7 @@ import log from "./log.js";
 import attributeService from "../services/attributes.js";
 import protectedSessionService from "../services/protected_session.js";
 import hiddenSubtreeService from "./hidden_subtree.js";
-import BNote from "../becca/entities/bnote.js";
+import type BNote from "../becca/entities/bnote.js";
 
 function getRunAtHours(note: BNote): number[] {
     try {
diff --git a/src/services/script.ts b/src/services/script.ts
index fedc1edc7..50bbb9fd5 100644
--- a/src/services/script.ts
+++ b/src/services/script.ts
@@ -2,7 +2,7 @@ import ScriptContext from "./script_context.js";
 import cls from "./cls.js";
 import log from "./log.js";
 import becca from "../becca/becca.js";
-import BNote from "../becca/entities/bnote.js";
+import type BNote from "../becca/entities/bnote.js";
 import type { ApiParams } from "./backend_script_api_interface.js";
 
 interface Bundle {
diff --git a/src/services/script_context.ts b/src/services/script_context.ts
index e30f6369b..f6dc0f780 100644
--- a/src/services/script_context.ts
+++ b/src/services/script_context.ts
@@ -1,6 +1,6 @@
 import { toObject } from "./utils.js";
 import BackendScriptApi from "./backend_script_api.js";
-import BNote from "../becca/entities/bnote.js";
+import type BNote from "../becca/entities/bnote.js";
 import type { ApiParams } from "./backend_script_api_interface.js";
 
 type Module = {
diff --git a/src/services/search/expressions/ancestor.ts b/src/services/search/expressions/ancestor.ts
index 2b5f5d4cb..3c0ecf0df 100644
--- a/src/services/search/expressions/ancestor.ts
+++ b/src/services/search/expressions/ancestor.ts
@@ -4,7 +4,7 @@ import Expression from "./expression.js";
 import NoteSet from "../note_set.js";
 import log from "../../log.js";
 import becca from "../../../becca/becca.js";
-import SearchContext from "../search_context.js";
+import type SearchContext from "../search_context.js";
 
 class AncestorExp extends Expression {
     private ancestorNoteId: string;
diff --git a/src/services/search/expressions/and.ts b/src/services/search/expressions/and.ts
index 72918a74f..32e53f3d1 100644
--- a/src/services/search/expressions/and.ts
+++ b/src/services/search/expressions/and.ts
@@ -1,7 +1,7 @@
 "use strict";
 
-import NoteSet from "../note_set.js";
-import SearchContext from "../search_context.js";
+import type NoteSet from "../note_set.js";
+import type SearchContext from "../search_context.js";
 import Expression from "./expression.js";
 import TrueExp from "./true.js";
 
diff --git a/src/services/search/expressions/attribute_exists.ts b/src/services/search/expressions/attribute_exists.ts
index 52c866001..b1353f87d 100644
--- a/src/services/search/expressions/attribute_exists.ts
+++ b/src/services/search/expressions/attribute_exists.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import NoteSet from "../note_set.js";
-import SearchContext from "../search_context.js";
+import type SearchContext from "../search_context.js";
 
 import becca from "../../../becca/becca.js";
 import Expression from "./expression.js";
diff --git a/src/services/search/expressions/child_of.ts b/src/services/search/expressions/child_of.ts
index aa5277423..24002c4c4 100644
--- a/src/services/search/expressions/child_of.ts
+++ b/src/services/search/expressions/child_of.ts
@@ -2,7 +2,7 @@
 
 import Expression from "./expression.js";
 import NoteSet from "../note_set.js";
-import SearchContext from "../search_context.js";
+import type SearchContext from "../search_context.js";
 
 class ChildOfExp extends Expression {
     private subExpression: Expression;
diff --git a/src/services/search/expressions/descendant_of.ts b/src/services/search/expressions/descendant_of.ts
index 7a7444de8..64ca15903 100644
--- a/src/services/search/expressions/descendant_of.ts
+++ b/src/services/search/expressions/descendant_of.ts
@@ -3,7 +3,7 @@
 import Expression from "./expression.js";
 import NoteSet from "../note_set.js";
 import becca from "../../../becca/becca.js";
-import SearchContext from "../search_context.js";
+import type SearchContext from "../search_context.js";
 
 class DescendantOfExp extends Expression {
     private subExpression: Expression;
diff --git a/src/services/search/expressions/is_hidden.ts b/src/services/search/expressions/is_hidden.ts
index 3ceeb5570..624db3774 100644
--- a/src/services/search/expressions/is_hidden.ts
+++ b/src/services/search/expressions/is_hidden.ts
@@ -2,7 +2,7 @@
 
 import Expression from "./expression.js";
 import NoteSet from "../note_set.js";
-import SearchContext from "../search_context.js";
+import type SearchContext from "../search_context.js";
 
 /**
  * Note is hidden when all its note paths start in hidden subtree (i.e., the note is not cloned into visible tree)
diff --git a/src/services/search/expressions/label_comparison.ts b/src/services/search/expressions/label_comparison.ts
index c162aa0a2..b6ed98791 100644
--- a/src/services/search/expressions/label_comparison.ts
+++ b/src/services/search/expressions/label_comparison.ts
@@ -3,7 +3,7 @@
 import Expression from "./expression.js";
 import NoteSet from "../note_set.js";
 import becca from "../../../becca/becca.js";
-import SearchContext from "../search_context.js";
+import type SearchContext from "../search_context.js";
 
 type Comparator = (value: string) => boolean;
 
diff --git a/src/services/search/expressions/not.ts b/src/services/search/expressions/not.ts
index 80f2adfe3..9dfb485b4 100644
--- a/src/services/search/expressions/not.ts
+++ b/src/services/search/expressions/not.ts
@@ -1,7 +1,7 @@
 "use strict";
 
-import NoteSet from "../note_set.js";
-import SearchContext from "../search_context.js";
+import type NoteSet from "../note_set.js";
+import type SearchContext from "../search_context.js";
 import Expression from "./expression.js";
 
 class NotExp extends Expression {
diff --git a/src/services/search/expressions/note_content_fulltext.ts b/src/services/search/expressions/note_content_fulltext.ts
index cd92e5178..083fd3d0e 100644
--- a/src/services/search/expressions/note_content_fulltext.ts
+++ b/src/services/search/expressions/note_content_fulltext.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import type { NoteRow } from "../../../becca/entities/rows.js";
-import SearchContext from "../search_context.js";
+import type SearchContext from "../search_context.js";
 
 import Expression from "./expression.js";
 import NoteSet from "../note_set.js";
diff --git a/src/services/search/expressions/note_flat_text.ts b/src/services/search/expressions/note_flat_text.ts
index 9d39e4397..163dd38a0 100644
--- a/src/services/search/expressions/note_flat_text.ts
+++ b/src/services/search/expressions/note_flat_text.ts
@@ -1,7 +1,7 @@
 "use strict";
 
-import BNote from "../../../becca/entities/bnote.js";
-import SearchContext from "../search_context.js";
+import type BNote from "../../../becca/entities/bnote.js";
+import type SearchContext from "../search_context.js";
 
 import Expression from "./expression.js";
 import NoteSet from "../note_set.js";
diff --git a/src/services/search/expressions/or.ts b/src/services/search/expressions/or.ts
index 1e41abff5..37d6cffd6 100644
--- a/src/services/search/expressions/or.ts
+++ b/src/services/search/expressions/or.ts
@@ -3,7 +3,7 @@
 import Expression from "./expression.js";
 import NoteSet from "../note_set.js";
 import TrueExp from "./true.js";
-import SearchContext from "../search_context.js";
+import type SearchContext from "../search_context.js";
 
 class OrExp extends Expression {
     subExpressions: Expression[];
diff --git a/src/services/search/expressions/order_by_and_limit.ts b/src/services/search/expressions/order_by_and_limit.ts
index 3bbc53a67..32943422d 100644
--- a/src/services/search/expressions/order_by_and_limit.ts
+++ b/src/services/search/expressions/order_by_and_limit.ts
@@ -1,8 +1,8 @@
 "use strict";
 
-import BNote from "../../../becca/entities/bnote.js";
+import type BNote from "../../../becca/entities/bnote.js";
 import NoteSet from "../note_set.js";
-import SearchContext from "../search_context.js";
+import type SearchContext from "../search_context.js";
 import Expression from "./expression.js";
 
 interface ValueExtractor {
diff --git a/src/services/search/expressions/parent_of.ts b/src/services/search/expressions/parent_of.ts
index 8a51bbf62..a5148ec89 100644
--- a/src/services/search/expressions/parent_of.ts
+++ b/src/services/search/expressions/parent_of.ts
@@ -2,7 +2,7 @@
 
 import Expression from "./expression.js";
 import NoteSet from "../note_set.js";
-import SearchContext from "../search_context.js";
+import type SearchContext from "../search_context.js";
 
 class ParentOfExp extends Expression {
     private subExpression: Expression;
diff --git a/src/services/search/expressions/relation_where.ts b/src/services/search/expressions/relation_where.ts
index 50d733b5e..f23813fb9 100644
--- a/src/services/search/expressions/relation_where.ts
+++ b/src/services/search/expressions/relation_where.ts
@@ -3,7 +3,7 @@
 import Expression from "./expression.js";
 import NoteSet from "../note_set.js";
 import becca from "../../../becca/becca.js";
-import SearchContext from "../search_context.js";
+import type SearchContext from "../search_context.js";
 
 class RelationWhereExp extends Expression {
     private relationName: string;
diff --git a/src/services/search/expressions/true.ts b/src/services/search/expressions/true.ts
index 5858a1075..816ef9676 100644
--- a/src/services/search/expressions/true.ts
+++ b/src/services/search/expressions/true.ts
@@ -1,7 +1,7 @@
 "use strict";
 
-import NoteSet from "../note_set.js";
-import SearchContext from "../search_context.js";
+import type NoteSet from "../note_set.js";
+import type SearchContext from "../search_context.js";
 
 import Expression from "./expression.js";
 
diff --git a/src/services/search/note_set.ts b/src/services/search/note_set.ts
index 0e146cfd3..bab76afa5 100644
--- a/src/services/search/note_set.ts
+++ b/src/services/search/note_set.ts
@@ -1,6 +1,6 @@
 "use strict";
 
-import BNote from "../../becca/entities/bnote.js";
+import type BNote from "../../becca/entities/bnote.js";
 
 class NoteSet {
     private noteIdSet: Set<string>;
diff --git a/src/services/search/services/parse.ts b/src/services/search/services/parse.ts
index 34acbc7ad..ba811fe03 100644
--- a/src/services/search/services/parse.ts
+++ b/src/services/search/services/parse.ts
@@ -20,9 +20,9 @@ import ValueExtractor from "../value_extractor.js";
 import { removeDiacritic } from "../../utils.js";
 import TrueExp from "../expressions/true.js";
 import IsHiddenExp from "../expressions/is_hidden.js";
-import SearchContext from "../search_context.js";
+import type SearchContext from "../search_context.js";
 import type { TokenData, TokenStructure } from "./types.js";
-import Expression from "../expressions/expression.js";
+import type Expression from "../expressions/expression.js";
 
 function getFulltext(_tokens: TokenData[], searchContext: SearchContext) {
     const tokens: string[] = _tokens.map((t) => removeDiacritic(t.token));
diff --git a/src/services/search/services/search.ts b/src/services/search/services/search.ts
index 842c7a272..745562cd7 100644
--- a/src/services/search/services/search.ts
+++ b/src/services/search/services/search.ts
@@ -11,10 +11,10 @@ import beccaService from "../../../becca/becca_service.js";
 import { normalize, escapeHtml, escapeRegExp } from "../../utils.js";
 import log from "../../log.js";
 import hoistedNoteService from "../../hoisted_note.js";
-import BNote from "../../../becca/entities/bnote.js";
-import BAttribute from "../../../becca/entities/battribute.js";
+import type BNote from "../../../becca/entities/bnote.js";
+import type BAttribute from "../../../becca/entities/battribute.js";
 import type { SearchParams, TokenStructure } from "./types.js";
-import Expression from "../expressions/expression.js";
+import type Expression from "../expressions/expression.js";
 import sql from "../../sql.js";
 import scriptService from "../../script.js";
 
diff --git a/src/services/search/value_extractor.ts b/src/services/search/value_extractor.ts
index 531d68c09..e00a0d47b 100644
--- a/src/services/search/value_extractor.ts
+++ b/src/services/search/value_extractor.ts
@@ -1,6 +1,6 @@
 "use strict";
 
-import BNote from "../../becca/entities/bnote.js";
+import type BNote from "../../becca/entities/bnote.js";
 
 /**
  * Search string is lower cased for case-insensitive comparison. But when retrieving properties,
diff --git a/src/services/tree.ts b/src/services/tree.ts
index 5a652a22d..64d1279e5 100644
--- a/src/services/tree.ts
+++ b/src/services/tree.ts
@@ -5,7 +5,7 @@ import log from "./log.js";
 import BBranch from "../becca/entities/bbranch.js";
 import entityChangesService from "./entity_changes.js";
 import becca from "../becca/becca.js";
-import BNote from "../becca/entities/bnote.js";
+import type BNote from "../becca/entities/bnote.js";
 
 interface ValidationResponse {
     branch: BBranch | null;
diff --git a/src/services/ws.ts b/src/services/ws.ts
index e38e06129..1439e4555 100644
--- a/src/services/ws.ts
+++ b/src/services/ws.ts
@@ -10,7 +10,7 @@ import becca from "../becca/becca.js";
 import AbstractBeccaEntity from "../becca/entities/abstract_becca_entity.js";
 
 import env from "./env.js";
-import { IncomingMessage, Server } from "http";
+import type { IncomingMessage, Server } from "http";
 import type { EntityChange } from "./entity_changes_interface.js";
 
 if (env.isDev()) {
diff --git a/src/share/content_renderer.ts b/src/share/content_renderer.ts
index c9c17b67f..4d287c905 100644
--- a/src/share/content_renderer.ts
+++ b/src/share/content_renderer.ts
@@ -3,7 +3,7 @@ import shaca from "./shaca/shaca.js";
 import assetPath from "../services/asset_path.js";
 import shareRoot from "./share_root.js";
 import escapeHtml from "escape-html";
-import SNote from "./shaca/entities/snote.js";
+import type SNote from "./shaca/entities/snote.js";
 
 /**
  * Represents the output of the content renderer.
diff --git a/src/share/routes.ts b/src/share/routes.ts
index de7a44c49..fedec7abb 100644
--- a/src/share/routes.ts
+++ b/src/share/routes.ts
@@ -12,9 +12,9 @@ import appPath from "../services/app_path.js";
 import searchService from "../services/search/services/search.js";
 import SearchContext from "../services/search/search_context.js";
 import log from "../services/log.js";
-import SNote from "./shaca/entities/snote.js";
-import SBranch from "./shaca/entities/sbranch.js";
-import SAttachment from "./shaca/entities/sattachment.js";
+import type SNote from "./shaca/entities/snote.js";
+import type SBranch from "./shaca/entities/sbranch.js";
+import type SAttachment from "./shaca/entities/sattachment.js";
 import utils from "../services/utils.js";
 
 function getSharedSubTreeRoot(note: SNote): { note?: SNote; branch?: SBranch } {
diff --git a/src/share/shaca/entities/abstract_shaca_entity.ts b/src/share/shaca/entities/abstract_shaca_entity.ts
index 44b8efa6b..60346fe16 100644
--- a/src/share/shaca/entities/abstract_shaca_entity.ts
+++ b/src/share/shaca/entities/abstract_shaca_entity.ts
@@ -1,5 +1,5 @@
 import shaca from "../shaca.js";
-import Shaca from "../shaca-interface.js";
+import type Shaca from "../shaca-interface.js";
 
 class AbstractShacaEntity {
     get shaca(): Shaca {
diff --git a/src/share/shaca/entities/sattachment.ts b/src/share/shaca/entities/sattachment.ts
index c2bb7f755..612ba81f3 100644
--- a/src/share/shaca/entities/sattachment.ts
+++ b/src/share/shaca/entities/sattachment.ts
@@ -3,7 +3,7 @@
 import sql from "../../sql.js";
 import utils from "../../../services/utils.js";
 import AbstractShacaEntity from "./abstract_shaca_entity.js";
-import SNote from "./snote.js";
+import type SNote from "./snote.js";
 import type { Blob } from "../../../services/blob-interface.js";
 import type { SAttachmentRow } from "./rows.js";
 
diff --git a/src/share/shaca/entities/sattribute.ts b/src/share/shaca/entities/sattribute.ts
index 66c8fadc7..dccdea83f 100644
--- a/src/share/shaca/entities/sattribute.ts
+++ b/src/share/shaca/entities/sattribute.ts
@@ -2,7 +2,7 @@
 
 import AbstractShacaEntity from "./abstract_shaca_entity.js";
 import type { SAttributeRow } from "./rows.js";
-import SNote from "./snote.js";
+import type SNote from "./snote.js";
 
 class SAttribute extends AbstractShacaEntity {
     attributeId: string;
diff --git a/src/share/shaca/entities/sbranch.ts b/src/share/shaca/entities/sbranch.ts
index 4d5e54052..a1bd6ee53 100644
--- a/src/share/shaca/entities/sbranch.ts
+++ b/src/share/shaca/entities/sbranch.ts
@@ -2,7 +2,7 @@
 
 import AbstractShacaEntity from "./abstract_shaca_entity.js";
 import type { SBranchRow } from "./rows.js";
-import SNote from "./snote.js";
+import type SNote from "./snote.js";
 
 class SBranch extends AbstractShacaEntity {
     private branchId: string;
diff --git a/src/share/shaca/entities/snote.ts b/src/share/shaca/entities/snote.ts
index 404125257..b9e1a8b23 100644
--- a/src/share/shaca/entities/snote.ts
+++ b/src/share/shaca/entities/snote.ts
@@ -5,9 +5,9 @@ import utils from "../../../services/utils.js";
 import AbstractShacaEntity from "./abstract_shaca_entity.js";
 import escape from "escape-html";
 import type { Blob } from "../../../services/blob-interface.js";
-import SAttachment from "./sattachment.js";
-import SAttribute from "./sattribute.js";
-import SBranch from "./sbranch.js";
+import type SAttachment from "./sattachment.js";
+import type SAttribute from "./sattribute.js";
+import type SBranch from "./sbranch.js";
 import type { SNoteRow } from "./rows.js";
 
 const LABEL = "label";
diff --git a/src/share/shaca/shaca-interface.ts b/src/share/shaca/shaca-interface.ts
index 8cec3a7d2..65b0585b7 100644
--- a/src/share/shaca/shaca-interface.ts
+++ b/src/share/shaca/shaca-interface.ts
@@ -1,7 +1,7 @@
-import SAttachment from "./entities/sattachment.js";
-import SAttribute from "./entities/sattribute.js";
-import SBranch from "./entities/sbranch.js";
-import SNote from "./entities/snote.js";
+import type SAttachment from "./entities/sattachment.js";
+import type SAttribute from "./entities/sattribute.js";
+import type SBranch from "./entities/sbranch.js";
+import type SNote from "./entities/snote.js";
 
 export default class Shaca {
     notes!: Record<string, SNote>;