diff --git a/alib2algo_experimental/src/automaton/RandomAutomatonFactory2.h b/alib2algo_experimental/src/automaton/RandomAutomatonFactory2.h
index 766b7177ae4c4e5aeaaa7fa561318d2c10be47d2..c50c113f66e1ab3e9588a630568da78709861775 100644
--- a/alib2algo_experimental/src/automaton/RandomAutomatonFactory2.h
+++ b/alib2algo_experimental/src/automaton/RandomAutomatonFactory2.h
@@ -8,10 +8,10 @@
 #ifndef RANDOM_AUTOMATON_FACTORY_2_H_
 #define RANDOM_AUTOMATON_FACTORY_2_H_
 
-#include <deque>
-#include <set>
-#include <algorithm>
-#include <random>
+#include <alib/deque>
+#include <alib/set>
+#include <alib/algorithm>
+#include <alib/random>
 
 #include <exception/CommonException.h>
 
diff --git a/alib2algo_experimental/src/grammar/parsing/AbsorbTerminalSymbol.h b/alib2algo_experimental/src/grammar/parsing/AbsorbTerminalSymbol.h
index a3185f7803314b5a07724d9dd667d320ee1ccb62..6ac109e685c5377ba6479571ed3083e9dea089a2 100644
--- a/alib2algo_experimental/src/grammar/parsing/AbsorbTerminalSymbol.h
+++ b/alib2algo_experimental/src/grammar/parsing/AbsorbTerminalSymbol.h
@@ -10,8 +10,8 @@
 
 #include <grammar/GrammarFeatures.h>
 #include <alphabet/Symbol.h>
