diff --git a/pytket/conanfile.py b/pytket/conanfile.py
index a5ca25a70a..b90e3d65e1 100644
--- a/pytket/conanfile.py
+++ b/pytket/conanfile.py
@@ -32,7 +32,7 @@ def package(self):
         cmake.install()
 
     def requirements(self):
-        self.requires("tket/1.3.23@tket/stable")
+        self.requires("tket/1.3.24@tket/stable")
         self.requires("tklog/0.3.3@tket/stable")
         self.requires("tkrng/0.3.3@tket/stable")
         self.requires("tkassert/0.3.4@tket/stable")
diff --git a/tket/conanfile.py b/tket/conanfile.py
index a812fd04bb..d65408a973 100644
--- a/tket/conanfile.py
+++ b/tket/conanfile.py
@@ -23,7 +23,7 @@
 
 class TketConan(ConanFile):
     name = "tket"
-    version = "1.3.23"
+    version = "1.3.24"
     package_type = "library"
     license = "Apache 2"
     homepage = "https://github.com/CQCL/tket"
diff --git a/tket/proptest/src/ComparisonFunctions.cpp b/tket/proptest/src/ComparisonFunctions.cpp
index a54dec3040..5cbc11e402 100644
--- a/tket/proptest/src/ComparisonFunctions.cpp
+++ b/tket/proptest/src/ComparisonFunctions.cpp
@@ -17,6 +17,8 @@
 #include <sstream>
 #include <stdexcept>
 
+#include "tket/Utils/MatrixAnalysis.hpp"
+
 // NOTE: this is an identical copy of a file in tket-tests, in the Simulation
 // folder. This is deliberate! Please keep both in sync!
 // See the tket-tests file for a mathematical discussion.
