diff --git a/alib2data_experimental/src/grammar/parsing/LRParserTypes.h b/alib2data_experimental/src/grammar/parsing/LRParserTypes.h
index 5a192d264d71ff56a8c04eac0d597cf1a1bec8e6..15a0088f2de4812a3cf447e8266a329b664445b3 100644
--- a/alib2data_experimental/src/grammar/parsing/LRParserTypes.h
+++ b/alib2data_experimental/src/grammar/parsing/LRParserTypes.h
@@ -11,10 +11,10 @@
 #include <common/DefaultSymbolType.h>
 #include <common/DefaultStateType.h>
 
-#include <map>
-#include <set>
-#include <variant>
-#include <vector>
+#include <alib/map>
+#include <alib/set>
+#include <alib/variant>
+#include <alib/vector>
 
 namespace grammar {
 
diff --git a/alib2data_experimental/src/graph/GraphTypes.h b/alib2data_experimental/src/graph/GraphTypes.h
index 26729f56133bf0044794e3d3ea72995f608157c3..8990efe2e4618b973d65fdaff88bd1fa94e63a9e 100644
--- a/alib2data_experimental/src/graph/GraphTypes.h
+++ b/alib2data_experimental/src/graph/GraphTypes.h
@@ -8,7 +8,7 @@
 #ifndef GRAPH_TYPES_H_
 #define GRAPH_TYPES_H_
 
-#include <string>
+#include <alib/string>
 
 namespace graph {
 
diff --git a/alib2data_experimental/src/graph/common/GraphToXMLComposer.h b/alib2data_experimental/src/graph/common/GraphToXMLComposer.h
index 8f5c052daa3e7d8e52d5f09ec78d2b90d7e7678f..be8740fdca788383cfae2b170d7a74752d5b3fe1 100644
--- a/alib2data_experimental/src/graph/common/GraphToXMLComposer.h
+++ b/alib2data_experimental/src/graph/common/GraphToXMLComposer.h
@@ -8,8 +8,8 @@
 #ifndef GRAPH_TO_XML_COMPOSER_H_
 #define GRAPH_TO_XML_COMPOSER_H_
 
-#include <set>
-#include <deque>
+#include <alib/set>
+#include <alib/deque>
 
 #include "../GraphClasses.h"
 #include <sax/Token.h>
diff --git a/alib2data_experimental/src/graph/directed/AdjacencyListDirectedGraph.cpp b/alib2data_experimental/src/graph/directed/AdjacencyListDirectedGraph.cpp
index 9567105146a9306b66c40befc91810f3565d7e08..a33e4fa66c5cf00e92fd000a91cb9b5b78dd190c 100644
--- a/alib2data_experimental/src/graph/directed/AdjacencyListDirectedGraph.cpp
+++ b/alib2data_experimental/src/graph/directed/AdjacencyListDirectedGraph.cpp
@@ -8,7 +8,7 @@
 
 #include "AdjacencyListDirectedGraph.h"
 
-#include <compare>
+#include <alib/compare>
 
 #include <object/Object.h>
 #include <sax/FromXMLParserHelper.h>
diff --git a/alib2data_experimental/src/graph/directed/AdjacencyListDirectedGraph.h b/alib2data_experimental/src/graph/directed/AdjacencyListDirectedGraph.h
index 0dce79e01c482fb1ec798c88bd1c1862f5219555..c1e4560cd8ab3f276b0edacd677126ec7a6a1025 100644
--- a/alib2data_experimental/src/graph/directed/AdjacencyListDirectedGraph.h
+++ b/alib2data_experimental/src/graph/directed/AdjacencyListDirectedGraph.h
@@ -9,8 +9,8 @@
 #ifndef ADJACENCY_LIST_DIRECTED_GRAPH_H_
 #define ADJACENCY_LIST_DIRECTED_GRAPH_H_
 
-#include <list>
-#include <unordered_map>
+#include <alib/list>
+#include <alib/unordered_map>
 
 #include "DirectedGraph.h"
 
diff --git a/alib2data_experimental/src/graph/directed/AdjacencyMatrixDirectedGraph.cpp b/alib2data_experimental/src/graph/directed/AdjacencyMatrixDirectedGraph.cpp
index c77c3ee5f5d22076d5194c583aa7165c309bd36f..2e59197e0f8afd59dee2f999f11b6f5823fd94c4 100644
--- a/alib2data_experimental/src/graph/directed/AdjacencyMatrixDirectedGraph.cpp
+++ b/alib2data_experimental/src/graph/directed/AdjacencyMatrixDirectedGraph.cpp
@@ -8,7 +8,7 @@
 
 #include "AdjacencyMatrixDirectedGraph.h"
 
-#include <compare>
+#include <alib/compare>
 
 #include <object/Object.h>
 #include <sax/FromXMLParserHelper.h>
diff --git a/alib2data_experimental/src/graph/directed/AdjacencyMatrixDirectedGraph.h b/alib2data_experimental/src/graph/directed/AdjacencyMatrixDirectedGraph.h
index 626f167eb30e3e6d02ce7fb3a5aacc7fcb6d2f2e..f66fe2ddeb4fcaf9e2377717788c2b550aac43e7 100644
--- a/alib2data_experimental/src/graph/directed/AdjacencyMatrixDirectedGraph.h
+++ b/alib2data_experimental/src/graph/directed/AdjacencyMatrixDirectedGraph.h
@@ -9,9 +9,9 @@
 #ifndef ADJACENCY_MATRIX_DIRECTED_GRAPH_H_
 #define ADJACENCY_MATRIX_DIRECTED_GRAPH_H_
 
-#include <set>
-#include <vector>
-#include <unordered_map>
+#include <alib/set>
+#include <alib/vector>
+#include <alib/unordered_map>
 
 #include "DirectedGraph.h"
 
diff --git a/alib2data_experimental/src/graph/directed/DirectedGraph.cpp b/alib2data_experimental/src/graph/directed/DirectedGraph.cpp
index ea72f09dec7de0f7bf22004a08d46afd041c6958..31900ae78ca115bb1116c47254650a43ec1c7a5b 100644
--- a/alib2data_experimental/src/graph/directed/DirectedGraph.cpp
+++ b/alib2data_experimental/src/graph/directed/DirectedGraph.cpp
@@ -10,8 +10,8 @@
 #include "AdjacencyListDirectedGraph.h"
 #include "AdjacencyMatrixDirectedGraph.h"
 
-#include <iostream>
-#include <algorithm>
+#include <alib/iostream>
+#include <alib/algorithm>
 #include <sstream>
 
 #include <sax/FromXMLParserHelper.h>
diff --git a/alib2data_experimental/src/graph/directed/DirectedGraph.h b/alib2data_experimental/src/graph/directed/DirectedGraph.h
index 022186f38f9a0676743d24d90e59fe8132a914f2..377c795639fcdb3e35ce19544ca7a5b3706efc75 100644
--- a/alib2data_experimental/src/graph/directed/DirectedGraph.h
+++ b/alib2data_experimental/src/graph/directed/DirectedGraph.h
@@ -9,10 +9,10 @@
 #ifndef DIRECTED_GRAPH_H_
 #define DIRECTED_GRAPH_H_
 
-#include <unordered_map>
-#include <vector>
-#include <set>
-#include <tuple>
+#include <alib/unordered_map>
+#include <alib/vector>
+#include <alib/set>
+#include <alib/tuple>
 
 #include "../GraphBase.h"
 #include "../GraphTypes.h"
diff --git a/alib2data_experimental/src/graph/undirected/AdjacencyListUndirectedGraph.cpp b/alib2data_experimental/src/graph/undirected/AdjacencyListUndirectedGraph.cpp
index 609043d040bbd42a5a209bf28e6184768854080a..d0e7658a30492effdbb4bf5b606a8e151d31fb35 100644
--- a/alib2data_experimental/src/graph/undirected/AdjacencyListUndirectedGraph.cpp
+++ b/alib2data_experimental/src/graph/undirected/AdjacencyListUndirectedGraph.cpp
@@ -8,7 +8,7 @@
 
 #include "AdjacencyListUndirectedGraph.h"
 
-#include <compare>
+#include <alib/compare>
 
 #include <object/Object.h>
 #include <sax/FromXMLParserHelper.h>
diff --git a/alib2data_experimental/src/graph/undirected/AdjacencyListUndirectedGraph.h b/alib2data_experimental/src/graph/undirected/AdjacencyListUndirectedGraph.h
index eccf92d5e5b7dfdd5e83582d60e4c6863638a272..9421b489594e23f18c4341ec920fa17b5830ac1d 100644
--- a/alib2data_experimental/src/graph/undirected/AdjacencyListUndirectedGraph.h
+++ b/alib2data_experimental/src/graph/undirected/AdjacencyListUndirectedGraph.h
@@ -9,8 +9,8 @@
 #ifndef ADJACENCY_LIST_UNDIRECTED_GRAPH_H_
 #define ADJACENCY_LIST_UNDIRECTED_GRAPH_H_
 
-#include <list>
-#include <unordered_map>
+#include <alib/list>
+#include <alib/unordered_map>
 
 #include "UndirectedGraph.h"
 
diff --git a/alib2data_experimental/src/graph/undirected/AdjacencyMatrixUndirectedGraph.cpp b/alib2data_experimental/src/graph/undirected/AdjacencyMatrixUndirectedGraph.cpp
index 4a5b4910b7d94ea1bca3024bc250b724e05777f1..0e3ae8a09a2d0cada7c0f45117e41e5000bb3219 100644
--- a/alib2data_experimental/src/graph/undirected/AdjacencyMatrixUndirectedGraph.cpp
+++ b/alib2data_experimental/src/graph/undirected/AdjacencyMatrixUndirectedGraph.cpp
@@ -8,7 +8,7 @@
 
 #include "AdjacencyMatrixUndirectedGraph.h"
 
-#include <compare>
+#include <alib/compare>
 
 #include <object/Object.h>
 #include <sax/FromXMLParserHelper.h>
diff --git a/alib2data_experimental/src/graph/undirected/AdjacencyMatrixUndirectedGraph.h b/alib2data_experimental/src/graph/undirected/AdjacencyMatrixUndirectedGraph.h
index 098a6ee02a1e6a9dd6962e6b516024de21fd02d3..f380f9ccc0ac036650e041488bc09c8ace7f7cc7 100644
--- a/alib2data_experimental/src/graph/undirected/AdjacencyMatrixUndirectedGraph.h
+++ b/alib2data_experimental/src/graph/undirected/AdjacencyMatrixUndirectedGraph.h
@@ -9,9 +9,9 @@
 #ifndef ADJACENCY_MATRIX_UNDIRECTED_GRAPH_H_
 #define ADJACENCY_MATRIX_UNDIRECTED_GRAPH_H_
 
-#include <set>
-#include <vector>
-#include <unordered_map>
+#include <alib/set>
+#include <alib/vector>
+#include <alib/unordered_map>
 
 #include "UndirectedGraph.h"
 
diff --git a/alib2data_experimental/src/graph/undirected/UndirectedGraph.cpp b/alib2data_experimental/src/graph/undirected/UndirectedGraph.cpp
index ba7027a6fbd5c6394b307379bb2c726103fabe0a..fd04eb0c402b13855128e524894f40ada3097b80 100644
--- a/alib2data_experimental/src/graph/undirected/UndirectedGraph.cpp
+++ b/alib2data_experimental/src/graph/undirected/UndirectedGraph.cpp
@@ -10,8 +10,8 @@
 #include "AdjacencyListUndirectedGraph.h"
 #include "AdjacencyMatrixUndirectedGraph.h"
 
-#include <iostream>
-#include <algorithm>
+#include <alib/iostream>
+#include <alib/algorithm>
 #include <sstream>
 #include <stdexcept>
 
diff --git a/alib2data_experimental/src/graph/undirected/UndirectedGraph.h b/alib2data_experimental/src/graph/undirected/UndirectedGraph.h
index 7f7f10f5d9f2dd171c8afb066bb891951452740d..83b1ff6a338611607e35d71989ef3ca8d6469e0a 100644
--- a/alib2data_experimental/src/graph/undirected/UndirectedGraph.h
+++ b/alib2data_experimental/src/graph/undirected/UndirectedGraph.h
@@ -9,10 +9,10 @@
 #ifndef UNDIRECTED_GRAPH_H_
 #define UNDIRECTED_GRAPH_H_
 
-#include <unordered_map>
-#include <vector>
-#include <set>
-#include <tuple>
+#include <alib/unordered_map>
+#include <alib/vector>
+#include <alib/set>
+#include <alib/tuple>
 
 #include "../GraphBase.h"
 #include "../GraphTypes.h"
diff --git a/alib2data_experimental/src/graph/undirected/utils.h b/alib2data_experimental/src/graph/undirected/utils.h
index 7b0b91684d2832a89f745b6488920003a5b5005a..cda8d31b90491c49fb07ecc2680e49cdfaffb11a 100644
--- a/alib2data_experimental/src/graph/undirected/utils.h
+++ b/alib2data_experimental/src/graph/undirected/utils.h
@@ -8,8 +8,8 @@
 #ifndef GRAPH_UTILS_H_
 #define GRAPH_UTILS_H_
 
-#include <list>
-#include <algorithm>
+#include <alib/list>
+#include <alib/algorithm>
 
 #include "../common/Node.h"
 #include "UndirectedEdge.h"
diff --git a/alib2data_experimental/src/indexes/common/IndexFromXMLParser.h b/alib2data_experimental/src/indexes/common/IndexFromXMLParser.h
index ca2b59d75acbc594ba06cd7d34ad5f43eeabf332..e7f765e32a31b5d2d75146c987a3c0fcbfcc523f 100644
--- a/alib2data_experimental/src/indexes/common/IndexFromXMLParser.h
+++ b/alib2data_experimental/src/indexes/common/IndexFromXMLParser.h
@@ -8,8 +8,8 @@
 #ifndef INDEX_FROM_XML_PARSER_H_
 #define INDEX_FROM_XML_PARSER_H_
 
-#include <set>
-#include <deque>
+#include <alib/set>
+#include <alib/deque>
 
 #include <sax/Token.h>
 #include <alphabet/SymbolFeatures.h>
diff --git a/alib2data_experimental/src/indexes/common/IndexToXMLComposer.h b/alib2data_experimental/src/indexes/common/IndexToXMLComposer.h
index e45c82f624770bd65e9314e687e84fa948aa478f..6f1ebd1b17c71c0a654040efbcfb017c804dbcbf 100644
--- a/alib2data_experimental/src/indexes/common/IndexToXMLComposer.h
+++ b/alib2data_experimental/src/indexes/common/IndexToXMLComposer.h
@@ -8,8 +8,8 @@
 #ifndef INDEX_TO_XML_COMPOSER_H_
 #define INDEX_TO_XML_COMPOSER_H_
 
-#include <deque>
-#include <set>
+#include <alib/deque>
+#include <alib/set>
 #include <alphabet/SymbolFeatures.h>
 #include <sax/Token.h>
 #include "../suffixTrie/SuffixTrieNodeTerminatingSymbol.h"
diff --git a/alib2data_experimental/src/indexes/suffixTrie/SuffixTrieNodeTerminatingSymbol.cpp b/alib2data_experimental/src/indexes/suffixTrie/SuffixTrieNodeTerminatingSymbol.cpp
index da244d7a0637ca4f76f9d8f7c957afe453240c09..dff02da843f3db27215c3f8b217b574862169186 100644
--- a/alib2data_experimental/src/indexes/suffixTrie/SuffixTrieNodeTerminatingSymbol.cpp
+++ b/alib2data_experimental/src/indexes/suffixTrie/SuffixTrieNodeTerminatingSymbol.cpp
@@ -9,7 +9,7 @@
 #include "SuffixTrieTerminatingSymbol.h"
 #include <exception/CommonException.h>
 #include <sstream>
-#include <tuple>
+#include <alib/tuple>
 
 namespace indexes {
 
diff --git a/alib2data_experimental/src/indexes/suffixTrie/SuffixTrieNodeTerminatingSymbol.h b/alib2data_experimental/src/indexes/suffixTrie/SuffixTrieNodeTerminatingSymbol.h
index 232d42721ad660c629e49674e15b8532cc554cc4..58ca61844e8c7efb4fbed21001af63766b74c6ba 100644
--- a/alib2data_experimental/src/indexes/suffixTrie/SuffixTrieNodeTerminatingSymbol.h
+++ b/alib2data_experimental/src/indexes/suffixTrie/SuffixTrieNodeTerminatingSymbol.h
@@ -9,8 +9,8 @@
 #define SUFFIX_TRIE_NODE_TERMINATING_SYMBOL_H_
 
 #include <common/DefaultSymbolType.h>
-#include <map>
-#include <set>
+#include <alib/map>
+#include <alib/set>
 #include <core/xmlApi.hpp>
 
 namespace indexes {
diff --git a/alib2data_experimental/src/indexes/suffixTrie/SuffixTrieTerminatingSymbol.cpp b/alib2data_experimental/src/indexes/suffixTrie/SuffixTrieTerminatingSymbol.cpp
index 96e8c2b1ff55477189852ea0465f253fad6a30ff..e9446110ca40e1ea73934624791c78378dc0fa74 100644
--- a/alib2data_experimental/src/indexes/suffixTrie/SuffixTrieTerminatingSymbol.cpp
+++ b/alib2data_experimental/src/indexes/suffixTrie/SuffixTrieTerminatingSymbol.cpp
@@ -8,8 +8,8 @@
 #include "SuffixTrieTerminatingSymbol.h"
 #include <exception/CommonException.h>
 
-#include <iostream>
-#include <algorithm>
+#include <alib/iostream>
+#include <alib/algorithm>
 #include <sstream>
 
 #include <sax/FromXMLParserHelper.h>
diff --git a/alib2data_experimental/src/indexes/suffixTrie/SuffixTrieTerminatingSymbol.h b/alib2data_experimental/src/indexes/suffixTrie/SuffixTrieTerminatingSymbol.h
index 566d2410bb4c2b4c56b6aea9043f4b8362239103..2a7cc8b8d3b1769e214c4d864f0efbf7d55014ec 100644
--- a/alib2data_experimental/src/indexes/suffixTrie/SuffixTrieTerminatingSymbol.h
+++ b/alib2data_experimental/src/indexes/suffixTrie/SuffixTrieTerminatingSymbol.h
@@ -8,10 +8,10 @@
 #ifndef SUFFIX_TRIE_TERMINATING_SYMBOL_H_
 #define SUFFIX_TRIE_TERMINATING_SYMBOL_H_
 
-#include <vector>
-#include <list>
-#include <string>
-#include <set>
+#include <alib/vector>
+#include <alib/list>
+#include <alib/string>
+#include <alib/set>
 #include <core/components.hpp>
 #include "SuffixTrieNodeTerminatingSymbol.h"
 #include <object/ObjectBase.h>
diff --git a/alib2data_experimental/src/label/LR0ItemsLabel.h b/alib2data_experimental/src/label/LR0ItemsLabel.h
index 00da50dcd292664879c190595711f3e0a9daa08a..e0ac6a12e44b820d5c6f96c440e9bfad72ebe3e1 100644
--- a/alib2data_experimental/src/label/LR0ItemsLabel.h
+++ b/alib2data_experimental/src/label/LR0ItemsLabel.h
@@ -8,9 +8,9 @@
 #ifndef LR0ITEMS_LABEL_H_
 #define LR0ITEMS_LABEL_H_
 
-#include <map>
-#include <set>
-#include <vector>
+#include <alib/map>
+#include <alib/set>
+#include <alib/vector>
 
 #include <object/Object.h>
 #include <label/LabelBase.h>
diff --git a/alib2data_experimental/src/string/LinearStringTerminatingSymbol.cpp b/alib2data_experimental/src/string/LinearStringTerminatingSymbol.cpp
index 48c599a036056940c841eb2d01c75ec1a1549c4a..dace463f0b34f0e009d6e9f335525256fb019121 100644
--- a/alib2data_experimental/src/string/LinearStringTerminatingSymbol.cpp
+++ b/alib2data_experimental/src/string/LinearStringTerminatingSymbol.cpp
@@ -10,7 +10,7 @@
 #include <exception/CommonException.h>
 
 #include <sstream>
-#include <algorithm>
+#include <alib/algorithm>
 
 #include <sax/FromXMLParserHelper.h>
 #include <string/xml/common/StringFromXmlParserCommon.h>
diff --git a/alib2data_experimental/src/string/LinearStringTerminatingSymbol.h b/alib2data_experimental/src/string/LinearStringTerminatingSymbol.h
index cf56b295120e27484bf0411157e074d9aacb249c..e85f78cf4699232c17f5726a5e87df223f9cc0c4 100644
--- a/alib2data_experimental/src/string/LinearStringTerminatingSymbol.h
+++ b/alib2data_experimental/src/string/LinearStringTerminatingSymbol.h
@@ -8,10 +8,10 @@
 #ifndef LINEAR_STRING_TERMINATING_SYMBOL_H_
 #define LINEAR_STRING_TERMINATING_SYMBOL_H_
 
-#include <iostream>
-#include <set>
-#include <vector>
-#include <deque>
+#include <alib/iostream>
+#include <alib/set>
+#include <alib/vector>
+#include <alib/deque>
 
 #include <string/StringBase.h>
 #include <string/StringFeatures.h>