diff --git a/src/engine.h b/src/engine.h
index b3fdaf6e7..d9439f968 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -32,12 +32,11 @@
 #include "search.h"
 #include "thread.h"
 #include "tt.h"
+#include "types.h"
 #include "ucioption.h"
 
 namespace Stockfish {
 
-enum Square : int;
-
 class Engine {
    public:
     using InfoShort = Search::InfoShort;
diff --git a/src/nnue/features/half_ka_v2_hm.cpp b/src/nnue/features/half_ka_v2_hm.cpp
index 0a16df1b3..a4ee64bfe 100644
--- a/src/nnue/features/half_ka_v2_hm.cpp
+++ b/src/nnue/features/half_ka_v2_hm.cpp
@@ -20,7 +20,6 @@
 
 #include "half_ka_v2_hm.h"
 
-#include "../../bitboard.h"
 #include "../../position.h"
 #include "../../types.h"
 #include "../nnue_accumulator.h"
diff --git a/src/nnue/nnue_misc.cpp b/src/nnue/nnue_misc.cpp
index 30b0a9e80..dc3d5c8eb 100644
--- a/src/nnue/nnue_misc.cpp
+++ b/src/nnue/nnue_misc.cpp
@@ -171,14 +171,11 @@ std::string trace(Position& pos, const Eval::NNUE::Network& network, Accumulator
         ss << "|  " << bucket << "        ";
         ss << " |  ";
         format_cp_aligned_dot(t.psqt[bucket], ss, pos);
-        ss << "  "
-           << " |  ";
+        ss << "  " << " |  ";
         format_cp_aligned_dot(t.positional[bucket], ss, pos);
-        ss << "  "
-           << " |  ";
+        ss << "  " << " |  ";
         format_cp_aligned_dot(t.psqt[bucket] + t.positional[bucket], ss, pos);
-        ss << "  "
-           << " |";
+        ss << "  " << " |";
         if (bucket == t.correctBucket)
             ss << " <-- this bucket is used";
         ss << '\n';
diff --git a/src/uci.cpp b/src/uci.cpp
index 57d842fc0..f6ba4a79c 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -18,7 +18,6 @@
 
 #include "uci.h"
 
-#include <stdint.h>
 #include <algorithm>
 #include <cmath>
 #include <functional>
@@ -273,9 +272,9 @@ void UCIEngine::bench(std::istream& args) {
 
     dbg_print();
 
-    std::cerr << "\n==========================="
-              << "\nTotal time (ms) : " << elapsed << "\nNodes searched  : " << nodes
-              << "\nNodes/second    : " << 1000 * nodes / elapsed << std::endl;
+    std::cerr << "\n===========================" << "\nTotal time (ms) : " << elapsed
+              << "\nNodes searched  : " << nodes << "\nNodes/second    : " << 1000 * nodes / elapsed
+              << std::endl;
 
     // reset callback, to not capture a dangling reference to nodesSearched
     engine.set_on_update_full([&](const auto& i) { on_update_full(i, options["UCI_ShowWDL"]); });