diff --git a/common/kernel/command.cc b/common/kernel/command.cc
index bf785148..842d8a71 100644
--- a/common/kernel/command.cc
+++ b/common/kernel/command.cc
@@ -34,6 +34,8 @@
 #include <fstream>
 #include <iostream>
 #include <random>
+#include <set>
+
 #include "command.h"
 #include "design_utils.h"
 #include "json_frontend.h"
diff --git a/common/route/router2.cc b/common/route/router2.cc
index cdd98b6e..bb545003 100644
--- a/common/route/router2.cc
+++ b/common/route/router2.cc
@@ -34,6 +34,7 @@
 #include <deque>
 #include <fstream>
 #include <queue>
+#include <set>
 
 #include "log.h"
 #include "nextpnr.h"
diff --git a/ecp5/arch.h b/ecp5/arch.h
index 40b931d6..56ba3e7b 100644
--- a/ecp5/arch.h
+++ b/ecp5/arch.h
@@ -1087,10 +1087,9 @@ struct Arch : BaseArch<ArchRanges>
     mutable std::vector<TileStatus> tile_status;
 
     // -------------------------------------------------
-    bool is_dsp_location_valid(CellInfo* cell) const;
+    bool is_dsp_location_valid(CellInfo *cell) const;
     void remap_dsp_blocks();
-    void remap_dsp_cell(CellInfo* ci, const std::array<IdString, 4> &ports,
-                        std::array<NetInfo*, 4> &assigned_nets);
+    void remap_dsp_cell(CellInfo *ci, const std::array<IdString, 4> &ports, std::array<NetInfo *, 4> &assigned_nets);
 };
 
 NEXTPNR_NAMESPACE_END
diff --git a/ecp5/config.cc b/ecp5/config.cc
index e44326be..ea9ece0d 100644
--- a/ecp5/config.cc
+++ b/ecp5/config.cc
@@ -20,7 +20,9 @@
 #include "config.h"
 #include <boost/range/adaptor/reversed.hpp>
 #include <iomanip>
+#include <set>
 #include "log.h"
+
 NEXTPNR_NAMESPACE_BEGIN
 
 #define fmt(x) (static_cast<const std::ostringstream &>(std::ostringstream() << x).str())
diff --git a/fpga_interchange/arch.cc b/fpga_interchange/arch.cc
index d20fe253..a1651c81 100644
--- a/fpga_interchange/arch.cc
+++ b/fpga_interchange/arch.cc
@@ -28,6 +28,7 @@
 #include <cmath>
 #include <cstring>
 #include <queue>
+#include <set>
 
 #include "constraints.impl.h"
 #include "fpga_interchange.h"
diff --git a/machxo2/arch.h b/machxo2/arch.h
index 489a44ab..214d8bb2 100644
--- a/machxo2/arch.h
+++ b/machxo2/arch.h
@@ -22,6 +22,7 @@
 #define MACHXO2_ARCH_H
 
 #include <cstdint>
+#include <set>
 
 #include "base_arch.h"
 #include "nextpnr_namespaces.h"
diff --git a/machxo2/config.cc b/machxo2/config.cc
index 0c5b0741..34c4954e 100644
--- a/machxo2/config.cc
+++ b/machxo2/config.cc
@@ -21,7 +21,9 @@
 #include "config.h"
 #include <boost/range/adaptor/reversed.hpp>
 #include <iomanip>
+#include <set>
 #include "log.h"
+
 NEXTPNR_NAMESPACE_BEGIN
 
 #define fmt(x) (static_cast<const std::ostringstream &>(std::ostringstream() << x).str())
diff --git a/nexus/fasm.cc b/nexus/fasm.cc
index 81208c0f..a725e7b1 100644
--- a/nexus/fasm.cc
+++ b/nexus/fasm.cc
@@ -24,6 +24,7 @@
 
 #include <boost/range/adaptor/reversed.hpp>
 #include <queue>
+#include <set>
 
 NEXTPNR_NAMESPACE_BEGIN
 namespace {
diff --git a/nexus/pack.cc b/nexus/pack.cc
index cd042485..4b39542d 100644
--- a/nexus/pack.cc
+++ b/nexus/pack.cc
@@ -25,6 +25,7 @@
 
 #include <boost/algorithm/string.hpp>
 #include <queue>
+#include <set>
 
 NEXTPNR_NAMESPACE_BEGIN