diff --git a/alib2common/src/container/ContainerClasses.h b/alib2common/src/container/ContainerClasses.h
deleted file mode 100644
index 668e1c77b754e392bf91b102b3f9e3d2ae28b3b2..0000000000000000000000000000000000000000
--- a/alib2common/src/container/ContainerClasses.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * ContainerClasses.h
- *
- *  Created on: Jun 19, 2014
- *      Author: Jan Travnicek
- */
-
-#ifndef CONTAINER_CLASSES_H_
-#define CONTAINER_CLASSES_H_
-
-#include "ObjectsDeque.h"
-#include "ObjectsList.h"
-#include "ObjectsMap.h"
-#include "ObjectsPair.h"
-#include "ObjectsSet.h"
-#include "ObjectsTree.h"
-#include "ObjectsVector.h"
-
-#endif /* CONTAINER_CLASSES_H_ */
diff --git a/alib2common/src/primitive/PrimitiveClasses.h b/alib2common/src/primitive/PrimitiveClasses.h
deleted file mode 100644
index bb5b30940b8aa9b3fe819a30e373f1146a624e5b..0000000000000000000000000000000000000000
--- a/alib2common/src/primitive/PrimitiveClasses.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * PrimitiveClasses.h
- *
- *  Created on: Jun 19, 2014
- *      Author: Jan Travnicek
- */
-
-#ifndef PRIMITIVE_CLASSES_H_
-#define PRIMITIVE_CLASSES_H_
-
-#include "String.h"
-#include "Integer.h"
-#include "Character.h"
-#include "Unsigned.h"
-#include "Bool.h"
-
-#endif /* PRIMITIVE_CLASSES_H_ */
diff --git a/alib2data/src/automaton/AutomatonClasses.h b/alib2data/src/automaton/AutomatonClasses.h
deleted file mode 100644
index d1f120910bf6779a60ecb590e69139e0aaa796eb..0000000000000000000000000000000000000000
--- a/alib2data/src/automaton/AutomatonClasses.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * AutomatonClasses.h
- *
- *  Created on: Jun 19, 2014
- *      Author: Jan Travnicek
- */
-
-#ifndef AUTOMATON_CLASSES_H_
-#define AUTOMATON_CLASSES_H_
-
-#include "FSM/EpsilonNFA.h"
-#include "FSM/NFA.h"
-#include "FSM/MultiInitialStateNFA.h"
-#include "FSM/DFA.h"
-#include "FSM/CompactNFA.h"
-#include "FSM/ExtendedNFA.h"
-#include "PDA/DPDA.h"
-#include "PDA/SinglePopDPDA.h"
-#include "PDA/InputDrivenDPDA.h"
-#include "PDA/InputDrivenNPDA.h"
-#include "PDA/VisiblyPushdownDPDA.h"
-#include "PDA/VisiblyPushdownNPDA.h"
-#include "PDA/RealTimeHeightDeterministicDPDA.h"
-#include "PDA/RealTimeHeightDeterministicNPDA.h"
-#include "PDA/NPDA.h"
-#include "PDA/NPDTA.h"
-#include "PDA/SinglePopNPDA.h"
-#include "TM/OneTapeDTM.h"
-#include "TA/DFTA.h"
-#include "TA/NFTA.h"
-
-#endif /* AUTOMATON_CLASSES_H_ */
diff --git a/alib2data/src/grammar/GrammarClasses.h b/alib2data/src/grammar/GrammarClasses.h
deleted file mode 100644
index 06dd80e08f52d786f3441c37819eaa18f2df1c5f..0000000000000000000000000000000000000000
--- a/alib2data/src/grammar/GrammarClasses.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GrammarClasses.h
- *
- *  Created on: Jun 19, 2014
- *      Author: Jan Travnicek
- */
-
-#ifndef GRAMMAR_CLASSES_H_
-#define GRAMMAR_CLASSES_H_
-
-#include "Regular/RightRG.h"
-#include "Regular/LeftRG.h"
-#include "Regular/RightLG.h"
-#include "Regular/LeftLG.h"
-
-#include "ContextFree/LG.h"
-#include "ContextFree/CFG.h"
-#include "ContextFree/EpsilonFreeCFG.h"
-#include "ContextFree/GNF.h"
-#include "ContextFree/CNF.h"
-
-#include "ContextSensitive/CSG.h"
-#include "ContextSensitive/NonContractingGrammar.h"
-
-#include "Unrestricted/ContextPreservingUnrestrictedGrammar.h"
-#include "Unrestricted/UnrestrictedGrammar.h"
-
-#endif /* GRAMMAR_CLASSES_H_ */
diff --git a/alib2data/src/regexp/RegExpClasses.h b/alib2data/src/regexp/RegExpClasses.h
deleted file mode 100644
index aa1167ac9ea7ab44cc87e512c1d7a64863704e2b..0000000000000000000000000000000000000000
--- a/alib2data/src/regexp/RegExpClasses.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * RegExpClasses.h
- *
- *  Created on: Jun 19, 2014
- *      Author: Jan Travnicek
- */
-
-#ifndef REG_EXP_CLASSES_H_
-#define REG_EXP_CLASSES_H_
-
-#include "unbounded/UnboundedRegExp.h"
-#include "formal/FormalRegExp.h"
-
-#endif /* REG_EXP_CLASSES_H_ */
diff --git a/alib2data/src/rte/RTEClasses.h b/alib2data/src/rte/RTEClasses.h
deleted file mode 100644
index 56a68cea60c70ea2beaebcd467786396ae725a8c..0000000000000000000000000000000000000000
--- a/alib2data/src/rte/RTEClasses.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * RTEClasses.h
- *
- *  Created on: Feb 20, 2016
- *      Author: Tomas Pecka
- */
-
-#ifndef RTE_CLASSES_H_
-#define RTE_CLASSES_H_
-
-#include "formal/FormalRTE.h"
-
-#endif /* RTE_CLASSES_H_ */
diff --git a/alib2data/src/string/StringClasses.h b/alib2data/src/string/StringClasses.h
deleted file mode 100644
index 6e82ce2a401720b30927073f4ec0c6de917e7086..0000000000000000000000000000000000000000
--- a/alib2data/src/string/StringClasses.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * StringClasses.h
- *
- *  Created on: Jun 19, 2014
- *      Author: Jan Travnicek
- */
-
-#ifndef STRING_CLASSES_H_
-#define STRING_CLASSES_H_
-
-#include "CyclicString.h"
-#include "LinearString.h"
-#include "WildcardLinearString.h"
-#include "Epsilon.h"
-
-#endif /* STRING_CLASSES_H_ */
diff --git a/alib2data/src/tree/TreeClasses.h b/alib2data/src/tree/TreeClasses.h
deleted file mode 100644
index 64a3138b2b68e26ea075681c7be6ba7d7328d72f..0000000000000000000000000000000000000000
--- a/alib2data/src/tree/TreeClasses.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * TreeClasses.h
- *
- *  Created on: Nov 16, 2014
- *      Author: Jan Travnicek
- */
-
-#ifndef TREE_CLASSES_H_
-#define TREE_CLASSES_H_
-
-#include "ranked/RankedTree.h"
-#include "ranked/RankedPattern.h"
-#include "ranked/RankedNonlinearPattern.h"
-#include "ranked/PrefixRankedTree.h"
-#include "ranked/PrefixRankedBarTree.h"
-#include "ranked/PrefixRankedPattern.h"
-#include "ranked/PrefixRankedBarPattern.h"
-#include "ranked/PostfixRankedTree.h"
-#include "unranked/UnrankedTree.h"
-#include "unranked/UnrankedPattern.h"
-#include "unranked/UnrankedNonlinearPattern.h"
-
-#endif /* TREE_CLASSES_H_ */
diff --git a/alib2str/src/grammar/string/common/GrammarFromStringParserCommon.h b/alib2str/src/grammar/string/common/GrammarFromStringParserCommon.h
index 76524a9b61d052bf3c73127016264925bd84e742..3fb6bc532b0f9dd461dfdd2ed3ce0b49e26e8929 100644
--- a/alib2str/src/grammar/string/common/GrammarFromStringParserCommon.h
+++ b/alib2str/src/grammar/string/common/GrammarFromStringParserCommon.h
@@ -15,7 +15,6 @@
 
 #include <exception/CommonException.h>
 
-#include <grammar/GrammarClasses.h>
 #include <grammar/Grammar.h>
 
 #include <core/stringApi.hpp>
diff --git a/alib2str/src/grammar/string/common/GrammarToStringComposerCommon.h b/alib2str/src/grammar/string/common/GrammarToStringComposerCommon.h
index a7fbd9176c6e409a8639d339dac1453d3c3fa310..d10aad65ae782637c4904c4eb44bebd845e85aa8 100644
--- a/alib2str/src/grammar/string/common/GrammarToStringComposerCommon.h
+++ b/alib2str/src/grammar/string/common/GrammarToStringComposerCommon.h
@@ -10,9 +10,6 @@
 
 #include <ostream>
 
-#include <grammar/GrammarClasses.h>
-#include <grammar/Grammar.h>
-
 #include <core/stringApi.hpp>
 
 namespace grammar {