diff --git a/src/buffer.cc b/src/buffer.cc
index 72031db3..a7811c9a 100644
--- a/src/buffer.cc
+++ b/src/buffer.cc
@@ -1,11 +1,11 @@
 #include "buffer.hh"
 
-#include "buffer_manager.hh"
-#include "window.hh"
 #include "assert.hh"
-#include "utils.hh"
+#include "buffer_manager.hh"
 #include "context.hh"
 #include "file.hh"
+#include "utils.hh"
+#include "window.hh"
 
 #include <algorithm>
 
diff --git a/src/buffer.hh b/src/buffer.hh
index e01919ee..8518da14 100644
--- a/src/buffer.hh
+++ b/src/buffer.hh
@@ -1,17 +1,17 @@
 #ifndef buffer_hh_INCLUDED
 #define buffer_hh_INCLUDED
 
+#include "hook_manager.hh"
+#include "line_and_column.hh"
+#include "option_manager.hh"
+#include "string.hh"
+#include "units.hh"
+
 #include <vector>
 #include <list>
 #include <memory>
 #include <unordered_set>
 
-#include "line_and_column.hh"
-#include "option_manager.hh"
-#include "hook_manager.hh"
-#include "string.hh"
-#include "units.hh"
-
 namespace Kakoune
 {
 
diff --git a/src/buffer_manager.cc b/src/buffer_manager.cc
index 00dcfad2..16ba65cf 100644
--- a/src/buffer_manager.cc
+++ b/src/buffer_manager.cc
@@ -2,10 +2,10 @@
 
 #include "assert.hh"
 #include "buffer.hh"
-#include "exception.hh"
-#include "string.hh"
 #include "client_manager.hh"
+#include "exception.hh"
 #include "file.hh"
+#include "string.hh"
 
 namespace Kakoune
 {
diff --git a/src/color_registry.hh b/src/color_registry.hh
index ed130e03..730ea0d1 100644
--- a/src/color_registry.hh
+++ b/src/color_registry.hh
@@ -1,11 +1,11 @@
 #ifndef color_registry_hh_INCLUDED
 #define color_registry_hh_INCLUDED
 
-#include <unordered_map>
-
 #include "color.hh"
 #include "utils.hh"
 
+#include <unordered_map>
+
 namespace Kakoune
 {
 
diff --git a/src/command_manager.cc b/src/command_manager.cc
index a5c590e7..33c7cf2f 100644
--- a/src/command_manager.cc
+++ b/src/command_manager.cc
@@ -1,10 +1,10 @@
 #include "command_manager.hh"
 
-#include "utils.hh"
 #include "assert.hh"
 #include "context.hh"
-#include "shell_manager.hh"
 #include "register_manager.hh"
+#include "shell_manager.hh"
+#include "utils.hh"
 
 #include <algorithm>
 
diff --git a/src/command_manager.hh b/src/command_manager.hh
index a8af72ac..2c272f03 100644
--- a/src/command_manager.hh
+++ b/src/command_manager.hh
@@ -1,16 +1,16 @@
 #ifndef command_manager_hh_INCLUDED
 #define command_manager_hh_INCLUDED
 
+#include "completion.hh"
+#include "memoryview.hh"
+#include "shell_manager.hh"
+#include "string.hh"
+#include "utils.hh"
+
 #include <unordered_map>
 #include <functional>
 #include <initializer_list>
 
-#include "string.hh"
-#include "utils.hh"
-#include "completion.hh"
-#include "memoryview.hh"
-#include "shell_manager.hh"
-
 namespace Kakoune
 {
 
diff --git a/src/completion.hh b/src/completion.hh
index 06dd3a53..c833e2b4 100644
--- a/src/completion.hh
+++ b/src/completion.hh
@@ -1,11 +1,11 @@
 #ifndef completion_hh_INCLUDED
 #define completion_hh_INCLUDED
 
+#include "string.hh"
+
 #include <vector>
 #include <functional>
 
-#include "string.hh"
-
 namespace Kakoune
 {
 
diff --git a/src/display_buffer.hh b/src/display_buffer.hh
index ee0c32d1..82940259 100644
--- a/src/display_buffer.hh
+++ b/src/display_buffer.hh
@@ -1,14 +1,14 @@
 #ifndef display_buffer_hh_INCLUDED
 #define display_buffer_hh_INCLUDED
 
-#include <vector>
-
-#include "string.hh"
+#include "buffer.hh"
 #include "color.hh"
 #include "line_and_column.hh"
-#include "buffer.hh"
+#include "string.hh"
 #include "utf8.hh"
 
+#include <vector>
+
 namespace Kakoune
 {
 
diff --git a/src/editor.cc b/src/editor.cc
index b0f5fa08..e7fc1412 100644
--- a/src/editor.cc
+++ b/src/editor.cc
@@ -1,11 +1,10 @@
 #include "editor.hh"
 
 #include "exception.hh"
-#include "utils.hh"
 #include "register.hh"
 #include "register_manager.hh"
-
 #include "utf8_iterator.hh"
+#include "utils.hh"
 
 #include <array>
 
diff --git a/src/exception.cc b/src/exception.cc
index 9bd8f6a2..7f378b6c 100644
--- a/src/exception.cc
+++ b/src/exception.cc
@@ -1,6 +1,7 @@
 #include "exception.hh"
 
 #include "string.hh"
+
 #include <typeinfo>
 
 namespace Kakoune
diff --git a/src/file.cc b/src/file.cc
index bd611426..86597681 100644
--- a/src/file.cc
+++ b/src/file.cc
@@ -1,11 +1,11 @@
 #include "file.hh"
 
+#include "assert.hh"
 #include "buffer.hh"
 #include "buffer_manager.hh"
-#include "assert.hh"
-#include "unicode.hh"
-#include "debug.hh"
 #include "completion.hh"
+#include "debug.hh"
+#include "unicode.hh"
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/file.hh b/src/file.hh
index 2b6105f1..a8422d0d 100644
--- a/src/file.hh
+++ b/src/file.hh
@@ -2,7 +2,6 @@
 #define file_hh_INCLUDED
 
 #include "string.hh"
-
 #include "exception.hh"
 
 namespace Kakoune
diff --git a/src/filter.hh b/src/filter.hh
index c9f6bf08..a33ea5c2 100644
--- a/src/filter.hh
+++ b/src/filter.hh
@@ -1,13 +1,13 @@
 #ifndef filter_hh_INCLUDED
 #define filter_hh_INCLUDED
 
-#include <functional>
-
+#include "function_group.hh"
+#include "function_registry.hh"
+#include "memoryview.hh"
 #include "string.hh"
 #include "utils.hh"
-#include "memoryview.hh"
-#include "function_registry.hh"
-#include "function_group.hh"
+
+#include <functional>
 
 namespace Kakoune
 {
diff --git a/src/filters.cc b/src/filters.cc
index 26ff5969..506e8ea5 100644
--- a/src/filters.cc
+++ b/src/filters.cc
@@ -1,4 +1,5 @@
 #include "filters.hh"
+
 #include "buffer.hh"
 #include "selection.hh"
 
diff --git a/src/function_group.hh b/src/function_group.hh
index 2772389c..739b7ffb 100644
--- a/src/function_group.hh
+++ b/src/function_group.hh
@@ -1,9 +1,9 @@
 #ifndef function_group_hh_INCLUDED
 #define function_group_hh_INCLUDED
 
-#include "string.hh"
-#include "idvaluemap.hh"
 #include "exception.hh"
+#include "idvaluemap.hh"
+#include "string.hh"
 
 namespace Kakoune
 {
diff --git a/src/function_registry.hh b/src/function_registry.hh
index 291ba0c4..2197efcc 100644
--- a/src/function_registry.hh
+++ b/src/function_registry.hh
@@ -1,9 +1,9 @@
 #ifndef function_registry_h_INCLUDED
 #define function_registry_h_INCLUDED
 
-#include "string.hh"
 #include "completion.hh"
 #include "idvaluemap.hh"
+#include "string.hh"
 
 namespace Kakoune
 {
diff --git a/src/highlighter.hh b/src/highlighter.hh
index 274ce182..7d224973 100644
--- a/src/highlighter.hh
+++ b/src/highlighter.hh
@@ -1,13 +1,13 @@
 #ifndef highlighter_hh_INCLUDED
 #define highlighter_hh_INCLUDED
 
-#include <functional>
-
+#include "function_group.hh"
+#include "function_registry.hh"
+#include "memoryview.hh"
 #include "string.hh"
 #include "utils.hh"
-#include "memoryview.hh"
-#include "function_registry.hh"
-#include "function_group.hh"
+
+#include <functional>
 
 namespace Kakoune
 {
diff --git a/src/highlighters.hh b/src/highlighters.hh
index f38f1a7e..504869c9 100644
--- a/src/highlighters.hh
+++ b/src/highlighters.hh
@@ -1,9 +1,8 @@
 #ifndef highlighters_hh_INCLUDED
 #define highlighters_hh_INCLUDED
 
-#include "highlighter.hh"
-
 #include "color.hh"
+#include "highlighter.hh"
 
 namespace Kakoune
 {
diff --git a/src/idvaluemap.hh b/src/idvaluemap.hh
index c21b9af4..aff64412 100644
--- a/src/idvaluemap.hh
+++ b/src/idvaluemap.hh
@@ -1,9 +1,10 @@
 #ifndef idvaluemap_hh_INCLUDED
 #define idvaluemap_hh_INCLUDED
 
-#include <vector>
 #include "completion.hh"
 
+#include <vector>
+
 namespace Kakoune
 {
 
diff --git a/src/keys.cc b/src/keys.cc
index 91888cb9..956d9e59 100644
--- a/src/keys.cc
+++ b/src/keys.cc
@@ -1,4 +1,5 @@
 #include "keys.hh"
+
 #include "utils.hh"
 
 namespace Kakoune
diff --git a/src/keys.hh b/src/keys.hh
index 749f83c1..0df78853 100644
--- a/src/keys.hh
+++ b/src/keys.hh
@@ -1,9 +1,10 @@
 #ifndef keys_hh_INCLUDED
 #define keys_hh_INCLUDED
 
-#include <vector>
-#include "unicode.hh"
 #include "string.hh"
+#include "unicode.hh"
+
+#include <vector>
 
 namespace Kakoune
 {
diff --git a/src/line_and_column.hh b/src/line_and_column.hh
index 5194dca2..76d70a21 100644
--- a/src/line_and_column.hh
+++ b/src/line_and_column.hh
@@ -1,8 +1,6 @@
 #ifndef line_and_column_hh_INCLUDED
 #define line_and_column_hh_INCLUDED
 
-#include "units.hh"
-
 namespace Kakoune
 {
 
diff --git a/src/main.cc b/src/main.cc
index 2b77fd91..a3e86a7e 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,26 +1,26 @@
-#include "window.hh"
-#include "buffer.hh"
-#include "shell_manager.hh"
-#include "commands.hh"
-#include "command_manager.hh"
-#include "buffer_manager.hh"
-#include "register_manager.hh"
-#include "selectors.hh"
 #include "assert.hh"
-#include "debug.hh"
-#include "highlighters.hh"
-#include "filters.hh"
-#include "hook_manager.hh"
-#include "option_manager.hh"
-#include "event_manager.hh"
-#include "context.hh"
-#include "ncurses.hh"
-#include "string.hh"
-#include "file.hh"
-#include "color_registry.hh"
-#include "remote.hh"
+#include "buffer.hh"
+#include "buffer_manager.hh"
 #include "client_manager.hh"
+#include "color_registry.hh"
+#include "command_manager.hh"
+#include "commands.hh"
+#include "context.hh"
+#include "debug.hh"
+#include "event_manager.hh"
+#include "file.hh"
+#include "filters.hh"
+#include "highlighters.hh"
+#include "hook_manager.hh"
+#include "ncurses.hh"
+#include "option_manager.hh"
 #include "parameters_parser.hh"
+#include "register_manager.hh"
+#include "remote.hh"
+#include "selectors.hh"
+#include "shell_manager.hh"
+#include "string.hh"
+#include "window.hh"
 
 #if defined(__APPLE__)
 #include <mach-o/dyld.h>
diff --git a/src/memoryview.hh b/src/memoryview.hh
index 238ee386..1f9a7feb 100644
--- a/src/memoryview.hh
+++ b/src/memoryview.hh
@@ -1,7 +1,6 @@
 #ifndef memoryview_hh_INCLUDED
 #define memoryview_hh_INCLUDED
 
-#include <cstddef>
 #include <vector>
 #include <initializer_list>
 
@@ -14,6 +13,8 @@ template<typename T>
 class memoryview
 {
 public:
+    using size_t = std::size_t;
+
     memoryview()
         : m_pointer(nullptr), m_size(0) {}
 
diff --git a/src/ncurses.cc b/src/ncurses.cc
index 1dc22708..e10ebd8d 100644
--- a/src/ncurses.cc
+++ b/src/ncurses.cc
@@ -1,10 +1,9 @@
 #include "ncurses.hh"
 
 #include "display_buffer.hh"
-#include "register_manager.hh"
-
-#include "utf8_iterator.hh"
 #include "event_manager.hh"
+#include "register_manager.hh"
+#include "utf8_iterator.hh"
 
 #include <map>
 
diff --git a/src/ncurses.hh b/src/ncurses.hh
index de4f1dc6..f1297e6e 100644
--- a/src/ncurses.hh
+++ b/src/ncurses.hh
@@ -1,11 +1,11 @@
 #ifndef ncurses_hh_INCLUDED
 #define ncurses_hh_INCLUDED
 
-#include <ncurses.h>
-
-#include "user_interface.hh"
 #include "display_buffer.hh"
 #include "event_manager.hh"
+#include "user_interface.hh"
+
+#include <ncurses.h>
 
 namespace Kakoune
 {
diff --git a/src/option_manager.cc b/src/option_manager.cc
index 1e84e67a..7a6a20a2 100644
--- a/src/option_manager.cc
+++ b/src/option_manager.cc
@@ -1,4 +1,5 @@
 #include "option_manager.hh"
+
 #include "assert.hh"
 
 #include <sstream>
diff --git a/src/option_manager.hh b/src/option_manager.hh
index 895f431d..129f09bb 100644
--- a/src/option_manager.hh
+++ b/src/option_manager.hh
@@ -1,10 +1,10 @@
 #ifndef option_manager_hh_INCLUDED
 #define option_manager_hh_INCLUDED
 
-#include "utils.hh"
-#include "exception.hh"
 #include "completion.hh"
+#include "exception.hh"
 #include "option_types.hh"
+#include "utils.hh"
 
 #include <unordered_map>
 
diff --git a/src/option_types.hh b/src/option_types.hh
index 6164de14..e44b3f0d 100644
--- a/src/option_types.hh
+++ b/src/option_types.hh
@@ -1,9 +1,9 @@
 #ifndef option_types_hh_INCLUDED
 #define option_types_hh_INCLUDED
 
+#include "exception.hh"
 #include "string.hh"
 #include "units.hh"
-#include "exception.hh"
 
 #include <tuple>
 #include <vector>
diff --git a/src/parameters_parser.hh b/src/parameters_parser.hh
index 76f30ca7..698230af 100644
--- a/src/parameters_parser.hh
+++ b/src/parameters_parser.hh
@@ -1,9 +1,9 @@
 #ifndef parameters_parser_hh_INCLUDED
 #define parameters_parser_hh_INCLUDED
 
-#include "string.hh"
-#include "memoryview.hh"
 #include "exception.hh"
+#include "memoryview.hh"
+#include "string.hh"
 
 #include <unordered_map>
 
diff --git a/src/register.hh b/src/register.hh
index 09ba360e..96781b36 100644
--- a/src/register.hh
+++ b/src/register.hh
@@ -1,8 +1,8 @@
 #ifndef register_hh_INCLUDED
 #define register_hh_INCLUDED
 
-#include "string.hh"
 #include "memoryview.hh"
+#include "string.hh"
 
 namespace Kakoune
 {
diff --git a/src/register_manager.cc b/src/register_manager.cc
index 2407d5d0..88f706b8 100644
--- a/src/register_manager.cc
+++ b/src/register_manager.cc
@@ -1,7 +1,7 @@
 #include "register_manager.hh"
 
-#include "utils.hh"
 #include "assert.hh"
+#include "utils.hh"
 
 namespace Kakoune
 {
diff --git a/src/register_manager.hh b/src/register_manager.hh
index e6fe7d94..d12d0a94 100644
--- a/src/register_manager.hh
+++ b/src/register_manager.hh
@@ -2,7 +2,6 @@
 #define register_manager_hh_INCLUDED
 
 #include "register.hh"
-
 #include "utils.hh"
 
 #include <unordered_map>
diff --git a/src/remote.cc b/src/remote.cc
index d8c07e9a..ee80ebe3 100644
--- a/src/remote.cc
+++ b/src/remote.cc
@@ -1,11 +1,11 @@
 #include "remote.hh"
 
-#include "display_buffer.hh"
-#include "debug.hh"
-#include "client_manager.hh"
-#include "event_manager.hh"
 #include "buffer_manager.hh"
+#include "client_manager.hh"
 #include "command_manager.hh"
+#include "debug.hh"
+#include "display_buffer.hh"
+#include "event_manager.hh"
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/src/remote.hh b/src/remote.hh
index b9576a6f..c9276893 100644
--- a/src/remote.hh
+++ b/src/remote.hh
@@ -1,9 +1,9 @@
 #ifndef remote_hh_INCLUDED
 #define remote_hh_INCLUDED
 
-#include "user_interface.hh"
 #include "display_buffer.hh"
 #include "event_manager.hh"
+#include "user_interface.hh"
 
 namespace Kakoune
 {
diff --git a/src/selectors.cc b/src/selectors.cc
index 7fa9bd56..f62e5a78 100644
--- a/src/selectors.cc
+++ b/src/selectors.cc
@@ -1,7 +1,6 @@
 #include "selectors.hh"
 
 #include "string.hh"
-
 #include "utf8_iterator.hh"
 
 #include <algorithm>
diff --git a/src/shell_manager.cc b/src/shell_manager.cc
index 265b97e8..545bed07 100644
--- a/src/shell_manager.cc
+++ b/src/shell_manager.cc
@@ -1,7 +1,7 @@
 #include "shell_manager.hh"
 
-#include "debug.hh"
 #include "context.hh"
+#include "debug.hh"
 
 #include <cstring>
 #include <sys/types.h>
diff --git a/src/shell_manager.hh b/src/shell_manager.hh
index 523aec47..2e4bae80 100644
--- a/src/shell_manager.hh
+++ b/src/shell_manager.hh
@@ -1,8 +1,8 @@
 #ifndef shell_manager_hh_INCLUDED
 #define shell_manager_hh_INCLUDED
 
-#include "utils.hh"
 #include "string.hh"
+#include "utils.hh"
 
 #include <unordered_map>
 
diff --git a/src/string.cc b/src/string.cc
index a5981f94..06a20c43 100644
--- a/src/string.cc
+++ b/src/string.cc
@@ -1,4 +1,5 @@
 #include "string.hh"
+
 #include "exception.hh"
 
 namespace Kakoune
diff --git a/src/string.hh b/src/string.hh
index 26922c3d..046544ed 100644
--- a/src/string.hh
+++ b/src/string.hh
@@ -1,13 +1,13 @@
 #ifndef string_hh_INCLUDED
 #define string_hh_INCLUDED
 
-#include <string>
-#include <boost/regex.hpp>
-
 #include "memoryview.hh"
 #include "units.hh"
 #include "utf8.hh"
 
+#include <string>
+#include <boost/regex.hpp>
+
 namespace Kakoune
 {
 
diff --git a/src/unicode.hh b/src/unicode.hh
index 49b2755b..4b783dde 100644
--- a/src/unicode.hh
+++ b/src/unicode.hh
@@ -27,4 +27,3 @@ inline bool is_blank(Codepoint c)
 }
 
 #endif // unicode_hh_INCLUDED
-
diff --git a/src/unit_tests.cc b/src/unit_tests.cc
index 7c45c3d0..9aeb9b92 100644
--- a/src/unit_tests.cc
+++ b/src/unit_tests.cc
@@ -1,8 +1,8 @@
-#include "buffer.hh"
 #include "assert.hh"
+#include "buffer.hh"
 #include "editor.hh"
-#include "selectors.hh"
 #include "keys.hh"
+#include "selectors.hh"
 
 using namespace Kakoune;
 
diff --git a/src/user_interface.hh b/src/user_interface.hh
index 522357ab..c80d72b0 100644
--- a/src/user_interface.hh
+++ b/src/user_interface.hh
@@ -1,11 +1,10 @@
 #ifndef user_interface_hh_INCLUDED
 #define user_interface_hh_INCLUDED
 
-#include "memoryview.hh"
-#include "keys.hh"
-#include "units.hh"
-#include "utils.hh"
 #include "color.hh"
+#include "keys.hh"
+#include "memoryview.hh"
+#include "utils.hh"
 
 namespace Kakoune
 {
diff --git a/src/utf8.hh b/src/utf8.hh
index 4113c9fe..9b74373f 100644
--- a/src/utf8.hh
+++ b/src/utf8.hh
@@ -1,10 +1,11 @@
 #ifndef utf8_hh_INCLUDED
 #define utf8_hh_INCLUDED
 
-#include <cstddef>
+#include "assert.hh"
 #include "unicode.hh"
 #include "units.hh"
-#include "assert.hh"
+
+#include <cstddef>
 
 namespace Kakoune
 {
diff --git a/src/utils.hh b/src/utils.hh
index 117adf75..4c1ae1f3 100644
--- a/src/utils.hh
+++ b/src/utils.hh
@@ -1,11 +1,11 @@
 #ifndef utils_hh_INCLUDED
 #define utils_hh_INCLUDED
 
-#include "exception.hh"
 #include "assert.hh"
+#include "exception.hh"
 
-#include <memory>
 #include <algorithm>
+#include <memory>
 #include <vector>
 
 namespace Kakoune
diff --git a/src/window.cc b/src/window.cc
index 285cf0ff..54d7e6a2 100644
--- a/src/window.cc
+++ b/src/window.cc
@@ -1,9 +1,9 @@
 #include "window.hh"
 
 #include "assert.hh"
+#include "context.hh"
 #include "highlighter.hh"
 #include "hook_manager.hh"
-#include "context.hh"
 
 #include <algorithm>
 #include <sstream>
diff --git a/src/window.hh b/src/window.hh
index 66be3d17..9349c450 100644
--- a/src/window.hh
+++ b/src/window.hh
@@ -1,9 +1,9 @@
 #ifndef window_hh_INCLUDED
 #define window_hh_INCLUDED
 
-#include "editor.hh"
-#include "display_buffer.hh"
 #include "completion.hh"
+#include "display_buffer.hh"
+#include "editor.hh"
 #include "highlighter.hh"
 #include "highlighter.hh"
 #include "hook_manager.hh"