From 3d05ecb4ac35c182018b70190431dab87f9a0b68 Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@lrde.epita.fr>
Date: Wed, 29 Nov 2023 16:59:45 +0100
Subject: [PATCH] remove many useless includes

Removal suggestions from clang-include-cleaner-17 applied manually.

* spot/gen/automata.cc, spot/ltsmin/ltsmin.cc, spot/misc/bitvect.cc,
spot/misc/intvcomp.cc, spot/misc/satsolver.cc, spot/misc/tmpfile.cc,
spot/priv/trim.cc, spot/priv/weight.cc, spot/ta/taexplicit.cc,
spot/ta/tgtaexplicit.cc, spot/ta/tgtaproduct.cc,
spot/taalgos/emptinessta.cc, spot/taalgos/minimize.cc,
spot/taalgos/reachiter.cc, spot/taalgos/statessetbuilder.cc,
spot/taalgos/tgba2ta.cc, spot/tl/apcollect.cc, spot/tl/contain.cc,
spot/tl/exclusive.cc, spot/tl/formula.cc, spot/tl/mark.cc,
spot/tl/randomltl.cc, spot/tl/relabel.cc, spot/tl/remove_x.cc,
spot/twa/acc.cc, spot/twa/bdddict.cc, spot/twa/taatgba.cc,
spot/twa/twagraph.cc, spot/twaalgos/aiger.cc,
spot/twaalgos/alternation.cc, spot/twaalgos/canonicalize.cc,
spot/twaalgos/cobuchi.cc, spot/twaalgos/complement.cc,
spot/twaalgos/compsusp.cc, spot/twaalgos/dbranch.cc,
spot/twaalgos/degen.cc, spot/twaalgos/determinize.cc,
spot/twaalgos/dot.cc, spot/twaalgos/dtbasat.cc,
spot/twaalgos/dtwasat.cc, spot/twaalgos/emptiness.cc,
spot/twaalgos/forq_contains.cc, spot/twaalgos/game.cc,
spot/twaalgos/genem.cc, spot/twaalgos/gv04.cc, spot/twaalgos/hoa.cc,
spot/twaalgos/isunamb.cc, spot/twaalgos/isweakscc.cc,
spot/twaalgos/lbtt.cc, spot/twaalgos/ltl2tgba_fm.cc,
spot/twaalgos/magic.cc, spot/twaalgos/mealy_machine.cc,
spot/twaalgos/minimize.cc, spot/twaalgos/neverclaim.cc,
spot/twaalgos/parity.cc, spot/twaalgos/powerset.cc,
spot/twaalgos/product.cc, spot/twaalgos/randomgraph.cc,
spot/twaalgos/randomize.cc, spot/twaalgos/relabel.cc,
spot/twaalgos/remfin.cc, spot/twaalgos/remprop.cc,
spot/twaalgos/sccinfo.cc, spot/twaalgos/se05.cc,
spot/twaalgos/sepsets.cc, spot/twaalgos/simulation.cc,
spot/twaalgos/split.cc, spot/twaalgos/strength.cc,
spot/twaalgos/stutter.cc, spot/twaalgos/synthesis.cc,
spot/twaalgos/tau03.cc, spot/twaalgos/tau03opt.cc,
spot/twaalgos/translate.cc, spot/twacube/cube.cc: Remove useless
includes.
---
 spot/gen/automata.cc             |  1 -
 spot/ltsmin/ltsmin.cc            |  5 -----
 spot/misc/bitvect.cc             |  1 -
 spot/misc/intvcomp.cc            |  1 -
 spot/misc/satsolver.cc           |  2 +-
 spot/misc/tmpfile.cc             |  2 +-
 spot/priv/trim.cc                |  1 -
 spot/priv/weight.cc              |  1 -
 spot/ta/taexplicit.cc            |  1 -
 spot/ta/tgtaexplicit.cc          |  2 --
 spot/ta/tgtaproduct.cc           |  3 ---
 spot/taalgos/emptinessta.cc      |  2 --
 spot/taalgos/minimize.cc         |  1 -
 spot/taalgos/reachiter.cc        |  1 -
 spot/taalgos/statessetbuilder.cc |  1 -
 spot/taalgos/tgba2ta.cc          |  3 ---
 spot/tl/apcollect.cc             |  4 +---
 spot/tl/contain.cc               |  2 --
 spot/tl/exclusive.cc             |  1 -
 spot/tl/formula.cc               |  1 -
 spot/tl/mark.cc                  |  2 --
 spot/tl/randomltl.cc             |  3 ---
 spot/tl/relabel.cc               |  1 -
 spot/tl/remove_x.cc              |  1 -
 spot/twa/acc.cc                  |  1 -
 spot/twa/bdddict.cc              |  2 --
 spot/twa/taatgba.cc              |  2 --
 spot/twa/twagraph.cc             |  1 -
 spot/twaalgos/aiger.cc           |  1 -
 spot/twaalgos/alternation.cc     |  2 +-
 spot/twaalgos/canonicalize.cc    |  1 -
 spot/twaalgos/cobuchi.cc         |  2 +-
 spot/twaalgos/complement.cc      |  1 -
 spot/twaalgos/compsusp.cc        |  4 +---
 spot/twaalgos/dbranch.cc         |  2 --
 spot/twaalgos/degen.cc           |  6 +-----
 spot/twaalgos/determinize.cc     |  2 --
 spot/twaalgos/dot.cc             |  2 --
 spot/twaalgos/dtbasat.cc         |  2 --
 spot/twaalgos/dtwasat.cc         |  2 --
 spot/twaalgos/emptiness.cc       |  1 -
 spot/twaalgos/forq_contains.cc   |  4 ----
 spot/twaalgos/game.cc            |  1 -
 spot/twaalgos/genem.cc           |  1 -
 spot/twaalgos/gv04.cc            |  1 -
 spot/twaalgos/hoa.cc             |  1 -
 spot/twaalgos/isunamb.cc         |  2 --
 spot/twaalgos/isweakscc.cc       |  1 -
 spot/twaalgos/lbtt.cc            | 12 ++++--------
 spot/twaalgos/ltl2tgba_fm.cc     |  2 --
 spot/twaalgos/magic.cc           |  1 -
 spot/twaalgos/mealy_machine.cc   |  3 ---
 spot/twaalgos/minimize.cc        |  6 +-----
 spot/twaalgos/neverclaim.cc      |  2 --
 spot/twaalgos/parity.cc          |  4 ----
 spot/twaalgos/powerset.cc        |  4 ----
 spot/twaalgos/product.cc         |  1 -
 spot/twaalgos/randomgraph.cc     |  3 ---
 spot/twaalgos/randomize.cc       |  1 -
 spot/twaalgos/relabel.cc         |  3 ---
 spot/twaalgos/remfin.cc          |  2 --
 spot/twaalgos/remprop.cc         |  1 -
 spot/twaalgos/sccinfo.cc         |  3 ---
 spot/twaalgos/se05.cc            |  1 -
 spot/twaalgos/sepsets.cc         |  1 -
 spot/twaalgos/simulation.cc      |  2 --
 spot/twaalgos/split.cc           |  4 ----
 spot/twaalgos/strength.cc        |  1 -
 spot/twaalgos/stutter.cc         |  5 -----
 spot/twaalgos/synthesis.cc       |  5 +----
 spot/twaalgos/tau03.cc           |  2 --
 spot/twaalgos/tau03opt.cc        |  1 -
 spot/twaalgos/translate.cc       |  1 -
 spot/twacube/cube.cc             |  1 -
 74 files changed, 13 insertions(+), 147 deletions(-)

