diff --git a/alib2algo/src/automaton/convert/ToPostfixPushdownAutomaton.cpp b/alib2algo/src/automaton/convert/ToPostfixPushdownAutomaton.cpp
index fae049fb02e9df80707f08e778efea6522a1e25d..f67754dd4895f56c0e9db1371607089954d5075c 100644
--- a/alib2algo/src/automaton/convert/ToPostfixPushdownAutomaton.cpp
+++ b/alib2algo/src/automaton/convert/ToPostfixPushdownAutomaton.cpp
@@ -21,6 +21,8 @@
 
 #include <registration/AlgoRegistration.hpp>
 
+#include <alphabet/RankedSymbol.h>
+
 namespace automaton {
 
 namespace convert {
diff --git a/alib2algo/src/automaton/convert/ToRegExpAlgebraic.h b/alib2algo/src/automaton/convert/ToRegExpAlgebraic.h
index bc91dcae1bdc85a0000dc8870e85f99f63b4e19f..a6bc5c239cf332931e4696571f4f0f0eb66ac815 100644
--- a/alib2algo/src/automaton/convert/ToRegExpAlgebraic.h
+++ b/alib2algo/src/automaton/convert/ToRegExpAlgebraic.h
@@ -9,7 +9,10 @@
 #define AUTOMATON_TO_REG_EXP_ALGEBRAIC_H_
 
 #include <regexp/unbounded/UnboundedRegExp.h>
-#include <automaton/AutomatonFeatures.h>
+#include <automaton/FSM/EpsilonNFA.h>
+#include <automaton/FSM/MultiInitialStateNFA.h>
+#include <automaton/FSM/NFA.h>
+#include <automaton/FSM/DFA.h>
 
 namespace automaton {
 
@@ -31,7 +34,7 @@ public:
 	static regexp::UnboundedRegExp < > convert(const automaton::EpsilonNFA < > & automaton);
 	static regexp::UnboundedRegExp < > convert(const automaton::MultiInitialStateNFA < > & automaton);
 	static regexp::UnboundedRegExp < > convert(const automaton::NFA < > & automaton);
-	static regexp::UnboundedRegExp < > convert(const automaton::DFA<>& automaton);
+	static regexp::UnboundedRegExp < > convert(const automaton::DFA < > & automaton);
 };
 
 } /* namespace convert */
diff --git a/alib2algo/src/automaton/determinize/Determinize.h b/alib2algo/src/automaton/determinize/Determinize.h
index f7dd25cab76299c8bba11de8a1d5ed10df22429b..02ad1f5a8d10c96e082c74bca2ce065fe844cdfb 100644
--- a/alib2algo/src/automaton/determinize/Determinize.h
+++ b/alib2algo/src/automaton/determinize/Determinize.h
@@ -10,14 +10,27 @@
 
 #include <alib/set>
 
-#include <automaton/Automaton.h>
-#include <automaton/AutomatonFeatures.h>
+#include <automaton/PDA/InputDrivenNPDA.h>
+#include <automaton/PDA/InputDrivenDPDA.h>
+#include <automaton/PDA/RealTimeHeightDeterministicNPDA.h>
+#include <automaton/PDA/RealTimeHeightDeterministicDPDA.h>
+#include <automaton/PDA/VisiblyPushdownNPDA.h>
+#include <automaton/PDA/VisiblyPushdownDPDA.h>
+#include <automaton/FSM/NFA.h>
+#include <automaton/FSM/DFA.h>
+#include <automaton/FSM/MultiInitialStateNFA.h>
+#include <automaton/TA/NFTA.h>
+#include <automaton/TA/DFTA.h>
 
 #include <automaton/transform/PDAToRHPDA.h>
 #include <automaton/transform/RHPDAToPDA.h>
 
-#include <automaton/PDA/RealTimeHeightDeterministicDPDA.h>
+#include <automaton/PDA/NPDA.h>
 #include <automaton/PDA/DPDA.h>
+#include <automaton/PDA/SinglePopNPDA.h>
+#include <automaton/PDA/SinglePopDPDA.h>
+
+#include <automaton/TM/OneTapeDTM.h>
 
 namespace automaton {
 
diff --git a/alib2algo/src/automaton/transform/PDAToRHPDA.h b/alib2algo/src/automaton/transform/PDAToRHPDA.h
index d14b7beccd94009d61f7b1236200c3a46fc23908..a9d679c1171587670b27a8ed541103bb1eb5fe64 100644
--- a/alib2algo/src/automaton/transform/PDAToRHPDA.h
+++ b/alib2algo/src/automaton/transform/PDAToRHPDA.h
@@ -8,7 +8,10 @@
 #ifndef PDA_TO_RHPDA_H_
 #define PDA_TO_RHPDA_H_
 
-#include "automaton/AutomatonFeatures.h"
+#include <automaton/PDA/RealTimeHeightDeterministicNPDA.h>
+#include <automaton/PDA/RealTimeHeightDeterministicDPDA.h>
+#include <automaton/PDA/NPDA.h>
+#include <automaton/PDA/DPDA.h>
 
 namespace automaton {
 
diff --git a/alib2algo/src/automaton/transform/RHPDAToPDA.h b/alib2algo/src/automaton/transform/RHPDAToPDA.h
index a3a416da6d3b8c5b1816b6556bf23a4783af14f6..3dcf0fb982c5177560abd807d0fe0475801cb42e 100644
--- a/alib2algo/src/automaton/transform/RHPDAToPDA.h
+++ b/alib2algo/src/automaton/transform/RHPDAToPDA.h
@@ -8,7 +8,11 @@
 #ifndef RHPDA_TO_PDA_H_
 #define RHPDA_TO_PDA_H_
 
-#include "automaton/AutomatonFeatures.h"
+#include <automaton/PDA/RealTimeHeightDeterministicNPDA.h>
+#include <automaton/PDA/RealTimeHeightDeterministicDPDA.h>
+#include <automaton/PDA/NPDA.h>
+#include <automaton/PDA/DPDA.h>
+
 
 namespace automaton {