diff --git a/.gitignore b/.gitignore
index 09944214..4de669bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,7 @@
+# Linting config files symlinked from dev-utils
+/.clang-format
+/.clang-tidy
+
+# Build related directories
 .task/
 build/
diff --git a/lint-requirements.txt b/lint-requirements.txt
index dbf21dec..44722a5c 100644
--- a/lint-requirements.txt
+++ b/lint-requirements.txt
@@ -1,4 +1,4 @@
 clang-format>=20.1
-clang-tidy>=20.1
+clang-tidy>=21.1
 gersemi>=0.16.2
 yamllint>=1.35.1
diff --git a/src/.clang-format b/src/.clang-format
index 09c44902..d371375d 100644
--- a/src/.clang-format
+++ b/src/.clang-format
@@ -6,11 +6,11 @@ IncludeCategories:
 
   # Project library headers
   - Regex: "^<log_surgeon"
-    Priority: 3
+    Priority: 4
 
   # External library headers. Update when adding new libraries.
   - Regex: "^<(fmt|gsl)"
-    Priority: 4
+    Priority: 3
 
   # C system headers
   - Regex: "^<.+\\.h>"
@@ -19,7 +19,3 @@ IncludeCategories:
   # C++ standard libraries
   - Regex: "^<.+>"
     Priority: 2
-
-  # Project relative headers
-  - Regex: "^\".+\""
-    Priority: 5
diff --git a/src/log_surgeon/SchemaParser.cpp b/src/log_surgeon/SchemaParser.cpp
index ef6cd42f..76f4b64b 100644
--- a/src/log_surgeon/SchemaParser.cpp
+++ b/src/log_surgeon/SchemaParser.cpp
@@ -23,7 +23,8 @@
 #include <log_surgeon/utils.hpp>
 
 using ParserValueRegex = log_surgeon::ParserValue<std::unique_ptr<
-        log_surgeon::finite_automata::RegexAST<log_surgeon::finite_automata::ByteNfaState>>>;
+        log_surgeon::finite_automata::RegexAST<log_surgeon::finite_automata::ByteNfaState>
+>>;
 using RegexASTByte
         = log_surgeon::finite_automata::RegexAST<log_surgeon::finite_automata::ByteNfaState>;
 using RegexASTGroupByte
@@ -32,8 +33,8 @@ using RegexASTIntegerByte
         = log_surgeon::finite_automata::RegexASTInteger<log_surgeon::finite_automata::ByteNfaState>;
 using RegexASTLiteralByte
         = log_surgeon::finite_automata::RegexASTLiteral<log_surgeon::finite_automata::ByteNfaState>;
-using RegexASTMultiplicationByte = log_surgeon::finite_automata::RegexASTMultiplication<
-        log_surgeon::finite_automata::ByteNfaState>;
+using RegexASTMultiplicationByte = log_surgeon::finite_automata::
+        RegexASTMultiplication<log_surgeon::finite_automata::ByteNfaState>;
 using RegexASTOrByte
         = log_surgeon::finite_automata::RegexASTOr<log_surgeon::finite_automata::ByteNfaState>;
 using RegexASTCatByte
diff --git a/src/log_surgeon/finite_automata/Dfa.hpp b/src/log_surgeon/finite_automata/Dfa.hpp
index 70118236..7475e9c8 100644
--- a/src/log_surgeon/finite_automata/Dfa.hpp
+++ b/src/log_surgeon/finite_automata/Dfa.hpp
@@ -16,6 +16,9 @@
 #include <utility>
 #include <vector>
 
+#include <fmt/format.h>
+#include <fmt/ranges.h>
+
 #include <log_surgeon/Constants.hpp>
 #include <log_surgeon/finite_automata/DeterminizationConfiguration.hpp>
 #include <log_surgeon/finite_automata/DfaStatePair.hpp>
@@ -25,9 +28,6 @@
 #include <log_surgeon/finite_automata/TagOperation.hpp>
 #include <log_surgeon/Token.hpp>
 