diff --git a/spot/gen/automata.cc b/spot/gen/automata.cc
index 2e6c49458..a7f858a64 100644
--- a/spot/gen/automata.cc
+++ b/spot/gen/automata.cc
@@ -19,7 +19,6 @@
 #include "config.h"
 #include <spot/twa/twagraph.hh>
 #include <spot/gen/automata.hh>
-#include <spot/tl/parse.hh>
 #include <spot/misc/clz.hh>
 
 namespace spot
diff --git a/spot/ltsmin/ltsmin.cc b/spot/ltsmin/ltsmin.cc
index 27e869f46..145d91845 100644
--- a/spot/ltsmin/ltsmin.cc
+++ b/spot/ltsmin/ltsmin.cc
@@ -17,13 +17,10 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config.h"
-#include <ltdl.h>
 #include <cstring>
 #include <cstdlib>
 #include <vector>
 #include <sstream>
-#include <sys/stat.h>
-#include <unistd.h>
 
 #include <spot/ltsmin/ltsmin.hh>
 #include <spot/misc/hashfunc.hh>
@@ -32,9 +29,7 @@
 #include <spot/misc/intvcomp.hh>
 #include <spot/misc/intvcmp2.hh>
 
-#include <spot/twaalgos/reachiter.hh>
 #include <string.h>
-#include <spot/mc/utils.hh>
 
 using namespace std::string_literals;
 
diff --git a/spot/misc/bitvect.cc b/spot/misc/bitvect.cc
index 90eb2a55f..69de2d76f 100644
--- a/spot/misc/bitvect.cc
+++ b/spot/misc/bitvect.cc
@@ -25,7 +25,6 @@
 #include <cmath>
 #include <hashfunc.hh>
 #include <cstring>
