diff --git a/include/libsemigroups/sims.hpp b/include/libsemigroups/sims.hpp
index 197638058..d0fa54fe4 100644
--- a/include/libsemigroups/sims.hpp
+++ b/include/libsemigroups/sims.hpp
@@ -23,7 +23,6 @@
 // TODO(0):
 // * review the function aliases, and remove them if they are unnecessary
 // * doc
-// * iwyu
 // * const
 // * noexcept
 // * nodiscard
@@ -72,11 +71,11 @@
 #include <utility>        // for move, pair, swap
 #include <vector>         // for vector
 
-#include "constants.hpp"  // for operator!=, operator==, Max, UNDEFINED
-#include "debug.hpp"      // for LIBSEMIGROUPS_ASSERT
-#include "dot.hpp"        // for Dot
-#include "exception.hpp"  // for LIBSEMIGROUPS_EXCEPTION, LibsemigroupsExcep...
-#include "forest.hpp"     // for Forest
+#include "constants.hpp"     // for operator!=, operator==, Max, UNDEFINED
+#include "debug.hpp"         // for LIBSEMIGROUPS_ASSERT
+#include "dot.hpp"           // for Dot
+#include "exception.hpp"     // for LIBSEMIGROUPS_EXCEPTION
+#include "forest.hpp"        // for Forest
 #include "knuth-bendix.hpp"  // for KnuthBendix, to_presentation
 #include "matrix.hpp"        // for DynamicMatrix, MatrixCommon, BMat
 #include "presentation.hpp"  // for Presentation, longest_rule_length, short...
@@ -85,10 +84,13 @@
 #include "types.hpp"         // for word_type, relation_type, congruence_kind
 #include "word-graph.hpp"    // for Joiner, WordGraph
 
-#include "detail/felsch-graph.hpp"  // for FelschGraph
-#include "detail/fmt.hpp"           // for format, print
-#include "detail/iterator.hpp"      // for detail/default_postfix_increment
-#include "detail/rewriters.hpp"     // for RewriteTrie
+#include "detail/felsch-graph.hpp"    // for FelschGraph
+#include "detail/fmt.hpp"             // for format, print
+#include "detail/iterator.hpp"        // for detail/default_postfix_increment
+#include "detail/path-iterators.hpp"  // for const_pstilo_iterator
+#include "detail/report.hpp"          // for ReportCell
+#include "detail/rewriters.hpp"       // for RewriteTrie
+#include "detail/word-graph-with-sources.hpp"  // for WordGraphWithSources
 
 #include "rx/ranges.hpp"  // for operator|, iterator_range
 
@@ -365,7 +367,6 @@ namespace libsemigroups {
     //!
     //! \exception
     //! \no_libsemigroups_except
-    // TODO(0) (tests)
     Subclass& init();
 
     //! Copy constructor.
diff --git a/src/sims.cpp b/src/sims.cpp
index 832887a4c..5652e5e30 100644
--- a/src/sims.cpp
+++ b/src/sims.cpp
@@ -44,6 +44,7 @@
 #include "libsemigroups/froidure-pin.hpp"     // for FroidurePin
 #include "libsemigroups/knuth-bendix.hpp"     // for KnuthBendix, to_present...
 #include "libsemigroups/presentation.hpp"     // for Presentation
+#include "libsemigroups/ranges.hpp"           // for shortlex_compare
 #include "libsemigroups/runner.hpp"           // for delta, Reporter
 #include "libsemigroups/to-froidure-pin.hpp"  // for to_word_graph
 #include "libsemigroups/transf.hpp"           // for Transf, one
diff --git a/tests/test-sims.cpp b/tests/test-sims.cpp
index 02f465e89..5ddb7bf9d 100644
--- a/tests/test-sims.cpp
+++ b/tests/test-sims.cpp
@@ -51,8 +51,10 @@
 #include "libsemigroups/matrix.hpp"           // for DynamicMatrix, BMat
 #include "libsemigroups/order.hpp"            // for shortlex_compare, Order
 #include "libsemigroups/presentation.hpp"     // for Presentation
+#include "libsemigroups/ranges.hpp"           // for shortlex_compare
 #include "libsemigroups/sims.hpp"             // for Sims1
 #include "libsemigroups/to-froidure-pin.hpp"  // for make
+#include "libsemigroups/to-presentation.hpp"  // for to_presentation
 #include "libsemigroups/transf.hpp"           // for Transf
 #include "libsemigroups/types.hpp"            // for word_type
 #include "libsemigroups/word-graph.hpp"       // for WordGraph
@@ -60,10 +62,13 @@
 #include <libsemigroups/constants.hpp>        // for UNDEFINED
 #include <libsemigroups/todd-coxeter.hpp>     // for ToddCoxeter
 
-#include "libsemigroups/detail/eigen.hpp"     // for DenseBase::row
-#include "libsemigroups/detail/fmt.hpp"       // for format, print
-#include "libsemigroups/detail/iterator.hpp"  // for operator+
-#include "libsemigroups/detail/report.hpp"  // for ReportGuard, SuppressReportFor
+#include "libsemigroups/detail/eigen.hpp"           // for DenseBase::row
+#include "libsemigroups/detail/felsch-graph.hpp"    // for FelschGraph
+#include "libsemigroups/detail/fmt.hpp"             // for format, print
+#include "libsemigroups/detail/iterator.hpp"        // for operator+
+#include "libsemigroups/detail/path-iterators.hpp"  // for const_pstilo_iterator
+#include "libsemigroups/detail/report.hpp"          // for ReportGuard
+#include "libsemigroups/detail/word-graph-with-sources.hpp"  // for WordGra...
 
 #include "rx/ranges.hpp"  // for operator|, iterator_range
 
@@ -90,7 +95,7 @@ namespace libsemigroups {
   using fpsemigroup::zero_rook_monoid;
 
   namespace {
-    // TODO check_exclude
+    // TODO(2) check_exclude
     template <typename P>
     void check_include(P const& p, std::vector<word_type> const& e, size_t n) {
       auto foo = [&e](auto const& wg) {
@@ -1195,7 +1200,7 @@ namespace libsemigroups {
         {{4, 8}, {4, 5, 7}, {4, 7}, {5, 4, 7}};
     Sims1 sims;
     sims.presentation(p);
-    // TODO use SimsRefinerFaithful instead
+    // TODO(2) use SimsRefinerFaithful instead
     for (auto it = forbid.cbegin(); it != forbid.cend(); it += 2) {
       sims.exclude(*it, *(it + 1));
     }