diff --git a/tket/proptest/src/ComparisonFunctions.hpp b/tket/proptest/src/ComparisonFunctions.hpp
index 2c33606d2d..662c458e70 100644
--- a/tket/proptest/src/ComparisonFunctions.hpp
+++ b/tket/proptest/src/ComparisonFunctions.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "tket/Utils/MatrixAnalysis.hpp"
+#include "tket/Utils/EigenConfig.hpp"
 
 namespace tket {
 namespace tket_sim {
diff --git a/tket/src/Architecture/Architecture.cpp b/tket/src/Architecture/Architecture.cpp
index ac8b59233e..215da721d8 100644
--- a/tket/src/Architecture/Architecture.cpp
+++ b/tket/src/Architecture/Architecture.cpp
@@ -16,11 +16,9 @@
 
 #include <boost/graph/biconnected_components.hpp>
 #include <tkassert/Assert.hpp>
-#include <unordered_set>
 #include <vector>
 
 #include "tket/Graphs/ArticulationPoints.hpp"
-#include "tket/Utils/Json.hpp"
 #include "tket/Utils/UnitID.hpp"
 
 namespace tket {
diff --git a/tket/src/Architecture/ArchitectureMapping.cpp b/tket/src/Architecture/ArchitectureMapping.cpp
index 95c7f3e978..d2956178e8 100644
--- a/tket/src/Architecture/ArchitectureMapping.cpp
+++ b/tket/src/Architecture/ArchitectureMapping.cpp
@@ -14,8 +14,6 @@
 
 #include "tket/Architecture/ArchitectureMapping.hpp"
 
-#include <sstream>
-#include <stdexcept>
 #include <tkassert/Assert.hpp>
 
 namespace tket {
diff --git a/tket/src/Architecture/DistancesFromArchitecture.cpp b/tket/src/Architecture/DistancesFromArchitecture.cpp
index 5c17a7917c..459c029715 100644
--- a/tket/src/Architecture/DistancesFromArchitecture.cpp
+++ b/tket/src/Architecture/DistancesFromArchitecture.cpp
@@ -14,9 +14,6 @@
 
 #include "tket/Architecture/DistancesFromArchitecture.hpp"
 
-#include <sstream>
-#include <stdexcept>
-
 namespace tket {
 
 DistancesFromArchitecture::DistancesFromArchitecture(
diff --git a/tket/src/Architecture/NeighboursFromArchitecture.cpp b/tket/src/Architecture/NeighboursFromArchitecture.cpp
index 03ac6b27ed..c77e7ae413 100644
--- a/tket/src/Architecture/NeighboursFromArchitecture.cpp
+++ b/tket/src/Architecture/NeighboursFromArchitecture.cpp
@@ -15,8 +15,6 @@
 #include "tket/Architecture/NeighboursFromArchitecture.hpp"
 
 #include <algorithm>
-#include <sstream>
-#include <stdexcept>
 
 namespace tket {
 
diff --git a/tket/src/Circuit/AssertionSynthesis.cpp b/tket/src/Circuit/AssertionSynthesis.cpp
index b802e6970e..e77189c8aa 100644
--- a/tket/src/Circuit/AssertionSynthesis.cpp
+++ b/tket/src/Circuit/AssertionSynthesis.cpp
@@ -16,17 +16,12 @@
 
 #include <array>
 #include <cmath>
-#include <complex>
-#include <optional>
 #include <stdexcept>
 #include <tkassert/Assert.hpp>
 
-#include "tket/Circuit/CircUtils.hpp"
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/OpType/OpType.hpp"
 #include "tket/Utils/Constants.hpp"
-#include "tket/Utils/CosSinDecomposition.hpp"
-#include "tket/Utils/EigenConfig.hpp"
 #include "tket/Utils/MatrixAnalysis.hpp"
 #include "tket/Utils/UnitID.hpp"
 
diff --git a/tket/src/Circuit/Boxes.cpp b/tket/src/Circuit/Boxes.cpp
index fa54e2809f..40d00fb6b8 100644
--- a/tket/src/Circuit/Boxes.cpp
+++ b/tket/src/Circuit/Boxes.cpp
@@ -29,10 +29,8 @@
 #include "tket/OpType/OpTypeInfo.hpp"
 #include "tket/Ops/OpJsonFactory.hpp"
 #include "tket/Ops/OpPtr.hpp"
-#include "tket/Utils/EigenConfig.hpp"
 #include "tket/Utils/Expression.hpp"
 #include "tket/Utils/HelperFunctions.hpp"
-#include "tket/Utils/Json.hpp"
 #include "tket/Utils/PauliTensor.hpp"
 
 namespace tket {
diff --git a/tket/src/Circuit/CircPool.cpp b/tket/src/Circuit/CircPool.cpp
index 49a87d05ed..0a99a34f4e 100644
--- a/tket/src/Circuit/CircPool.cpp
+++ b/tket/src/Circuit/CircPool.cpp
@@ -18,11 +18,9 @@
 
 #include "tket/Circuit/CircUtils.hpp"
 #include "tket/Circuit/Circuit.hpp"
-#include "tket/Gate/Rotation.hpp"
 #include "tket/OpType/OpType.hpp"
 #include "tket/Transformations/BasicOptimisation.hpp"
 #include "tket/Utils/Expression.hpp"
-#include "tket/Utils/MatrixAnalysis.hpp"
 
 namespace tket {
 
diff --git a/tket/src/Circuit/CircUtils.cpp b/tket/src/Circuit/CircUtils.cpp
index c97cb45f26..76e8b2ffe5 100644
--- a/tket/src/Circuit/CircUtils.cpp
+++ b/tket/src/Circuit/CircUtils.cpp
@@ -27,8 +27,6 @@
 #include "tket/Gate/GateUnitaryMatrixImplementations.hpp"
 #include "tket/Gate/Rotation.hpp"
 #include "tket/OpType/OpType.hpp"
-#include "tket/Ops/Op.hpp"
-#include "tket/Utils/EigenConfig.hpp"
 #include "tket/Utils/Expression.hpp"
 #include "tket/Utils/MatrixAnalysis.hpp"
 #include "tket/Utils/UnitID.hpp"
diff --git a/tket/src/Circuit/Circuit.cpp b/tket/src/Circuit/Circuit.cpp
index 5b93a90de2..e85292b2b6 100644
--- a/tket/src/Circuit/Circuit.cpp
+++ b/tket/src/Circuit/Circuit.cpp
@@ -17,7 +17,6 @@
 #include <algorithm>
 #include <cstddef>
 #include <fstream>
-#include <numeric>
 #include <optional>
 #include <set>
 #include <string>
@@ -32,7 +31,6 @@
 #include "tket/OpType/OpType.hpp"
 #include "tket/OpType/OpTypeFunctions.hpp"
 #include "tket/Utils/Expression.hpp"
-#include "tket/Utils/GraphHeaders.hpp"
 #include "tket/Utils/HelperFunctions.hpp"
 
 namespace tket {
diff --git a/tket/src/Circuit/CircuitJson.cpp b/tket/src/Circuit/CircuitJson.cpp
index ecd79674da..3f08cb56fb 100644
--- a/tket/src/Circuit/CircuitJson.cpp
+++ b/tket/src/Circuit/CircuitJson.cpp
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 #include "tket/Circuit/Circuit.hpp"
-#include "tket/Utils/Json.hpp"
 
 namespace tket {
 
diff --git a/tket/src/Circuit/ConjugationBox.cpp b/tket/src/Circuit/ConjugationBox.cpp
index 1c1e7ba34a..7ba600b04d 100644
--- a/tket/src/Circuit/ConjugationBox.cpp
+++ b/tket/src/Circuit/ConjugationBox.cpp
@@ -20,8 +20,6 @@
 #include "Utils/Expression.hpp"
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/Ops/OpJsonFactory.hpp"
-#include "tket/Utils/HelperFunctions.hpp"
-#include "tket/Utils/Json.hpp"
 
 namespace tket {
 
diff --git a/tket/src/Circuit/ControlledGates.cpp b/tket/src/Circuit/ControlledGates.cpp
index f1f648d7a4..4ee1487ed0 100644
--- a/tket/src/Circuit/ControlledGates.cpp
+++ b/tket/src/Circuit/ControlledGates.cpp
@@ -23,7 +23,6 @@
 #include "tket/Gate/GatePtr.hpp"
 #include "tket/Gate/Rotation.hpp"
 #include "tket/OpType/OpType.hpp"
-#include "tket/Utils/EigenConfig.hpp"
 #include "tket/Utils/HelperFunctions.hpp"
 
 namespace tket {
diff --git a/tket/src/Circuit/DAGProperties.cpp b/tket/src/Circuit/DAGProperties.cpp
index b82dab2988..19b1d6e7cb 100644
--- a/tket/src/Circuit/DAGProperties.cpp
+++ b/tket/src/Circuit/DAGProperties.cpp
@@ -15,11 +15,10 @@
 #include "DAGProperties.hpp"
 
 #include <algorithm>
+#include <tkassert/Assert.hpp>
 #include <tklog/TketLog.hpp>
 
-#include "tket/Circuit/Circuit.hpp"
 #include "tket/OpType/EdgeType.hpp"
-#include "tket/Utils/GraphHeaders.hpp"
 
 namespace tket {
 
diff --git a/tket/src/Circuit/DiagonalBox.cpp b/tket/src/Circuit/DiagonalBox.cpp
index eee6de88a1..98e9a800c2 100644
--- a/tket/src/Circuit/DiagonalBox.cpp
+++ b/tket/src/Circuit/DiagonalBox.cpp
@@ -16,10 +16,8 @@
 
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/Circuit/Multiplexor.hpp"
-#include "tket/Gate/Rotation.hpp"
 #include "tket/Ops/OpJsonFactory.hpp"
 #include "tket/Utils/HelperFunctions.hpp"
-#include "tket/Utils/Json.hpp"
 
 namespace tket {
 
diff --git a/tket/src/Circuit/Multiplexor.cpp b/tket/src/Circuit/Multiplexor.cpp
index 48b5aad46d..a19e67733a 100644
--- a/tket/src/Circuit/Multiplexor.cpp
+++ b/tket/src/Circuit/Multiplexor.cpp
@@ -24,7 +24,6 @@
 #include "tket/Ops/OpJsonFactory.hpp"
 #include "tket/Utils/Constants.hpp"
 #include "tket/Utils/HelperFunctions.hpp"
-#include "tket/Utils/Json.hpp"
 
 namespace tket {
 
diff --git a/tket/src/Circuit/OpJson.cpp b/tket/src/Circuit/OpJson.cpp
index fde591784d..4774aecc9a 100644
--- a/tket/src/Circuit/OpJson.cpp
+++ b/tket/src/Circuit/OpJson.cpp
@@ -19,7 +19,6 @@
 #include "tket/OpType/OpTypeFunctions.hpp"
 #include "tket/Ops/BarrierOp.hpp"
 #include "tket/Ops/ClassicalOps.hpp"
-#include "tket/Ops/MetaOp.hpp"
 #include "tket/Ops/OpPtr.hpp"
 #include "tket/Utils/Json.hpp"
 
diff --git a/tket/src/Circuit/PauliExpBoxes.cpp b/tket/src/Circuit/PauliExpBoxes.cpp
index 1d612615f7..8bc377bea3 100644
--- a/tket/src/Circuit/PauliExpBoxes.cpp
+++ b/tket/src/Circuit/PauliExpBoxes.cpp
@@ -14,8 +14,6 @@
 
 #include "tket/Circuit/PauliExpBoxes.hpp"
 
-#include <iostream>
-
 #include "tket/Circuit/CircUtils.hpp"
 #include "tket/Circuit/ConjugationBox.hpp"
 #include "tket/Converters/PhasePoly.hpp"
diff --git a/tket/src/Circuit/ResourceData.cpp b/tket/src/Circuit/ResourceData.cpp
index 34b3ab931b..a20ed06b10 100644
--- a/tket/src/Circuit/ResourceData.cpp
+++ b/tket/src/Circuit/ResourceData.cpp
@@ -14,8 +14,6 @@
 
 #include "tket/Circuit/ResourceData.hpp"
 
-#include "tket/Utils/Json.hpp"
-
 namespace tket {
 
 bool ResourceData::operator==(const ResourceData& other) const {
diff --git a/tket/src/Circuit/Simulation/BitOperations.cpp b/tket/src/Circuit/Simulation/BitOperations.cpp
index 00d3417d25..bdac753e68 100644
--- a/tket/src/Circuit/Simulation/BitOperations.cpp
+++ b/tket/src/Circuit/Simulation/BitOperations.cpp
@@ -14,7 +14,6 @@
 
 #include "BitOperations.hpp"
 
-#include <stdexcept>
 #include <tkassert/Assert.hpp>
 
 namespace tket {
diff --git a/tket/src/Circuit/Simulation/DecomposeCircuit.cpp b/tket/src/Circuit/Simulation/DecomposeCircuit.cpp
index 3d9bac7008..d094aebef3 100644
--- a/tket/src/Circuit/Simulation/DecomposeCircuit.cpp
+++ b/tket/src/Circuit/Simulation/DecomposeCircuit.cpp
@@ -20,8 +20,6 @@
 #include "GateNodesBuffer.hpp"
 #include "tket/Circuit/Boxes.hpp"
 #include "tket/Circuit/Circuit.hpp"
-#include "tket/Circuit/PauliExpBoxes.hpp"
-#include "tket/Circuit/Simulation/PauliExpBoxUnitaryCalculator.hpp"
 #include "tket/Gate/Gate.hpp"
 #include "tket/Gate/GateUnitaryMatrix.hpp"
 #include "tket/Gate/GateUnitaryMatrixError.hpp"
diff --git a/tket/src/Circuit/Simulation/DecomposeCircuit.hpp b/tket/src/Circuit/Simulation/DecomposeCircuit.hpp
index 28dc453393..65290e1cf3 100644
--- a/tket/src/Circuit/Simulation/DecomposeCircuit.hpp
+++ b/tket/src/Circuit/Simulation/DecomposeCircuit.hpp
@@ -14,8 +14,6 @@
 
 #pragma once
 
-#include "tket/Utils/MatrixAnalysis.hpp"
-
 namespace tket {
 class Circuit;
 namespace tket_sim {
diff --git a/tket/src/Circuit/Simulation/GateNodesBuffer.hpp b/tket/src/Circuit/Simulation/GateNodesBuffer.hpp
index d6bacc5a31..7e9d3451ae 100644
--- a/tket/src/Circuit/Simulation/GateNodesBuffer.hpp
+++ b/tket/src/Circuit/Simulation/GateNodesBuffer.hpp
@@ -17,7 +17,6 @@
 #include <memory>
 
 #include "GateNode.hpp"
-#include "tket/Utils/MatrixAnalysis.hpp"
 
 namespace tket {
 namespace tket_sim {
diff --git a/tket/src/Circuit/StatePreparation.cpp b/tket/src/Circuit/StatePreparation.cpp
index 516eef3c0e..40165d5070 100644
--- a/tket/src/Circuit/StatePreparation.cpp
+++ b/tket/src/Circuit/StatePreparation.cpp
@@ -22,7 +22,6 @@
 #include "tket/Gate/Rotation.hpp"
 #include "tket/Ops/OpJsonFactory.hpp"
 #include "tket/Utils/HelperFunctions.hpp"
-#include "tket/Utils/Json.hpp"
 
 namespace tket {
 
diff --git a/tket/src/Circuit/SubcircuitFinder.cpp b/tket/src/Circuit/SubcircuitFinder.cpp
index 262499e860..40ba4c419d 100644
--- a/tket/src/Circuit/SubcircuitFinder.cpp
+++ b/tket/src/Circuit/SubcircuitFinder.cpp
@@ -16,7 +16,6 @@
 #include <boost/graph/transitive_closure.hpp>
 #include <cstddef>
 #include <iterator>
-#include <memory>
 #include <optional>
 #include <tkassert/Assert.hpp>
 #include <vector>
diff --git a/tket/src/Circuit/ThreeQubitConversion.cpp b/tket/src/Circuit/ThreeQubitConversion.cpp
index 00f53e9787..23a6638a2a 100644
--- a/tket/src/Circuit/ThreeQubitConversion.cpp
+++ b/tket/src/Circuit/ThreeQubitConversion.cpp
@@ -30,8 +30,6 @@
 #include "tket/OpType/OpType.hpp"
 #include "tket/Utils/Constants.hpp"
 #include "tket/Utils/CosSinDecomposition.hpp"
-#include "tket/Utils/EigenConfig.hpp"
-#include "tket/Utils/MatrixAnalysis.hpp"
 #include "tket/Utils/UnitID.hpp"
 
 namespace tket {
diff --git a/tket/src/Circuit/ToffoliBox.cpp b/tket/src/Circuit/ToffoliBox.cpp
index 9943d650a1..9feaa245b3 100644
--- a/tket/src/Circuit/ToffoliBox.cpp
+++ b/tket/src/Circuit/ToffoliBox.cpp
@@ -20,10 +20,8 @@
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/Circuit/DiagonalBox.hpp"
 #include "tket/Circuit/Multiplexor.hpp"
-#include "tket/Gate/Rotation.hpp"
 #include "tket/Ops/OpJsonFactory.hpp"
 #include "tket/Utils/HelperFunctions.hpp"
-#include "tket/Utils/Json.hpp"
 
 namespace tket {
 
diff --git a/tket/src/Circuit/macro_circ_info.cpp b/tket/src/Circuit/macro_circ_info.cpp
index cb4aedf91f..5f6e2bf9f6 100644
--- a/tket/src/Circuit/macro_circ_info.cpp
+++ b/tket/src/Circuit/macro_circ_info.cpp
@@ -23,7 +23,6 @@
 #include "tket/OpType/EdgeType.hpp"
 #include "tket/OpType/OpType.hpp"
 #include "tket/Ops/OpPtr.hpp"
-#include "tket/Utils/GraphHeaders.hpp"
 
 namespace tket {
 
diff --git a/tket/src/Circuit/setters_and_getters.cpp b/tket/src/Circuit/setters_and_getters.cpp
index 973740542d..5662d0f1b3 100644
--- a/tket/src/Circuit/setters_and_getters.cpp
+++ b/tket/src/Circuit/setters_and_getters.cpp
@@ -26,7 +26,6 @@
 #include "tket/OpType/OpDesc.hpp"
 #include "tket/OpType/OpType.hpp"
 #include "tket/Ops/OpPtr.hpp"
-#include "tket/Utils/GraphHeaders.hpp"
 
 namespace tket {
 
diff --git a/tket/src/Converters/PauliGraphConverters.cpp b/tket/src/Converters/PauliGraphConverters.cpp
index 46a3126433..8542ac28c4 100644
--- a/tket/src/Converters/PauliGraphConverters.cpp
+++ b/tket/src/Converters/PauliGraphConverters.cpp
@@ -15,8 +15,6 @@
 #include "tket/Circuit/Boxes.hpp"
 #include "tket/Circuit/PauliExpBoxes.hpp"
 #include "tket/Converters/Converters.hpp"
-#include "tket/Converters/PhasePoly.hpp"
-#include "tket/Diagonalisation/Diagonalisation.hpp"
 #include "tket/Gate/Gate.hpp"
 
 namespace tket {
diff --git a/tket/src/Converters/PhasePoly.cpp b/tket/src/Converters/PhasePoly.cpp
index b0e841e4c6..0c53607a3c 100644
--- a/tket/src/Converters/PhasePoly.cpp
+++ b/tket/src/Converters/PhasePoly.cpp
@@ -26,8 +26,6 @@
 #include "tket/OpType/OpType.hpp"
 #include "tket/Ops/OpJsonFactory.hpp"
 #include "tket/Ops/OpPtr.hpp"
-#include "tket/Utils/GraphHeaders.hpp"
-#include "tket/Utils/Json.hpp"
 
 namespace tket {
 
diff --git a/tket/src/Converters/ZXConverters.cpp b/tket/src/Converters/ZXConverters.cpp
index e9666f1c81..2b07da47ae 100644
--- a/tket/src/Converters/ZXConverters.cpp
+++ b/tket/src/Converters/ZXConverters.cpp
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tket/Circuit/CircPool.hpp"
 #include "tket/Converters/Converters.hpp"
 #include "tket/ZX/Flow.hpp"
 #include "tket/ZX/ZXDiagram.hpp"
diff --git a/tket/src/Diagonalisation/Diagonalisation.cpp b/tket/src/Diagonalisation/Diagonalisation.cpp
index 6b433e10a3..0d59d6236d 100644
--- a/tket/src/Diagonalisation/Diagonalisation.cpp
+++ b/tket/src/Diagonalisation/Diagonalisation.cpp
@@ -16,7 +16,6 @@
 
 #include <tkassert/Assert.hpp>
 
-#include "tket/Ops/Op.hpp"
 #include "tket/PauliGraph/ConjugatePauliFunctions.hpp"
 #include "tket/Utils/UnitID.hpp"
 
diff --git a/tket/src/Diagonalisation/PauliPartition.cpp b/tket/src/Diagonalisation/PauliPartition.cpp
index 9f9eaedf2d..01dec7ce1e 100644
--- a/tket/src/Diagonalisation/PauliPartition.cpp
+++ b/tket/src/Diagonalisation/PauliPartition.cpp
@@ -19,7 +19,6 @@
 
 #include "tket/Graphs/AdjacencyData.hpp"
 #include "tket/Graphs/GraphColouring.hpp"
-#include "tket/Utils/GraphHeaders.hpp"
 
 namespace tket {
 
diff --git a/tket/src/Gate/GateUnitaryMatrixVariableQubits.hpp b/tket/src/Gate/GateUnitaryMatrixVariableQubits.hpp
index 87593a5e45..d3b7d0692d 100644
--- a/tket/src/Gate/GateUnitaryMatrixVariableQubits.hpp
+++ b/tket/src/Gate/GateUnitaryMatrixVariableQubits.hpp
@@ -15,7 +15,7 @@
 #pragma once
 
 #include "tket/OpType/OpType.hpp"
-#include "tket/Utils/MatrixAnalysis.hpp"
+#include "tket/Utils/EigenConfig.hpp"
 
 namespace tket {
 namespace internal {
diff --git a/tket/src/Gate/Rotation.cpp b/tket/src/Gate/Rotation.cpp
index 3ed8b62249..55065962bf 100644
--- a/tket/src/Gate/Rotation.cpp
+++ b/tket/src/Gate/Rotation.cpp
@@ -21,7 +21,6 @@
 #include "tket/OpType/OpDesc.hpp"
 #include "tket/OpType/OpType.hpp"
 #include "tket/Utils/Expression.hpp"
-#include "tket/Utils/Symbols.hpp"
 
 namespace tket {
 
diff --git a/tket/src/Graphs/AdjacencyData.cpp b/tket/src/Graphs/AdjacencyData.cpp
index 0a43767320..bbdd37a072 100644
--- a/tket/src/Graphs/AdjacencyData.cpp
+++ b/tket/src/Graphs/AdjacencyData.cpp
@@ -17,12 +17,9 @@
 #include <algorithm>
 #include <set>
 #include <sstream>
-#include <stdexcept>
 #include <tkassert/Assert.hpp>
 
-using std::exception;
 using std::map;
-using std::runtime_error;
 using std::set;
 using std::string;
 using std::stringstream;
diff --git a/tket/src/Graphs/ArticulationPoints.cpp b/tket/src/Graphs/ArticulationPoints.cpp
index 76d925a935..456aa87539 100644
--- a/tket/src/Graphs/ArticulationPoints.cpp
+++ b/tket/src/Graphs/ArticulationPoints.cpp
@@ -23,7 +23,6 @@
 #include <vector>
 
 #include "tket/Graphs/Utils.hpp"
-#include "tket/Utils/GraphHeaders.hpp"
 
 namespace tket::graphs {
 
diff --git a/tket/src/Graphs/BruteForceColouring.cpp b/tket/src/Graphs/BruteForceColouring.cpp
index 0326d9b082..c8b5ee9ad8 100644
--- a/tket/src/Graphs/BruteForceColouring.cpp
+++ b/tket/src/Graphs/BruteForceColouring.cpp
@@ -15,7 +15,6 @@
 #include "BruteForceColouring.hpp"
 
 #include <set>
-#include <sstream>
 #include <stdexcept>
 #include <tkassert/Assert.hpp>
 
diff --git a/tket/src/Graphs/GraphColouring.cpp b/tket/src/Graphs/GraphColouring.cpp
index ef446db3a8..d60809152f 100644
--- a/tket/src/Graphs/GraphColouring.cpp
+++ b/tket/src/Graphs/GraphColouring.cpp
@@ -28,7 +28,6 @@
 #include "tket/Graphs/LargeCliquesResult.hpp"
 
 using std::exception;
-using std::map;
 using std::runtime_error;
 using std::set;
 using std::string;
diff --git a/tket/src/Graphs/GraphRoutines.cpp b/tket/src/Graphs/GraphRoutines.cpp
index 60dd858f38..d06a39a14c 100644
--- a/tket/src/Graphs/GraphRoutines.cpp
+++ b/tket/src/Graphs/GraphRoutines.cpp
@@ -18,7 +18,6 @@
 
 #include "tket/Graphs/AdjacencyData.hpp"
 
-using std::map;
 using std::set;
 using std::size_t;
 using std::vector;
diff --git a/tket/src/Mapping/LexiRoute.cpp b/tket/src/Mapping/LexiRoute.cpp
index 61bb34b598..bfa57111fa 100644
--- a/tket/src/Mapping/LexiRoute.cpp
+++ b/tket/src/Mapping/LexiRoute.cpp
@@ -15,7 +15,6 @@
 #include "tket/Mapping/LexiRoute.hpp"
 
 #include "tket/Mapping/MappingFrontier.hpp"
-#include "tket/Utils/Json.hpp"
 
 namespace tket {
 
diff --git a/tket/src/Ops/BarrierOp.cpp b/tket/src/Ops/BarrierOp.cpp
index f4b9d19592..27cc392781 100644
--- a/tket/src/Ops/BarrierOp.cpp
+++ b/tket/src/Ops/BarrierOp.cpp
@@ -14,11 +14,8 @@
 
 #include "tket/Ops/BarrierOp.hpp"
 
-#include <typeinfo>
-
 #include "tket/OpType/EdgeType.hpp"
 #include "tket/OpType/OpType.hpp"
-#include "tket/Utils/Json.hpp"
 
 namespace tket {
 
diff --git a/tket/src/Ops/MetaOp.cpp b/tket/src/Ops/MetaOp.cpp
index a54625e495..96b939d422 100644
--- a/tket/src/Ops/MetaOp.cpp
+++ b/tket/src/Ops/MetaOp.cpp
@@ -15,11 +15,9 @@
 #include "tket/Ops/MetaOp.hpp"
 
 #include <memory>
-#include <typeinfo>
 
 #include "tket/OpType/EdgeType.hpp"
 #include "tket/OpType/OpType.hpp"
-#include "tket/Utils/Json.hpp"
 
 namespace tket {
 
diff --git a/tket/src/Ops/Op.cpp b/tket/src/Ops/Op.cpp
index e21e03842f..3551fb6ef7 100644
--- a/tket/src/Ops/Op.cpp
+++ b/tket/src/Ops/Op.cpp
@@ -17,7 +17,6 @@
 #include <sstream>
 
 #include "tket/Ops/OpPtr.hpp"
-#include "tket/Utils/Json.hpp"
 
 namespace tket {
 
diff --git a/tket/src/PauliGraph/ConjugatePauliFunctions.cpp b/tket/src/PauliGraph/ConjugatePauliFunctions.cpp
index 2c403fb5eb..e59b988528 100644
--- a/tket/src/PauliGraph/ConjugatePauliFunctions.cpp
+++ b/tket/src/PauliGraph/ConjugatePauliFunctions.cpp
@@ -17,7 +17,6 @@
 #include <tkassert/Assert.hpp>
 
 #include "tket/OpType/OpTypeInfo.hpp"
-#include "tket/PauliGraph/PauliGraph.hpp"
 
 namespace tket {
 
diff --git a/tket/src/PauliGraph/PauliGraph.cpp b/tket/src/PauliGraph/PauliGraph.cpp
index abd2a8b42c..bf859423ee 100644
--- a/tket/src/PauliGraph/PauliGraph.cpp
+++ b/tket/src/PauliGraph/PauliGraph.cpp
@@ -18,7 +18,6 @@
 
 #include "tket/Gate/Gate.hpp"
 #include "tket/OpType/OpType.hpp"
-#include "tket/Utils/GraphHeaders.hpp"
 #include "tket/Utils/PauliTensor.hpp"
 
 namespace tket {
diff --git a/tket/src/Placement/GraphPlacement.cpp b/tket/src/Placement/GraphPlacement.cpp
index 34254713a1..fe567d45b5 100644
--- a/tket/src/Placement/GraphPlacement.cpp
+++ b/tket/src/Placement/GraphPlacement.cpp
@@ -15,7 +15,6 @@
 #include <chrono>
 
 #include "tket/Placement/Placement.hpp"
-#include "tket/Utils/HelperFunctions.hpp"
 
 typedef std::chrono::steady_clock Clock;
 
diff --git a/tket/src/Placement/LinePlacement.cpp b/tket/src/Placement/LinePlacement.cpp
index 3d413211d1..cccae2757d 100644
--- a/tket/src/Placement/LinePlacement.cpp
+++ b/tket/src/Placement/LinePlacement.cpp
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 #include "tket/Placement/Placement.hpp"
-#include "tket/Utils/HelperFunctions.hpp"
 
 namespace tket {
 
diff --git a/tket/src/Placement/NeighbourPlacements.cpp b/tket/src/Placement/NeighbourPlacements.cpp
index 3b44e869ba..f2e8825bbb 100644
--- a/tket/src/Placement/NeighbourPlacements.cpp
+++ b/tket/src/Placement/NeighbourPlacements.cpp
@@ -16,7 +16,6 @@
 
 #include <cstdlib>
 #include <sstream>
-#include <string>
 #include <tklog/TketLog.hpp>
 #include <tktokenswap/SwapListOptimiser.hpp>
 
diff --git a/tket/src/Placement/NoiseAwarePlacement.cpp b/tket/src/Placement/NoiseAwarePlacement.cpp
index 6ad95988ad..8e1ded7cf3 100644
--- a/tket/src/Placement/NoiseAwarePlacement.cpp
+++ b/tket/src/Placement/NoiseAwarePlacement.cpp
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 #include "tket/Placement/Placement.hpp"
-#include "tket/Utils/HelperFunctions.hpp"
 
 namespace tket {
 
diff --git a/tket/src/Placement/Placement.cpp b/tket/src/Placement/Placement.cpp
index 41e1b1cfad..0d674da2e2 100644
--- a/tket/src/Placement/Placement.cpp
+++ b/tket/src/Placement/Placement.cpp
@@ -14,8 +14,6 @@
 
 #include "tket/Placement/Placement.hpp"
 
-#include "tket/Utils/HelperFunctions.hpp"
-
 namespace tket {
 
 const std::string& Placement::unplaced_reg() {
diff --git a/tket/src/Placement/RelabelledGraphWSM.hpp b/tket/src/Placement/RelabelledGraphWSM.hpp
index e251488657..4783878ec8 100644
--- a/tket/src/Placement/RelabelledGraphWSM.hpp
+++ b/tket/src/Placement/RelabelledGraphWSM.hpp
@@ -13,13 +13,12 @@
 // limitations under the License.
 
 #pragma once
+#include <boost/graph/adjacency_list.hpp>
 #include <stdexcept>
 #include <tkassert/Assert.hpp>
 #include <tkwsm/Common/GeneralUtils.hpp>
 #include <tkwsm/GraphTheoretic/GeneralStructs.hpp>
 
-#include "tket/Placement/Placement.hpp"
-
 namespace tket {
 namespace WeightedSubgraphMonomorphism {
 
diff --git a/tket/src/Predicates/CompilerPass.cpp b/tket/src/Predicates/CompilerPass.cpp
index 56f7054b54..f253da095f 100644
--- a/tket/src/Predicates/CompilerPass.cpp
+++ b/tket/src/Predicates/CompilerPass.cpp
@@ -18,7 +18,6 @@
 #include <optional>
 #include <tklog/TketLog.hpp>
 
-#include "tket/Mapping/RoutingMethodJson.hpp"
 #include "tket/Predicates/PassGenerators.hpp"
 #include "tket/Predicates/PassLibrary.hpp"
 #include "tket/Transformations/ContextualReduction.hpp"
diff --git a/tket/src/Predicates/PassGenerators.cpp b/tket/src/Predicates/PassGenerators.cpp
index 584cb6b062..54b0d98683 100644
--- a/tket/src/Predicates/PassGenerators.cpp
+++ b/tket/src/Predicates/PassGenerators.cpp
@@ -24,7 +24,6 @@
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/Converters/PhasePoly.hpp"
 #include "tket/Mapping/LexiLabelling.hpp"
-#include "tket/Mapping/LexiRoute.hpp"
 #include "tket/Mapping/MappingManager.hpp"
 #include "tket/OpType/OpType.hpp"
 #include "tket/Placement/Placement.hpp"
@@ -43,7 +42,6 @@
 #include "tket/Transformations/Rebase.hpp"
 #include "tket/Transformations/ThreeQubitSquash.hpp"
 #include "tket/Transformations/Transform.hpp"
-#include "tket/Utils/Json.hpp"
 
 namespace tket {
 
diff --git a/tket/src/Predicates/PassLibrary.cpp b/tket/src/Predicates/PassLibrary.cpp
index afdc493771..3e5f12bb79 100644
--- a/tket/src/Predicates/PassLibrary.cpp
+++ b/tket/src/Predicates/PassLibrary.cpp
@@ -16,19 +16,17 @@
 
 #include <memory>
 
-#include "tket/Circuit/CircPool.hpp"
 #include "tket/Converters/Converters.hpp"
 #include "tket/Predicates/CompilationUnit.hpp"
 #include "tket/Predicates/CompilerPass.hpp"
-#include "tket/Predicates/PassGenerators.hpp"
 #include "tket/Predicates/Predicates.hpp"
 #include "tket/Transformations/BasicOptimisation.hpp"
+#include "tket/Transformations/ContextualReduction.hpp"
 #include "tket/Transformations/Decomposition.hpp"
 #include "tket/Transformations/MeasurePass.hpp"
 #include "tket/Transformations/OptimisationPass.hpp"
 #include "tket/Transformations/Rebase.hpp"
 #include "tket/Transformations/Transform.hpp"
-#include "tket/Utils/Json.hpp"
 #include "tket/ZX/Rewrite.hpp"
 
 namespace tket {
diff --git a/tket/src/Predicates/Predicates.cpp b/tket/src/Predicates/Predicates.cpp
index e5a6207921..55d756ed65 100644
--- a/tket/src/Predicates/Predicates.cpp
+++ b/tket/src/Predicates/Predicates.cpp
@@ -14,7 +14,6 @@
 
 #include "tket/Predicates/Predicates.hpp"
 
-#include "tket/Gate/Gate.hpp"
 #include "tket/Mapping/Verification.hpp"
 #include "tket/OpType/OpTypeFunctions.hpp"
 #include "tket/Placement/Placement.hpp"
diff --git a/tket/src/Transformations/BasicOptimisation.cpp b/tket/src/Transformations/BasicOptimisation.cpp
index 6f05398af5..9fa6fe86fd 100644
--- a/tket/src/Transformations/BasicOptimisation.cpp
+++ b/tket/src/Transformations/BasicOptimisation.cpp
@@ -26,7 +26,6 @@
 #include "tket/Circuit/DAGDefs.hpp"
 #include "tket/Transformations/Decomposition.hpp"
 #include "tket/Transformations/Transform.hpp"
-#include "tket/Utils/EigenConfig.hpp"
 #include "tket/Utils/Expression.hpp"
 #include "tket/Utils/MatrixAnalysis.hpp"
 #include "tket/Utils/UnitID.hpp"
diff --git a/tket/src/Transformations/Decomposition.cpp b/tket/src/Transformations/Decomposition.cpp
index e3d36157ff..647716cdb8 100644
--- a/tket/src/Transformations/Decomposition.cpp
+++ b/tket/src/Transformations/Decomposition.cpp
@@ -29,7 +29,6 @@
 #include "tket/OpType/OpTypeInfo.hpp"
 #include "tket/Ops/OpPtr.hpp"
 #include "tket/Transformations/BasicOptimisation.hpp"
-#include "tket/Transformations/OptimisationPass.hpp"
 #include "tket/Transformations/PhasedXFrontier.hpp"
 #include "tket/Transformations/Rebase.hpp"
 #include "tket/Transformations/Replacement.hpp"
diff --git a/tket/src/Transformations/GreedyPauliOptimisation.cpp b/tket/src/Transformations/GreedyPauliOptimisation.cpp
index fd4277e84c..9515ddbbc5 100644
--- a/tket/src/Transformations/GreedyPauliOptimisation.cpp
+++ b/tket/src/Transformations/GreedyPauliOptimisation.cpp
@@ -19,8 +19,6 @@
 #include "tket/Circuit/PauliExpBoxes.hpp"
 #include "tket/Converters/Converters.hpp"
 #include "tket/OpType/OpType.hpp"
-#include "tket/OpType/OpTypeInfo.hpp"
-#include "tket/Ops/Op.hpp"
 #include "tket/PauliGraph/PauliGraph.hpp"
 #include "tket/Transformations/CliffordOptimisation.hpp"
 #include "tket/Transformations/GreedyPauliOptimisationLookupTables.hpp"
diff --git a/tket/src/Transformations/MeasurePass.cpp b/tket/src/Transformations/MeasurePass.cpp
index 30c8861c8c..56f320ab7e 100644
--- a/tket/src/Transformations/MeasurePass.cpp
+++ b/tket/src/Transformations/MeasurePass.cpp
@@ -15,12 +15,10 @@
 #include "tket/Transformations/MeasurePass.hpp"
 
 #include <optional>
-#include <tuple>
 
 #include "tket/Circuit/DAGDefs.hpp"
 #include "tket/OpType/EdgeType.hpp"
 #include "tket/OpType/OpTypeFunctions.hpp"
-#include "tket/Ops/Op.hpp"
 #include "tket/Ops/OpPtr.hpp"
 #include "tket/Transformations/Transform.hpp"
 
diff --git a/tket/src/Transformations/PQPSquash.cpp b/tket/src/Transformations/PQPSquash.cpp
index 68cd73c2fe..ccc021f261 100644
--- a/tket/src/Transformations/PQPSquash.cpp
+++ b/tket/src/Transformations/PQPSquash.cpp
@@ -16,7 +16,6 @@
 
 #include <memory>
 
-#include "tket/Circuit/DAGDefs.hpp"
 #include "tket/Gate/Rotation.hpp"
 #include "tket/OpType/OpTypeInfo.hpp"
 #include "tket/Transformations/BasicOptimisation.hpp"
diff --git a/tket/src/Transformations/PauliOptimisation.cpp b/tket/src/Transformations/PauliOptimisation.cpp
index 32a99994fd..34f3e2d749 100644
--- a/tket/src/Transformations/PauliOptimisation.cpp
+++ b/tket/src/Transformations/PauliOptimisation.cpp
@@ -18,7 +18,6 @@
 #include "tket/Converters/Converters.hpp"
 #include "tket/OpType/OpType.hpp"
 #include "tket/OpType/OpTypeInfo.hpp"
-#include "tket/Ops/Op.hpp"
 #include "tket/PauliGraph/PauliGraph.hpp"
 #include "tket/Transformations/Decomposition.hpp"
 #include "tket/Transformations/OptimisationPass.hpp"
diff --git a/tket/src/Transformations/PhasedXFrontier.cpp b/tket/src/Transformations/PhasedXFrontier.cpp
index 5829d18042..465a96b112 100644
--- a/tket/src/Transformations/PhasedXFrontier.cpp
+++ b/tket/src/Transformations/PhasedXFrontier.cpp
@@ -17,7 +17,6 @@
 #include <string>
 
 #include "tket/Circuit/CircPool.hpp"
-#include "tket/Circuit/CircUtils.hpp"
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/OpType/OpType.hpp"
 #include "tket/OpType/OpTypeInfo.hpp"
diff --git a/tket/src/Transformations/Rebase.cpp b/tket/src/Transformations/Rebase.cpp
index 168919c781..74edd27656 100644
--- a/tket/src/Transformations/Rebase.cpp
+++ b/tket/src/Transformations/Rebase.cpp
@@ -18,12 +18,10 @@
 #include <tklog/TketLog.hpp>
 
 #include "tket/Circuit/CircPool.hpp"
-#include "tket/Circuit/CircUtils.hpp"
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/Gate/GatePtr.hpp"
 #include "tket/OpType/OpType.hpp"
 #include "tket/OpType/OpTypeFunctions.hpp"
-#include "tket/Ops/Op.hpp"
 #include "tket/Transformations/BasicOptimisation.hpp"
 #include "tket/Transformations/Replacement.hpp"
 #include "tket/Transformations/Transform.hpp"
diff --git a/tket/src/Transformations/RedundancyRemoval.cpp b/tket/src/Transformations/RedundancyRemoval.cpp
index c026aa1b40..1f51eecfea 100644
--- a/tket/src/Transformations/RedundancyRemoval.cpp
+++ b/tket/src/Transformations/RedundancyRemoval.cpp
@@ -15,7 +15,6 @@
 #include <optional>
 
 #include "tket/Circuit/DAGDefs.hpp"
-#include "tket/Gate/Gate.hpp"
 #include "tket/Transformations/BasicOptimisation.hpp"
 #include "tket/Transformations/Transform.hpp"
 
diff --git a/tket/src/Transformations/SingleQubitSquash.cpp b/tket/src/Transformations/SingleQubitSquash.cpp
index 84efc58ec1..32fbcb851e 100644
--- a/tket/src/Transformations/SingleQubitSquash.cpp
+++ b/tket/src/Transformations/SingleQubitSquash.cpp
@@ -21,7 +21,6 @@
 #include "Gate/GatePtr.hpp"
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/Circuit/DAGDefs.hpp"
-#include "tket/Gate/Gate.hpp"
 
 namespace tket {
 
diff --git a/tket/src/Transformations/ThreeQubitSquash.cpp b/tket/src/Transformations/ThreeQubitSquash.cpp
index af08a6eac2..11c8539cd2 100644
--- a/tket/src/Transformations/ThreeQubitSquash.cpp
+++ b/tket/src/Transformations/ThreeQubitSquash.cpp
@@ -16,12 +16,8 @@
 
 #include <algorithm>
 #include <array>
-#include <iostream>
-#include <iterator>
 #include <memory>
-#include <numeric>
 #include <set>
-#include <string>
 #include <tkassert/Assert.hpp>
 
 #include "tket/Circuit/CircUtils.hpp"
@@ -34,7 +30,6 @@
 #include "tket/Transformations/Decomposition.hpp"
 #include "tket/Transformations/OptimisationPass.hpp"
 #include "tket/Transformations/Transform.hpp"
-#include "tket/Utils/GraphHeaders.hpp"
 
 namespace tket {
 
diff --git a/tket/src/Utils/CosSinDecomposition.cpp b/tket/src/Utils/CosSinDecomposition.cpp
index 3c8d6ebb78..3790f8c254 100644
--- a/tket/src/Utils/CosSinDecomposition.cpp
+++ b/tket/src/Utils/CosSinDecomposition.cpp
@@ -18,7 +18,6 @@
 #include <tklog/TketLog.hpp>
 
 #include "tket/Utils/Constants.hpp"
-#include "tket/Utils/EigenConfig.hpp"
 #include "tket/Utils/MatrixAnalysis.hpp"
 
 namespace tket {
diff --git a/tket/src/Utils/Expression.cpp b/tket/src/Utils/Expression.cpp
index 0fdae4c49b..a1549b50cb 100644
--- a/tket/src/Utils/Expression.cpp
+++ b/tket/src/Utils/Expression.cpp
@@ -18,7 +18,6 @@
 
 #include "symengine/symengine_exception.h"
 #include "tket/Utils/Constants.hpp"
-#include "tket/Utils/Symbols.hpp"
 
 namespace tket {
 
diff --git a/tket/src/Utils/MatrixAnalysis.cpp b/tket/src/Utils/MatrixAnalysis.cpp
index 34e2d65065..be47ca66dd 100644
--- a/tket/src/Utils/MatrixAnalysis.cpp
+++ b/tket/src/Utils/MatrixAnalysis.cpp
@@ -14,7 +14,6 @@
 
 #include "tket/Utils/MatrixAnalysis.hpp"
 
-#include <fstream>
 #include <iostream>
 #include <limits>
 #include <map>
@@ -24,8 +23,6 @@
 #include <utility>
 #include <vector>
 
-#include "tket/Utils/EigenConfig.hpp"
-
 namespace tket {
 
 bool is_unitary(const Eigen::MatrixXcd &U, double tol) {
diff --git a/tket/src/Utils/UnitID.cpp b/tket/src/Utils/UnitID.cpp
index 773a1db178..6bd90f9ae1 100644
--- a/tket/src/Utils/UnitID.cpp
+++ b/tket/src/Utils/UnitID.cpp
@@ -16,8 +16,6 @@
 
 #include <sstream>
 
-#include "tket/Utils/Json.hpp"
-
 namespace tket {
 
 std::string UnitID::repr() const {
diff --git a/tket/test/src/Circuit/test_Circ.cpp b/tket/test/src/Circuit/test_Circ.cpp
index 270e63b38c..0575e382c7 100644
--- a/tket/test/src/Circuit/test_Circ.cpp
+++ b/tket/test/src/Circuit/test_Circ.cpp
@@ -20,7 +20,6 @@
 #include <vector>
 
 #include "../testutil.hpp"
-#include "tket/Circuit/CircUtils.hpp"
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/Circuit/DAGDefs.hpp"
 #include "tket/Circuit/Simulation/CircuitSimulator.hpp"
@@ -30,13 +29,11 @@
 #include "tket/OpType/OpType.hpp"
 #include "tket/OpType/OpTypeFunctions.hpp"
 #include "tket/Ops/ClassicalOps.hpp"
-#include "tket/Ops/Op.hpp"
 #include "tket/Ops/OpPtr.hpp"
 #include "tket/Transformations/Decomposition.hpp"
 #include "tket/Transformations/OptimisationPass.hpp"
 #include "tket/Transformations/Replacement.hpp"
 #include "tket/Transformations/Transform.hpp"
-#include "tket/Utils/MatrixAnalysis.hpp"
 #include "tket/Utils/UnitID.hpp"
 
 namespace tket {
diff --git a/tket/test/src/Circuit/test_CircPool.cpp b/tket/test/src/Circuit/test_CircPool.cpp
index 37a5a6db3c..34f343e145 100644
--- a/tket/test/src/Circuit/test_CircPool.cpp
+++ b/tket/test/src/Circuit/test_CircPool.cpp
@@ -15,7 +15,6 @@
 #include <catch2/catch_test_macros.hpp>
 
 #include "tket/Circuit/CircPool.hpp"
-#include "tket/Circuit/CircUtils.hpp"
 #include "tket/Circuit/Simulation/CircuitSimulator.hpp"
 #include "tket/Predicates/Predicates.hpp"
 
diff --git a/tket/test/src/Circuit/test_ConjugationBox.cpp b/tket/test/src/Circuit/test_ConjugationBox.cpp
index ca19699c26..7f9197bff4 100644
--- a/tket/test/src/Circuit/test_ConjugationBox.cpp
+++ b/tket/test/src/Circuit/test_ConjugationBox.cpp
@@ -16,15 +16,12 @@
 #include <boost/dynamic_bitset.hpp>
 #include <catch2/catch_template_test_macros.hpp>
 #include <catch2/catch_test_macros.hpp>
-#include <random>
 
 #include "../testutil.hpp"
 #include "tket/Circuit/Boxes.hpp"
-#include "tket/Circuit/CircUtils.hpp"
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/Circuit/ConjugationBox.hpp"
 #include "tket/Circuit/Simulation/CircuitSimulator.hpp"
-#include "tket/Gate/Rotation.hpp"
 
 namespace tket {
 namespace test_ConjugationBox {
diff --git a/tket/test/src/Circuit/test_DiagonalBox.cpp b/tket/test/src/Circuit/test_DiagonalBox.cpp
index 6327241367..f0c5b29987 100644
--- a/tket/test/src/Circuit/test_DiagonalBox.cpp
+++ b/tket/test/src/Circuit/test_DiagonalBox.cpp
@@ -20,11 +20,9 @@
 
 #include "../testutil.hpp"
 #include "tket/Circuit/Boxes.hpp"
-#include "tket/Circuit/CircUtils.hpp"
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/Circuit/DiagonalBox.hpp"
 #include "tket/Circuit/Simulation/CircuitSimulator.hpp"
-#include "tket/Gate/Rotation.hpp"
 
 namespace tket {
 namespace test_DiagonalBox {
diff --git a/tket/test/src/Circuit/test_Multiplexor.cpp b/tket/test/src/Circuit/test_Multiplexor.cpp
index 7c7f45ca4c..6c390993e3 100644
--- a/tket/test/src/Circuit/test_Multiplexor.cpp
+++ b/tket/test/src/Circuit/test_Multiplexor.cpp
@@ -18,7 +18,6 @@
 
 #include "../testutil.hpp"
 #include "tket/Circuit/Boxes.hpp"
-#include "tket/Circuit/CircUtils.hpp"
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/Circuit/Multiplexor.hpp"
 #include "tket/Circuit/Simulation/CircuitSimulator.hpp"
diff --git a/tket/test/src/Circuit/test_StatePreparation.cpp b/tket/test/src/Circuit/test_StatePreparation.cpp
index 02f55d113e..55000f6dd3 100644
--- a/tket/test/src/Circuit/test_StatePreparation.cpp
+++ b/tket/test/src/Circuit/test_StatePreparation.cpp
@@ -20,7 +20,6 @@
 
 #include "../testutil.hpp"
 #include "tket/Circuit/Boxes.hpp"
-#include "tket/Circuit/CircUtils.hpp"
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/Circuit/Simulation/CircuitSimulator.hpp"
 #include "tket/Circuit/StatePreparation.hpp"
diff --git a/tket/test/src/Circuit/test_ThreeQubitConversion.cpp b/tket/test/src/Circuit/test_ThreeQubitConversion.cpp
index 3e438f03a0..b683e81eeb 100644
--- a/tket/test/src/Circuit/test_ThreeQubitConversion.cpp
+++ b/tket/test/src/Circuit/test_ThreeQubitConversion.cpp
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <array>
 #include <catch2/catch_test_macros.hpp>
 #include <cmath>
 
@@ -26,8 +25,6 @@
 #include "tket/Transformations/Decomposition.hpp"
 #include "tket/Transformations/ThreeQubitSquash.hpp"
 #include "tket/Transformations/Transform.hpp"
-#include "tket/Utils/Constants.hpp"
-#include "tket/Utils/EigenConfig.hpp"
 #include "tket/Utils/UnitID.hpp"
 
 namespace tket {
diff --git a/tket/test/src/Circuit/test_ToffoliBox.cpp b/tket/test/src/Circuit/test_ToffoliBox.cpp
index f5fecf8173..6e9e374dfa 100644
--- a/tket/test/src/Circuit/test_ToffoliBox.cpp
+++ b/tket/test/src/Circuit/test_ToffoliBox.cpp
@@ -21,11 +21,9 @@
 
 #include "../testutil.hpp"
 #include "tket/Circuit/Boxes.hpp"
-#include "tket/Circuit/CircUtils.hpp"
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/Circuit/Simulation/CircuitSimulator.hpp"
 #include "tket/Circuit/ToffoliBox.hpp"
-#include "tket/Gate/Rotation.hpp"
 #include "tket/Utils/HelperFunctions.hpp"
 
 namespace tket {
diff --git a/tket/test/src/Gate/test_GateUnitaryMatrix.cpp b/tket/test/src/Gate/test_GateUnitaryMatrix.cpp
index 06bbbffde5..a1cca987d1 100644
--- a/tket/test/src/Gate/test_GateUnitaryMatrix.cpp
+++ b/tket/test/src/Gate/test_GateUnitaryMatrix.cpp
@@ -20,7 +20,6 @@
 
 #include "../testutil.hpp"
 #include "GatesData.hpp"
-#include "tket/Circuit/CircUtils.hpp"
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/Circuit/Simulation/CircuitSimulator.hpp"
 #include "tket/Gate/Gate.hpp"
diff --git a/tket/test/src/Graphs/test_ArticulationPoints.cpp b/tket/test/src/Graphs/test_ArticulationPoints.cpp
index 394e867870..09a1bde439 100644
--- a/tket/test/src/Graphs/test_ArticulationPoints.cpp
+++ b/tket/test/src/Graphs/test_ArticulationPoints.cpp
@@ -15,7 +15,6 @@
 #include <algorithm>
 #include <boost/graph/adjacency_list.hpp>
 #include <catch2/catch_test_macros.hpp>
-#include <iostream>
 #include <vector>
 
 #include "tket/Architecture/Architecture.hpp"
diff --git a/tket/test/src/Graphs/test_DirectedGraph.cpp b/tket/test/src/Graphs/test_DirectedGraph.cpp
index 2e742877cd..8b2ed58626 100644
--- a/tket/test/src/Graphs/test_DirectedGraph.cpp
+++ b/tket/test/src/Graphs/test_DirectedGraph.cpp
@@ -14,10 +14,8 @@
 
 #include <boost/graph/adjacency_list.hpp>
 #include <catch2/catch_test_macros.hpp>
-#include <iostream>
 #include <vector>
 
-#include "boost/range/iterator_range_core.hpp"
 #include "tket/Graphs/DirectedGraph.hpp"
 #include "tket/Utils/UnitID.hpp"
 
diff --git a/tket/test/src/Graphs/test_GraphUtils.cpp b/tket/test/src/Graphs/test_GraphUtils.cpp
index ca6ba74447..c6c5128120 100644
--- a/tket/test/src/Graphs/test_GraphUtils.cpp
+++ b/tket/test/src/Graphs/test_GraphUtils.cpp
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <algorithm>
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/range/iterator_range_core.hpp>
 #include <catch2/catch_test_macros.hpp>
diff --git a/tket/test/src/Ops/test_Ops.cpp b/tket/test/src/Ops/test_Ops.cpp
index b07654bbd5..593fe8bc25 100644
--- a/tket/test/src/Ops/test_Ops.cpp
+++ b/tket/test/src/Ops/test_Ops.cpp
@@ -19,7 +19,6 @@
 
 #include "../testutil.hpp"
 #include "tket/Circuit/Boxes.hpp"
-#include "tket/Circuit/CircUtils.hpp"
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/Circuit/PauliExpBoxes.hpp"
 #include "tket/Circuit/Simulation/CircuitSimulator.hpp"
@@ -27,7 +26,6 @@
 #include "tket/Gate/SymTable.hpp"
 #include "tket/OpType/OpType.hpp"
 #include "tket/Ops/OpPtr.hpp"
-#include "tket/Predicates/CompilerPass.hpp"
 #include "tket/Predicates/PassLibrary.hpp"
 #include "tket/Transformations/OptimisationPass.hpp"
 #include "tket/Utils/Constants.hpp"
diff --git a/tket/test/src/Placement/test_GraphPlacement.cpp b/tket/test/src/Placement/test_GraphPlacement.cpp
index 25fc2f75f6..4d78731e83 100644
--- a/tket/test/src/Placement/test_GraphPlacement.cpp
+++ b/tket/test/src/Placement/test_GraphPlacement.cpp
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 #include <catch2/catch_test_macros.hpp>
-#include <random>
 
 #include "../testutil.hpp"
 #include "tket/Placement/Placement.hpp"
diff --git a/tket/test/src/Placement/test_LinePlacement.cpp b/tket/test/src/Placement/test_LinePlacement.cpp
index 351e7defa4..4bc804fc20 100644
--- a/tket/test/src/Placement/test_LinePlacement.cpp
+++ b/tket/test/src/Placement/test_LinePlacement.cpp
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 #include <catch2/catch_test_macros.hpp>
-#include <random>
 
 #include "../testutil.hpp"
 #include "tket/Placement/Placement.hpp"
diff --git a/tket/test/src/Placement/test_NeighbourPlacements.cpp b/tket/test/src/Placement/test_NeighbourPlacements.cpp
index 18d2b0005c..b255156eb7 100644
--- a/tket/test/src/Placement/test_NeighbourPlacements.cpp
+++ b/tket/test/src/Placement/test_NeighbourPlacements.cpp
@@ -13,12 +13,9 @@
 // limitations under the License.
 
 #include <catch2/catch_test_macros.hpp>
-#include <random>
 #include <tket/Placement/NeighbourPlacements.hpp>
 #include <utility>
 
-#include "../testutil.hpp"
-
 namespace tket {
 namespace test_NeighbourPlacements {
 
diff --git a/tket/test/src/Placement/test_NoiseAwarePlacement.cpp b/tket/test/src/Placement/test_NoiseAwarePlacement.cpp
index df8d720a6f..be952f5c85 100644
--- a/tket/test/src/Placement/test_NoiseAwarePlacement.cpp
+++ b/tket/test/src/Placement/test_NoiseAwarePlacement.cpp
@@ -13,9 +13,7 @@
 // limitations under the License.
 
 #include <catch2/catch_test_macros.hpp>
-#include <random>
 
-#include "../testutil.hpp"
 #include "tket/Placement/Placement.hpp"
 
 namespace tket {
diff --git a/tket/test/src/Placement/test_Placement.cpp b/tket/test/src/Placement/test_Placement.cpp
index 8180d4ecad..caff2cdc7a 100644
--- a/tket/test/src/Placement/test_Placement.cpp
+++ b/tket/test/src/Placement/test_Placement.cpp
@@ -13,9 +13,7 @@
 // limitations under the License.
 
 #include <catch2/catch_test_macros.hpp>
-#include <random>
 
-#include "../testutil.hpp"
 #include "tket/Placement/Placement.hpp"
 
 namespace tket {
diff --git a/tket/test/src/Simulation/ComparisonFunctions.cpp b/tket/test/src/Simulation/ComparisonFunctions.cpp
index 42dad49e1b..a9f439e3d1 100644
--- a/tket/test/src/Simulation/ComparisonFunctions.cpp
+++ b/tket/test/src/Simulation/ComparisonFunctions.cpp
@@ -17,6 +17,8 @@
 #include <sstream>
 #include <stdexcept>
 
+#include "tket/Utils/MatrixAnalysis.hpp"
+
 // NOTE: this is used by both tket-proptests and tket-tests.
 // Since it's test-only code, it is NOT placed in tket.
 // However, we don't want to make proptests depend on tket-tests,
diff --git a/tket/test/src/Simulation/ComparisonFunctions.hpp b/tket/test/src/Simulation/ComparisonFunctions.hpp
index 403008219e..1a1f09442c 100644
--- a/tket/test/src/Simulation/ComparisonFunctions.hpp
+++ b/tket/test/src/Simulation/ComparisonFunctions.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "tket/Utils/MatrixAnalysis.hpp"
+#include "tket/Utils/EigenConfig.hpp"
 
 // NOTE: an identical copy also exists in proptests. This is deliberate.
 // Please ensure you update BOTH if you update either one of them!
diff --git a/tket/test/src/Simulation/test_PauliExpBoxUnitaryCalculator.cpp b/tket/test/src/Simulation/test_PauliExpBoxUnitaryCalculator.cpp
index 51abdc8f92..3bebcbb8ae 100644
--- a/tket/test/src/Simulation/test_PauliExpBoxUnitaryCalculator.cpp
+++ b/tket/test/src/Simulation/test_PauliExpBoxUnitaryCalculator.cpp
@@ -15,7 +15,6 @@
 #include <catch2/catch_test_macros.hpp>
 #include <stack>
 
-#include "tket/Circuit/Boxes.hpp"
 #include "tket/Circuit/PauliExpBoxes.hpp"
 #include "tket/Circuit/Simulation/PauliExpBoxUnitaryCalculator.hpp"
 #include "tket/Gate/GateUnitaryMatrix.hpp"
diff --git a/tket/test/src/TokenSwapping/TestUtils/TestStatsStructs.hpp b/tket/test/src/TokenSwapping/TestUtils/TestStatsStructs.hpp
index 7e2a73e770..6b15b239c4 100644
--- a/tket/test/src/TokenSwapping/TestUtils/TestStatsStructs.hpp
+++ b/tket/test/src/TokenSwapping/TestUtils/TestStatsStructs.hpp
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <cstdint>
 #include <limits>
 #include <string>
 
diff --git a/tket/test/src/TokenSwapping/test_DistancesFromArchitecture.cpp b/tket/test/src/TokenSwapping/test_DistancesFromArchitecture.cpp
index 36aa21cd3e..6582c2adf4 100644
--- a/tket/test/src/TokenSwapping/test_DistancesFromArchitecture.cpp
+++ b/tket/test/src/TokenSwapping/test_DistancesFromArchitecture.cpp
@@ -15,7 +15,6 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/matchers/catch_matchers_string.hpp>
 #include <sstream>
-#include <stdexcept>
 
 #include "tket/Architecture/DistancesFromArchitecture.hpp"
 
diff --git a/tket/test/src/TokenSwapping/test_SwapsFromQubitMapping.cpp b/tket/test/src/TokenSwapping/test_SwapsFromQubitMapping.cpp
index 179a28be00..8a9e34ca07 100644
--- a/tket/test/src/TokenSwapping/test_SwapsFromQubitMapping.cpp
+++ b/tket/test/src/TokenSwapping/test_SwapsFromQubitMapping.cpp
@@ -18,8 +18,6 @@
 
 #include "tket/Architecture/BestTsaWithArch.hpp"
 
-using std::vector;
-
 // Detailed algorithmic checks with quantitative benchmarks
 // are done elsewhere, so this is really just checking conversion.
 
diff --git a/tket/test/src/TokenSwapping/test_VariousPartialTsa.cpp b/tket/test/src/TokenSwapping/test_VariousPartialTsa.cpp
index 29ff0fd4a0..021940d953 100644
--- a/tket/test/src/TokenSwapping/test_VariousPartialTsa.cpp
+++ b/tket/test/src/TokenSwapping/test_VariousPartialTsa.cpp
@@ -19,7 +19,6 @@
 #include <tktokenswap/TrivialTSA.hpp>
 
 #include "TestUtils/ArchitectureEdgesReimplementation.hpp"
-#include "TestUtils/DebugFunctions.hpp"
 #include "TestUtils/PartialTsaTesting.hpp"
 #include "TestUtils/ProblemGeneration.hpp"
 
diff --git a/tket/test/src/Transformations/test_RedundancyRemoval.cpp b/tket/test/src/Transformations/test_RedundancyRemoval.cpp
index eb0170dc1b..1bcefa8af2 100644
--- a/tket/test/src/Transformations/test_RedundancyRemoval.cpp
+++ b/tket/test/src/Transformations/test_RedundancyRemoval.cpp
@@ -14,11 +14,9 @@
 
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/generators/catch_generators.hpp>
-#include <iostream>
 
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/Transformations/BasicOptimisation.hpp"
-#include "tket/Transformations/PQPSquash.hpp"
 
 namespace tket {
 namespace test_RedundancyRemoval {
diff --git a/tket/test/src/Utils/test_CosSinDecomposition.cpp b/tket/test/src/Utils/test_CosSinDecomposition.cpp
index 32404b5f0a..294bb89981 100644
--- a/tket/test/src/Utils/test_CosSinDecomposition.cpp
+++ b/tket/test/src/Utils/test_CosSinDecomposition.cpp
@@ -16,7 +16,6 @@
 #include <cstdlib>
 
 #include "../testutil.hpp"
-#include "tket/Utils/Constants.hpp"
 #include "tket/Utils/CosSinDecomposition.hpp"
 #include "tket/Utils/MatrixAnalysis.hpp"
 
diff --git a/tket/test/src/test_AASRoute.cpp b/tket/test/src/test_AASRoute.cpp
index c3197133b4..a84e72bbc3 100644
--- a/tket/test/src/test_AASRoute.cpp
+++ b/tket/test/src/test_AASRoute.cpp
@@ -1,22 +1,14 @@
-#include <algorithm>
 #include <catch2/catch_test_macros.hpp>
 
-#include "Simulation/ComparisonFunctions.hpp"
 #include "testutil.hpp"
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/Circuit/Simulation/CircuitSimulator.hpp"
 #include "tket/Mapping/AASLabelling.hpp"
 #include "tket/Mapping/AASRoute.hpp"
 #include "tket/Mapping/LexiLabelling.hpp"
-#include "tket/Mapping/LexiRoute.hpp"
 #include "tket/Mapping/MappingManager.hpp"
 #include "tket/OpType/OpType.hpp"
-#include "tket/OpType/OpTypeFunctions.hpp"
 #include "tket/Predicates/CompilationUnit.hpp"
-#include "tket/Predicates/CompilerPass.hpp"
-#include "tket/Predicates/PassGenerators.hpp"
-#include "tket/Predicates/PassLibrary.hpp"
-#include "tket/Transformations/ContextualReduction.hpp"
 
 namespace tket {
 SCENARIO("Test aas route in RV3") {
diff --git a/tket/test/src/test_Architectures.cpp b/tket/test/src/test_Architectures.cpp
index b22dc47fc4..e6f0c2820d 100644
--- a/tket/test/src/test_Architectures.cpp
+++ b/tket/test/src/test_Architectures.cpp
@@ -12,15 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <algorithm>
 #include <boost/graph/adjacency_list.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <cmath>
-#include <iostream>
 #include <vector>
 
 #include "tket/Architecture/Architecture.hpp"
-#include "tket/Graphs/ArticulationPoints.hpp"
 
 namespace tket {
 namespace graphs {
diff --git a/tket/test/src/test_Assertion.cpp b/tket/test/src/test_Assertion.cpp
index aa4410e26d..94e4511d79 100644
--- a/tket/test/src/test_Assertion.cpp
+++ b/tket/test/src/test_Assertion.cpp
@@ -15,12 +15,10 @@
 #include <catch2/catch_test_macros.hpp>
 #include <stdexcept>
 
-#include "testutil.hpp"
 #include "tket/Circuit/AssertionSynthesis.hpp"
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/Predicates/CompilationUnit.hpp"
 #include "tket/Predicates/PassLibrary.hpp"
-#include "tket/Utils/MatrixAnalysis.hpp"
 namespace tket {
 
 SCENARIO("Testing projector based assertion synthesis") {
diff --git a/tket/test/src/test_BoxDecompRoutingMethod.cpp b/tket/test/src/test_BoxDecompRoutingMethod.cpp
index 73e82ec81c..72b64cecc7 100644
--- a/tket/test/src/test_BoxDecompRoutingMethod.cpp
+++ b/tket/test/src/test_BoxDecompRoutingMethod.cpp
@@ -16,7 +16,7 @@
 #include "Simulation/ComparisonFunctions.hpp"
 #include "tket/Circuit/Simulation/CircuitSimulator.hpp"
 #include "tket/Mapping/BoxDecomposition.hpp"
-#include "tket/Mapping/LexiRoute.hpp"
+#include "tket/Mapping/LexiRouteRoutingMethod.hpp"
 #include "tket/Mapping/MappingManager.hpp"
 #include "tket/Predicates/Predicates.hpp"
 
diff --git a/tket/test/src/test_Combinators.cpp b/tket/test/src/test_Combinators.cpp
index f6d5844d24..605f578192 100644
--- a/tket/test/src/test_Combinators.cpp
+++ b/tket/test/src/test_Combinators.cpp
@@ -17,7 +17,6 @@
 #include "CircuitsForTesting.hpp"
 #include "Simulation/ComparisonFunctions.hpp"
 #include "tket/Circuit/Simulation/CircuitSimulator.hpp"
-#include "tket/Predicates/PassGenerators.hpp"
 #include "tket/Transformations/Combinator.hpp"
 #include "tket/Transformations/OptimisationPass.hpp"
 #include "tket/Transformations/Rebase.hpp"
diff --git a/tket/test/src/test_CompilerPass.cpp b/tket/test/src/test_CompilerPass.cpp
index 4bcb99043b..f287e7cb0d 100644
--- a/tket/test/src/test_CompilerPass.cpp
+++ b/tket/test/src/test_CompilerPass.cpp
@@ -18,7 +18,6 @@
 #include <tkrng/RNG.hpp>
 #include <vector>
 
-#include "Simulation/ComparisonFunctions.hpp"
 #include "testutil.hpp"
 #include "tket/Circuit/CircPool.hpp"
 #include "tket/Circuit/Circuit.hpp"
@@ -35,7 +34,6 @@
 #include "tket/Predicates/CompilerPass.hpp"
 #include "tket/Predicates/PassGenerators.hpp"
 #include "tket/Predicates/PassLibrary.hpp"
-#include "tket/Transformations/ContextualReduction.hpp"
 #include "tket/Transformations/MeasurePass.hpp"
 #include "tket/Transformations/OptimisationPass.hpp"
 #include "tket/Transformations/PauliOptimisation.hpp"
diff --git a/tket/test/src/test_ContextOpt.cpp b/tket/test/src/test_ContextOpt.cpp
index aee7604308..16e0d27d6b 100644
--- a/tket/test/src/test_ContextOpt.cpp
+++ b/tket/test/src/test_ContextOpt.cpp
@@ -22,7 +22,6 @@
 #include "tket/Predicates/PassGenerators.hpp"
 #include "tket/Transformations/ContextualReduction.hpp"
 #include "tket/Transformations/Transform.hpp"
-#include "tket/Utils/EigenConfig.hpp"
 
 namespace tket {
 namespace test_ContextOpt {
diff --git a/tket/test/src/test_ControlDecomp.cpp b/tket/test/src/test_ControlDecomp.cpp
index 9200554cd4..b346cd3f9e 100644
--- a/tket/test/src/test_ControlDecomp.cpp
+++ b/tket/test/src/test_ControlDecomp.cpp
@@ -22,7 +22,6 @@
 #include "tket/Circuit/Simulation/CircuitSimulator.hpp"
 #include "tket/Gate/GateUnitaryMatrix.hpp"
 #include "tket/Gate/SymTable.hpp"
-#include "tket/Transformations/CliffordReductionPass.hpp"
 #include "tket/Transformations/Decomposition.hpp"
 #include "tket/Transformations/OptimisationPass.hpp"
 #include "tket/Transformations/Replacement.hpp"
diff --git a/tket/test/src/test_DeviceCharacterisation.cpp b/tket/test/src/test_DeviceCharacterisation.cpp
index 54ffb429c8..d04661113f 100644
--- a/tket/test/src/test_DeviceCharacterisation.cpp
+++ b/tket/test/src/test_DeviceCharacterisation.cpp
@@ -15,7 +15,6 @@
 #include <catch2/catch_test_macros.hpp>
 
 #include "tket/Characterisation/DeviceCharacterisation.hpp"
-#include "tket/OpType/OpDesc.hpp"
 
 namespace tket {
 namespace test_DeviceCharacterisation {
diff --git a/tket/test/src/test_GlobalisePhasedX.cpp b/tket/test/src/test_GlobalisePhasedX.cpp
index 65265ac2e3..ab92a383ec 100644
--- a/tket/test/src/test_GlobalisePhasedX.cpp
+++ b/tket/test/src/test_GlobalisePhasedX.cpp
@@ -14,7 +14,6 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include "testutil.hpp"
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/Circuit/Simulation/CircuitSimulator.hpp"
 #include "tket/Transformations/Decomposition.hpp"
diff --git a/tket/test/src/test_GreedyPauli.cpp b/tket/test/src/test_GreedyPauli.cpp
index 2cca0e178a..16250ca8c8 100644
--- a/tket/test/src/test_GreedyPauli.cpp
+++ b/tket/test/src/test_GreedyPauli.cpp
@@ -14,7 +14,6 @@
 
 #include <catch2/catch_template_test_macros.hpp>
 #include <catch2/catch_test_macros.hpp>
-#include <optional>
 
 #include "testutil.hpp"
 #include "tket/Circuit/Circuit.hpp"
@@ -23,7 +22,6 @@
 #include "tket/Gate/SymTable.hpp"
 #include "tket/PauliGraph/PauliGraph.hpp"
 #include "tket/Predicates/PassGenerators.hpp"
-#include "tket/Transformations/Decomposition.hpp"
 #include "tket/Transformations/GreedyPauliOptimisation.hpp"
 #include "tket/Utils/Expression.hpp"
 
diff --git a/tket/test/src/test_LexiRoute.cpp b/tket/test/src/test_LexiRoute.cpp
index b333996eb3..58bfbbd280 100644
--- a/tket/test/src/test_LexiRoute.cpp
+++ b/tket/test/src/test_LexiRoute.cpp
@@ -25,9 +25,7 @@
 #include "tket/Predicates/CompilationUnit.hpp"
 #include "tket/Predicates/CompilerPass.hpp"
 #include "tket/Predicates/PassGenerators.hpp"
-#include "tket/Predicates/PassLibrary.hpp"
 #include "tket/Transformations/Decomposition.hpp"
-#include "tket/Utils/Json.hpp"
 
 namespace tket {
 
diff --git a/tket/test/src/test_LexicographicalComparison.cpp b/tket/test/src/test_LexicographicalComparison.cpp
index d148430b88..f1936142f6 100644
--- a/tket/test/src/test_LexicographicalComparison.cpp
+++ b/tket/test/src/test_LexicographicalComparison.cpp
@@ -14,8 +14,6 @@
 
 #include <catch2/catch_test_macros.hpp>
 #include <cstdlib>
-#include <fstream>
-#include <iostream>
 
 #include "tket/Mapping/LexicographicalComparison.hpp"
 
diff --git a/tket/test/src/test_MappingFrontier.cpp b/tket/test/src/test_MappingFrontier.cpp
index 510ce807b0..cccdb1eb6e 100644
--- a/tket/test/src/test_MappingFrontier.cpp
+++ b/tket/test/src/test_MappingFrontier.cpp
@@ -14,11 +14,11 @@
 
 #include <catch2/catch_test_macros.hpp>
 #include <cstdlib>
-#include <fstream>
-#include <iostream>
 
-#include "tket/Circuit/ClassicalExpBox.hpp"
-#include "tket/Mapping/MappingManager.hpp"
+#include "tket/Architecture/Architecture.hpp"
+#include "tket/Circuit/Circuit.hpp"
+#include "tket/Mapping/MappingFrontier.hpp"
+#include "tket/Utils/UnitID.hpp"
 
 namespace tket {
 
diff --git a/tket/test/src/test_MappingManager.cpp b/tket/test/src/test_MappingManager.cpp
index 1e0ab6544d..f59fea8674 100644
--- a/tket/test/src/test_MappingManager.cpp
+++ b/tket/test/src/test_MappingManager.cpp
@@ -14,8 +14,6 @@
 
 #include <catch2/catch_test_macros.hpp>
 #include <cstdlib>
-#include <fstream>
-#include <iostream>
 
 #include "tket/Mapping/MappingManager.hpp"
 
diff --git a/tket/test/src/test_MappingVerification.cpp b/tket/test/src/test_MappingVerification.cpp
index 4bc6893dd3..994aa6849a 100644
--- a/tket/test/src/test_MappingVerification.cpp
+++ b/tket/test/src/test_MappingVerification.cpp
@@ -15,7 +15,7 @@
 #include <catch2/catch_test_macros.hpp>
 
 #include "testutil.hpp"
-#include "tket/Mapping/LexiRoute.hpp"
+#include "tket/Mapping/LexiRouteRoutingMethod.hpp"
 #include "tket/Mapping/MappingManager.hpp"
 #include "tket/Mapping/Verification.hpp"
 #include "tket/Placement/Placement.hpp"
diff --git a/tket/test/src/test_MultiGateReorder.cpp b/tket/test/src/test_MultiGateReorder.cpp
index 990fc07c82..3fbe9a159c 100644
--- a/tket/test/src/test_MultiGateReorder.cpp
+++ b/tket/test/src/test_MultiGateReorder.cpp
@@ -15,7 +15,7 @@
 
 #include "Simulation/ComparisonFunctions.hpp"
 #include "tket/Circuit/Simulation/CircuitSimulator.hpp"
-#include "tket/Mapping/LexiRoute.hpp"
+#include "tket/Mapping/LexiRouteRoutingMethod.hpp"
 #include "tket/Mapping/MappingManager.hpp"
 #include "tket/Mapping/MultiGateReorder.hpp"
 #include "tket/Predicates/Predicates.hpp"
diff --git a/tket/test/src/test_Partition.cpp b/tket/test/src/test_Partition.cpp
index 602116b501..7b503adb31 100644
--- a/tket/test/src/test_Partition.cpp
+++ b/tket/test/src/test_Partition.cpp
@@ -14,7 +14,6 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include "testutil.hpp"
 #include "tket/Diagonalisation/PauliPartition.hpp"
 
 namespace tket {
diff --git a/tket/test/src/test_PhaseGadget.cpp b/tket/test/src/test_PhaseGadget.cpp
index 56f5182843..3c51deb47e 100644
--- a/tket/test/src/test_PhaseGadget.cpp
+++ b/tket/test/src/test_PhaseGadget.cpp
@@ -26,7 +26,6 @@
 #include "tket/Transformations/PauliOptimisation.hpp"
 #include "tket/Transformations/PhaseOptimisation.hpp"
 #include "tket/Transformations/Transform.hpp"
-#include "tket/Utils/EigenConfig.hpp"
 
 namespace tket {
 namespace test_PhaseGadget {
diff --git a/tket/test/src/test_PhasePolynomials.cpp b/tket/test/src/test_PhasePolynomials.cpp
index 8f712b5698..8004c539b9 100644
--- a/tket/test/src/test_PhasePolynomials.cpp
+++ b/tket/test/src/test_PhasePolynomials.cpp
@@ -17,14 +17,11 @@
 #include "CircuitsForTesting.hpp"
 #include "testutil.hpp"
 #include "tket/Circuit/Boxes.hpp"
-#include "tket/Circuit/CircUtils.hpp"
 #include "tket/Converters/PhasePoly.hpp"
-#include "tket/Predicates/CompilerPass.hpp"
 #include "tket/Predicates/PassLibrary.hpp"
 #include "tket/Transformations/Decomposition.hpp"
 #include "tket/Transformations/Rebase.hpp"
 #include "tket/Transformations/Transform.hpp"
-#include "tket/Utils/HelperFunctions.hpp"
 #include "tket/Utils/MatrixAnalysis.hpp"
 
 namespace tket {
diff --git a/tket/test/src/test_PhasedXFrontier.cpp b/tket/test/src/test_PhasedXFrontier.cpp
index 786d0ef5d3..a8b447059b 100644
--- a/tket/test/src/test_PhasedXFrontier.cpp
+++ b/tket/test/src/test_PhasedXFrontier.cpp
@@ -15,10 +15,8 @@
 #include <catch2/catch_test_macros.hpp>
 #include <optional>
 
-#include "testutil.hpp"
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/Circuit/Simulation/CircuitSimulator.hpp"
-#include "tket/Transformations/Decomposition.hpp"
 #include "tket/Transformations/PhasedXFrontier.hpp"
 #include "tket/Utils/Expression.hpp"
 
diff --git a/tket/test/src/test_Rebase.cpp b/tket/test/src/test_Rebase.cpp
index 17f5745765..f997dc9b82 100644
--- a/tket/test/src/test_Rebase.cpp
+++ b/tket/test/src/test_Rebase.cpp
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 #include <catch2/catch_test_macros.hpp>
-#include <numeric>
 
 #include "CircuitsForTesting.hpp"
 #include "Simulation/ComparisonFunctions.hpp"
@@ -25,7 +24,6 @@
 #include "tket/Transformations/Decomposition.hpp"
 #include "tket/Transformations/Rebase.hpp"
 #include "tket/Transformations/Transform.hpp"
-#include "tket/Utils/MatrixAnalysis.hpp"
 
 namespace tket {
 namespace test_Rebase {
diff --git a/tket/test/src/test_RoutingMethod.cpp b/tket/test/src/test_RoutingMethod.cpp
index f1118a57ba..94153e2f28 100644
--- a/tket/test/src/test_RoutingMethod.cpp
+++ b/tket/test/src/test_RoutingMethod.cpp
@@ -1,7 +1,5 @@
 #include <catch2/catch_test_macros.hpp>
 #include <cstdlib>
-#include <fstream>
-#include <iostream>
 
 #include "tket/Mapping/MappingFrontier.hpp"
 #include "tket/Mapping/RoutingMethodCircuit.hpp"
diff --git a/tket/test/src/test_RoutingPasses.cpp b/tket/test/src/test_RoutingPasses.cpp
index f25fa9d25f..7d54901793 100644
--- a/tket/test/src/test_RoutingPasses.cpp
+++ b/tket/test/src/test_RoutingPasses.cpp
@@ -14,27 +14,19 @@
 
 #include <catch2/catch_test_macros.hpp>
 #include <numeric>
-#include <optional>
 
-#include "Simulation/ComparisonFunctions.hpp"
 #include "testutil.hpp"
-#include "tket/Characterisation/DeviceCharacterisation.hpp"
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/Circuit/Simulation/CircuitSimulator.hpp"
 #include "tket/Mapping/LexiLabelling.hpp"
-#include "tket/Mapping/LexiRoute.hpp"
 #include "tket/Mapping/MappingManager.hpp"
 #include "tket/Mapping/Verification.hpp"
 #include "tket/OpType/OpType.hpp"
 #include "tket/Predicates/CompilerPass.hpp"
 #include "tket/Predicates/PassGenerators.hpp"
 #include "tket/Predicates/Predicates.hpp"
-#include "tket/Transformations/BasicOptimisation.hpp"
 #include "tket/Transformations/Decomposition.hpp"
-#include "tket/Transformations/OptimisationPass.hpp"
-#include "tket/Transformations/Rebase.hpp"
 #include "tket/Transformations/Transform.hpp"
-#include "tket/Utils/HelperFunctions.hpp"
 
 namespace tket {
 
diff --git a/tket/test/src/test_Synthesis.cpp b/tket/test/src/test_Synthesis.cpp
index 7e9921c256..e15e1025cd 100644
--- a/tket/test/src/test_Synthesis.cpp
+++ b/tket/test/src/test_Synthesis.cpp
@@ -22,7 +22,6 @@
 #include "Simulation/ComparisonFunctions.hpp"
 #include "testutil.hpp"
 #include "tket/Circuit/CircPool.hpp"
-#include "tket/Circuit/CircUtils.hpp"
 #include "tket/Circuit/Simulation/CircuitSimulator.hpp"
 #include "tket/Gate/Rotation.hpp"
 #include "tket/OpType/OpType.hpp"
diff --git a/tket/test/src/test_TwoQubitCanonical.cpp b/tket/test/src/test_TwoQubitCanonical.cpp
index 71f3f47115..2f36ec340f 100644
--- a/tket/test/src/test_TwoQubitCanonical.cpp
+++ b/tket/test/src/test_TwoQubitCanonical.cpp
@@ -26,7 +26,6 @@
 #include "tket/Transformations/BasicOptimisation.hpp"
 #include "tket/Transformations/Decomposition.hpp"
 #include "tket/Transformations/Transform.hpp"
-#include "tket/Utils/EigenConfig.hpp"
 #include "tket/Utils/MatrixAnalysis.hpp"
 
 namespace tket {
diff --git a/tket/test/src/test_json.cpp b/tket/test/src/test_json.cpp
index 4af2183bca..c7194ac709 100644
--- a/tket/test/src/test_json.cpp
+++ b/tket/test/src/test_json.cpp
@@ -14,7 +14,6 @@
 
 #include <boost/range/join.hpp>
 #include <catch2/catch_test_macros.hpp>
-#include <iostream>
 
 #include "CircuitsForTesting.hpp"
 #include "testutil.hpp"
@@ -34,7 +33,6 @@
 #include "tket/Converters/PhasePoly.hpp"
 #include "tket/Gate/SymTable.hpp"
 #include "tket/Mapping/LexiLabelling.hpp"
-#include "tket/Mapping/LexiRoute.hpp"
 #include "tket/Mapping/RoutingMethod.hpp"
 #include "tket/MeasurementSetup/MeasurementSetup.hpp"
 #include "tket/OpType/OpType.hpp"
diff --git a/tket/test/src/test_wasm.cpp b/tket/test/src/test_wasm.cpp
index f4fbe21bbd..1def6cda0c 100644
--- a/tket/test/src/test_wasm.cpp
+++ b/tket/test/src/test_wasm.cpp
@@ -15,11 +15,8 @@
 #include <Eigen/Core>
 #include <catch2/catch_test_macros.hpp>
 
-#include "testutil.hpp"
-#include "tket/Circuit/CircUtils.hpp"
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/Circuit/Simulation/CircuitSimulator.hpp"
-#include "tket/Converters/PhasePoly.hpp"
 #include "tket/Ops/ClassicalOps.hpp"
 
 namespace tket {
diff --git a/tket/test/src/testutil.cpp b/tket/test/src/testutil.cpp
index 44f92d4583..baba9c2cfa 100644
--- a/tket/test/src/testutil.cpp
+++ b/tket/test/src/testutil.cpp
@@ -19,8 +19,6 @@
 #include "Simulation/ComparisonFunctions.hpp"
 #include "tket/Circuit/Circuit.hpp"
 #include "tket/Circuit/Simulation/CircuitSimulator.hpp"
-#include "tket/Utils/EigenConfig.hpp"
-#include "tket/Utils/MatrixAnalysis.hpp"
 
 namespace tket {
 
diff --git a/tket/test/src/testutil.hpp b/tket/test/src/testutil.hpp
index 46d1809fe5..fa2a51285d 100644
--- a/tket/test/src/testutil.hpp
+++ b/tket/test/src/testutil.hpp
@@ -23,7 +23,6 @@
 #include <cstdlib>
 
 #include "tket/Circuit/Circuit.hpp"
-#include "tket/Utils/EigenConfig.hpp"
 
 namespace tket {