diff --git a/motions/jumpToHeading.ts b/motions/jumpToHeading.ts
index 42cd69c..f4ee545 100644
--- a/motions/jumpToHeading.ts
+++ b/motions/jumpToHeading.ts
@@ -1,4 +1,3 @@
-import { Editor as CodeMirrorEditor } from "codemirror";
 import { EditorPosition } from "obsidian";
 import { isWithinMatch, jumpToPattern } from "../utils/jumpToPattern";
 import { MotionFn } from "../utils/vimApi";
@@ -43,7 +42,7 @@ function jumpToHeading({
   repeat,
   direction,
 }: {
-  cm: CodeMirrorEditor;
+  cm: CodeMirror.Editor;
   cursorPosition: EditorPosition;
   repeat: number;
   direction: "next" | "previous";
@@ -60,7 +59,7 @@ function jumpToHeading({
   });
 }
 
-function findAllCodeblocks(cm: CodeMirrorEditor): RegExpExecArray[] {
+function findAllCodeblocks(cm: CodeMirror.Editor): RegExpExecArray[] {
   const content = cm.getValue();
   return [...content.matchAll(FENCED_CODEBLOCK_REGEX)];
 }
diff --git a/tests/createFakeCodeMirrorEditor.ts b/tests/createFakeCodeMirrorEditor.ts
index 46b0769..db06a49 100644
--- a/tests/createFakeCodeMirrorEditor.ts
+++ b/tests/createFakeCodeMirrorEditor.ts
@@ -1,4 +1,3 @@
-import { Editor as CodeMirrorEditor } from "codemirror";
 import { EditorPosition } from "obsidian";
 
 /**
@@ -6,7 +5,7 @@ import { EditorPosition } from "obsidian";
  */
 export function createFakeCodeMirrorEditor(
   contentLines: string[]
-): Pick<CodeMirrorEditor, "getValue" | "indexFromPos" | "posFromIndex"> {
+): Pick<CodeMirror.Editor, "getValue" | "indexFromPos" | "posFromIndex"> {
   const content = contentLines.join("\n");
   const lineStartIndexes = getLineStartIndexes(contentLines);
   return {
diff --git a/utils/jumpToPattern.ts b/utils/jumpToPattern.ts
index 05e3b4b..80120fb 100644
--- a/utils/jumpToPattern.ts
+++ b/utils/jumpToPattern.ts
@@ -1,4 +1,3 @@
-import { Editor as CodeMirrorEditor } from "codemirror";
 import { EditorPosition } from "obsidian";
 
 /**
@@ -27,7 +26,7 @@ export function jumpToPattern({
   filterMatch = () => true,
   direction,
 }: {
-  cm: CodeMirrorEditor;
+  cm: CodeMirror.Editor;
   cursorPosition: EditorPosition;
   repeat: number;
   regex: RegExp;
diff --git a/utils/obsidianVimCommand.ts b/utils/obsidianVimCommand.ts
index 39f1499..e270d22 100644
--- a/utils/obsidianVimCommand.ts
+++ b/utils/obsidianVimCommand.ts
@@ -2,14 +2,13 @@
  * Utility types and functions for defining Obsidian-specific Vim commands.
  */
 
-import { Editor as CodeMirrorEditor } from "codemirror";
 
 import VimrcPlugin from "../main";
 import { MotionFn, VimApi } from "./vimApi";
 
 export type ObsidianActionFn = (
   vimrcPlugin: VimrcPlugin,  // Included so we can run Obsidian commands as part of the action
-  cm: CodeMirrorEditor,
+  cm: CodeMirror.Editor,
   actionArgs: { repeat: number },
 ) => void;
 
diff --git a/utils/vimApi.ts b/utils/vimApi.ts
index 60a662c..9e105da 100644
--- a/utils/vimApi.ts
+++ b/utils/vimApi.ts
@@ -6,17 +6,16 @@
  * https://libvoyant.ucr.edu/resources/codemirror/doc/manual.html
  */
 
-import { Editor as CodeMirrorEditor } from "codemirror";
 import { EditorPosition } from "obsidian";
 
 export type MotionFn = (
-  cm: CodeMirrorEditor,
+  cm: CodeMirror.Editor,
   cursorPosition: EditorPosition, // called `head` in the API
   motionArgs: { repeat: number }
 ) => EditorPosition;
 
 export type ActionFn = (
-  cm: CodeMirrorEditor,
+  cm: CodeMirror.Editor,
   actionArgs: { repeat: number },
 ) => void;