Merge remote-tracking branch 'arrufat/includes-cleanup'

43 files changed, 15 insertions, 57 deletions

diff --git a/src/alias_registry.cc b/src/alias_registry.cc
index 96f2e4ef..4263c317 100644
--- a/src/alias_registry.cc
+++ b/src/alias_registry.cc
@@ -1,7 +1,6 @@
 #include "alias_registry.hh"
 
 #include "command_manager.hh"
-#include "ranges.hh"
 
 namespace Kakoune
 {
diff --git a/src/assert.cc b/src/assert.cc
index 6e5fc512..c27fb1e8 100644
--- a/src/assert.cc
+++ b/src/assert.cc
@@ -8,7 +8,6 @@
 
 #include <sys/types.h>
 #include <unistd.h>
-#include <signal.h>
 
 namespace Kakoune
 {
diff --git a/src/backtrace.cc b/src/backtrace.cc
index 04b772ad..9c1df97a 100644
--- a/src/backtrace.cc
+++ b/src/backtrace.cc
@@ -1,7 +1,6 @@
 #include "backtrace.hh"
 
 #include "string.hh"
-#include "format.hh"
 
 #if defined(__GLIBC__) || defined(__APPLE__)
 # include <execinfo.h>
diff --git a/src/client.cc b/src/client.cc
index 3f7494d9..0f1b8d5f 100644
--- a/src/client.cc
+++ b/src/client.cc
@@ -1,8 +1,6 @@
 #include "client.hh"
 
 #include "context.hh"
-#include "face_registry.hh"
-#include "buffer_manager.hh"
 #include "buffer_utils.hh"
 #include "debug.hh"
 #include "file.hh"
diff --git a/src/client_manager.cc b/src/client_manager.cc
index 0ad5392f..3c8a7b6e 100644
--- a/src/client_manager.cc
+++ b/src/client_manager.cc
@@ -2,7 +2,6 @@
 
 #include "buffer_manager.hh"
 #include "command_manager.hh"
-#include "event_manager.hh"
 #include "face_registry.hh"
 #include "file.hh"
 #include "ranges.hh"
diff --git a/src/command_manager.hh b/src/command_manager.hh
index 878ca129..c0a2e878 100644
--- a/src/command_manager.hh
+++ b/src/command_manager.hh
@@ -1,7 +1,6 @@
 #ifndef command_manager_hh_INCLUDED
 #define command_manager_hh_INCLUDED
 
-#include "coord.hh"
 #include "completion.hh"
 #include "array_view.hh"
 #include "shell_manager.hh"
@@ -12,7 +11,6 @@
 #include "hash_map.hh"
 
 #include <functional>
-#include <initializer_list>
 
 namespace Kakoune
 {
diff --git a/src/commands.cc b/src/commands.cc
index 7c6fdb94..1d3f5a50 100644
--- a/src/commands.cc
+++ b/src/commands.cc
@@ -32,7 +32,6 @@
 #include "user_interface.hh"
 #include "window.hh"
 
-#include <functional>
 #include <utility>
 
 #include <sys/types.h>
diff --git a/src/context.hh b/src/context.hh
index e1c0f657..ce17c3f7 100644
--- a/src/context.hh
+++ b/src/context.hh
@@ -4,7 +4,6 @@
 #include "selection.hh"
 #include "optional.hh"
 #include "utils.hh"
-#include "flags.hh"
 
 #include <functional>
 
diff --git a/src/debug.hh b/src/debug.hh
index 723bbb9e..774d5710 100644
--- a/src/debug.hh
+++ b/src/debug.hh
@@ -3,7 +3,6 @@
 
 #include "array.hh"
 #include "enum.hh"
-#include "flags.hh"
 
 namespace Kakoune
 {
diff --git a/src/display_buffer.cc b/src/display_buffer.cc
index 26c58754..bc934202 100644
--- a/src/display_buffer.cc
+++ b/src/display_buffer.cc
@@ -2,7 +2,6 @@
 
 #include "assert.hh"
 #include "buffer.hh"
-#include "buffer_utils.hh"
 #include "face_registry.hh"
 #include "utf8.hh"
 
diff --git a/src/face_registry.hh b/src/face_registry.hh
index 88e52980..110e9769 100644
--- a/src/face_registry.hh
+++ b/src/face_registry.hh
@@ -2,7 +2,6 @@
 #define face_registry_hh_INCLUDED
 
 #include "face.hh"
-#include "utils.hh"
 #include "hash_map.hh"
 #include "ranges.hh"
 #include "string.hh"
diff --git a/src/file.cc b/src/file.cc
index ca2d2834..ac19a089 100644
--- a/src/file.cc
+++ b/src/file.cc
@@ -4,12 +4,10 @@
 #include "buffer.hh"
 #include "exception.hh"
 #include "flags.hh"
-#include "option_types.hh"
 #include "event_manager.hh"
 #include "ranked_match.hh"
 #include "regex.hh"
 #include "string.hh"
-#include "unicode.hh"
 
 #include <limits>
 #include <cerrno>
diff --git a/src/highlighter.cc b/src/highlighter.cc
index c6b1a13d..7a6b2155 100644
--- a/src/highlighter.cc
+++ b/src/highlighter.cc
@@ -1,6 +1,7 @@
 #include "highlighter.hh"
 
 #include "debug.hh"
+#include "flags.hh"
 
 namespace Kakoune
 {
diff --git a/src/highlighter.hh b/src/highlighter.hh
index c1070d9a..73520c53 100644
--- a/src/highlighter.hh
+++ b/src/highlighter.hh
@@ -3,8 +3,6 @@
 
 #include "coord.hh"
 #include "completion.hh"
-#include "exception.hh"
-#include "flags.hh"
 #include "range.hh"
 #include "hash_map.hh"
 #include "array_view.hh"
diff --git a/src/highlighter_group.cc b/src/highlighter_group.cc
index 7802df94..57bbd7d2 100644
--- a/src/highlighter_group.cc
+++ b/src/highlighter_group.cc
@@ -1,7 +1,9 @@
 #include "highlighter_group.hh"
 
-#include "ranges.hh"
+#include "flags.hh"
 #include "format.hh"
+#include "ranges.hh"
+
 
 namespace Kakoune
 {
diff --git a/src/highlighters.cc b/src/highlighters.cc
index 4b18a447..cccccffd 100644
--- a/src/highlighters.cc
+++ b/src/highlighters.cc
@@ -6,7 +6,6 @@
 #include "changes.hh"
 #include "command_manager.hh"
 #include "context.hh"
-#include "clock.hh"
 #include "display_buffer.hh"
 #include "face_registry.hh"
 #include "highlighter_group.hh"
diff --git a/src/hook_manager.cc b/src/hook_manager.cc
index 00b38677..ae3acf65 100644
--- a/src/hook_manager.cc
+++ b/src/hook_manager.cc
@@ -1,7 +1,6 @@
 #include "hook_manager.hh"
 
 #include "debug.hh"
-#include "clock.hh"
 #include "command_manager.hh"
 #include "context.hh"
 #include "display_buffer.hh"
diff --git a/src/hook_manager.hh b/src/hook_manager.hh
index ee1adafb..97c768a3 100644
--- a/src/hook_manager.hh
+++ b/src/hook_manager.hh
@@ -1,7 +1,6 @@
 #ifndef hook_manager_hh_INCLUDED
 #define hook_manager_hh_INCLUDED
 
-#include "hash_map.hh"
 #include "completion.hh"
 #include "safe_ptr.hh"
 #include "meta.hh"
diff --git a/src/input_handler.cc b/src/input_handler.cc
index 8ab88f20..aa43783e 100644
--- a/src/input_handler.cc
+++ b/src/input_handler.cc
@@ -1,6 +1,6 @@
 #include "input_handler.hh"
 
-#include "buffer_manager.hh"
+#include "buffer.hh"
 #include "debug.hh"
 #include "command_manager.hh"
 #include "client.hh"
@@ -11,9 +11,7 @@
 #include "option_types.hh"
 #include "regex.hh"
 #include "register_manager.hh"
-#include "hash_map.hh"
 #include "user_interface.hh"
-#include "utf8.hh"
 #include "window.hh"
 #include "word_db.hh"
 
diff --git a/src/insert_completer.cc b/src/insert_completer.cc
index b369359a..1e83a47e 100644
--- a/src/insert_completer.cc
+++ b/src/insert_completer.cc
@@ -17,7 +17,6 @@
 #include "utf8_iterator.hh"
 #include "user_interface.hh"
 
-#include <numeric>
 #include <utility>
 
 namespace Kakoune
diff --git a/src/keymap_manager.cc b/src/keymap_manager.cc
index 8894267a..1d05d50c 100644
--- a/src/keymap_manager.cc
+++ b/src/keymap_manager.cc
@@ -1,13 +1,10 @@
 #include "keymap_manager.hh"
 
-#include "array_view.hh"
 #include "assert.hh"
 #include "exception.hh"
 #include "format.hh"
 #include "ranges.hh"
 
-#include <algorithm>
-
 namespace Kakoune
 {
 
diff --git a/src/keymap_manager.hh b/src/keymap_manager.hh
index 4819be05..233ed08b 100644
--- a/src/keymap_manager.hh
+++ b/src/keymap_manager.hh
@@ -1,12 +1,9 @@
 #ifndef keymap_manager_hh_INCLUDED
 #define keymap_manager_hh_INCLUDED
 
-#include "array_view.hh"
 #include "keys.hh"
-#include "hash.hh"
 #include "string.hh"
 #include "hash_map.hh"
-#include "utils.hh"
 #include "vector.hh"
 
 namespace Kakoune
diff --git a/src/keys.cc b/src/keys.cc
index 30aeaca7..4170ce98 100644
--- a/src/keys.cc
+++ b/src/keys.cc
@@ -5,7 +5,6 @@
 #include "string.hh"
 #include "unit_tests.hh"
 #include "utf8_iterator.hh"
-#include "utils.hh"
 #include "format.hh"
 #include "string_utils.hh"
 
diff --git a/src/main.cc b/src/main.cc
index f9890eed..2e1c6d38 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -17,7 +17,6 @@
 #include "terminal_ui.hh"
 #include "option_types.hh"
 #include "parameters_parser.hh"
-#include "profile.hh"
 #include "ranges.hh"
 #include "regex.hh"
 #include "register_manager.hh"
@@ -26,9 +25,7 @@
 #include "shared_string.hh"
 #include "shell_manager.hh"
 #include "string.hh"
-#include "unit_tests.hh"
 #include "window.hh"
-#include "clock.hh"
 
 #include <fcntl.h>
 #include <locale.h>
diff --git a/src/normal.cc b/src/normal.cc
index 5a7c4e58..689137ef 100644
--- a/src/normal.cc
+++ b/src/normal.cc
@@ -4,9 +4,7 @@
 #include "buffer_manager.hh"
 #include "buffer_utils.hh"
 #include "changes.hh"
-#include "client_manager.hh"
 #include "command_manager.hh"
-#include "commands.hh"
 #include "context.hh"
 #include "diff.hh"
 #include "enum.hh"
diff --git a/src/option.hh b/src/option.hh
index 7e29deb7..a27fc256 100644
--- a/src/option.hh
+++ b/src/option.hh
@@ -1,10 +1,10 @@
 #ifndef option_hh_INCLUDED
 #define option_hh_INCLUDED
 
-#include "enum.hh"
+#include "exception.hh"
 #include "meta.hh"
+#include "string.hh"
 #include "vector.hh"
-#include "array.hh"
 
 namespace Kakoune
 {
diff --git a/src/option_manager.hh b/src/option_manager.hh
index 480b589b..c36aeb6d 100644
--- a/src/option_manager.hh
+++ b/src/option_manager.hh
@@ -5,8 +5,8 @@
 #include "exception.hh"
 #include "hash_map.hh"
 #include "option.hh"
+#include "option_types.hh"
 #include "ranges.hh"
-#include "utils.hh"
 #include "vector.hh"
 #include "format.hh"
 #include "string_utils.hh"
diff --git a/src/parameters_parser.hh b/src/parameters_parser.hh
index 7d26c3bb..f1ff8b73 100644
--- a/src/parameters_parser.hh
+++ b/src/parameters_parser.hh
@@ -6,7 +6,6 @@
 #include "meta.hh"
 #include "array_view.hh"
 #include "optional.hh"
-#include "flags.hh"
 #include "string.hh"
 #include "format.hh"
 
diff --git a/src/profile.hh b/src/profile.hh
index f107ebd3..6c121731 100644
--- a/src/profile.hh
+++ b/src/profile.hh
@@ -1,8 +1,9 @@
 #ifndef profile_hh_INCLUDED
 #define profile_hh_INCLUDED
 
-#include "option.hh"
 #include "clock.hh"
+#include "context.hh"
+#include "debug.hh"
 #include "option_manager.hh"
 
 namespace Kakoune
diff --git a/src/range.hh b/src/range.hh
index a36386f2..6e72ffba 100644
--- a/src/range.hh
+++ b/src/range.hh
@@ -1,6 +1,8 @@
 #ifndef range_hh_INCLUDED
 #define range_hh_INCLUDED
 
+#include <cstddef>
+
 namespace Kakoune
 {
 
diff --git a/src/regex_impl.cc b/src/regex_impl.cc
index f6393b56..4b404cfa 100644
--- a/src/regex_impl.cc
+++ b/src/regex_impl.cc
@@ -1,6 +1,5 @@
 #include "regex_impl.hh"
 
-#include "exception.hh"
 #include "string.hh"
 #include "unicode.hh"
 #include "unit_tests.hh"
diff --git a/src/safe_ptr.hh b/src/safe_ptr.hh
index 216a14ff..d08a9a79 100644
--- a/src/safe_ptr.hh
+++ b/src/safe_ptr.hh
@@ -3,7 +3,6 @@
 
 // #define SAFE_PTR_TRACK_CALLSTACKS
 
-#include "assert.hh"
 #include "ref_ptr.hh"
 
 #ifdef SAFE_PTR_TRACK_CALLSTACKS
diff --git a/src/selection.cc b/src/selection.cc
index 03dd4721..99b21c3e 100644
--- a/src/selection.cc
+++ b/src/selection.cc
@@ -2,7 +2,6 @@
 
 #include "buffer_utils.hh"
 #include "changes.hh"
-#include "utf8.hh"
 
 namespace Kakoune
 {
diff --git a/src/string_utils.cc b/src/string_utils.cc
index b76c7511..d533a12b 100644
--- a/src/string_utils.cc
+++ b/src/string_utils.cc
@@ -5,8 +5,6 @@
 #include "unit_tests.hh"
 #include "ranges.hh"
 
-#include <charconv>
-
 namespace Kakoune
 {
 
diff --git a/src/string_utils.hh b/src/string_utils.hh
index 559a6867..9e245bcc 100644
--- a/src/string_utils.hh
+++ b/src/string_utils.hh
@@ -5,7 +5,6 @@
 #include "enum.hh"
 #include "vector.hh"
 #include "optional.hh"
-#include "utils.hh"
 #include "format.hh"
 #include "array.hh"
 
diff --git a/src/terminal_ui.cc b/src/terminal_ui.cc
index e5d2b56c..bcb0cde5 100644
--- a/src/terminal_ui.cc
+++ b/src/terminal_ui.cc
@@ -1,6 +1,5 @@
 #include "terminal_ui.hh"
 
-#include "buffer_utils.hh"
 #include "display_buffer.hh"
 #include "event_manager.hh"
 #include "exception.hh"
@@ -9,6 +8,7 @@
 #include "ranges.hh"
 #include "format.hh"
 #include "diff.hh"
+#include "string_utils.hh"
 
 #include <algorithm>
 
diff --git a/src/terminal_ui.hh b/src/terminal_ui.hh
index 85583a1d..64e3bfcf 100644
--- a/src/terminal_ui.hh
+++ b/src/terminal_ui.hh
@@ -6,7 +6,6 @@
 #include "display_buffer.hh"
 #include "event_manager.hh"
 #include "face.hh"
-#include "hash_map.hh"
 #include "optional.hh"
 #include "string.hh"
 #include "user_interface.hh"
diff --git a/src/unique_descriptor.hh b/src/unique_descriptor.hh
index c099c17e..0d925ef5 100644
--- a/src/unique_descriptor.hh
+++ b/src/unique_descriptor.hh
@@ -1,6 +1,8 @@
 #ifndef fd_hh_INCLUDED
 #define fd_hh_INCLUDED
 
+#include <utility>
+
 namespace Kakoune
 {
 
diff --git a/src/units.hh b/src/units.hh
index 3bdfe253..ff4ed882 100644
--- a/src/units.hh
+++ b/src/units.hh
@@ -5,7 +5,6 @@
 #include "hash.hh"
 
 #include <type_traits>
-#include <compare>
 
 namespace Kakoune
 {
diff --git a/src/utf8.hh b/src/utf8.hh
index 6ef2f63d..0ba8bdef 100644
--- a/src/utf8.hh
+++ b/src/utf8.hh
@@ -6,8 +6,6 @@
 #include "units.hh"
 #include "optional.hh"
 
-#include <cstddef>
-
 namespace Kakoune
 {
 
diff --git a/src/value.hh b/src/value.hh
index 2b9e0d22..f38e4fa2 100644
--- a/src/value.hh
+++ b/src/value.hh
@@ -2,7 +2,6 @@
 #define value_hh_INCLUDED
 
 #include "hash_map.hh"
-#include "units.hh"
 #include "meta.hh"
 
 #include <type_traits>
diff --git a/src/window.cc b/src/window.cc
index e992af01..c5fc44db 100644
--- a/src/window.cc
+++ b/src/window.cc
@@ -3,7 +3,6 @@
 #include "assert.hh"
 #include "buffer.hh"
 #include "buffer_utils.hh"
-#include "clock.hh"
 #include "context.hh"
 #include "highlighter.hh"
 #include "hook_manager.hh"
diff --git a/src/word_db.cc b/src/word_db.cc
index 755304ca..0a1873e7 100644
--- a/src/word_db.cc
+++ b/src/word_db.cc
@@ -2,9 +2,7 @@
 
 #include "buffer.hh"
 #include "line_modification.hh"
-#include "option_types.hh"
 #include "unit_tests.hh"
-#include "utils.hh"
 #include "value.hh"
 
 namespace Kakoune