diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ea62d6..e4358c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,13 @@ endif()
 
 # Compilation settings
 set_property(TARGET progressia PROPERTY CXX_STANDARD 17)
-target_compile_options(progressia PRIVATE -Wall -Wextra -Wpedantic -Werror)
+set_property(TARGET progressia PROPERTY CXX_STANDARD_REQUIRED ON)
+target_compile_options(progressia PRIVATE -Wall)
+
+# Extra options for gcc -- we're using this for extra static analisys for now
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    target_compile_options(progressia PRIVATE -Wextra -Wpedantic -Werror)
+endif()
 
 # Version information
 if (NOT DEFINED BUILD_ID)
diff --git a/desktop/graphics/vulkan_adapter.cpp b/desktop/graphics/vulkan_adapter.cpp
index 7b87212..db496a6 100644
--- a/desktop/graphics/vulkan_adapter.cpp
+++ b/desktop/graphics/vulkan_adapter.cpp
@@ -2,6 +2,7 @@
 
 #include "vulkan_common.h"
 
+#include <array>
 #include <cstddef>
 #include <fstream>
 #include <memory>
diff --git a/desktop/graphics/vulkan_uniform.h b/desktop/graphics/vulkan_uniform.h
index 91a8f8f..873e78f 100644
--- a/desktop/graphics/vulkan_uniform.h
+++ b/desktop/graphics/vulkan_uniform.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <array>
 #include <memory>
 #include <vector>
 
diff --git a/main/game.cpp b/main/game.cpp
index 1cd42d6..b354bc5 100644
--- a/main/game.cpp
+++ b/main/game.cpp
@@ -1,5 +1,6 @@
 #include "game.h"
 
+#include <array>
 #include <iostream>
 
 #define GLM_FORCE_RADIANS