diff --git a/.clang-format b/.clang-format
index 734a4369..bb132d97 100644
--- a/.clang-format
+++ b/.clang-format
@@ -49,7 +49,7 @@ Cpp11BracedListStyle: true
 DerivePointerAlignment: false  # Make sure the * or & align on the left
 EmptyLineBeforeAccessModifier: LogicalBlock
 FixNamespaceComments: true
-IncludeBlocks: Preserve
+IncludeBlocks: Regroup
 IndentCaseLabels: true
 IndentPPDirectives: None
 IndentWidth: 2
@@ -59,7 +59,7 @@ NamespaceIndentation: None
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
 PointerAlignment: Left
-ReflowComments: false
+ReflowComments: true
 # SeparateDefinitionBlocks: Always   # Only support since clang-format 14
 SpaceAfterCStyleCast: false
 SpaceAfterLogicalNot: false
diff --git a/src/analysis/analysis.cc b/src/analysis/analysis.cc
index f3fada5f..e648f56e 100644
--- a/src/analysis/analysis.cc
+++ b/src/analysis/analysis.cc
@@ -1,8 +1,10 @@
 #include "analysis/analysis.h"
+
 #include <algorithm>
 #include <memory>
 #include <utility>
 #include <vector>
+
 #include "analysis/handnode.h"
 #include "analysis/handtree.h"
 #include "types/hand.h"
