diff --git a/arbor/backends/gpu/multi_event_stream.hpp b/arbor/backends/gpu/multi_event_stream.hpp
index b03e374c6f954e4aa18c7ad12386a2c7ca7efb84..217c19920f434237b6b41476c8cb34c46b86671c 100644
--- a/arbor/backends/gpu/multi_event_stream.hpp
+++ b/arbor/backends/gpu/multi_event_stream.hpp
@@ -2,6 +2,7 @@
 
 // Indexed collection of pop-only event queues --- multicore back-end implementation.
 
+#include <arbor/arbexcept.hpp>
 #include <arbor/common_types.hpp>
 #include <arbor/fvm_types.hpp>
 #include <arbor/generic_event.hpp>
diff --git a/arbor/backends/gpu/shared_state.cpp b/arbor/backends/gpu/shared_state.cpp
index d49be673e0e23ce1af65c11e140554c6c6510b9f..9ab086088dbe6a973ab44602521209b17ad8cc3c 100644
--- a/arbor/backends/gpu/shared_state.cpp
+++ b/arbor/backends/gpu/shared_state.cpp
@@ -1,6 +1,7 @@
 #include <cstddef>
 #include <vector>
 
+#include <arbor/constants.hpp>
 #include <arbor/fvm_types.hpp>
 #include <arbor/ion.hpp>
 
@@ -8,7 +9,6 @@
 #include "backends/gpu/gpu_store_types.hpp"
 #include "backends/gpu/shared_state.hpp"
 #include "backends/multi_event_stream_state.hpp"
-#include "constants.hpp"
 #include "memory/wrappers.hpp"
 #include "util/rangeutil.hpp"
 
diff --git a/test/unit/test_mc_cell_group_gpu.cpp b/test/unit/test_mc_cell_group_gpu.cpp
index f36624845e43bbe9f649e4c4f555079ad3989c03..b14314542c45aab13b7703894ddd449905c72312 100644
--- a/test/unit/test_mc_cell_group_gpu.cpp
+++ b/test/unit/test_mc_cell_group_gpu.cpp
@@ -2,7 +2,6 @@
 
 #include <arbor/common_types.hpp>
 
-#include "backends.hpp"
 #include "epoch.hpp"
 #include "fvm_lowered_cell.hpp"
 #include "mc_cell_group.hpp"