diff --git a/include/common/bspfile.hh b/include/common/bspfile.hh
index a8101b6d..66a80f41 100644
--- a/include/common/bspfile.hh
+++ b/include/common/bspfile.hh
@@ -23,6 +23,7 @@
 #include <array>
 #include <tuple>
 #include <variant>
+#include <unordered_map>
 
 #include <common/cmdlib.hh>
 #include <common/log.hh>
diff --git a/include/common/qvec.hh b/include/common/qvec.hh
index ecdc0aa2..0d45cd1e 100644
--- a/include/common/qvec.hh
+++ b/include/common/qvec.hh
@@ -60,7 +60,7 @@ public:
         else {
             constexpr size_t copy_size = qmin(N, count);
             size_t i = 0;
-            ((i++ < copy_size ? (v[i - 1] = a, true) : false), ...);
+            [[maybe_unused]] auto _ = ((i++ < copy_size ? (v[i - 1] = a, true) : false), ...);
             // Bug with MSVC:
             // https://developercommunity.visualstudio.com/t/stdc20-fatal-error-c1004-unexpected-end-of-file-fo/1509806
             constexpr bool fill_rest = count < N;
diff --git a/include/qbsp/map.hh b/include/qbsp/map.hh
index 28a83158..6e811f0d 100644
--- a/include/qbsp/map.hh
+++ b/include/qbsp/map.hh
@@ -26,6 +26,7 @@
 
 #include <optional>
 #include <vector>
+#include <unordered_map>
 
 struct mapface_t
 {