@@ -78,8 +80,8 @@ std::unique_ptr<Node> breakdownHand(const std::vector<Piece>& pieces) {
   b.pieces = pieces;
   countPieces(&b);
   std::ranges::sort(b.pieces);
-  auto [begin,end] = std::ranges::unique(b.pieces);
-  b.pieces.erase(begin,end);
+  auto [begin, end] = std::ranges::unique(b.pieces);
+  b.pieces.erase(begin, end);
 
   driver(&b);
 
diff --git a/src/analysis/handtree.cc b/src/analysis/handtree.cc
index eae0fe78..2d84ac94 100644
--- a/src/analysis/handtree.cc
+++ b/src/analysis/handtree.cc
@@ -167,8 +167,7 @@ void driver(Breakdown* b) {
           // Check if we can start a chi with this piece
           if (possibleChiForward(b->counts, chi_start)) {
             // Find the position of chi_start in the pieces vector
-            auto piece_itr =
-                std::ranges::find(b->pieces, chi_start);
+            auto piece_itr = std::ranges::find(b->pieces, chi_start);
             if (piece_itr != b->pieces.end()) {
               breakdownForwardChi(b, *piece_itr);
             }
diff --git a/src/analysis/handtree.h b/src/analysis/handtree.h
index f675d985..96ccfd96 100644
--- a/src/analysis/handtree.h
+++ b/src/analysis/handtree.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <map>
+
 #include "analysis/handnode.h"
 #include "types/piecetype.h"
 namespace mahjong {
diff --git a/src/analysis/util.cc b/src/analysis/util.cc
index 18ff84ad..930df1b3 100644
--- a/src/analysis/util.cc
+++ b/src/analysis/util.cc
@@ -4,6 +4,7 @@
 #include <cstdlib>
 #include <map>
 #include <vector>
+
 #include "analysis/analysis.h"
 #include "types/hand.h"
 #include "types/pieces.h"
diff --git a/src/api/gamestate.cc b/src/api/gamestate.cc
index 0e6333e0..6a5003d4 100644
--- a/src/api/gamestate.cc
+++ b/src/api/gamestate.cc
@@ -3,6 +3,7 @@
 #include <algorithm>
 #include <memory>
 #include <vector>
+
 #include "api/types.h"
 #include "controllers/controllermanager.h"
 #include "statefunctions/statecontroller.h"
@@ -95,8 +96,8 @@ bool IsValidGameController(const char* controller) {
 
 mahjong::GameState* InitGameState(const CGameSettings* settings) {
   const mahjong::GameSettings cpp_settings = convertGameSettings(settings);
-  // Check controllers ahead of time as C++ throws will not be handled correctly by
-  // all library consumers (rust)
+  // Check controllers ahead of time as C++ throws will not be handled correctly
+  // by all library consumers (rust)
   for (const auto& controller : cpp_settings.seatControllers) {
     if (!IsValidGameController(controller.c_str())) {
       return nullptr;
diff --git a/src/api/types.h b/src/api/types.h
index 46289dd2..3b99198d 100644
--- a/src/api/types.h
+++ b/src/api/types.h
@@ -76,15 +76,15 @@ struct CHand {
 };
 
 struct CObservedGameState {
-  int currentPlayer;  // Whose turn it is
-  int turnNum;        // Turn counter within current round
-  int roundNum;       // Current round number
-  int riichiSticks;   // Number of riichi sticks on the table
-  int counters;       // Honba counters
-  int lastCall;       // Turn number when last call (chi/pon/kan) was made
-  int lastCaller;     // Player index who made the last call
-  bool
-      concealedKan;  // Whether concealed kan was just performed (affects ron rules)
+  int currentPlayer;    // Whose turn it is
+  int turnNum;          // Turn counter within current round
+  int roundNum;         // Current round number
+  int riichiSticks;     // Number of riichi sticks on the table
+  int counters;         // Honba counters
+  int lastCall;         // Turn number when last call (chi/pon/kan) was made
+  int lastCaller;       // Player index who made the last call
+  bool concealedKan;    // Whether concealed kan was just performed (affects ron
+                        // rules)
   uint64_t seed;        // Random seed used for wall generation and shuffling
   CPiece pendingPiece;  // Current piece being processed
   int scores[4];        // Temporary round score changes
diff --git a/src/controllers/alphabeticalbot.cc b/src/controllers/alphabeticalbot.cc
index aa37d106..e4d05697 100644
--- a/src/controllers/alphabeticalbot.cc
+++ b/src/controllers/alphabeticalbot.cc
@@ -41,7 +41,8 @@ void AlphabeticalBot::ReceiveEvent(Event e) {
       break;
     case Event::kDiscard:
       if (e.decision && e.player == id_) {
-        // std::cout << "Player " << id_ << " pushing piece into hand: " << e.piece << std::endl;
+        // std::cout << "Player " << id_ << " pushing piece into hand: " <<
+        // e.piece << std::endl;
         hand_.emplace_back(e.piece);
       }
       break;
diff --git a/src/controllers/fasttanyao.cc b/src/controllers/fasttanyao.cc
index bc1b03eb..8035d01c 100644
--- a/src/controllers/fasttanyao.cc
+++ b/src/controllers/fasttanyao.cc
@@ -18,7 +18,8 @@ bool FastTanyao::ShouldKeep(Piece piece) {
 }
 
 void FastTanyao::OutputSet(uint8_t /*unused*/, const pieceSet& /*unused*/) {
-  // std::cout << "(" << Piece(id).toStr() << ", " << unsigned(set.at(id)) << ")" << std::endl;
+  // std::cout << "(" << Piece(id).toStr() << ", " << unsigned(set.at(id)) <<
+  // ")" << std::endl;
 }
 
 void FastTanyao::IncrementPiece(Piece piece, pieceSet& set) {
@@ -52,7 +53,8 @@ void FastTanyao::DecrementPiece(Piece piece, pieceSet& set) {
 void FastTanyao::ProcessNewPiece(Piece piece) {
   if (!ShouldKeep(piece)) {
     immediate_discard_.push_back(piece);
-    // std::cout << Piece(piece).toStr() << " should be immediately discarded." << std::endl;
+    // std::cout << Piece(piece).toStr() << " should be immediately discarded."
+    // << std::endl;
     return;
   }
 
@@ -71,7 +73,8 @@ Piece FastTanyao::ChooseDiscard() {
   if (!immediate_discard_.empty()) {
     auto discard = immediate_discard_.back();
     immediate_discard_.pop_back();
-    // std::cout << "Chose piece " << discard.toStr() << " to discard (imm discard)" << std::endl;
+    // std::cout << "Chose piece " << discard.toStr() << " to discard (imm
+    // discard)" << std::endl;
     return discard;
   }
 
@@ -85,7 +88,8 @@ Piece FastTanyao::ChooseDiscard() {
       if (possible_triple.second + set_contains_piece->second == 4 &&
           possible_triple.second < 3) {
         DecrementPiece(Piece(piece), possible_triples_);
-        // std::cout << "Chose piece " << Piece(piece).toStr() << " to discard (all pieces in play)" << std::endl;
+        // std::cout << "Chose piece " << Piece(piece).toStr() << " to discard
+        // (all pieces in play)" << std::endl;
         return Piece(piece);
       }
       if (possible_triple.second > 0) {
@@ -97,10 +101,12 @@ Piece FastTanyao::ChooseDiscard() {
   auto min_value = *std::ranges::min_element(
       discard_options,
       [](const auto& l, const auto& r) { return l.second < r.second; });
-  // std::cout << unsigned(minValue.first) << ", " << unsigned(minValue.second) << std::endl;
+  // std::cout << unsigned(minValue.first) << ", " << unsigned(minValue.second)
+  // << std::endl;
   auto discard_piece = Piece(min_value.first);
   DecrementPiece(discard_piece, possible_triples_);
-  // std::cout << "Chose piece " << discardPiece.toStr() << " to discard (min risk)" << std::endl;
+  // std::cout << "Chose piece " << discardPiece.toStr() << " to discard (min
+  // risk)" << std::endl;
   return discard_piece;
 }
 
diff --git a/src/scoring/scoring.cc b/src/scoring/scoring.cc
index d434f477..4a0016c4 100644
--- a/src/scoring/scoring.cc
+++ b/src/scoring/scoring.cc
@@ -1,4 +1,5 @@
 #include "scoring/scoring.h"
+
 #include <algorithm>
 #include <vector>
 
diff --git a/src/scoring/yakus.cc b/src/scoring/yakus.cc
index 3cdae842..9f5bf206 100644
--- a/src/scoring/yakus.cc
+++ b/src/scoring/yakus.cc
@@ -1,5 +1,7 @@
 #include "scoring/yakus.h"
+
 #include <vector>
+
 #include "types/yaku.h"
 
 namespace mahjong {
diff --git a/src/scoring/yakus/outsidehand.cc b/src/scoring/yakus/outsidehand.cc
index a6b0bdbf..4057202b 100644
--- a/src/scoring/yakus/outsidehand.cc
+++ b/src/scoring/yakus/outsidehand.cc
@@ -40,7 +40,8 @@ bool isOutsideHand(const GameState& state, int player,
       }
     }
   }
-  // Terminals in all Sets and All Terminals and Honors are more valuable and score instead of Outside Hand.
+  // Terminals in all Sets and All Terminals and Honors are more valuable and
+  // score instead of Outside Hand.
   return chi && !isTerminalsInAllSets(state, player, branch) &&
          !isAllTerminalsAndHonors(state, player);
 }
diff --git a/src/statefunctions/decisionfunction.cc b/src/statefunctions/decisionfunction.cc
index d4d5e68d..506c4a7f 100644
--- a/src/statefunctions/decisionfunction.cc
+++ b/src/statefunctions/decisionfunction.cc
@@ -7,7 +7,6 @@
 #include "analysis/util.h"
 #include "scoring/scoring.h"
 #include "scoring/yakus/thirteenorphans.h"
-
 #include "statefunctions/stateutilities.h"
 #include "types/gamestate.h"
 #include "types/piecetype.h"
diff --git a/src/types/gamestate.h b/src/types/gamestate.h
index 7be81055..2dd24668 100644
--- a/src/types/gamestate.h
+++ b/src/types/gamestate.h
@@ -1,10 +1,7 @@
 #pragma once
 #include <array>
 #include <cstdint>
-#include <functional>
-#include <iostream>
 #include <random>
-#include <vector>
 
 #include "types/hand.h"
 #include "types/piecetype.h"
diff --git a/src/types/yaku.h b/src/types/yaku.h
index 84e30559..b4f4e6ac 100644
--- a/src/types/yaku.h
+++ b/src/types/yaku.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <functional>
+
 #include "analysis/handnode.h"
 #include "types/gamestate.h"
 
diff --git a/tests/api/game_control.test.cc b/tests/api/game_control.test.cc
index 9bbfe301..06d15f1a 100644
--- a/tests/api/game_control.test.cc
+++ b/tests/api/game_control.test.cc
@@ -1,4 +1,5 @@
 #include <gtest/gtest.h>
+
 #include <array>
 #include <cstdint>
 #include <memory>
@@ -79,8 +80,8 @@ TEST(Api, ObserveGameState) {
   // Check state function name, the rest will be in unknown positions
   // until we advance the game state
   EXPECT_EQ(observed.nextState,
-            api::CStateFunctionType::
-                kGameStart);  // Initial state should be GameStart
+            api::CStateFunctionType::kGameStart);  // Initial state should be
+                                                   // GameStart
 
   // Check arrays are properly sized and initialized
   for (int i = 0; i < 4; i++) {
@@ -114,7 +115,8 @@ TEST(Api, ObserveGameStateAfterAdvancement) {
   EXPECT_EQ(observed.seed, state->seed);
 
   // After advancement, some fields should have changed from initial values
-  // (exact values depend on game logic, but we can check they're copied correctly)
+  // (exact values depend on game logic, but we can check they're copied
+  // correctly)
   EXPECT_EQ(observed.riichiSticks, state->riichiSticks);
   EXPECT_EQ(observed.counters, state->counters);
 
diff --git a/tests/can_chi.test.cc b/tests/can_chi.test.cc
index 6d262b81..fdcb319a 100644
--- a/tests/can_chi.test.cc
+++ b/tests/can_chi.test.cc
@@ -1,4 +1,5 @@
 #include <gtest/gtest.h>
+
 #include <array>
 
 #include "statefunctions/decisionfunction.h"
diff --git a/tests/count_pieces.test.cc b/tests/count_pieces.test.cc
index 5ccdfd1e..ebe5364f 100644
--- a/tests/count_pieces.test.cc
+++ b/tests/count_pieces.test.cc
@@ -1,4 +1,5 @@
 #include <gtest/gtest.h>
+
 #include <array>
 
 #include "statefunctions/stateutilities.h"
diff --git a/tests/discard_piece.test.cc b/tests/discard_piece.test.cc
index f3418bfb..8e376a24 100644
--- a/tests/discard_piece.test.cc
+++ b/tests/discard_piece.test.cc
@@ -1,4 +1,5 @@
 #include <gtest/gtest.h>
+
 #include <array>
 
 #include "statefunctions/stateutilities.h"
diff --git a/tests/game_play.test.cc b/tests/game_play.test.cc
index 447f0aec..96e45639 100644
--- a/tests/game_play.test.cc
+++ b/tests/game_play.test.cc
@@ -1,4 +1,5 @@
 #include <gtest/gtest.h>
+
 #include <array>
 
 #include "scoring/scoring.h"
diff --git a/tests/remove_pieces.test.cc b/tests/remove_pieces.test.cc
index f41b6cf2..c9aeb5fb 100644
--- a/tests/remove_pieces.test.cc
+++ b/tests/remove_pieces.test.cc
@@ -1,4 +1,5 @@
 #include <gtest/gtest.h>
+
 #include <array>
 #include <vector>
 
diff --git a/tests/rules/basic_rules.test.cc b/tests/rules/basic_rules.test.cc
index c6489f68..b8ae57bc 100644
--- a/tests/rules/basic_rules.test.cc
+++ b/tests/rules/basic_rules.test.cc
@@ -1,4 +1,5 @@
 #include <gtest/gtest.h>
+
 #include <memory>
 #include <utility>
 #include <vector>
diff --git a/tests/rules/calls.test.cc b/tests/rules/calls.test.cc
index c7afaf8a..be8519fe 100644
--- a/tests/rules/calls.test.cc
+++ b/tests/rules/calls.test.cc
@@ -1,4 +1,5 @@
 #include <gtest/gtest.h>
+
 #include <cstdint>
 #include <memory>
 #include <utility>
diff --git a/tests/setup.test.cc b/tests/setup.test.cc
index da5855d2..4b8bb06a 100644
--- a/tests/setup.test.cc
+++ b/tests/setup.test.cc
@@ -1,4 +1,5 @@
 #include <gtest/gtest.h>
+
 #include <array>
 #include <memory>
 #include <utility>
diff --git a/tests/utils/gamestate_utils.h b/tests/utils/gamestate_utils.h
index 309bfe89..e4a212d3 100644
--- a/tests/utils/gamestate_utils.h
+++ b/tests/utils/gamestate_utils.h
@@ -1,14 +1,9 @@
 #pragma once
-#include <functional>
 #include <memory>
-#include <optional>
 #include <vector>
 
 #include "controllers/playercontroller.h"
-#include "statefunctions/router.h"
-#include "types/event.h"
 #include "types/gamestate.h"
-#include "types/piecetype.h"
 #include "types/statefunction.h"
 
 namespace mahjong {
@@ -18,7 +13,8 @@ std::unique_ptr<GameState> AdvanceUntilState(std::unique_ptr<GameState> state,
                                              StateFunctionType targetState,
                                              int maxIterations = 100);
 
-// Advances game state until it reaches the target state, then advances once more
+// Advances game state until it reaches the target state, then advances once
+// more
 std::unique_ptr<GameState> AdvanceThroughState(std::unique_ptr<GameState> state,
                                                StateFunctionType targetState,
                                                int maxIterations = 100);
diff --git a/tests/utils/gamestate_utils.test.cc b/tests/utils/gamestate_utils.test.cc
index fb54d13b..329603a1 100644
--- a/tests/utils/gamestate_utils.test.cc
+++ b/tests/utils/gamestate_utils.test.cc
@@ -1,10 +1,12 @@
+#include "gamestate_utils.h"
+
 #include <gtest/gtest.h>
+
 #include <cstdint>
 #include <memory>
 #include <stdexcept>
 #include <utility>
 
-#include "gamestate_utils.h"
 #include "types/gamestate.h"
 #include "types/settings.h"
 #include "types/statefunction.h"
diff --git a/tests/utils/handformer.cc b/tests/utils/handformer.cc
index a4b7212a..ce26e932 100644
--- a/tests/utils/handformer.cc
+++ b/tests/utils/handformer.cc
@@ -1,8 +1,7 @@
 #include "utils/handformer.h"
 
-#include <cctype>
-
 #include <algorithm>
+#include <cctype>
 #include <cstdint>
 #include <iterator>
 #include <map>
@@ -46,7 +45,8 @@ std::vector<Piece> HandFromNotation(const std::string& notation) {
   std::vector<int8_t> current_tiles;
   for (const auto& c : notation) {
     if (!std::isdigit(c) && !std::isalpha(c)) {
-      // Push -1 if input is invalid (which is later translated to an error piece)
+      // Push -1 if input is invalid (which is later translated to an error
+      // piece)
       current_tiles.push_back(-1);
       continue;
     }
diff --git a/tests/utils/handformer.test.cc b/tests/utils/handformer.test.cc
index 62f211c5..f1a88bf0 100644
--- a/tests/utils/handformer.test.cc
+++ b/tests/utils/handformer.test.cc
@@ -1,7 +1,10 @@
 #include "utils/handformer.h"
+
 #include <gtest/gtest.h>
+
 #include <string>
 #include <vector>
+
 #include "types/pieces.h"
 #include "types/piecetype.h"
 
diff --git a/tests/yakus/afterkan.test.cc b/tests/yakus/afterkan.test.cc
index 27f7a511..1fe6e965 100644
--- a/tests/yakus/afterkan.test.cc
+++ b/tests/yakus/afterkan.test.cc
@@ -1,10 +1,10 @@
 #include <gtest/gtest.h>
+
 #include <array>
 #include <memory>
 #include <string>
 
 #include "analysis/analysis.h"
-
 #include "analysis/handnode.h"
 #include "scoring/yakus/afterakan.h"
 #include "types/gamestate.h"
diff --git a/tests/yakus/allpon.test.cc b/tests/yakus/allpon.test.cc
index 43a308d1..40cd0392 100644
--- a/tests/yakus/allpon.test.cc
+++ b/tests/yakus/allpon.test.cc
@@ -1,11 +1,11 @@
 #include <gtest/gtest.h>
+
 #include <array>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "analysis/analysis.h"
-
 #include "analysis/handnode.h"
 #include "scoring/yakus/allpons.h"
 #include "types/gamestate.h"
diff --git a/tests/yakus/allsimples.test.cc b/tests/yakus/allsimples.test.cc
index 05977968..41d9d483 100644
--- a/tests/yakus/allsimples.test.cc
+++ b/tests/yakus/allsimples.test.cc
@@ -1,11 +1,12 @@
 #include "scoring/yakus/allsimples.h"
+
 #include <gtest/gtest.h>
+
 #include <array>
 #include <memory>
 #include <string>
 
 #include "analysis/analysis.h"
-
 #include "analysis/handnode.h"
 #include "types/gamestate.h"
 #include "types/hand.h"
diff --git a/tests/yakus/allterminalsandhonors.test.cc b/tests/yakus/allterminalsandhonors.test.cc
index 30882ea7..30c4da92 100644
--- a/tests/yakus/allterminalsandhonors.test.cc
+++ b/tests/yakus/allterminalsandhonors.test.cc
@@ -1,12 +1,13 @@
 #include "scoring/yakus/allterminalsandhonors.h"
+
 #include <gtest/gtest.h>
+
 #include <array>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "analysis/analysis.h"
-
 #include "analysis/handnode.h"
 #include "types/gamestate.h"
 #include "types/hand.h"
diff --git a/tests/yakus/blessingofman.test.cc b/tests/yakus/blessingofman.test.cc
index 403db817..571eada4 100644
--- a/tests/yakus/blessingofman.test.cc
+++ b/tests/yakus/blessingofman.test.cc
@@ -1,11 +1,12 @@
 #include "scoring/yakus/blessingofman.h"
+
 #include <gtest/gtest.h>
+
 #include <array>
 #include <memory>
 #include <string>
 
 #include "analysis/analysis.h"
-
 #include "analysis/handnode.h"
 #include "types/gamestate.h"
 #include "types/hand.h"
diff --git a/tests/yakus/concealedhand.test.cc b/tests/yakus/concealedhand.test.cc
index caefb601..f885fdfc 100644
--- a/tests/yakus/concealedhand.test.cc
+++ b/tests/yakus/concealedhand.test.cc
@@ -1,4 +1,5 @@
 #include <gtest/gtest.h>
+
 #include <array>
 #include <string>
 #include <vector>
diff --git a/tests/yakus/concealedpon.test.cc b/tests/yakus/concealedpon.test.cc
index 2b12969c..4f13e3ee 100644
--- a/tests/yakus/concealedpon.test.cc
+++ b/tests/yakus/concealedpon.test.cc
@@ -1,11 +1,11 @@
 #include <gtest/gtest.h>
+
 #include <array>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "analysis/analysis.h"
-
 #include "analysis/handnode.h"
 #include "scoring/yakus/threeconcealedpons.h"
 #include "types/gamestate.h"
diff --git a/tests/yakus/dragonpon.test.cc b/tests/yakus/dragonpon.test.cc
index 737fb55a..9d95487b 100644
--- a/tests/yakus/dragonpon.test.cc
+++ b/tests/yakus/dragonpon.test.cc
@@ -1,10 +1,10 @@
 #include <gtest/gtest.h>
+
 #include <array>
 #include <memory>
 #include <string>
 
 #include "analysis/analysis.h"
-
 #include "analysis/handnode.h"
 #include "scoring/yakus/honorpon.h"
 #include "types/gamestate.h"
diff --git a/tests/yakus/fullflush.test.cc b/tests/yakus/fullflush.test.cc
index 39b25d9d..2fc2f669 100644
--- a/tests/yakus/fullflush.test.cc
+++ b/tests/yakus/fullflush.test.cc
@@ -1,12 +1,13 @@
 #include "scoring/yakus/fullflush.h"
+
 #include <gtest/gtest.h>
+
 #include <array>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "analysis/analysis.h"
-
 #include "analysis/handnode.h"
 #include "types/gamestate.h"
 #include "types/hand.h"
diff --git a/tests/yakus/halfflush.test.cc b/tests/yakus/halfflush.test.cc
index 111e9004..ad990f14 100644
--- a/tests/yakus/halfflush.test.cc
+++ b/tests/yakus/halfflush.test.cc
@@ -1,12 +1,13 @@
 #include "scoring/yakus/halfflush.h"
+
 #include <gtest/gtest.h>
+
 #include <array>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "analysis/analysis.h"
-
 #include "analysis/handnode.h"
 #include "types/gamestate.h"
 #include "types/hand.h"
diff --git a/tests/yakus/littlethreedragons.test.cc b/tests/yakus/littlethreedragons.test.cc
index 226beedf..f5814caa 100644
--- a/tests/yakus/littlethreedragons.test.cc
+++ b/tests/yakus/littlethreedragons.test.cc
@@ -1,12 +1,13 @@
 #include "scoring/yakus/littlethreedragons.h"
+
 #include <gtest/gtest.h>
+
 #include <array>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "analysis/analysis.h"
-
 #include "analysis/handnode.h"
 #include "types/gamestate.h"
 #include "types/hand.h"
diff --git a/tests/yakus/mixedtriplechi.test.cc b/tests/yakus/mixedtriplechi.test.cc
index 296f6350..6211099d 100644
--- a/tests/yakus/mixedtriplechi.test.cc
+++ b/tests/yakus/mixedtriplechi.test.cc
@@ -1,11 +1,12 @@
 #include "scoring/yakus/mixedtriplechi.h"
+
 #include <gtest/gtest.h>
+
 #include <array>
 #include <memory>
 #include <string>
 
 #include "analysis/analysis.h"
-
 #include "analysis/handnode.h"
 #include "types/gamestate.h"
 #include "types/hand.h"
diff --git a/tests/yakus/outsidehand.test.cc b/tests/yakus/outsidehand.test.cc
index 53f6ec65..ffc78bb1 100644
--- a/tests/yakus/outsidehand.test.cc
+++ b/tests/yakus/outsidehand.test.cc
@@ -1,11 +1,12 @@
 #include "scoring/yakus/outsidehand.h"
+
 #include <gtest/gtest.h>
+
 #include <array>
 #include <memory>
 #include <string>
 
 #include "analysis/analysis.h"
-
 #include "analysis/handnode.h"
 #include "types/gamestate.h"
 #include "types/hand.h"
diff --git a/tests/yakus/pinfu.test.cc b/tests/yakus/pinfu.test.cc
index 90f0c161..9f8bbfd6 100644
--- a/tests/yakus/pinfu.test.cc
+++ b/tests/yakus/pinfu.test.cc
@@ -1,5 +1,7 @@
 #include "scoring/yakus/pinfu.h"
+
 #include <gtest/gtest.h>
+
 #include <array>
 #include <memory>
 #include <string>
diff --git a/tests/yakus/puredoublechi.test.cc b/tests/yakus/puredoublechi.test.cc
index 2cc14842..14e3be84 100644
--- a/tests/yakus/puredoublechi.test.cc
+++ b/tests/yakus/puredoublechi.test.cc
@@ -1,11 +1,12 @@
 #include "scoring/yakus/puredoublechi.h"
+
 #include <gtest/gtest.h>
+
 #include <array>
 #include <memory>
 #include <string>
 
 #include "analysis/analysis.h"
-
 #include "analysis/handnode.h"
 #include "types/gamestate.h"
 #include "types/hand.h"
diff --git a/tests/yakus/purestraight.test.cc b/tests/yakus/purestraight.test.cc
index 20ba18ec..231818be 100644
--- a/tests/yakus/purestraight.test.cc
+++ b/tests/yakus/purestraight.test.cc
@@ -1,11 +1,12 @@
 #include "scoring/yakus/purestraight.h"
+
 #include <gtest/gtest.h>
+
 #include <array>
 #include <memory>
 #include <string>
 
 #include "analysis/analysis.h"
-
 #include "analysis/handnode.h"
 #include "types/gamestate.h"
 #include "types/hand.h"
diff --git a/tests/yakus/riichi.test.cc b/tests/yakus/riichi.test.cc
index fc2b23b0..8297afc3 100644
--- a/tests/yakus/riichi.test.cc
+++ b/tests/yakus/riichi.test.cc
@@ -1,5 +1,7 @@
 #include "scoring/yakus/riichi.h"
+
 #include <gtest/gtest.h>
+
 #include <array>
 #include <string>
 
diff --git a/tests/yakus/robbingkan.test.cc b/tests/yakus/robbingkan.test.cc
index 5ac7251b..3e0949c7 100644
--- a/tests/yakus/robbingkan.test.cc
+++ b/tests/yakus/robbingkan.test.cc
@@ -1,10 +1,10 @@
 #include <gtest/gtest.h>
+
 #include <array>
 #include <memory>
 #include <string>
 
 #include "analysis/analysis.h"
-
 #include "analysis/handnode.h"
 #include "scoring/yakus/robbingakan.h"
 #include "types/gamestate.h"
diff --git a/tests/yakus/sevenpairs.test.cc b/tests/yakus/sevenpairs.test.cc
index 050f1513..5c1c0dbc 100644
--- a/tests/yakus/sevenpairs.test.cc
+++ b/tests/yakus/sevenpairs.test.cc
@@ -1,11 +1,12 @@
 #include "scoring/yakus/sevenpairs.h"
+
 #include <gtest/gtest.h>
+
 #include <array>
 #include <memory>
 #include <string>
 
 #include "analysis/analysis.h"
-
 #include "analysis/handnode.h"
 #include "types/gamestate.h"
 #include "types/hand.h"
diff --git a/tests/yakus/terminalinsets.test.cc b/tests/yakus/terminalinsets.test.cc
index 2e54d65b..bb354420 100644
--- a/tests/yakus/terminalinsets.test.cc
+++ b/tests/yakus/terminalinsets.test.cc
@@ -1,11 +1,11 @@
 #include <gtest/gtest.h>
+
 #include <array>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "analysis/analysis.h"
-
 #include "analysis/handnode.h"
 #include "scoring/yakus/terminalsinallsets.h"
 #include "types/gamestate.h"
diff --git a/tests/yakus/triplekan.test.cc b/tests/yakus/triplekan.test.cc
index f4b6a26f..2d7e5c24 100644
--- a/tests/yakus/triplekan.test.cc
+++ b/tests/yakus/triplekan.test.cc
@@ -1,11 +1,11 @@
 #include <gtest/gtest.h>
+
 #include <array>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "analysis/analysis.h"
-
 #include "analysis/handnode.h"
 #include "scoring/yakus/threekans.h"
 #include "types/gamestate.h"
diff --git a/tests/yakus/triplepon.test.cc b/tests/yakus/triplepon.test.cc
index 1ae97b9d..4c1d0805 100644
--- a/tests/yakus/triplepon.test.cc
+++ b/tests/yakus/triplepon.test.cc
@@ -1,11 +1,12 @@
 #include "scoring/yakus/triplepon.h"
+
 #include <gtest/gtest.h>
+
 #include <array>
 #include <memory>
 #include <string>
 
 #include "analysis/analysis.h"
-
 #include "analysis/handnode.h"
 #include "types/gamestate.h"
 #include "types/hand.h"
diff --git a/tests/yakus/twicepuredoublechi.test.cc b/tests/yakus/twicepuredoublechi.test.cc
index 7f568a10..d8ab809a 100644
--- a/tests/yakus/twicepuredoublechi.test.cc
+++ b/tests/yakus/twicepuredoublechi.test.cc
@@ -1,11 +1,12 @@
 #include "scoring/yakus/twicepuredoublechi.h"
+
 #include <gtest/gtest.h>
+
 #include <array>
 #include <memory>
 #include <string>
 
 #include "analysis/analysis.h"
-
 #include "analysis/handnode.h"
 #include "types/gamestate.h"
 #include "types/hand.h"
diff --git a/tests/yakus/underthesea.test.cc b/tests/yakus/underthesea.test.cc
index 03f16e06..74d3d979 100644
--- a/tests/yakus/underthesea.test.cc
+++ b/tests/yakus/underthesea.test.cc
@@ -1,11 +1,11 @@
 #include <gtest/gtest.h>
+
 #include <array>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "analysis/analysis.h"
-
 #include "analysis/handnode.h"
 #include "scoring/yakus/bottomofthesea.h"
 #include "types/gamestate.h"
diff --git a/tests/yakus/windpons.test.cc b/tests/yakus/windpons.test.cc
index 057b9ba1..f8c6946a 100644
--- a/tests/yakus/windpons.test.cc
+++ b/tests/yakus/windpons.test.cc
@@ -1,10 +1,10 @@
 #include <gtest/gtest.h>
+
 #include <array>
 #include <memory>
 #include <string>
 
 #include "analysis/analysis.h"
-
 #include "analysis/handnode.h"
 #include "scoring/yakus/honorpon.h"
 #include "types/gamestate.h"