diff --git a/src/file.cc b/src/file.cc
index ce6f8405..7ad6f48d 100644
--- a/src/file.cc
+++ b/src/file.cc
@@ -10,6 +10,7 @@
 #include "string.hh"
 #include "unicode.hh"
 
+#include <limits>
 #include <cerrno>
 #include <cstdlib>
 #include <cstdio>
diff --git a/src/highlighters.cc b/src/highlighters.cc
index 309ade94..47278cd0 100644
--- a/src/highlighters.cc
+++ b/src/highlighters.cc
@@ -20,6 +20,7 @@
 #include "window.hh"
 
 #include <cstdio>
+#include <limits>
 
 namespace Kakoune
 {
diff --git a/src/input_handler.cc b/src/input_handler.cc
index b75efd94..a287b2db 100644
--- a/src/input_handler.cc
+++ b/src/input_handler.cc
@@ -1,5 +1,3 @@
-#include <utility>
-
 #include "input_handler.hh"
 
 #include "buffer_manager.hh"
@@ -19,6 +17,9 @@
 #include "window.hh"
 #include "word_db.hh"
 
+#include <utility>
+#include <limits>
+
 namespace Kakoune
 {
 
diff --git a/src/regex_impl.cc b/src/regex_impl.cc
index a4457bcc..c5d755ac 100644
--- a/src/regex_impl.cc
+++ b/src/regex_impl.cc
@@ -12,6 +12,7 @@
 
 #include <cstdio>
 #include <cstring>
+#include <limits>
 
 namespace Kakoune
 {
diff --git a/src/selection.hh b/src/selection.hh
index 28eca5f2..c880aaf7 100644
--- a/src/selection.hh
+++ b/src/selection.hh
@@ -3,6 +3,8 @@
 
 #include "buffer.hh"
 
+#include <limits>
+
 namespace Kakoune
 {