diff --git a/src/buffer.cc b/src/buffer.cc
index 095353661..dac1e19c8 100644
--- a/src/buffer.cc
+++ b/src/buffer.cc
@@ -7,6 +7,7 @@
 #include "context.hh"
 #include "diff.hh"
 #include "file.hh"
+#include "flags.hh"
 #include "shared_string.hh"
 #include "unit_tests.hh"
 #include "utils.hh"
diff --git a/src/buffer.hh b/src/buffer.hh
index f535c3873..7e4b54bec 100644
--- a/src/buffer.hh
+++ b/src/buffer.hh
@@ -3,7 +3,6 @@
 
 #include "clock.hh"
 #include "coord.hh"
-#include "flags.hh"
 #include "safe_ptr.hh"
 #include "scope.hh"
 #include "shared_string.hh"
diff --git a/src/command_manager.cc b/src/command_manager.cc
index e3aea006d..9d42b0a97 100644
--- a/src/command_manager.cc
+++ b/src/command_manager.cc
@@ -3,6 +3,7 @@
 #include "alias_registry.hh"
 #include "assert.hh"
 #include "context.hh"
+#include "flags.hh"
 #include "register_manager.hh"
 #include "shell_manager.hh"
 #include "utils.hh"
diff --git a/src/command_manager.hh b/src/command_manager.hh
index 36cfe423c..be2dd7d69 100644
--- a/src/command_manager.hh
+++ b/src/command_manager.hh
@@ -3,7 +3,6 @@
 
 #include "coord.hh"
 #include "completion.hh"
-#include "flags.hh"
 #include "array_view.hh"
 #include "shell_manager.hh"
 #include "parameters_parser.hh"
@@ -36,7 +35,6 @@ enum class CommandFlags
     None   = 0,
     Hidden = 1,
 };
-
 constexpr bool with_bit_ops(Meta::Type<CommandFlags>) { return true; }
 
 struct CommandInfo { String name, info; };
diff --git a/src/completion.hh b/src/completion.hh
index 281c120fc..335cfbd64 100644
--- a/src/completion.hh
+++ b/src/completion.hh
@@ -4,7 +4,6 @@
 #include <functional>
 #include <algorithm>
 
-#include "flags.hh"
 #include "units.hh"
 #include "string.hh"
 #include "vector.hh"
diff --git a/src/context.hh b/src/context.hh
index ba981f691..9fe54a770 100644
--- a/src/context.hh
+++ b/src/context.hh
@@ -3,7 +3,6 @@
 
 #include "selection.hh"
 #include "optional.hh"
-#include "flags.hh"
 
 namespace Kakoune
 {
@@ -86,6 +85,7 @@ public:
         None = 0,
         Transient = 1,
     };
+    friend constexpr bool with_bit_ops(Meta::Type<Flags>) { return true; }
 
     Context(InputHandler& input_handler, SelectionList selections,
             Flags flags, String name = "");
@@ -183,8 +183,6 @@ private:
     NestedBool m_history_disabled;
 };
 
-constexpr bool with_bit_ops(Meta::Type<Context::Flags>) { return true; }
-
 struct ScopedEdition
 {
     ScopedEdition(Context& context)
diff --git a/src/file.cc b/src/file.cc
index 585c309ae..29e285e9c 100644
--- a/src/file.cc
+++ b/src/file.cc
@@ -3,6 +3,7 @@
 #include "assert.hh"
 #include "buffer.hh"
 #include "exception.hh"
+#include "flags.hh"
 #include "ranked_match.hh"
 #include "regex.hh"
 #include "string.hh"
diff --git a/src/file.hh b/src/file.hh
index 1ecb10902..7cb5f88cc 100644
--- a/src/file.hh
+++ b/src/file.hh
@@ -2,7 +2,7 @@
 #define file_hh_INCLUDED
 
 #include "array_view.hh"
-#include "flags.hh"
+#include "meta.hh"
 #include "units.hh"
 #include "vector.hh"
 
@@ -78,7 +78,6 @@ enum class FilenameFlags
     OnlyDirectories = 1 << 0,
     Expand = 1 << 1
 };
-
 constexpr bool with_bit_ops(Meta::Type<FilenameFlags>) { return true; }
 
 CandidateList complete_filename(StringView prefix, const Regex& ignore_regex,
diff --git a/src/parameters_parser.cc b/src/parameters_parser.cc
index 30154483e..9ca475f78 100644
--- a/src/parameters_parser.cc
+++ b/src/parameters_parser.cc
@@ -1,5 +1,7 @@
 #include "parameters_parser.hh"
 
+#include "flags.hh"
+
 namespace Kakoune
 {
 
diff --git a/src/parameters_parser.hh b/src/parameters_parser.hh
index a790aa6e9..dc9f66122 100644
--- a/src/parameters_parser.hh
+++ b/src/parameters_parser.hh
@@ -3,8 +3,8 @@
 
 #include "exception.hh"
 #include "hash_map.hh"
+#include "meta.hh"
 #include "array_view.hh"
-#include "flags.hh"
 #include "optional.hh"
 #include "string.hh"
 
diff --git a/src/selectors.cc b/src/selectors.cc
index 5ab25e5dd..ece2b9ce7 100644
--- a/src/selectors.cc
+++ b/src/selectors.cc
@@ -1,6 +1,7 @@
 #include "selectors.hh"
 
 #include "buffer_utils.hh"
+#include "flags.hh"
 #include "optional.hh"
 #include "regex.hh"
 #include "string.hh"
diff --git a/src/selectors.hh b/src/selectors.hh
index e873d9abc..8b2ced6db 100644
--- a/src/selectors.hh
+++ b/src/selectors.hh
@@ -1,7 +1,6 @@
 #ifndef selectors_hh_INCLUDED
 #define selectors_hh_INCLUDED
 
-#include "flags.hh"
 #include "selection.hh"
 
 namespace Kakoune