diff --git a/rc/filetype/javascript.kak b/rc/filetype/javascript.kak
index 3dfa4d409..4e39fc690 100644
--- a/rc/filetype/javascript.kak
+++ b/rc/filetype/javascript.kak
@@ -1,7 +1,7 @@
 # Detection
 # ‾‾‾‾‾‾‾‾‾
 
-hook global BufCreate .*[.](js)x? %{
+hook global BufCreate .*[.]m?(js)x? %{
     set-option buffer filetype javascript
 }
 
diff --git a/src/diff.hh b/src/diff.hh
index 0205ef73b..2e719669a 100644
--- a/src/diff.hh
+++ b/src/diff.hh
@@ -7,6 +7,7 @@
 
 #include "array_view.hh"
 
+#include <algorithm>
 #include <functional>
 #include <iterator>
 #include <memory>