-#include <fmt/format.h>
-#include <fmt/ranges.h>
-
 namespace log_surgeon::finite_automata {
 /**
  * Represents a Deterministic Finite Automaton (DFA).
diff --git a/src/log_surgeon/finite_automata/DfaState.hpp b/src/log_surgeon/finite_automata/DfaState.hpp
index b974d459..0cec7c77 100644
--- a/src/log_surgeon/finite_automata/DfaState.hpp
+++ b/src/log_surgeon/finite_automata/DfaState.hpp
@@ -12,15 +12,15 @@
 #include <unordered_map>
 #include <vector>
 
+#include <fmt/format.h>
+#include <fmt/ranges.h>
+
 #include <log_surgeon/Constants.hpp>
 #include <log_surgeon/finite_automata/DfaTransition.hpp>
 #include <log_surgeon/finite_automata/RegisterOperation.hpp>
 #include <log_surgeon/finite_automata/StateType.hpp>
 #include <log_surgeon/finite_automata/UnicodeIntervalTree.hpp>
 
-#include <fmt/format.h>
-#include <fmt/ranges.h>
-
 namespace log_surgeon::finite_automata {
 template <StateType state_type>
 class DfaState;
diff --git a/src/log_surgeon/finite_automata/DfaTransition.hpp b/src/log_surgeon/finite_automata/DfaTransition.hpp
index e1c13b13..327116a4 100644
--- a/src/log_surgeon/finite_automata/DfaTransition.hpp
+++ b/src/log_surgeon/finite_automata/DfaTransition.hpp
@@ -8,12 +8,12 @@
 #include <utility>
 #include <vector>
 
-#include <log_surgeon/finite_automata/RegisterOperation.hpp>
-#include <log_surgeon/finite_automata/StateType.hpp>
-
 #include <fmt/format.h>
 #include <fmt/ranges.h>
 
+#include <log_surgeon/finite_automata/RegisterOperation.hpp>
+#include <log_surgeon/finite_automata/StateType.hpp>
+
 namespace log_surgeon::finite_automata {
 template <StateType state_type>
 class DfaState;
diff --git a/src/log_surgeon/finite_automata/Nfa.hpp b/src/log_surgeon/finite_automata/Nfa.hpp
index ae6d0fc6..6ce71320 100644
--- a/src/log_surgeon/finite_automata/Nfa.hpp
+++ b/src/log_surgeon/finite_automata/Nfa.hpp
@@ -12,6 +12,9 @@
 #include <utility>
 #include <vector>
 
+#include <fmt/format.h>
+#include <fmt/ranges.h>
+
 #include <log_surgeon/Constants.hpp>
 #include <log_surgeon/finite_automata/Capture.hpp>
 #include <log_surgeon/finite_automata/TagOperation.hpp>
@@ -20,9 +23,6 @@
 #include <log_surgeon/types.hpp>
 #include <log_surgeon/UniqueIdGenerator.hpp>
 
-#include <fmt/format.h>
-#include <fmt/ranges.h>
-
 namespace log_surgeon::finite_automata {
 /**
  * Represents a Non-Deterministic Finite Automaton (NFA) designed to recognize a language based on
diff --git a/src/log_surgeon/finite_automata/NfaSpontaneousTransition.hpp b/src/log_surgeon/finite_automata/NfaSpontaneousTransition.hpp
index de72715a..2f990bb9 100644
--- a/src/log_surgeon/finite_automata/NfaSpontaneousTransition.hpp
+++ b/src/log_surgeon/finite_automata/NfaSpontaneousTransition.hpp
@@ -9,11 +9,11 @@
 #include <utility>
 #include <vector>
 
-#include <log_surgeon/finite_automata/TagOperation.hpp>
-
 #include <fmt/format.h>
 #include <fmt/ranges.h>
 
+#include <log_surgeon/finite_automata/TagOperation.hpp>
+
 namespace log_surgeon::finite_automata {
 /**
  * Represents an NFA transition with a collection of tag operations to be performed during the
diff --git a/src/log_surgeon/finite_automata/NfaState.hpp b/src/log_surgeon/finite_automata/NfaState.hpp
index ee80e900..e5f973bd 100644
--- a/src/log_surgeon/finite_automata/NfaState.hpp
+++ b/src/log_surgeon/finite_automata/NfaState.hpp
@@ -13,6 +13,9 @@
 #include <utility>
 #include <vector>
 
+#include <fmt/format.h>
+#include <fmt/ranges.h>
+
 #include <log_surgeon/Constants.hpp>
 #include <log_surgeon/finite_automata/NfaSpontaneousTransition.hpp>
 #include <log_surgeon/finite_automata/StateType.hpp>
@@ -20,9 +23,6 @@
 #include <log_surgeon/finite_automata/UnicodeIntervalTree.hpp>
 #include <log_surgeon/types.hpp>
 
-#include <fmt/format.h>
-#include <fmt/ranges.h>
-
 namespace log_surgeon::finite_automata {
 template <StateType state_type>
 class NfaState;
diff --git a/src/log_surgeon/finite_automata/RegexAST.hpp b/src/log_surgeon/finite_automata/RegexAST.hpp
index 36b9301c..3d5bbe04 100644
--- a/src/log_surgeon/finite_automata/RegexAST.hpp
+++ b/src/log_surgeon/finite_automata/RegexAST.hpp
@@ -14,16 +14,16 @@
 #include <utility>
 #include <vector>
 
-#include <log_surgeon/Constants.hpp>
-#include <log_surgeon/finite_automata/Capture.hpp>
-#include <log_surgeon/finite_automata/TagOperation.hpp>
-#include <log_surgeon/finite_automata/UnicodeIntervalTree.hpp>
-
 #include <fmt/format.h>
 #include <fmt/ranges.h>
 #include <fmt/xchar.h>
 #include <gsl/pointers>
 
+#include <log_surgeon/Constants.hpp>
+#include <log_surgeon/finite_automata/Capture.hpp>
+#include <log_surgeon/finite_automata/TagOperation.hpp>
+#include <log_surgeon/finite_automata/UnicodeIntervalTree.hpp>
+
 namespace log_surgeon::finite_automata {
 template <typename TypedNfaState>
 class Nfa;
diff --git a/src/log_surgeon/finite_automata/RegisterOperation.hpp b/src/log_surgeon/finite_automata/RegisterOperation.hpp
index 4dfb1e7d..9de94871 100644
--- a/src/log_surgeon/finite_automata/RegisterOperation.hpp
+++ b/src/log_surgeon/finite_automata/RegisterOperation.hpp
@@ -5,10 +5,10 @@
 #include <optional>
 #include <string>
 
-#include <log_surgeon/types.hpp>
-
 #include <fmt/format.h>
 
+#include <log_surgeon/types.hpp>
+
 namespace log_surgeon::finite_automata {
 /**
  * Represents a register operation:
diff --git a/src/log_surgeon/finite_automata/TagOperation.hpp b/src/log_surgeon/finite_automata/TagOperation.hpp
index 52ac4993..f3c03c62 100644
--- a/src/log_surgeon/finite_automata/TagOperation.hpp
+++ b/src/log_surgeon/finite_automata/TagOperation.hpp
@@ -5,10 +5,10 @@
 #include <string>
 #include <tuple>
 
-#include <log_surgeon/types.hpp>
-
 #include <fmt/format.h>
 
+#include <log_surgeon/types.hpp>
+
 namespace log_surgeon::finite_automata {
 enum class TagOperationType : uint8_t {
     Set,
diff --git a/src/log_surgeon/wildcard_query_parser/QueryInterpretation.cpp b/src/log_surgeon/wildcard_query_parser/QueryInterpretation.cpp
index 674035ad..c1adb151 100644
--- a/src/log_surgeon/wildcard_query_parser/QueryInterpretation.cpp
+++ b/src/log_surgeon/wildcard_query_parser/QueryInterpretation.cpp
@@ -6,12 +6,12 @@
 #include <variant>
 #include <vector>
 
-#include <log_surgeon/wildcard_query_parser/StaticQueryToken.hpp>
-#include <log_surgeon/wildcard_query_parser/VariableQueryToken.hpp>
-
 #include <fmt/format.h>
 #include <fmt/ranges.h>
 
+#include <log_surgeon/wildcard_query_parser/StaticQueryToken.hpp>
+#include <log_surgeon/wildcard_query_parser/VariableQueryToken.hpp>
+
 using std::string;
 using std::strong_ordering;
 using std::vector;
diff --git a/tests/test-schema.cpp b/tests/test-schema.cpp
index eaedf97e..419a7381 100644
--- a/tests/test-schema.cpp
+++ b/tests/test-schema.cpp
@@ -27,8 +27,8 @@ using RegexASTGroupByte
         = log_surgeon::finite_automata::RegexASTGroup<log_surgeon::finite_automata::ByteNfaState>;
 using RegexASTLiteralByte
         = log_surgeon::finite_automata::RegexASTLiteral<log_surgeon::finite_automata::ByteNfaState>;
-using RegexASTMultiplicationByte = log_surgeon::finite_automata::RegexASTMultiplication<
-        log_surgeon::finite_automata::ByteNfaState>;
+using RegexASTMultiplicationByte = log_surgeon::finite_automata::
+        RegexASTMultiplication<log_surgeon::finite_automata::ByteNfaState>;
 
 /**
  * @ingroup unit_tests_schema
diff --git a/tools/yscope-dev-utils b/tools/yscope-dev-utils
index b965f19f..3ff7d055 160000
--- a/tools/yscope-dev-utils
+++ b/tools/yscope-dev-utils
@@ -1 +1 @@
-Subproject commit b965f19f3e11c548f32bf7ab8e28ff38906be018
+Subproject commit 3ff7d055c01b7b2b94b9288e0fdc33a5c937a64e