diff --git a/arbor/backends/multicore/shared_state.hpp b/arbor/backends/multicore/shared_state.hpp
index bedfaf57366313ccaa25acd925b975b22ae24f4f..95b0ab136d3d360ac35277d1d3a946968e39a332 100644
--- a/arbor/backends/multicore/shared_state.hpp
+++ b/arbor/backends/multicore/shared_state.hpp
@@ -14,7 +14,6 @@
 #include <arbor/simd/simd.hpp>
 
 #include "backends/event.hpp"
-#include "event_queue.hpp"
 #include "util/padded_alloc.hpp"
 #include "util/rangeutil.hpp"
 
diff --git a/arbor/cell_group.hpp b/arbor/cell_group.hpp
index a77d720eed9143a63c4e74a78cad28fc76ab9f90..4c73352c48810daf5ed32ab2b853a8dd073c2387 100644
--- a/arbor/cell_group.hpp
+++ b/arbor/cell_group.hpp
@@ -12,7 +12,6 @@
 
 #include "epoch.hpp"
 #include "event_binner.hpp"
-#include "event_queue.hpp"
 #include "util/rangeutil.hpp"
 
 namespace arb {
diff --git a/arbor/communication/communicator.hpp b/arbor/communication/communicator.hpp
index 996e76da02f946b54abe5906a5f1e4e4247b53b0..38613f4e841413ce60e4dfd0d365b7c17c631779 100644
--- a/arbor/communication/communicator.hpp
+++ b/arbor/communication/communicator.hpp
@@ -17,7 +17,6 @@
 #include "communication/gathered_vector.hpp"
 #include "connection.hpp"
 #include "distributed_context.hpp"
-#include "event_queue.hpp"
 #include "execution_context.hpp"
 #include "profile/profiler_macro.hpp"
 #include "threading/threading.hpp"
diff --git a/arbor/connection.hpp b/arbor/connection.hpp
index e4fbf1509668dca58b11cd18dd91822c855260e8..cdcfe994d71241f771b85131457253ed2d46ecad 100644
--- a/arbor/connection.hpp
+++ b/arbor/connection.hpp
@@ -5,8 +5,6 @@
 #include <arbor/common_types.hpp>
 #include <arbor/spike.hpp>
 
-#include "event_queue.hpp"
-
 namespace arb {
 
 class connection {
diff --git a/arbor/mc_cell_group.cpp b/arbor/mc_cell_group.cpp
index ec8371abe1652113bed70ea56405e3f01280c866..bcd96d2f61bbe9e7ee3a9f9370fb134ad6a5dd94 100644
--- a/arbor/mc_cell_group.cpp
+++ b/arbor/mc_cell_group.cpp
@@ -11,7 +11,6 @@
 #include "backends/event.hpp"
 #include "cell_group.hpp"
 #include "event_binner.hpp"
-#include "event_queue.hpp"
 #include "fvm_lowered_cell.hpp"
 #include "mc_cell_group.hpp"
 #include "profile/profiler_macro.hpp"
diff --git a/arbor/merge_events.hpp b/arbor/merge_events.hpp
index 6427d75360f4562290bf17c442101e628be89f87..9a8581f62e4d766fb9a222773fbbb8f7d951bdea 100644
--- a/arbor/merge_events.hpp
+++ b/arbor/merge_events.hpp
@@ -6,7 +6,6 @@
 #include <arbor/event_generator.hpp>
 #include <arbor/spike_event.hpp>
 
-#include "event_queue.hpp"
 #include "profile/profiler_macro.hpp"
 #include "util/range.hpp"
 
diff --git a/arbor/partition_load_balance.cpp b/arbor/partition_load_balance.cpp
index cc09a8618ab2829b4f5c3c29ce99610d9891bb3b..5497e6bc8e549d3d940023b4471e49324a3e8f10 100644
--- a/arbor/partition_load_balance.cpp
+++ b/arbor/partition_load_balance.cpp
@@ -1,4 +1,6 @@
+#include <queue>
 #include <unordered_set>
+#include <vector>
 
 #include <arbor/domain_decomposition.hpp>
 #include <arbor/load_balance.hpp>