-#include <set>
-#include <map>
+#include <alib/set>
+#include <alib/map>
 
 namespace grammar {
 
diff --git a/alib2algo_experimental/src/grammar/parsing/DeterministicLL1Grammar.cpp b/alib2algo_experimental/src/grammar/parsing/DeterministicLL1Grammar.cpp
index 7cf3d9faeb1ec455ba9e9b21d7c5dd5fda492e88..1ced2810c956f7606cc3c1860a660b571f6081f2 100644
--- a/alib2algo_experimental/src/grammar/parsing/DeterministicLL1Grammar.cpp
+++ b/alib2algo_experimental/src/grammar/parsing/DeterministicLL1Grammar.cpp
@@ -12,7 +12,7 @@
 
 #include <grammar/ContextFree/CFG.h>
 #include <exception/CommonException.h>
-#include <algorithm>
+#include <alib/algorithm>
 
 #include <grammar/properties/RecursiveNonterminal.h>
 #include <registration/AlgoRegistration.hpp>
diff --git a/alib2algo_experimental/src/grammar/parsing/DeterministicLL1ParseTable.h b/alib2algo_experimental/src/grammar/parsing/DeterministicLL1ParseTable.h
index db91d7210663f849bb76d81be4a25f37fb247dad..de905ce1fea911d9f923a7c571237a0ee33d2ebd 100644
--- a/alib2algo_experimental/src/grammar/parsing/DeterministicLL1ParseTable.h
+++ b/alib2algo_experimental/src/grammar/parsing/DeterministicLL1ParseTable.h
@@ -10,10 +10,10 @@
 
 #include <alphabet/Symbol.h>
 #include <string/Epsilon.h>
-#include <vector>
-#include <variant>
-#include <set>
-#include <map>
+#include <alib/vector>
+#include <alib/variant>
+#include <alib/set>
+#include <alib/map>
 
 namespace grammar {
 
diff --git a/alib2algo_experimental/src/grammar/parsing/ExtractRightContext.h b/alib2algo_experimental/src/grammar/parsing/ExtractRightContext.h
index c3bceebd5f4a5c475efc60acdb8ada705b87975c..7821f5c04c789613bcdffbb7df16eec19958ad9b 100644
--- a/alib2algo_experimental/src/grammar/parsing/ExtractRightContext.h
+++ b/alib2algo_experimental/src/grammar/parsing/ExtractRightContext.h
@@ -10,7 +10,7 @@
 
 #include <grammar/GrammarFeatures.h>
 #include <alphabet/Symbol.h>
-#include <set>
+#include <alib/set>
 
 namespace grammar {
 
diff --git a/alib2algo_experimental/src/grammar/parsing/First.h b/alib2algo_experimental/src/grammar/parsing/First.h
index 1cbb577d80efab4485cf851d8ca577d7ee6e4e0e..8b24a2ace34451df05badcade6288983a119ce5c 100644
--- a/alib2algo_experimental/src/grammar/parsing/First.h
+++ b/alib2algo_experimental/src/grammar/parsing/First.h
@@ -8,9 +8,9 @@
 #ifndef FIRST_H_
 #define FIRST_H_
 
-#include <vector>
-#include <set>
-#include <variant>
+#include <alib/vector>
+#include <alib/set>
+#include <alib/variant>
 
 #include <string/Epsilon.h>
 #include <grammar/Grammar.h>
diff --git a/alib2algo_experimental/src/grammar/parsing/Follow.h b/alib2algo_experimental/src/grammar/parsing/Follow.h
index 10f9d9a79f8403185b8ef27e558987e828da201f..341b1e006e44e9f5c027d7883d6202c96bed7907 100644
--- a/alib2algo_experimental/src/grammar/parsing/Follow.h
+++ b/alib2algo_experimental/src/grammar/parsing/Follow.h
@@ -8,11 +8,11 @@
 #ifndef FOLLOW_H_
 #define FOLLOW_H_
 
-#include <vector>
-#include <set>
-#include <variant>
-#include <algorithm>
-#include <iterator>
+#include <alib/vector>
+#include <alib/set>
+#include <alib/variant>
+#include <alib/algorithm>
+#include <alib/iterator>
 
 #include <exception/CommonException.h>
 
diff --git a/alib2algo_experimental/src/grammar/parsing/HandleFirstFirstConflict.h b/alib2algo_experimental/src/grammar/parsing/HandleFirstFirstConflict.h
index fc95695835e7367b1bc42e4a9d3b3337065f19e9..cfc6dc16ad941b2c3459360b3f793a405cb7d6f4 100644
--- a/alib2algo_experimental/src/grammar/parsing/HandleFirstFirstConflict.h
+++ b/alib2algo_experimental/src/grammar/parsing/HandleFirstFirstConflict.h
@@ -10,7 +10,7 @@
 
 #include <grammar/GrammarFeatures.h>
 #include <alphabet/Symbol.h>
-#include <vector>
+#include <alib/vector>
 
 namespace grammar {
 
diff --git a/alib2algo_experimental/src/grammar/parsing/HandleFirstFollowConflict.h b/alib2algo_experimental/src/grammar/parsing/HandleFirstFollowConflict.h
index 31b6ce228fe0b29d22957f055914ece8ca8ba6a6..02eb3611fec549d6b4172573575cee1d9acdb46e 100644
--- a/alib2algo_experimental/src/grammar/parsing/HandleFirstFollowConflict.h
+++ b/alib2algo_experimental/src/grammar/parsing/HandleFirstFollowConflict.h
@@ -10,8 +10,8 @@
 
 #include <grammar/GrammarFeatures.h>
 #include <alphabet/Symbol.h>
-#include <vector>
-#include <set>
+#include <alib/vector>
+#include <alib/set>
 
 namespace grammar {
 
diff --git a/alib2algo_experimental/src/grammar/parsing/LL1ParseTable.h b/alib2algo_experimental/src/grammar/parsing/LL1ParseTable.h
index 56601ef5076aa0ca55f2d6f26fc97ad294d5be04..ef2120525ce8511bd99eceea2772290c324f45b4 100644
--- a/alib2algo_experimental/src/grammar/parsing/LL1ParseTable.h
+++ b/alib2algo_experimental/src/grammar/parsing/LL1ParseTable.h
@@ -8,10 +8,10 @@
 #ifndef LL_1_PARSE_TABLE_H_
 #define LL_1_PARSE_TABLE_H_
 
-#include <vector>
-#include <variant>
-#include <set>
-#include <map>
+#include <alib/vector>
+#include <alib/variant>
+#include <alib/set>
+#include <alib/map>
 
 #include <grammar/Grammar.h>
 #include <string/Epsilon.h>
diff --git a/alib2algo_experimental/src/grammar/parsing/LRParser.h b/alib2algo_experimental/src/grammar/parsing/LRParser.h
index 48e0f3f7a19e96670e2d62bd88ab2ca4b33e89e6..f759a6f7e5ac998fdf6b10687cdf06e495191981 100644
--- a/alib2algo_experimental/src/grammar/parsing/LRParser.h
+++ b/alib2algo_experimental/src/grammar/parsing/LRParser.h
@@ -12,7 +12,7 @@
 #include <grammar/ContextFree/CFG.h>
 #include <grammar/parsing/LRParserTypes.h>
 
-#include <vector>
+#include <alib/vector>
 
 namespace grammar {
 
diff --git a/alib2algo_experimental/src/grammar/parsing/common/Substitute.h b/alib2algo_experimental/src/grammar/parsing/common/Substitute.h
index f6a9ac46e4e58b6afa415cb0a84a34e4a5d24d8c..2799e225fa45c0a1e077ae1c1935e9dd4c225259 100644
--- a/alib2algo_experimental/src/grammar/parsing/common/Substitute.h
+++ b/alib2algo_experimental/src/grammar/parsing/common/Substitute.h
@@ -10,7 +10,7 @@
 
 #include <grammar/GrammarFeatures.h>
 #include <alphabet/Symbol.h>
-#include <vector>
+#include <alib/vector>
 
 namespace grammar {
 
diff --git a/alib2algo_experimental/src/graph/datastructs/Components.h b/alib2algo_experimental/src/graph/datastructs/Components.h
index c3564e4ab4690460f1e106ff8f6179c17d098191..aa72e087f6d6ce9bd43a6a3512131f1de84bd18b 100644
--- a/alib2algo_experimental/src/graph/datastructs/Components.h
+++ b/alib2algo_experimental/src/graph/datastructs/Components.h
@@ -5,7 +5,7 @@
  *       Author: Jan Broz
  */
 
-#include <unordered_map>
+#include <alib/unordered_map>
 
 #include <graph/common/Node.h>
 
diff --git a/alib2algo_experimental/src/graph/embedding/HopcroftTarjan.cpp b/alib2algo_experimental/src/graph/embedding/HopcroftTarjan.cpp
index 202f6f3d15cb1d8d64478422171ca5d377a9d423..55fd35f6da9d1c0c51939ca16c5ebb8e48163e56 100644
--- a/alib2algo_experimental/src/graph/embedding/HopcroftTarjan.cpp
+++ b/alib2algo_experimental/src/graph/embedding/HopcroftTarjan.cpp
@@ -7,9 +7,9 @@
 
 #include "HopcroftTarjan.h"
 
-#include <list>
+#include <alib/list>
 #include <stack>
-#include <algorithm>
+#include <alib/algorithm>
 
 #include <exception/CommonException.h>
 
diff --git a/alib2algo_experimental/src/graph/generate/RandomGraphFactory.cpp b/alib2algo_experimental/src/graph/generate/RandomGraphFactory.cpp
index 888c711261a1ecd1433ff204e3fc20672b473d50..64bc8b27262266e8b026e7648af77f471b095f4d 100644
--- a/alib2algo_experimental/src/graph/generate/RandomGraphFactory.cpp
+++ b/alib2algo_experimental/src/graph/generate/RandomGraphFactory.cpp
@@ -8,10 +8,10 @@
 
 #include "RandomGraphFactory.h"
 
-#include <random>
-#include <algorithm>
-#include <unordered_map>
-#include <iostream>
+#include <alib/random>
+#include <alib/algorithm>
+#include <alib/unordered_map>
+#include <alib/iostream>
 #include <sstream>
 
 #include "../datastructs/Array.h"
diff --git a/alib2algo_experimental/src/graph/isomorphism/HopcroftGraph.cpp b/alib2algo_experimental/src/graph/isomorphism/HopcroftGraph.cpp
index 8c0a4c7563a14b85c72c51f907b79f4911557411..145fc9c880ce9186a3c6cfa352e170b5383ddbf2 100644
--- a/alib2algo_experimental/src/graph/isomorphism/HopcroftGraph.cpp
+++ b/alib2algo_experimental/src/graph/isomorphism/HopcroftGraph.cpp
@@ -8,11 +8,11 @@
 #include "HopcroftGraph.h"
 #include "HopcroftDebug.h"
 
-#include <algorithm>
+#include <alib/algorithm>
 
 #include <exception/CommonException.h>
 
-#include <iostream>
+#include <alib/iostream>
 
 namespace graph
 {
diff --git a/alib2algo_experimental/src/graph/isomorphism/HopcroftGraph.h b/alib2algo_experimental/src/graph/isomorphism/HopcroftGraph.h
index 0eb92a9a0967f2471bd0cd895fa79fb9d3bc9577..9b3ef2618a12d99ed3e2a486527988b75db3b44c 100644
--- a/alib2algo_experimental/src/graph/isomorphism/HopcroftGraph.h
+++ b/alib2algo_experimental/src/graph/isomorphism/HopcroftGraph.h
@@ -8,7 +8,7 @@
 #ifndef GRAPH_HOPCROFT_GRAPH_H_
 #define GRAPH_HOPCROFT_GRAPH_H_
 
-#include <vector>
+#include <alib/vector>
 
 #include <graph/GraphClasses.h>
 
diff --git a/alib2algo_experimental/src/graph/isomorphism/HopcroftImpl.cpp b/alib2algo_experimental/src/graph/isomorphism/HopcroftImpl.cpp
index ac9d4d65737b72fe4e011396245d2ac45fd8f271..2ca9d017bc8da28fb6aaa680fd2fc474340ffb35 100644
--- a/alib2algo_experimental/src/graph/isomorphism/HopcroftImpl.cpp
+++ b/alib2algo_experimental/src/graph/isomorphism/HopcroftImpl.cpp
@@ -8,9 +8,9 @@
 #include "HopcroftImpl.h"
 #include "HopcroftDebug.h"
 
-#include <tuple>
-#include <iostream>
-#include <algorithm>
+#include <alib/tuple>
+#include <alib/iostream>
+#include <alib/algorithm>
 
 #include <exception/CommonException.h>
 
diff --git a/alib2algo_experimental/src/graph/isomorphism/HopcroftImpl.h b/alib2algo_experimental/src/graph/isomorphism/HopcroftImpl.h
index 9a283628b5882fecca3d0121072c8fefed5fe0a0..167503b73b5b2c6fa7135e6c2cc2a6bf8575ffb7 100644
--- a/alib2algo_experimental/src/graph/isomorphism/HopcroftImpl.h
+++ b/alib2algo_experimental/src/graph/isomorphism/HopcroftImpl.h
@@ -8,9 +8,9 @@
 #ifndef GRAPH_HOPCROFT_IMPL_H_
 #define GRAPH_HOPCROFT_IMPL_H_
 
-#include <list>
-#include <vector>
-#include <unordered_map>
+#include <alib/list>
+#include <alib/vector>
+#include <alib/unordered_map>
 
 #include "HopcroftGraph.h"
 
diff --git a/alib2algo_experimental/src/graph/maximumflow/FordFulkerson.cpp b/alib2algo_experimental/src/graph/maximumflow/FordFulkerson.cpp
index 26ab8ccb59d24f836d7aff767dec27bf8eb01040..90ca375a2b729ce7ef852bcedb0a40d055a747dd 100644
--- a/alib2algo_experimental/src/graph/maximumflow/FordFulkerson.cpp
+++ b/alib2algo_experimental/src/graph/maximumflow/FordFulkerson.cpp
@@ -7,9 +7,9 @@
 
 #include "FordFulkerson.h"
 
-#include <unordered_map>
+#include <alib/unordered_map>
 #include <queue>
-#include <string>
+#include <alib/string>
 #include <sstream>
 #include <climits>
 #include <stdexcept>
diff --git a/alib2algo_experimental/src/graph/maximumflow/FordFulkerson.h b/alib2algo_experimental/src/graph/maximumflow/FordFulkerson.h
index 4a40f8b4f38b2cad539b1da0c9339da08d764d25..5ebee61093ba7b0725a5c24a6edb1a2b75395703 100644
--- a/alib2algo_experimental/src/graph/maximumflow/FordFulkerson.h
+++ b/alib2algo_experimental/src/graph/maximumflow/FordFulkerson.h
@@ -8,7 +8,7 @@
 #ifndef FORD_FULKERSON
 #define FORD_FULKERSON
 
-#include <unordered_map>
+#include <alib/unordered_map>
 
 #include <graph/GraphClasses.h>
 
diff --git a/alib2algo_experimental/src/graph/minimumcut/FordFulkerson.cpp b/alib2algo_experimental/src/graph/minimumcut/FordFulkerson.cpp
index bf5c723188c11afc6a117b6b9f5733a3956e8bf9..1bf93fe7ad24c869d2fa11705e55c419cbbc9ee6 100644
--- a/alib2algo_experimental/src/graph/minimumcut/FordFulkerson.cpp
+++ b/alib2algo_experimental/src/graph/minimumcut/FordFulkerson.cpp
@@ -7,18 +7,20 @@
 
 #include "FordFulkerson.h"
 
-#include <unordered_map>
 #include <unordered_set>  // return value
+#include <unordered_map>  // return value
 #include <vector>         // removed edges
 #include <queue>          // BFS
 
-#include <utility>
+#include <alib/utility>
 
 #include <exception/CommonException.h>
 
 #include "../maximumflow/FordFulkerson.h"
 #include <registration/AlgoRegistration.hpp>
 
+#include <alib/iostream>
+
 namespace graph {
 
 namespace minimumcut {
@@ -116,7 +118,6 @@ static Cut fordfulkerson_impl_dir( const DirectedGraph & graph, Node source, Nod
 	return cut;
 }
 
-#include <iostream>
 static Cut fordfulkerson_impl_undir( const UndirectedGraph & ugraph, Node source, Node sink )
 {
 	Cut cut;
diff --git a/alib2algo_experimental/src/graph/shortestpath/BellmanFord.h b/alib2algo_experimental/src/graph/shortestpath/BellmanFord.h
index 8ae2affeffbcaba7dab02868951d0eb1f03375ab..e648115535eb7b2611973f2ed888726cb031084a 100644
--- a/alib2algo_experimental/src/graph/shortestpath/BellmanFord.h
+++ b/alib2algo_experimental/src/graph/shortestpath/BellmanFord.h
@@ -8,7 +8,7 @@
 #ifndef GRAPH_BELLMAN_FORD_H_
 #define GRAPH_BELLMAN_FORD_H_
 
-#include <unordered_map>
+#include <alib/unordered_map>
 
 #include <graph/GraphClasses.h>
 
diff --git a/alib2algo_experimental/src/graph/shortestpath/Dijkstra.h b/alib2algo_experimental/src/graph/shortestpath/Dijkstra.h
index 14b154013929cc1761157c66c3bfc1d1a16ba2fb..0215e50becf641866f8e06ee9ed88c8851bedd09 100644
--- a/alib2algo_experimental/src/graph/shortestpath/Dijkstra.h
+++ b/alib2algo_experimental/src/graph/shortestpath/Dijkstra.h
@@ -8,7 +8,7 @@
 #ifndef GRAPH_DIJKSTRA_H_
 #define GRAPH_DIJKSTRA_H_
 
-#include <unordered_map>
+#include <alib/unordered_map>
 
 #include <graph/GraphClasses.h>
 
diff --git a/alib2algo_experimental/src/graph/shortestpath/FloydWarshall.h b/alib2algo_experimental/src/graph/shortestpath/FloydWarshall.h
index 240f76350cec25f740a0d44ded943e73cf649f97..b90ef95de911cd0d5c100c039b463cb886dea75a 100644
--- a/alib2algo_experimental/src/graph/shortestpath/FloydWarshall.h
+++ b/alib2algo_experimental/src/graph/shortestpath/FloydWarshall.h
@@ -8,7 +8,7 @@
 #ifndef GRAPH_FLOYD_WARSHALL_FORD_H_
 #define GRAPH_FLOYD_WARSHALL_FORD_H_
 
-#include <unordered_map>
+#include <alib/unordered_map>
 
 #include <graph/GraphClasses.h>
 
diff --git a/alib2algo_experimental/src/graph/sort/TopologicalSort.h b/alib2algo_experimental/src/graph/sort/TopologicalSort.h
index b1ccd2fc9a8c8cc40d70bd12b5c86c5d147ce5bf..cb99850c3dcae6a3e663893c7bd64f4f38480d53 100644
--- a/alib2algo_experimental/src/graph/sort/TopologicalSort.h
+++ b/alib2algo_experimental/src/graph/sort/TopologicalSort.h
@@ -8,7 +8,7 @@
 #ifndef GRAPH_TOPOLOGICAL_SORT_H_
 #define GRAPH_TOPOLOGICAL_SORT_H_
 
-#include <list>
+#include <alib/list>
 
 #include <graph/GraphClasses.h>
 
diff --git a/alib2algo_experimental/src/graph/spanningtree/Edmonds.cpp b/alib2algo_experimental/src/graph/spanningtree/Edmonds.cpp
index b84ac36ee2392d0604053342a6e018a3e1931980..6a80c94bc0a9b971f0b9f752adf31eaf86ab2b83 100644
--- a/alib2algo_experimental/src/graph/spanningtree/Edmonds.cpp
+++ b/alib2algo_experimental/src/graph/spanningtree/Edmonds.cpp
@@ -7,8 +7,8 @@
 
 #include "Edmonds.h"
 
-#include <vector>
-#include <list>
+#include <alib/vector>
+#include <alib/list>
 #include <queue>
 #include <climits>
 #include <stdexcept>
diff --git a/alib2algo_experimental/src/graph/spanningtree/Kruskal.cpp b/alib2algo_experimental/src/graph/spanningtree/Kruskal.cpp
index b6c263db7aee4791cf4087d1ba63eb5a55b8c6bf..a012915a61838d5c89bb4ef834ef474200cd2037 100644
--- a/alib2algo_experimental/src/graph/spanningtree/Kruskal.cpp
+++ b/alib2algo_experimental/src/graph/spanningtree/Kruskal.cpp
@@ -7,9 +7,9 @@
 
 #include "Kruskal.h"
 
-#include <vector>
-#include <unordered_map>
-#include <algorithm>
+#include <alib/vector>
+#include <alib/unordered_map>
+#include <alib/algorithm>
 #include <stdexcept>
 
 #include "../datastructs/Components.h"
diff --git a/alib2algo_experimental/src/graph/traverse/Bfs.cpp b/alib2algo_experimental/src/graph/traverse/Bfs.cpp
index 628cba2225ce65e114428f9b770850674ba4c961..cadcd947d824625ae86a9c758a287bfc8d2c652b 100644
--- a/alib2algo_experimental/src/graph/traverse/Bfs.cpp
+++ b/alib2algo_experimental/src/graph/traverse/Bfs.cpp
@@ -8,7 +8,7 @@
 #include "Bfs.h"
 
 #include <queue>
-#include <unordered_map>
+#include <alib/unordered_map>
 #include <registration/AlgoRegistration.hpp>
 
 namespace graph {
diff --git a/alib2algo_experimental/src/graph/traverse/Dfs.cpp b/alib2algo_experimental/src/graph/traverse/Dfs.cpp
index 95ae205f090b2a86a346320d8eb6bebc562b983d..b3fa49bda8c2fcda3dc2f2e168b37c531e122c18 100644
--- a/alib2algo_experimental/src/graph/traverse/Dfs.cpp
+++ b/alib2algo_experimental/src/graph/traverse/Dfs.cpp
@@ -8,7 +8,7 @@
 #include "Dfs.h"
 
 #include <stack>
-#include <unordered_map>
+#include <alib/unordered_map>
 #include <registration/AlgoRegistration.hpp>
 
 namespace graph {
diff --git a/alib2algo_experimental/test-src/grammar/parsing/LR0Parser.cpp b/alib2algo_experimental/test-src/grammar/parsing/LR0Parser.cpp
index da5f4833ee6cb8d8a7fcc27790e9e14009a6c02a..ed9f3b0e1bebddc951e860ae889aee0f2c8ec1d6 100644
--- a/alib2algo_experimental/test-src/grammar/parsing/LR0Parser.cpp
+++ b/alib2algo_experimental/test-src/grammar/parsing/LR0Parser.cpp
@@ -5,7 +5,7 @@
 
 #include <label/LR0ItemsLabel.h>
 
-#include <vector>
+#include <alib/vector>
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( LR0Parser, "grammar" );
 CPPUNIT_TEST_SUITE_REGISTRATION ( LR0Parser );
diff --git a/alib2algo_experimental/test-src/grammar/parsing/LRParser.cpp b/alib2algo_experimental/test-src/grammar/parsing/LRParser.cpp
index 2932d56688dda010fbd613c67cb4d3ebff10e678..19215627401a6334d16f704ef080ee2ca6dba1d7 100644
--- a/alib2algo_experimental/test-src/grammar/parsing/LRParser.cpp
+++ b/alib2algo_experimental/test-src/grammar/parsing/LRParser.cpp
@@ -5,7 +5,7 @@
 
 #include <label/LR0ItemsLabel.h>
 
-#include <vector>
+#include <alib/vector>
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( LRParser, "grammar" );
 CPPUNIT_TEST_SUITE_REGISTRATION ( LRParser );
diff --git a/alib2algo_experimental/test-src/grammar/parsing/SLR1ParseTable.cpp b/alib2algo_experimental/test-src/grammar/parsing/SLR1ParseTable.cpp
index 5f9709bd4f29755aef42d5a2dd08daaf789287c7..ac24ce337a2fa9717c183ec0c8a884be4f9f2d53 100644
--- a/alib2algo_experimental/test-src/grammar/parsing/SLR1ParseTable.cpp
+++ b/alib2algo_experimental/test-src/grammar/parsing/SLR1ParseTable.cpp
@@ -5,8 +5,8 @@
 
 #include <label/LR0ItemsLabel.h>
 
-#include <variant>
-#include <vector>
+#include <alib/variant>
+#include <alib/vector>
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( SLR1ParseTable, "grammar" );
 CPPUNIT_TEST_SUITE_REGISTRATION ( SLR1ParseTable );
diff --git a/alib2algo_experimental/test-src/graph/TestUtils.cpp b/alib2algo_experimental/test-src/graph/TestUtils.cpp
index be562038d6f310e8af9996ab195d98a1448cf9f5..43d431ec66f8584ad519c9186e9adb86e708c7ea 100644
--- a/alib2algo_experimental/test-src/graph/TestUtils.cpp
+++ b/alib2algo_experimental/test-src/graph/TestUtils.cpp
@@ -1,6 +1,6 @@
 #include "TestUtils.h"
 
-#include <unordered_map>
+#include <alib/unordered_map>
 
 void printGraphData( const graph::DirectedGraph & graph )
 {
diff --git a/alib2algo_experimental/test-src/graph/TestUtils.h b/alib2algo_experimental/test-src/graph/TestUtils.h
index ad56d57698b33ae9dc1525098b2c278656b4a2d4..33f1092348f69ed471caa75df798a322d6e51374 100644
--- a/alib2algo_experimental/test-src/graph/TestUtils.h
+++ b/alib2algo_experimental/test-src/graph/TestUtils.h
@@ -2,11 +2,11 @@
 #define TEST_UTILS_H
 
 #include <cstdio>
-#include <string>
+#include <alib/string>
 #include <sstream>
 
-#include <vector>
-#include <unordered_map>
+#include <alib/vector>
+#include <alib/unordered_map>
 
 #include <graph/GraphClasses.h>
 
diff --git a/alib2algo_experimental/test-src/graph/isomorphism/HopcroftTest.cpp b/alib2algo_experimental/test-src/graph/isomorphism/HopcroftTest.cpp
index c33c7cbb968d03db1791bb4c29f50f12979b5571..794d1e7adb6ad4131527fcb67ce757cf28c7f1b1 100644
--- a/alib2algo_experimental/test-src/graph/isomorphism/HopcroftTest.cpp
+++ b/alib2algo_experimental/test-src/graph/isomorphism/HopcroftTest.cpp
@@ -1,6 +1,6 @@
 #include "HopcroftTest.h"
 
-#include <algorithm>
+#include <alib/algorithm>
 
 #include "graph/isomorphism/HopcroftImpl.h"
 #include "graph/embedding/HopcroftTarjan.h"
diff --git a/alib2algo_experimental/test-src/graph/minimumcut/FordFulkersonTest.cpp b/alib2algo_experimental/test-src/graph/minimumcut/FordFulkersonTest.cpp
index eb4d626613fd681438fb9afe6a2d04e5bf58d221..4adb30a3204cd6e3ed2808a459c1c9dffdd35afb 100644
--- a/alib2algo_experimental/test-src/graph/minimumcut/FordFulkersonTest.cpp
+++ b/alib2algo_experimental/test-src/graph/minimumcut/FordFulkersonTest.cpp
@@ -2,7 +2,7 @@
 
 #include <graph/minimumcut/FordFulkerson.h>
 
-#include <utility>
+#include <alib/utility>
 
 #include <exception/CommonException.h>
 
diff --git a/alib2algo_experimental/test-src/graph/spanningtree/JarnikPrimTest.cpp b/alib2algo_experimental/test-src/graph/spanningtree/JarnikPrimTest.cpp
index 4540e5fef4af71d06d8f128cc7152f1e60b50afa..f085f8c519d05aff048a113944cf9d6e604c68c1 100644
--- a/alib2algo_experimental/test-src/graph/spanningtree/JarnikPrimTest.cpp
+++ b/alib2algo_experimental/test-src/graph/spanningtree/JarnikPrimTest.cpp
@@ -2,7 +2,7 @@
 
 #include "graph/spanningtree/JarnikPrim.h"
 
-#include <iostream>
+#include <alib/iostream>
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GraphJarnikPrimTest, "graph" );
 CPPUNIT_TEST_SUITE_REGISTRATION( GraphJarnikPrimTest );
diff --git a/alib2algo_experimental/test-src/graph/traverse/BfsTest.cpp b/alib2algo_experimental/test-src/graph/traverse/BfsTest.cpp
index 95863eecc3a6153871e0ed2cdf48b1b89063951d..b15a58d1f28f446f475acaa71f634b5e0ebe1b9b 100644
--- a/alib2algo_experimental/test-src/graph/traverse/BfsTest.cpp
+++ b/alib2algo_experimental/test-src/graph/traverse/BfsTest.cpp
@@ -2,7 +2,7 @@
 
 #include "graph/traverse/Bfs.h"
 
-#include <unordered_map>
+#include <alib/unordered_map>
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GraphBfsTest, "graph" );
 CPPUNIT_TEST_SUITE_REGISTRATION( GraphBfsTest );