diff --git a/db/per_partition_rate_limit_extension.hh b/db/per_partition_rate_limit_extension.hh
index e8fb55ac3c..5acf2cd5a9 100644
--- a/db/per_partition_rate_limit_extension.hh
+++ b/db/per_partition_rate_limit_extension.hh
@@ -9,6 +9,7 @@
 #pragma once
 
 #include "db/per_partition_rate_limit_options.hh"
+#include "schema.hh"
 
 namespace db {
 
diff --git a/db/per_partition_rate_limit_options.hh b/db/per_partition_rate_limit_options.hh
index f75a40a3ae..62e246bd6f 100644
--- a/db/per_partition_rate_limit_options.hh
+++ b/db/per_partition_rate_limit_options.hh
@@ -12,7 +12,6 @@
 
 #include "operation_type.hh"
 #include "serializer.hh"
-#include "schema.hh"
 #include "log.hh"
 
 namespace db {
diff --git a/sstables/downsampling.hh b/sstables/downsampling.hh
index 15a227bb09..93b540495f 100644
--- a/sstables/downsampling.hh
+++ b/sstables/downsampling.hh
@@ -13,6 +13,7 @@
 #include <list>
 #include <map>
 #include <vector>
+#include <array>
 #include <algorithm>
 #include <iterator>
 #include <cassert>
diff --git a/utils/sequenced_set.hh b/utils/sequenced_set.hh
index 2638394f3b..aa68c24883 100644
--- a/utils/sequenced_set.hh
+++ b/utils/sequenced_set.hh
@@ -10,6 +10,7 @@
 
 #include <vector>
 #include <unordered_set>
+#include <cstddef>
 
 namespace utils {
 /**