-#include <climits>
 
 namespace spot
 {
diff --git a/spot/misc/intvcomp.cc b/spot/misc/intvcomp.cc
index b400d230c..c4d60619a 100644
--- a/spot/misc/intvcomp.cc
+++ b/spot/misc/intvcomp.cc
@@ -21,7 +21,6 @@
 #include <cstddef>
 #include <cassert>
 #include <spot/misc/intvcomp.hh>
-#include <iostream>
 
 namespace spot
 {
diff --git a/spot/misc/satsolver.cc b/spot/misc/satsolver.cc
index 9180b7f7c..fa5075f4f 100644
--- a/spot/misc/satsolver.cc
+++ b/spot/misc/satsolver.cc
@@ -26,7 +26,7 @@
 #include <fstream>
 #include <limits>
 #include <cassert>
-#include <sys/wait.h>
+#include <sys/wait.h>  // could be our replacement WIFEXITED from lib/
 
 namespace spot
 {
diff --git a/spot/misc/tmpfile.cc b/spot/misc/tmpfile.cc
index 154ee603c..e68cde7da 100644
--- a/spot/misc/tmpfile.cc
+++ b/spot/misc/tmpfile.cc
@@ -20,7 +20,7 @@
 #include <spot/misc/tmpfile.hh>
 #include <errno.h>
 #include <stdlib.h>
-#include <unistd.h>
+#include <unistd.h>             // unlink
 #include <string.h>
 
 using namespace std::string_literals;
diff --git a/spot/priv/trim.cc b/spot/priv/trim.cc
index 3fb449b86..db162dde2 100644
--- a/spot/priv/trim.cc
+++ b/spot/priv/trim.cc
@@ -20,7 +20,6 @@
 #include <spot/priv/trim.hh>
 #include <algorithm>
 #include <cctype>
-#include <locale>
 
 namespace spot
 {
diff --git a/spot/priv/weight.cc b/spot/priv/weight.cc
index 7a6164204..786ecd5c8 100644
--- a/spot/priv/weight.cc
+++ b/spot/priv/weight.cc
@@ -17,7 +17,6 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config.h"
-#include <cassert>
 #include <ostream>
 #include <spot/priv/weight.hh>
 
diff --git a/spot/ta/taexplicit.cc b/spot/ta/taexplicit.cc
index 17a7b6038..6a842ad1f 100644
--- a/spot/ta/taexplicit.cc
+++ b/spot/ta/taexplicit.cc
@@ -27,7 +27,6 @@
 #endif
 
 #include <spot/ta/taexplicit.hh>
-#include <spot/twa/formula2bdd.hh>
 #include <cassert>
 #include <spot/twa/bddprint.hh>
 
diff --git a/spot/ta/tgtaexplicit.cc b/spot/ta/tgtaexplicit.cc
index 14c8f0b14..74d0ab107 100644
--- a/spot/ta/tgtaexplicit.cc
+++ b/spot/ta/tgtaexplicit.cc
@@ -18,8 +18,6 @@
 
 #include "config.h"
 #include <spot/ta/tgtaexplicit.hh>
-#include <spot/twa/formula2bdd.hh>
-#include <spot/twa/bddprint.hh>
 
 namespace spot
 {
diff --git a/spot/ta/tgtaproduct.cc b/spot/ta/tgtaproduct.cc
index 81fbef2db..591a1c97b 100644
--- a/spot/ta/tgtaproduct.cc
+++ b/spot/ta/tgtaproduct.cc
@@ -28,9 +28,6 @@
 #endif
 
 #include <spot/ta/tgtaproduct.hh>
-#include <string>
-#include <cassert>
-#include <spot/misc/hashfunc.hh>
 #include <spot/kripke/kripke.hh>
 
 namespace spot
diff --git a/spot/taalgos/emptinessta.cc b/spot/taalgos/emptinessta.cc
index e91852388..ba89b3e15 100644
--- a/spot/taalgos/emptinessta.cc
+++ b/spot/taalgos/emptinessta.cc
@@ -27,9 +27,7 @@
 #endif
 
 #include <spot/taalgos/emptinessta.hh>
-#include <spot/misc/memusage.hh>
 #include <cstdlib>
-#include <spot/twa/bddprint.hh>
 
 namespace spot
 {
diff --git a/spot/taalgos/minimize.cc b/spot/taalgos/minimize.cc
index 28749ecdb..bda3a60f5 100644
--- a/spot/taalgos/minimize.cc
+++ b/spot/taalgos/minimize.cc
@@ -30,7 +30,6 @@
 #include <list>
 #include <sstream>
 #include <spot/taalgos/minimize.hh>
-#include <spot/misc/hash.hh>
 #include <spot/misc/bddlt.hh>
 #include <spot/ta/tgtaexplicit.hh>
 #include <spot/taalgos/statessetbuilder.hh>
diff --git a/spot/taalgos/reachiter.cc b/spot/taalgos/reachiter.cc
index b57f99a0d..b21d7b0ad 100644
--- a/spot/taalgos/reachiter.cc
+++ b/spot/taalgos/reachiter.cc
@@ -20,7 +20,6 @@
 #include <cassert>
 #include <spot/taalgos/reachiter.hh>
 
-#include <iostream>
 using namespace std;
 
 namespace spot
diff --git a/spot/taalgos/statessetbuilder.cc b/spot/taalgos/statessetbuilder.cc
index 563a96a92..399f6af41 100644
--- a/spot/taalgos/statessetbuilder.cc
+++ b/spot/taalgos/statessetbuilder.cc
@@ -17,7 +17,6 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config.h"
-#include <iostream>
 #include <spot/ta/ta.hh>
 #include <spot/taalgos/statessetbuilder.hh>
 #include <spot/taalgos/reachiter.hh>
diff --git a/spot/taalgos/tgba2ta.cc b/spot/taalgos/tgba2ta.cc
index 096080d6f..40e4b92cc 100644
--- a/spot/taalgos/tgba2ta.cc
+++ b/spot/taalgos/tgba2ta.cc
@@ -26,12 +26,9 @@
 #define trace while (0) std::clog
 #endif
 
-#include <spot/twa/formula2bdd.hh>
 #include <cassert>
-#include <spot/twa/bddprint.hh>
 #include <stack>
 #include <spot/taalgos/tgba2ta.hh>
-#include <spot/taalgos/statessetbuilder.hh>
 #include <spot/ta/tgtaexplicit.hh>
 
 using namespace std;
diff --git a/spot/tl/apcollect.cc b/spot/tl/apcollect.cc
index 8e6cdefea..61a570f3d 100644
--- a/spot/tl/apcollect.cc
+++ b/spot/tl/apcollect.cc
@@ -19,12 +19,10 @@
 #include "config.h"
 #include <map>
 #include <spot/tl/apcollect.hh>
-#include <spot/twa/twa.hh>
 #include <spot/twa/twagraph.hh>
 #include <spot/twa/bdddict.hh>
-#include <spot/twaalgos/hoa.hh>
+#include <spot/twaalgos/game.hh>
 #include <spot/twaalgos/sccinfo.hh>
-#include <spot/twaalgos/synthesis.hh>
 #include <spot/tl/relabel.hh>
 #include <spot/priv/robin_hood.hh>
 
diff --git a/spot/tl/contain.cc b/spot/tl/contain.cc
index 6782f6211..3df0134db 100644
--- a/spot/tl/contain.cc
+++ b/spot/tl/contain.cc
@@ -18,11 +18,9 @@
 
 #include "config.h"
 #include <spot/tl/contain.hh>
-#include <spot/tl/simplify.hh>
 #include <spot/tl/formula.hh>
 #include <spot/twaalgos/product.hh>
 #include <spot/twaalgos/are_isomorphic.hh>
-#include <spot/misc/hash.hh>
 #include <spot/priv/robin_hood.hh>
 #include <spot/twaalgos/ltl2tgba_fm.hh>
 
diff --git a/spot/tl/exclusive.cc b/spot/tl/exclusive.cc
index 2cc22af3e..4a284d139 100644
--- a/spot/tl/exclusive.cc
+++ b/spot/tl/exclusive.cc
@@ -19,7 +19,6 @@
 #include "config.h"
 #include <spot/tl/exclusive.hh>
 #include <spot/twaalgos/mask.hh>
-#include <spot/misc/casts.hh>
 #include <spot/misc/minato.hh>
 #include <spot/tl/apcollect.hh>
 
diff --git a/spot/tl/formula.cc b/spot/tl/formula.cc
index a1e67b475..3c5afc8d1 100644
--- a/spot/tl/formula.cc
+++ b/spot/tl/formula.cc
@@ -23,7 +23,6 @@
 #include <sstream>
 #include <map>
 #include <set>
-#include <tuple>
 #include <cstring>
 #include <algorithm>
 #include <spot/misc/bareword.hh>
diff --git a/spot/tl/mark.cc b/spot/tl/mark.cc
index b20d367b9..7bff532c7 100644
--- a/spot/tl/mark.cc
+++ b/spot/tl/mark.cc
@@ -18,8 +18,6 @@
 
 #include "config.h"
 #include <spot/tl/mark.hh>
-#include <cassert>
-#include <algorithm>
 #include <set>
 #include <vector>
 
diff --git a/spot/tl/randomltl.cc b/spot/tl/randomltl.cc
index 21e6b61b3..9aa604ee2 100644
--- a/spot/tl/randomltl.cc
+++ b/spot/tl/randomltl.cc
@@ -18,14 +18,11 @@
 
 #include "config.h"
 #include <cassert>
-#include <algorithm>
 #include <spot/tl/randomltl.hh>
 #include <spot/misc/random.hh>
 #include <iostream>
 #include <cstring>
 #include <spot/misc/optionmap.hh>
-#include <spot/tl/defaultenv.hh>
-#include <sstream>
 
 namespace spot
 {
diff --git a/spot/tl/relabel.cc b/spot/tl/relabel.cc
index 1a376f11b..385445ab7 100644
--- a/spot/tl/relabel.cc
+++ b/spot/tl/relabel.cc
@@ -20,7 +20,6 @@
 #include <spot/tl/relabel.hh>
 #include <spot/tl/simplify.hh>
 #include <sstream>
-#include <spot/misc/hash.hh>
 #include <map>
 #include <set>
 #include <stack>
diff --git a/spot/tl/remove_x.cc b/spot/tl/remove_x.cc
index 06f48179c..9a9c71127 100644
--- a/spot/tl/remove_x.cc
+++ b/spot/tl/remove_x.cc
@@ -17,7 +17,6 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config.h"
-#include <spot/tl/simplify.hh>
 #include <spot/tl/apcollect.hh>
 #include <spot/tl/remove_x.hh>
 
diff --git a/spot/twa/acc.cc b/spot/twa/acc.cc
index a06e784a2..fb7373ead 100644
--- a/spot/twa/acc.cc
+++ b/spot/twa/acc.cc
@@ -20,7 +20,6 @@
 #include "config.h"
 #include <iostream>
 #include <sstream>
-#include <set>
 #include <cctype>
 #include <cstring>
 #include <map>
diff --git a/spot/twa/bdddict.cc b/spot/twa/bdddict.cc
index e849ede7a..abb0704a5 100644
--- a/spot/twa/bdddict.cc
+++ b/spot/twa/bdddict.cc
@@ -18,11 +18,9 @@
 
 #include "config.h"
 #include <ostream>
-#include <sstream>
 #include <cassert>
 #include <spot/tl/print.hh>
 #include <spot/tl/formula.hh>
-#include <spot/tl/defaultenv.hh>
 #include "spot/priv/bddalloc.hh"
 #include <spot/twa/bdddict.hh>
 
diff --git a/spot/twa/taatgba.cc b/spot/twa/taatgba.cc
index 95ddc85ee..ccd28ede9 100644
--- a/spot/twa/taatgba.cc
+++ b/spot/twa/taatgba.cc
@@ -17,10 +17,8 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config.h"
-#include <map>
 #include <algorithm>
 #include <iterator>
-#include <iostream>
 #include <spot/twa/formula2bdd.hh>
 #include <spot/tl/print.hh>
 #include <spot/twa/taatgba.hh>
diff --git a/spot/twa/twagraph.cc b/spot/twa/twagraph.cc
index 0fc9aa292..9cf0a00ff 100644
--- a/spot/twa/twagraph.cc
+++ b/spot/twa/twagraph.cc
@@ -20,7 +20,6 @@
 #include <spot/twa/twagraph.hh>
 #include <spot/tl/print.hh>
 #include <spot/misc/bddlt.hh>
-#include <spot/misc/timer.hh>
 #include <spot/twa/bddprint.hh>
 #include <spot/kripke/kripkegraph.hh>
 #include <spot/misc/escape.hh>
diff --git a/spot/twaalgos/aiger.cc b/spot/twaalgos/aiger.cc
index 8f3bfdcc7..c5a2f8961 100644
--- a/spot/twaalgos/aiger.cc
+++ b/spot/twaalgos/aiger.cc
@@ -29,7 +29,6 @@
 #include <fstream>
 #include <string>
 #include <sstream>
-#include <initializer_list>
 
 #include <spot/twa/twagraph.hh>
 #include <spot/misc/bddlt.hh>
diff --git a/spot/twaalgos/alternation.cc b/spot/twaalgos/alternation.cc
index b247a4e57..88ca240eb 100644
--- a/spot/twaalgos/alternation.cc
+++ b/spot/twaalgos/alternation.cc
@@ -20,8 +20,8 @@
 #include <algorithm>
 #include <sstream>
 #include <spot/twaalgos/alternation.hh>
+#include <spot/twaalgos/sccinfo.hh>
 #include <spot/misc/minato.hh>
-#include <spot/twaalgos/strength.hh>
 
 namespace spot
 {
diff --git a/spot/twaalgos/canonicalize.cc b/spot/twaalgos/canonicalize.cc
index 3053445a4..27a5134d8 100644
--- a/spot/twaalgos/canonicalize.cc
+++ b/spot/twaalgos/canonicalize.cc
@@ -19,7 +19,6 @@
 #include "config.h"
 #include <spot/twaalgos/canonicalize.hh>
 #include <spot/twa/twagraph.hh>
-#include <set>
 #include <vector>
 
 namespace
diff --git a/spot/twaalgos/cobuchi.cc b/spot/twaalgos/cobuchi.cc
index 6eacdb489..986c982fb 100644
--- a/spot/twaalgos/cobuchi.cc
+++ b/spot/twaalgos/cobuchi.cc
@@ -21,7 +21,7 @@
 
 #include <spot/misc/bddlt.hh>
 #include <spot/misc/bitvect.hh>
-#include <spot/misc/hash.hh>
+#include <spot/misc/hashfunc.hh>
 #include <spot/twa/acc.hh>
 #include <spot/twa/bddprint.hh>
 #include <spot/twa/twagraph.hh>
diff --git a/spot/twaalgos/complement.cc b/spot/twaalgos/complement.cc
index 728b764d5..0a7f0cc16 100644
--- a/spot/twaalgos/complement.cc
+++ b/spot/twaalgos/complement.cc
@@ -18,7 +18,6 @@
 
 #include "config.h"
 #include <deque>
-#include <map>
 #include <spot/twaalgos/complement.hh>
 #include <spot/twaalgos/dualize.hh>
 #include <spot/twaalgos/isdet.hh>
diff --git a/spot/twaalgos/compsusp.cc b/spot/twaalgos/compsusp.cc
index 859602b3f..e738b7060 100644
--- a/spot/twaalgos/compsusp.cc
+++ b/spot/twaalgos/compsusp.cc
@@ -24,11 +24,9 @@
 #include <spot/twaalgos/ltl2tgba_fm.hh>
 #include <spot/twaalgos/minimize.hh>
 #include <spot/twaalgos/simulation.hh>
-#include <spot/twaalgos/strength.hh>
 #include <spot/tl/print.hh>
-#include <queue>
+#include <deque>
 #include <sstream>
-#include <spot/tl/environment.hh>
 
 namespace spot
 {
diff --git a/spot/twaalgos/dbranch.cc b/spot/twaalgos/dbranch.cc
index d4ba24db0..3e46c56c3 100644
--- a/spot/twaalgos/dbranch.cc
+++ b/spot/twaalgos/dbranch.cc
@@ -19,9 +19,7 @@
 #include "config.h"
 
 #include <spot/twaalgos/dbranch.hh>
-#include <spot/misc/bddlt.hh>
 #include <spot/priv/robin_hood.hh>
-#include <unordered_map>
 #include <utility>
 #include <stack>
 
diff --git a/spot/twaalgos/degen.cc b/spot/twaalgos/degen.cc
index 6e718459b..fc737e3f7 100644
--- a/spot/twaalgos/degen.cc
+++ b/spot/twaalgos/degen.cc
@@ -19,16 +19,12 @@
 #include "config.h"
 #include <spot/twaalgos/degen.hh>
 #include <spot/twa/twagraph.hh>
-#include <spot/misc/hash.hh>
 #include <spot/misc/hashfunc.hh>
+#include <spot/twaalgos/sccinfo.hh>
 #include <deque>
 #include <vector>
 #include <algorithm>
-#include <iterator>
 #include <memory>
-#include <spot/twaalgos/sccinfo.hh>
-#include <spot/twa/bddprint.hh>
-#include <spot/twaalgos/isdet.hh>
 
 //#define DEGEN_DEBUG
 
diff --git a/spot/twaalgos/determinize.cc b/spot/twaalgos/determinize.cc
index c99933467..a364ffa48 100644
--- a/spot/twaalgos/determinize.cc
+++ b/spot/twaalgos/determinize.cc
@@ -21,10 +21,8 @@
 #include <deque>
 #include <stack>
 #include <utility>
-#include <unordered_map>
 #include <set>
 #include <map>
-
 #include <spot/misc/bddlt.hh>
 #include <spot/twaalgos/sccinfo.hh>
 #include <spot/twaalgos/determinize.hh>
diff --git a/spot/twaalgos/dot.cc b/spot/twaalgos/dot.cc
index fd76e173f..2b5e68d01 100644
--- a/spot/twaalgos/dot.cc
+++ b/spot/twaalgos/dot.cc
@@ -23,7 +23,6 @@
 #include <spot/tl/print.hh>
 #include <spot/twa/twagraph.hh>
 #include <spot/twaalgos/dot.hh>
-#include <spot/twa/bddprint.hh>
 #include <spot/misc/escape.hh>
 #include <spot/twa/formula2bdd.hh>
 #include <spot/twaalgos/sccinfo.hh>
@@ -32,7 +31,6 @@
 #include <cstdlib>
 #include <cstring>
 #include <algorithm>
-#include <ctype.h>
 #include <utility>
 
 using namespace std::string_literals;
diff --git a/spot/twaalgos/dtbasat.cc b/spot/twaalgos/dtbasat.cc
index bc556d264..90319bd20 100644
--- a/spot/twaalgos/dtbasat.cc
+++ b/spot/twaalgos/dtbasat.cc
@@ -17,8 +17,6 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config.h"
-#include <fstream>
-#include <sstream>
 #include <map>
 #include <spot/misc/bddlt.hh>
 #include <spot/misc/satsolver.hh>
diff --git a/spot/twaalgos/dtwasat.cc b/spot/twaalgos/dtwasat.cc
index 9aee79d57..64dfbd5f6 100644
--- a/spot/twaalgos/dtwasat.cc
+++ b/spot/twaalgos/dtwasat.cc
@@ -17,8 +17,6 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config.h"
-#include <fstream>
-#include <sstream>
 #include <map>
 #include <spot/misc/bddlt.hh>
 #include <spot/misc/optionmap.hh>
diff --git a/spot/twaalgos/emptiness.cc b/spot/twaalgos/emptiness.cc
index d3f05ca38..10cc89553 100644
--- a/spot/twaalgos/emptiness.cc
+++ b/spot/twaalgos/emptiness.cc
@@ -25,7 +25,6 @@
 #include <spot/twaalgos/gtec/gtec.hh>
 #include <spot/twaalgos/gv04.hh>
 #include <spot/twaalgos/magic.hh>
-#include <spot/misc/hash.hh>
 #include <spot/twaalgos/se05.hh>
 #include <spot/twaalgos/tau03.hh>
 #include <spot/twaalgos/tau03opt.hh>
diff --git a/spot/twaalgos/forq_contains.cc b/spot/twaalgos/forq_contains.cc
index 1b6b54f01..106553160 100644
--- a/spot/twaalgos/forq_contains.cc
+++ b/spot/twaalgos/forq_contains.cc
@@ -19,9 +19,6 @@
 #include "config.h"
 #include <spot/twaalgos/split.hh>
 #include <spot/twaalgos/forq_contains.hh>
-
-#include <spot/twaalgos/contains.hh>
-#include <spot/twaalgos/product.hh>
 #include <spot/twaalgos/word.hh>
 #include <spot/misc/bddlt.hh>
 #include <spot/twa/twagraph.hh>
@@ -34,7 +31,6 @@
 #include <iterator>
 #include <optional>
 #include <vector>
-#include <string>
 #include <memory>
 #include <array>
 
diff --git a/spot/twaalgos/game.cc b/spot/twaalgos/game.cc
index 4850e07b2..3c7758161 100644
--- a/spot/twaalgos/game.cc
+++ b/spot/twaalgos/game.cc
@@ -20,7 +20,6 @@
 
 #include <utility>
 
-#include <spot/misc/timer.hh>
 #include <spot/twaalgos/game.hh>
 #include <spot/misc/escape.hh>
 #include <spot/twaalgos/sccinfo.hh>
diff --git a/spot/twaalgos/genem.cc b/spot/twaalgos/genem.cc
index 63ee7ce24..6e26d43fe 100644
--- a/spot/twaalgos/genem.cc
+++ b/spot/twaalgos/genem.cc
@@ -18,7 +18,6 @@
 
 #include "config.h"
 #include <spot/twaalgos/genem.hh>
-#include <spot/twaalgos/cleanacc.hh>
 
 namespace spot
 {
diff --git a/spot/twaalgos/gv04.cc b/spot/twaalgos/gv04.cc
index cdaebcc4a..4440437c3 100644
--- a/spot/twaalgos/gv04.cc
+++ b/spot/twaalgos/gv04.cc
@@ -30,7 +30,6 @@
 #include <utility>
 #include <vector>
 #include <spot/twa/twa.hh>
-#include <spot/misc/hash.hh>
 #include <spot/twaalgos/emptiness.hh>
 #include <spot/twaalgos/emptiness_stats.hh>
 #include <spot/twaalgos/gv04.hh>
diff --git a/spot/twaalgos/hoa.cc b/spot/twaalgos/hoa.cc
index 902af0007..644d8f166 100644
--- a/spot/twaalgos/hoa.cc
+++ b/spot/twaalgos/hoa.cc
@@ -27,7 +27,6 @@
 #include <spot/misc/escape.hh>
 #include <spot/misc/bddlt.hh>
 #include <spot/misc/minato.hh>
-#include <spot/twa/formula2bdd.hh>
 #include <spot/tl/formula.hh>
 #include <spot/kripke/fairkripke.hh>
 #include <spot/kripke/kripkegraph.hh>
diff --git a/spot/twaalgos/isunamb.cc b/spot/twaalgos/isunamb.cc
index 22fc0cdd8..4a9fc45d0 100644
--- a/spot/twaalgos/isunamb.cc
+++ b/spot/twaalgos/isunamb.cc
@@ -21,8 +21,6 @@
 #include <spot/twaalgos/product.hh>
 #include <spot/twaalgos/sccinfo.hh>
 #include <spot/twaalgos/mask.hh>
-#include <set>
-#include <list>
 
 namespace spot
 {
diff --git a/spot/twaalgos/isweakscc.cc b/spot/twaalgos/isweakscc.cc
index 6f4502e30..80fc09c26 100644
--- a/spot/twaalgos/isweakscc.cc
+++ b/spot/twaalgos/isweakscc.cc
@@ -17,7 +17,6 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config.h"
-#include <spot/tl/formula.hh>
 #include <spot/twaalgos/isweakscc.hh>
 #include <spot/twaalgos/genem.hh>
 
diff --git a/spot/twaalgos/lbtt.cc b/spot/twaalgos/lbtt.cc
index cb0d1abe5..9d8e58670 100644
--- a/spot/twaalgos/lbtt.cc
+++ b/spot/twaalgos/lbtt.cc
@@ -17,15 +17,11 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config.h"
-#include <spot/twaalgos/lbtt.hh>
-#include <map>
-#include <string>
-#include <ostream>
-#include <spot/twa/formula2bdd.hh>
-#include <spot/twaalgos/reachiter.hh>
-#include <spot/misc/bddlt.hh>
-#include "spot/priv/accmap.hh"
 #include <spot/tl/print.hh>
+#include <spot/twaalgos/lbtt.hh>
+#include <spot/twaalgos/reachiter.hh>
+#include <spot/twa/formula2bdd.hh>
+#include <spot/twa/twagraph.hh>
 
 using namespace std::string_literals;
 
diff --git a/spot/twaalgos/ltl2tgba_fm.cc b/spot/twaalgos/ltl2tgba_fm.cc
index 3ce8f86db..24c797f89 100644
--- a/spot/twaalgos/ltl2tgba_fm.cc
+++ b/spot/twaalgos/ltl2tgba_fm.cc
@@ -17,10 +17,8 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config.h"
-#include <spot/misc/hash.hh>
 #include <spot/misc/bddlt.hh>
 #include <spot/misc/minato.hh>
-#include <spot/tl/nenoform.hh>
 #include <spot/tl/print.hh>
 #include <spot/tl/apcollect.hh>
 #include <spot/tl/mark.hh>
diff --git a/spot/twaalgos/magic.cc b/spot/twaalgos/magic.cc
index 4fb3d5b07..635bba286 100644
--- a/spot/twaalgos/magic.cc
+++ b/spot/twaalgos/magic.cc
@@ -28,7 +28,6 @@
 
 #include <cassert>
 #include <list>
-#include <spot/misc/hash.hh>
 #include <spot/twa/twa.hh>
 #include <spot/twaalgos/emptiness.hh>
 #include <spot/twaalgos/emptiness_stats.hh>
diff --git a/spot/twaalgos/mealy_machine.cc b/spot/twaalgos/mealy_machine.cc
index 89f44cc6a..512848edb 100644
--- a/spot/twaalgos/mealy_machine.cc
+++ b/spot/twaalgos/mealy_machine.cc
@@ -22,7 +22,6 @@
 #include <queue>
 #include <deque>
 #include <set>
-#include <list>
 #include <vector>
 #include <sstream>
 #include <string>
@@ -33,9 +32,7 @@
 #include <spot/misc/timer.hh>
 #include <spot/misc/minato.hh>
 #include <spot/twaalgos/game.hh>
-#include <spot/twaalgos/hoa.hh>
 #include <spot/twaalgos/product.hh>
-#include <spot/twaalgos/relabel.hh>
 #include <spot/twaalgos/synthesis.hh>
 #include <spot/priv/partitioned_relabel.hh>
 
diff --git a/spot/twaalgos/minimize.cc b/spot/twaalgos/minimize.cc
index 4628df900..faaca1cae 100644
--- a/spot/twaalgos/minimize.cc
+++ b/spot/twaalgos/minimize.cc
@@ -25,17 +25,14 @@
 #endif
 
 #include "config.h"
-#include <queue>
-#include <deque>
 #include <set>
 #include <list>
 #include <vector>
+#include <stack>
 #include <sstream>
 #include <spot/twaalgos/minimize.hh>
-#include <spot/misc/hash.hh>
 #include <spot/misc/bddlt.hh>
 #include <spot/twaalgos/product.hh>
-#include <spot/twaalgos/gtec/gtec.hh>
 #include <spot/twaalgos/strength.hh>
 #include <spot/twaalgos/sccfilter.hh>
 #include <spot/twaalgos/sccinfo.hh>
@@ -44,7 +41,6 @@
 #include <spot/twaalgos/dualize.hh>
 #include <spot/twaalgos/remfin.hh>
 #include <spot/twaalgos/alternation.hh>
-#include <spot/tl/hierarchy.hh>
 
 namespace spot
 {
diff --git a/spot/twaalgos/neverclaim.cc b/spot/twaalgos/neverclaim.cc
index 59cb152a0..5afb0a0d4 100644
--- a/spot/twaalgos/neverclaim.cc
+++ b/spot/twaalgos/neverclaim.cc
@@ -18,9 +18,7 @@
 
 #include "config.h"
 #include <ostream>
-#include <sstream>
 #include <spot/twaalgos/neverclaim.hh>
-#include <spot/twa/bddprint.hh>
 #include <spot/twa/twagraph.hh>
 #include <spot/tl/print.hh>
 #include <spot/twa/formula2bdd.hh>
diff --git a/spot/twaalgos/parity.cc b/spot/twaalgos/parity.cc
index a54942400..f3765305f 100644
--- a/spot/twaalgos/parity.cc
+++ b/spot/twaalgos/parity.cc
@@ -19,14 +19,10 @@
 #include "config.h"
 #include <spot/twaalgos/parity.hh>
 #include <spot/twa/twagraph.hh>
-#include <spot/twaalgos/product.hh>
-#include <spot/twaalgos/complete.hh>
 #include <spot/twaalgos/sccinfo.hh>
 #include <algorithm>
 #include <vector>
 #include <utility>
-#include <functional>
-#include <queue>
 
 namespace spot
 {
diff --git a/spot/twaalgos/powerset.cc b/spot/twaalgos/powerset.cc
index c192d72fb..044ea21b9 100644
--- a/spot/twaalgos/powerset.cc
+++ b/spot/twaalgos/powerset.cc
@@ -21,16 +21,12 @@
 #include <iterator>
 #include <vector>
 #include <spot/twaalgos/powerset.hh>
-#include <spot/misc/hash.hh>
 #include <spot/twaalgos/sccinfo.hh>
 #include <spot/twaalgos/cycles.hh>
-#include <spot/twaalgos/gtec/gtec.hh>
 #include <spot/twaalgos/product.hh>
-#include <spot/twa/bddprint.hh>
 #include <spot/twaalgos/sccfilter.hh>
 #include <spot/twaalgos/ltl2tgba_fm.hh>
 #include <spot/twaalgos/dualize.hh>
-#include <spot/twaalgos/remfin.hh>
 #include <spot/misc/bitvect.hh>
 #include <spot/misc/bddlt.hh>
 
diff --git a/spot/twaalgos/product.cc b/spot/twaalgos/product.cc
index e494da1bb..ccb6085d5 100644
--- a/spot/twaalgos/product.cc
+++ b/spot/twaalgos/product.cc
@@ -24,7 +24,6 @@
 #include <spot/twaalgos/isdet.hh>
 #include <deque>
 #include <unordered_map>
-#include <spot/misc/hash.hh>
 
 using namespace std::string_literals;
 
diff --git a/spot/twaalgos/randomgraph.cc b/spot/twaalgos/randomgraph.cc
index b66b6df01..fe0f1edb9 100644
--- a/spot/twaalgos/randomgraph.cc
+++ b/spot/twaalgos/randomgraph.cc
@@ -20,9 +20,6 @@
 #include <spot/twaalgos/randomgraph.hh>
 #include <spot/twa/twagraph.hh>
 #include <spot/misc/random.hh>
-#include <spot/misc/bddlt.hh>
-#include <sstream>
-#include <list>
 #include <set>
 #include <iterator>
 #include <vector>
diff --git a/spot/twaalgos/randomize.cc b/spot/twaalgos/randomize.cc
index 32765ecbe..19c32bea0 100644
--- a/spot/twaalgos/randomize.cc
+++ b/spot/twaalgos/randomize.cc
@@ -19,7 +19,6 @@
 #include "config.h"
 #include <algorithm>
 #include <numeric>
-#include <random>
 #include <spot/twaalgos/randomize.hh>
 #include <spot/misc/random.hh>
 
diff --git a/spot/twaalgos/relabel.cc b/spot/twaalgos/relabel.cc
index 66c566846..594b8bdeb 100644
--- a/spot/twaalgos/relabel.cc
+++ b/spot/twaalgos/relabel.cc
@@ -20,12 +20,9 @@
 #include <spot/twaalgos/relabel.hh>
 #include <spot/twa/formula2bdd.hh>
 #include <spot/tl/formula.hh>
-
 #include <spot/priv/partitioned_relabel.hh>
-
 #include <cmath>
 #include <algorithm>
-#include <iostream>
 
 
 namespace spot
diff --git a/spot/twaalgos/remfin.cc b/spot/twaalgos/remfin.cc
index 6274c8255..435fdfa6c 100644
--- a/spot/twaalgos/remfin.cc
+++ b/spot/twaalgos/remfin.cc
@@ -22,8 +22,6 @@
 #include <iostream>
 #include <spot/twaalgos/cleanacc.hh>
 #include <spot/twaalgos/totgba.hh>
-#include <spot/twaalgos/isdet.hh>
-#include <spot/twaalgos/mask.hh>
 #include <spot/twaalgos/alternation.hh>
 #include <spot/twaalgos/degen.hh>
 
diff --git a/spot/twaalgos/remprop.cc b/spot/twaalgos/remprop.cc
index 380ba1a71..14570f148 100644
--- a/spot/twaalgos/remprop.cc
+++ b/spot/twaalgos/remprop.cc
@@ -19,7 +19,6 @@
 #include "config.h"
 #include <spot/twaalgos/remprop.hh>
 #include <spot/twaalgos/mask.hh>
-#include <spot/misc/casts.hh>
 #include <ctype.h>
 #include <sstream>
 
diff --git a/spot/twaalgos/sccinfo.cc b/spot/twaalgos/sccinfo.cc
index 947c7cd94..e8d2258b3 100644
--- a/spot/twaalgos/sccinfo.cc
+++ b/spot/twaalgos/sccinfo.cc
@@ -21,11 +21,8 @@
 #include <stack>
 #include <algorithm>
 #include <queue>
-#include <spot/twa/bddprint.hh>
-#include <spot/twaalgos/bfssteps.hh>
 #include <spot/twaalgos/mask.hh>
 #include <spot/twaalgos/genem.hh>
-#include <spot/misc/escape.hh>
 
 namespace spot
 {
diff --git a/spot/twaalgos/se05.cc b/spot/twaalgos/se05.cc
index 73558fcf7..a4eb21af5 100644
--- a/spot/twaalgos/se05.cc
+++ b/spot/twaalgos/se05.cc
@@ -28,7 +28,6 @@
 
 #include <cassert>
 #include <list>
-#include <spot/misc/hash.hh>
 #include <spot/twa/twa.hh>
 #include <spot/twaalgos/emptiness.hh>
 #include <spot/twaalgos/emptiness_stats.hh>
diff --git a/spot/twaalgos/sepsets.cc b/spot/twaalgos/sepsets.cc
index 264a9c128..8aa54d42b 100644
--- a/spot/twaalgos/sepsets.cc
+++ b/spot/twaalgos/sepsets.cc
@@ -18,7 +18,6 @@
 
 #include "config.h"
 #include <spot/twaalgos/sepsets.hh>
-#include <spot/twaalgos/sccinfo.hh>
 
 
 namespace spot
diff --git a/spot/twaalgos/simulation.cc b/spot/twaalgos/simulation.cc
index bdcb21846..1beb41b75 100644
--- a/spot/twaalgos/simulation.cc
+++ b/spot/twaalgos/simulation.cc
@@ -20,8 +20,6 @@
 #include <queue>
 #include <map>
 #include <utility>
-#include <cmath>
-#include <limits>
 #include <numeric>
 #include <spot/twaalgos/simulation.hh>
 #include <spot/misc/minato.hh>
diff --git a/spot/twaalgos/split.cc b/spot/twaalgos/split.cc
index 11146837d..d26877373 100644
--- a/spot/twaalgos/split.cc
+++ b/spot/twaalgos/split.cc
@@ -18,12 +18,8 @@
 
 #include "config.h"
 #include <spot/twaalgos/split.hh>
-#include <spot/misc/minato.hh>
 #include <spot/misc/bddlt.hh>
 #include <spot/priv/robin_hood.hh>
-
-#include <algorithm>
-#include <map>
 #include <unordered_set>
 
 namespace std
diff --git a/spot/twaalgos/strength.cc b/spot/twaalgos/strength.cc
index cd89c6892..0ba9d0637 100644
--- a/spot/twaalgos/strength.cc
+++ b/spot/twaalgos/strength.cc
@@ -18,7 +18,6 @@
 
 #include "config.h"
 #include <spot/twaalgos/strength.hh>
-#include <spot/misc/hash.hh>
 #include <spot/twaalgos/isweakscc.hh>
 #include <spot/twaalgos/mask.hh>
 #include <spot/twaalgos/minimize.hh>
diff --git a/spot/twaalgos/stutter.cc b/spot/twaalgos/stutter.cc
index 37fb0690f..622c8edeb 100644
--- a/spot/twaalgos/stutter.cc
+++ b/spot/twaalgos/stutter.cc
@@ -19,25 +19,20 @@
 #include "config.h"
 #include <spot/twaalgos/stutter.hh>
 #include <spot/twa/twa.hh>
-#include <spot/misc/hash.hh>
 #include <spot/misc/hashfunc.hh>
-#include <spot/tl/apcollect.hh>
 #include <spot/twaalgos/translate.hh>
 #include <spot/tl/remove_x.hh>
 #include <spot/twaalgos/product.hh>
 #include <spot/twaalgos/ltl2tgba_fm.hh>
 #include <spot/twaalgos/isdet.hh>
 #include <spot/twaalgos/complement.hh>
-#include <spot/twaalgos/remfin.hh>
 #include <spot/twaalgos/sccinfo.hh>
 #include <spot/twaalgos/word.hh>
 #include <spot/twa/twaproduct.hh>
 #include <spot/twa/bddprint.hh>
 #include <deque>
 #include <unordered_map>
-#include <unordered_set>
 #include <vector>
-#include <numeric>
 
 namespace spot
 {
diff --git a/spot/twaalgos/synthesis.cc b/spot/twaalgos/synthesis.cc
index 3f5bcf505..fef412e09 100644
--- a/spot/twaalgos/synthesis.cc
+++ b/spot/twaalgos/synthesis.cc
@@ -29,14 +29,11 @@
 #include <spot/twaalgos/synthesis.hh>
 #include <spot/twaalgos/translate.hh>
 #include <spot/twaalgos/zlktree.hh>
-#include <spot/misc/minato.hh>
-#include <spot/twaalgos/totgba.hh>
 #include <spot/twaalgos/toparity.hh>
 #include <spot/tl/parse.hh>
-
-
 #include <algorithm>
 #include <string>
+#include <stack>
 
 // Helper function/structures for split_2step
 namespace{
diff --git a/spot/twaalgos/tau03.cc b/spot/twaalgos/tau03.cc
index ec75d7bb6..307370dd0 100644
--- a/spot/twaalgos/tau03.cc
+++ b/spot/twaalgos/tau03.cc
@@ -30,8 +30,6 @@
 #endif
 
 #include <cassert>
-#include <list>
-#include <spot/misc/hash.hh>
 #include <spot/twa/twa.hh>
 #include <spot/twaalgos/emptiness.hh>
 #include <spot/twaalgos/emptiness_stats.hh>
diff --git a/spot/twaalgos/tau03opt.cc b/spot/twaalgos/tau03opt.cc
index a518160fb..0e7b0f1a4 100644
--- a/spot/twaalgos/tau03opt.cc
+++ b/spot/twaalgos/tau03opt.cc
@@ -41,7 +41,6 @@
 #include <cassert>
 #include <vector>
 #include <stack>
-#include <spot/misc/hash.hh>
 #include <spot/twa/twa.hh>
 #include <spot/twaalgos/emptiness.hh>
 #include <spot/twaalgos/emptiness_stats.hh>
diff --git a/spot/twaalgos/translate.cc b/spot/twaalgos/translate.cc
index 99c15ca46..1a5125f91 100644
--- a/spot/twaalgos/translate.cc
+++ b/spot/twaalgos/translate.cc
@@ -27,7 +27,6 @@
 #include <spot/twaalgos/isdet.hh>
 #include <spot/twaalgos/product.hh>
 #include <spot/twaalgos/sccinfo.hh>
-#include <spot/twaalgos/hoa.hh>
 #include <spot/twaalgos/dbranch.hh>
 
 namespace spot
diff --git a/spot/twacube/cube.cc b/spot/twacube/cube.cc
index b901c94a5..0f3531fb7 100644
--- a/spot/twacube/cube.cc
+++ b/spot/twacube/cube.cc
@@ -20,7 +20,6 @@
 #include <sstream>
 #include <iostream>
 #include <spot/twacube/cube.hh>
-#include <cassert>
 
 namespace spot
 {