diff --git a/CorsixTH/Src/main.cpp b/CorsixTH/Src/main.cpp
index 46037e7d9..db8f9aa4d 100644
--- a/CorsixTH/Src/main.cpp
+++ b/CorsixTH/Src/main.cpp
@@ -104,9 +104,13 @@ std::string search_script_file(lua_State* L) {
       if (iProgramPathLengthReal != iProgramPathLength ||
           iProgramPathLength <= iProgramDirLength) {
         if (iProgramPathLengthReal != iProgramPathLength)
-          spdlog::error("Path length of CorsixTH binary changed?!?! Old: {}, new: {}", iProgramPathLength, iProgramPathLengthReal);
+          spdlog::error(
+              "Path length of CorsixTH binary changed?!?! Old: {}, new: {}",
+              iProgramPathLength, iProgramPathLengthReal);
         else
-          spdlog::error("Path to CorsixTH looks like a directory?!?! Path is: '{}'.", sProgramDir);
+          spdlog::error(
+              "Path to CorsixTH looks like a directory?!?! Path is: '{}'.",
+              sProgramDir);
         spdlog::shutdown();
         exit(255);
       }
diff --git a/CorsixTH/Src/sdl_core.cpp b/CorsixTH/Src/sdl_core.cpp
index 25c81110a..c0539a30a 100644
--- a/CorsixTH/Src/sdl_core.cpp
+++ b/CorsixTH/Src/sdl_core.cpp
@@ -22,12 +22,12 @@ SOFTWARE.
 
 #include "config.h"
 
+#include <spdlog/spdlog.h>
+
 #include <array>
 #include <cstdio>
 #include <cstring>
 
-#include <spdlog/spdlog.h>
-
 #include "SDL_error.h"
 #include "lua_sdl.h"
 #include "th_lua.h"
diff --git a/CorsixTH/Src/th_gfx_sdl.cpp b/CorsixTH/Src/th_gfx_sdl.cpp
index 842eec5ed..2ad4a607b 100644
--- a/CorsixTH/Src/th_gfx_sdl.cpp
+++ b/CorsixTH/Src/th_gfx_sdl.cpp
@@ -28,6 +28,8 @@ SOFTWARE.
 #include "th_gfx_font.h"
 #endif
 
+#include <spdlog/spdlog.h>
+
 #include <algorithm>
 #include <cmath>
 #include <cstdio>
@@ -39,8 +41,6 @@ SOFTWARE.
 #include <new>
 #include <stdexcept>
 
-#include <spdlog/spdlog.h>
-
 #include "th_map.h"
 
 #if SDL_VERSION_ATLEAST(2, 0, 10)
diff --git a/CorsixTH/Src/th_lua_ui.cpp b/CorsixTH/Src/th_lua_ui.cpp
index 9e5d15c84..79f002f73 100644
--- a/CorsixTH/Src/th_lua_ui.cpp
+++ b/CorsixTH/Src/th_lua_ui.cpp
@@ -43,7 +43,7 @@ uint8_t range_scale(uint16_t low, uint16_t high, uint16_t val, uint16_t start,
 }
 
 inline bool is_wall(uint16_t blk) {
-  return ((82 <= ((blk)&0xFF)) && (((blk)&0xFF) <= 164));
+  return ((82 <= ((blk) & 0xFF)) && (((blk) & 0xFF) <= 164));
 }
 
 inline bool is_wall_drawn(const level_map& map, const map_tile& node,
diff --git a/CorsixTH/Src/th_movie.cpp b/CorsixTH/Src/th_movie.cpp
index bac769493..445e3d059 100644
--- a/CorsixTH/Src/th_movie.cpp
+++ b/CorsixTH/Src/th_movie.cpp
@@ -105,8 +105,9 @@ void movie_picture_buffer::allocate(SDL_Renderer* pRenderer, int iWidth,
                                     int iHeight) {
   if (texture) {
     SDL_DestroyTexture(texture);
-    spdlog::error("movie_player overlay should be deallocated before being "
-                 "allocated!");
+    spdlog::error(
+        "movie_player overlay should be deallocated before being "
+        "allocated!");
   }
   texture = SDL_CreateTexture(pRenderer, SDL_PIXELFORMAT_RGB24,
                               SDL_TEXTUREACCESS_STREAMING, iWidth, iHeight);
@@ -460,7 +461,8 @@ void movie_player::play_audio(int requested_audio_channel) {
       target_channel_layout = AV_CH_LAYOUT_7POINT1;
       break;
     default:
-      spdlog::warn("Unsupported channel layout {}. Please report issue.", mixer_channels);
+      spdlog::warn("Unsupported channel layout {}. Please report issue.",
+                   mixer_channels);
       target_channel_layout = 0;
   }