diff --git a/src/client/app/common/scripts/note-mixin.ts b/src/client/app/common/scripts/note-mixin.ts
index 047e2ae55..5707d1bb4 100644
--- a/src/client/app/common/scripts/note-mixin.ts
+++ b/src/client/app/common/scripts/note-mixin.ts
@@ -1,4 +1,4 @@
-import parse from '../../../../mfm/parse';
+import { parse } from '../../../../mfm/parse';
 import { sum, unique } from '../../../../prelude/array';
 import shouldMuteNote from './should-mute-note';
 import MkNoteMenu from '../views/components/note-menu.vue';
diff --git a/src/client/app/common/views/components/messaging-room.message.vue b/src/client/app/common/views/components/messaging-room.message.vue
index ba2af0303..ce76c402f 100644
--- a/src/client/app/common/views/components/messaging-room.message.vue
+++ b/src/client/app/common/views/components/messaging-room.message.vue
@@ -34,7 +34,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
-import parse from '../../../../../mfm/parse';
+import { parse } from '../../../../../mfm/parse';
 import { unique } from '../../../../../prelude/array';
 
 export default Vue.extend({
diff --git a/src/client/app/common/views/components/mfm.ts b/src/client/app/common/views/components/mfm.ts
index 61eeb4e07..86ae11fd4 100644
--- a/src/client/app/common/views/components/mfm.ts
+++ b/src/client/app/common/views/components/mfm.ts
@@ -1,7 +1,7 @@
 import Vue, { VNode } from 'vue';
 import { length } from 'stringz';
 import { MfmForest } from '../../../../../mfm/types';
-import parse, { parsePlain } from '../../../../../mfm/parse';
+import { parse, parsePlain } from '../../../../../mfm/parse';
 import MkUrl from './url.vue';
 import MkMention from './mention.vue';
 import { concat, sum } from '../../../../../prelude/array';
diff --git a/src/client/app/desktop/views/components/post-form.vue b/src/client/app/desktop/views/components/post-form.vue
index 5b2a30540..b26187d71 100644
--- a/src/client/app/desktop/views/components/post-form.vue
+++ b/src/client/app/desktop/views/components/post-form.vue
@@ -68,7 +68,7 @@ import insertTextAtCursor from 'insert-text-at-cursor';
 import * as XDraggable from 'vuedraggable';
 import getFace from '../../../common/scripts/get-face';
 import MkVisibilityChooser from '../../../common/views/components/visibility-chooser.vue';
-import parse from '../../../../../mfm/parse';
+import { parse } from '../../../../../mfm/parse';
 import { host } from '../../../config';
 import { erase, unique } from '../../../../../prelude/array';
 import { length } from 'stringz';
diff --git a/src/client/app/mobile/views/components/post-form.vue b/src/client/app/mobile/views/components/post-form.vue
index b6e70a5b1..1c4ddd60a 100644
--- a/src/client/app/mobile/views/components/post-form.vue
+++ b/src/client/app/mobile/views/components/post-form.vue
@@ -60,7 +60,7 @@ import insertTextAtCursor from 'insert-text-at-cursor';
 import * as XDraggable from 'vuedraggable';
 import MkVisibilityChooser from '../../../common/views/components/visibility-chooser.vue';
 import getFace from '../../../common/scripts/get-face';
-import parse from '../../../../../mfm/parse';
+import { parse } from '../../../../../mfm/parse';
 import { host } from '../../../config';
 import { erase, unique } from '../../../../../prelude/array';
 import { length } from 'stringz';
diff --git a/src/client/app/test/views/index.vue b/src/client/app/test/views/index.vue
index 028919ad3..ee66b5cb4 100644
--- a/src/client/app/test/views/index.vue
+++ b/src/client/app/test/views/index.vue
@@ -41,7 +41,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import parse from '../../../../mfm/parse';
+import { parse } from '../../../../mfm/parse';
 import * as JSON5 from 'json5';
 
 export default Vue.extend({
diff --git a/src/mfm/fromHtml.ts b/src/mfm/fromHtml.ts
index 1441f97d9..b6e0546bc 100644
--- a/src/mfm/fromHtml.ts
+++ b/src/mfm/fromHtml.ts
@@ -1,7 +1,7 @@
 const parse5 = require('parse5');
 import { URL } from 'url';
 
-export default function(html: string): string {
+export function fromHtml(html: string): string {
 	if (html == null) return null;
 
 	const dom = parse5.parseFragment(html);
diff --git a/src/mfm/parse.ts b/src/mfm/parse.ts
index 014904f32..8ff6c975b 100644
--- a/src/mfm/parse.ts
+++ b/src/mfm/parse.ts
@@ -1,19 +1,19 @@
-import parser from './parser';
+import { mfmLanguage } from './parser';
 import { MfmForest } from './types';
 import { normalize } from './normalize';
 
-export default (source: string): MfmForest => {
+export function parse(source: string): MfmForest {
 	if (source == null || source == '') {
 		return null;
 	}
 
-	return normalize(parser.root.tryParse(source));
-};
+	return normalize(mfmLanguage.root.tryParse(source));
+}
 
 export function parsePlain(source: string): MfmForest {
 	if (source == null || source == '') {
 		return null;
 	}
 
-	return normalize(parser.plain.tryParse(source));
+	return normalize(mfmLanguage.plain.tryParse(source));
 }
diff --git a/src/mfm/parser.ts b/src/mfm/parser.ts
index cfa3f5262..37be85ee2 100644
--- a/src/mfm/parser.ts
+++ b/src/mfm/parser.ts
@@ -28,7 +28,7 @@ const newline = P((input, i) => {
 	}
 });
 
-const mfm = P.createLanguage({
+export const mfmLanguage = P.createLanguage({
 	root: r => P.alt(
 		r.big,
 		r.small,
@@ -413,5 +413,3 @@ const mfm = P.createLanguage({
 		.map(x => createLeaf('url', { url: x })),
 	//#endregion
 });
-
-export default mfm;
diff --git a/src/mfm/toHtml.ts b/src/mfm/toHtml.ts
index ceaf3e421..eb68a63a6 100644
--- a/src/mfm/toHtml.ts
+++ b/src/mfm/toHtml.ts
@@ -5,7 +5,7 @@ import { INote } from '../models/note';
 import { intersperse } from '../prelude/array';
 import { MfmForest, MfmTree } from './types';
 
-export default (tokens: MfmForest, mentionedRemoteUsers: INote['mentionedRemoteUsers'] = []) => {
+export function toHtml(tokens: MfmForest, mentionedRemoteUsers: INote['mentionedRemoteUsers'] = []) {
 	if (tokens == null) {
 		return null;
 	}
@@ -184,4 +184,4 @@ export default (tokens: MfmForest, mentionedRemoteUsers: INote['mentionedRemoteU
 	appendChildren(tokens, doc.body);
 
 	return `<p>${doc.body.innerHTML}</p>`;
-};
+}
diff --git a/src/remote/activitypub/misc/get-note-html.ts b/src/remote/activitypub/misc/get-note-html.ts
index 687faebed..967ee6554 100644
--- a/src/remote/activitypub/misc/get-note-html.ts
+++ b/src/remote/activitypub/misc/get-note-html.ts
@@ -1,6 +1,6 @@
 import { INote } from '../../../models/note';
-import toHtml from '../../../mfm/toHtml';
-import parse from '../../../mfm/parse';
+import { toHtml } from '../../../mfm/toHtml';
+import { parse } from '../../../mfm/parse';
 
 export default function(note: INote) {
 	let html = toHtml(parse(note.text), note.mentionedRemoteUsers);
diff --git a/src/remote/activitypub/models/note.ts b/src/remote/activitypub/models/note.ts
index f93e3d4c6..0f2e51526 100644
--- a/src/remote/activitypub/models/note.ts
+++ b/src/remote/activitypub/models/note.ts
@@ -9,7 +9,7 @@ import { INote as INoteActivityStreamsObject, IObject } from '../type';
 import { resolvePerson, updatePerson } from './person';
 import { resolveImage } from './image';
 import { IRemoteUser, IUser } from '../../../models/user';
-import fromHtml from '../../../mfm/fromHtml';
+import { fromHtml } from '../../../mfm/fromHtml';
 import Emoji, { IEmoji } from '../../../models/emoji';
 import { ITag } from './tag';
 import { toUnicode } from 'punycode';
diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts
index 192c73c03..54e57f733 100644
--- a/src/remote/activitypub/models/person.ts
+++ b/src/remote/activitypub/models/person.ts
@@ -9,7 +9,7 @@ import { resolveImage } from './image';
 import { isCollectionOrOrderedCollection, isCollection, IPerson } from '../type';
 import { IDriveFile } from '../../../models/drive-file';
 import Meta from '../../../models/meta';
-import fromHtml from '../../../mfm/fromHtml';
+import { fromHtml } from '../../../mfm/fromHtml';
 import usersChart from '../../../chart/users';
 import { URL } from 'url';
 import { resolveNote, extractEmojis } from './note';
diff --git a/src/remote/activitypub/renderer/person.ts b/src/remote/activitypub/renderer/person.ts
index 827fa91f2..68f0bd83f 100644
--- a/src/remote/activitypub/renderer/person.ts
+++ b/src/remote/activitypub/renderer/person.ts
@@ -2,8 +2,8 @@ import renderImage from './image';
 import renderKey from './key';
 import config from '../../../config';
 import { ILocalUser } from '../../../models/user';
-import toHtml from '../../../mfm/toHtml';
-import parse from '../../../mfm/parse';
+import { toHtml } from '../../../mfm/toHtml';
+import { parse } from '../../../mfm/parse';
 import DriveFile from '../../../models/drive-file';
 import { getEmojis } from './note';
 import renderEmoji from './emoji';
diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts
index a98bd5029..b47e29c5a 100644
--- a/src/server/api/endpoints/i/update.ts
+++ b/src/server/api/endpoints/i/update.ts
@@ -6,7 +6,7 @@ import acceptAllFollowRequests from '../../../../services/following/requests/acc
 import { publishToFollowers } from '../../../../services/i/update';
 import define from '../../define';
 import getDriveFileUrl from '../../../../misc/get-drive-file-url';
-import parse, { parsePlain } from '../../../../mfm/parse';
+import { parse, parsePlain } from '../../../../mfm/parse';
 import extractEmojis from '../../../../misc/extract-emojis';
 const langmap = require('langmap');
 
diff --git a/src/services/note/create.ts b/src/services/note/create.ts
index 3b5aac8f8..344672bd6 100644
--- a/src/services/note/create.ts
+++ b/src/services/note/create.ts
@@ -13,7 +13,7 @@ import notify from '../../notify';
 import NoteWatching from '../../models/note-watching';
 import watch from './watch';
 import Mute from '../../models/mute';
-import parse from '../../mfm/parse';
+import { parse } from '../../mfm/parse';
 import { IApp } from '../../models/app';
 import UserList from '../../models/user-list';
 import resolveUser from '../../remote/resolve-user';
diff --git a/test/extract-mentions.ts b/test/extract-mentions.ts
index b32f5dd4b..a70926cbb 100644
--- a/test/extract-mentions.ts
+++ b/test/extract-mentions.ts
@@ -1,7 +1,7 @@
 import * as assert from 'assert';
 
 import extractMentions from '../src/misc/extract-mentions';
-import parse from '../src/mfm/parse';
+import { parse } from '../src/mfm/parse';
 
 describe('Extract mentions', () => {
 	it('simple', () => {
diff --git a/test/mfm.ts b/test/mfm.ts
index bbd53fe58..5873164d6 100644
--- a/test/mfm.ts
+++ b/test/mfm.ts
@@ -10,8 +10,8 @@
 
 import * as assert from 'assert';
 
-import parse, { parsePlain } from '../src/mfm/parse';
-import toHtml from '../src/mfm/toHtml';
+import { parse, parsePlain } from '../src/mfm/parse';
+import { toHtml } from '../src/mfm/toHtml';
 import { createTree as tree, createLeaf as leaf, MfmTree } from '../src/mfm/types';
 import { removeOrphanedBrackets } from '../src/mfm/parser';