diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6492fa6..8dd7214 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -321,10 +321,8 @@ if(YAML_CPP_BUILD_TOOLS)
 endif()
 
 ### Formatting
-if(${CMAKE_BUILD_TOOL} MATCHES make OR ${CMAKE_BUILD_TOOL} MATCHES gmake)
-  get_property(all_sources GLOBAL PROPERTY SRCS_LIST)
-	add_custom_target(format
-		COMMAND clang-format --style=file -i ${all_sources}
-		COMMENT "Running clang-format"
-		VERBATIM)
-endif()
\ No newline at end of file
+get_property(all_sources GLOBAL PROPERTY SRCS_LIST)
+add_custom_target(format
+	COMMAND clang-format --style=file -i ${all_sources}
+	COMMENT "Running clang-format"
+	VERBATIM)
diff --git a/src/scanscalar.cpp b/src/scanscalar.cpp
index 165742e..8253b8d 100644
--- a/src/scanscalar.cpp
+++ b/src/scanscalar.cpp
@@ -1,6 +1,9 @@
+#include "scanscalar.h"
+
+#include <algorithm>
+
 #include "exp.h"
 #include "regeximpl.h"
-#include "scanscalar.h"
 #include "stream.h"
 #include "yaml-cpp/exceptions.h"  // IWYU pragma: keep