diff --git a/alib2str/src/automaton/AutomatonFromStringLexer.cpp b/alib2str/src/automaton/AutomatonFromStringLexer.cpp
index d14172de4a8ebc01738feb70c1574d55b98e4296..2ba51cc9cd94af475e6889ab40a5994bf434d208 100644
--- a/alib2str/src/automaton/AutomatonFromStringLexer.cpp
+++ b/alib2str/src/automaton/AutomatonFromStringLexer.cpp
@@ -7,7 +7,7 @@
 
 #include "AutomatonFromStringLexer.h"
 #include <exception/CommonException.h>
-#include <iterator>
+#include <alib/iterator>
 
 namespace automaton {
 
diff --git a/alib2str/src/automaton/AutomatonFromStringLexer.h b/alib2str/src/automaton/AutomatonFromStringLexer.h
index 077480a67a50ebc75864871b29139da93b7e1f6c..b921e114763687a5acce95afc591f0cefd9a9b00 100644
--- a/alib2str/src/automaton/AutomatonFromStringLexer.h
+++ b/alib2str/src/automaton/AutomatonFromStringLexer.h
@@ -8,8 +8,8 @@
 #ifndef AUTOMATON_FROM_STRING_LEXER_H_
 #define AUTOMATON_FROM_STRING_LEXER_H_
 
-#include <string>
-#include <istream>
+#include <alib/string>
+#include <alib/istream>
 
 namespace automaton {
 
diff --git a/alib2str/src/automaton/string/common/AutomatonFromStringParserCommon.h b/alib2str/src/automaton/string/common/AutomatonFromStringParserCommon.h
index 2afeaa5f07f58d5e96a62a1b6e2efa9036e57da3..a097f5f13cebce85d645e28d47a86ff6a944ed3e 100644
--- a/alib2str/src/automaton/string/common/AutomatonFromStringParserCommon.h
+++ b/alib2str/src/automaton/string/common/AutomatonFromStringParserCommon.h
@@ -8,7 +8,7 @@
 #ifndef AUTOMATON_FROM_STRING_PARSER_COMMON_H_
 #define AUTOMATON_FROM_STRING_PARSER_COMMON_H_
 
-#include <istream>
+#include <alib/istream>
 
 namespace automaton {
 
diff --git a/alib2str/src/container/ContainerFromStringLexer.h b/alib2str/src/container/ContainerFromStringLexer.h
index 69d18a53d5cf5e3f47c45a1119236034ccf63586..cdd29a8d4ea80038da2240d4df46edc2ecc17cd0 100644
--- a/alib2str/src/container/ContainerFromStringLexer.h
+++ b/alib2str/src/container/ContainerFromStringLexer.h
@@ -8,8 +8,8 @@
 #ifndef _CONTAINER_FROM_STRING_LEXER_H_
 #define _CONTAINER_FROM_STRING_LEXER_H_
 
-#include <string>
-#include <istream>
+#include <alib/string>
+#include <alib/istream>
 
 namespace container {
 
diff --git a/alib2str/src/core/stringApi.hpp b/alib2str/src/core/stringApi.hpp
index 9a242d180838f4def8e2573018acd4d1694c13c2..935544b01b50c161fc47e87f17ba15d8f3880732 100644
--- a/alib2str/src/core/stringApi.hpp
+++ b/alib2str/src/core/stringApi.hpp
@@ -8,12 +8,12 @@
 #ifndef STRING_API_HPP_
 #define STRING_API_HPP_
 
-#include <functional>
-#include <deque>
-#include <map>
-#include <string>
-#include <memory>
-#include <algorithm>
+#include <alib/functional>
+#include <alib/deque>
+#include <alib/map>
+#include <alib/string>
+#include <alib/memory>
+#include <alib/algorithm>
 
 #include "base/WrapperBase.hpp"
 
diff --git a/alib2str/src/factory/StringDataFactory.hpp b/alib2str/src/factory/StringDataFactory.hpp
index e5126e8fcb79c053f169f8a8f569d1bfb8b45d04..21109c552b322b1a5f348a64467efe95a41c2ea4 100644
--- a/alib2str/src/factory/StringDataFactory.hpp
+++ b/alib2str/src/factory/StringDataFactory.hpp
@@ -8,7 +8,7 @@
 #ifndef STRING_DATA_FACTORY
 #define STRING_DATA_FACTORY
 
-#include <set>
+#include <alib/set>
 #include "exception/CommonException.h"
 #include <core/stringApi.hpp>
 #include <fstream>
diff --git a/alib2str/src/grammar/GrammarFromStringLexer.h b/alib2str/src/grammar/GrammarFromStringLexer.h
index 209688895c533e8f5e65f667eb0ee6f64441ccc5..3535509b03a856952813dd3104f517db2f7b4616 100644
--- a/alib2str/src/grammar/GrammarFromStringLexer.h
+++ b/alib2str/src/grammar/GrammarFromStringLexer.h
@@ -8,8 +8,8 @@
 #ifndef GRAMMAR_FROM_STRING_LEXER_H_
 #define GRAMMAR_FROM_STRING_LEXER_H_
 
-#include <string>
-#include <istream>
+#include <alib/string>
+#include <alib/istream>
 
 namespace grammar {
 
diff --git a/alib2str/src/grammar/string/common/GrammarFromStringParserCommon.h b/alib2str/src/grammar/string/common/GrammarFromStringParserCommon.h
index fadc0303f765e57ac429882c487b6710ab777379..45131d8c84e049609a291421909b2d4dba1af2f3 100644
--- a/alib2str/src/grammar/string/common/GrammarFromStringParserCommon.h
+++ b/alib2str/src/grammar/string/common/GrammarFromStringParserCommon.h
@@ -8,10 +8,10 @@
 #ifndef _GRAMMAR_FROM_STRING_PARSER_COMMON_H_
 #define _GRAMMAR_FROM_STRING_PARSER_COMMON_H_
 
-#include <set>
-#include <vector>
-#include <map>
-#include <tuple>
+#include <alib/set>
+#include <alib/vector>
+#include <alib/map>
+#include <alib/tuple>
 
 #include <exception/CommonException.h>
 
diff --git a/alib2str/src/primitive/PrimitiveFromStringLexer.h b/alib2str/src/primitive/PrimitiveFromStringLexer.h
index 946dc0668d6a469bac44d5ddda8fccb61e7d4995..cb9d25da513f7ae86f5c3009a2613e78e207669a 100644
--- a/alib2str/src/primitive/PrimitiveFromStringLexer.h
+++ b/alib2str/src/primitive/PrimitiveFromStringLexer.h
@@ -8,8 +8,8 @@
 #ifndef PRIMITIVE_FROM_STRING_LEXER_H_
 #define PRIMITIVE_FROM_STRING_LEXER_H_
 
-#include <string>
-#include <istream>
+#include <alib/string>
+#include <alib/istream>
 
 namespace primitive {
 
diff --git a/alib2str/src/regexp/RegExpFromStringLexer.h b/alib2str/src/regexp/RegExpFromStringLexer.h
index 40911243c54283e23de43309f44d3f910d33300d..6f23d3772aeb78df085b74be623195be42c34673 100644
--- a/alib2str/src/regexp/RegExpFromStringLexer.h
+++ b/alib2str/src/regexp/RegExpFromStringLexer.h
@@ -8,8 +8,8 @@
 #ifndef REG_EXP_FROM_STRING_LEXER_H_
 #define REG_EXP_FROM_STRING_LEXER_H_
 
-#include <string>
-#include <istream>
+#include <alib/string>
+#include <alib/istream>
 
 namespace regexp {
 
diff --git a/alib2str/src/regexp/string/UnboundedRegExp.h b/alib2str/src/regexp/string/UnboundedRegExp.h
index 082ba308f0599ae511711375d3c67e029b5da7f2..475177541bc5909bc5f36af7a154ce23cdef8b64 100644
--- a/alib2str/src/regexp/string/UnboundedRegExp.h
+++ b/alib2str/src/regexp/string/UnboundedRegExp.h
@@ -8,8 +8,8 @@
 #ifndef _STRING_UNBOUNDED_REG_EXP_H_
 #define _STRING_UNBOUNDED_REG_EXP_H_
 
-#include <memory>
-#include <utility>
+#include <alib/memory>
+#include <alib/utility>
 
 #include <regexp/unbounded/UnboundedRegExpStructure.h>
 #include <regexp/unbounded/UnboundedRegExp.h>
diff --git a/alib2str/src/registry/StringReaderRegistry.hpp b/alib2str/src/registry/StringReaderRegistry.hpp
index 722c5f96bc48ba417c695028618a499959d4484d..de12a0cd32a5f60b3728cfc603a2a30c18caf785 100644
--- a/alib2str/src/registry/StringReaderRegistry.hpp
+++ b/alib2str/src/registry/StringReaderRegistry.hpp
@@ -8,9 +8,9 @@
 #ifndef _STRING_READER_REGISTRY_HPP_
 #define _STRING_READER_REGISTRY_HPP_
 
-#include <memory>
-#include <string>
-#include <map>
+#include <alib/memory>
+#include <alib/string>
+#include <alib/map>
 
 #include <exception/CommonException.h>
 #include <abstraction/OperationAbstraction.hpp>
diff --git a/alib2str/src/registry/StringWriterRegistry.hpp b/alib2str/src/registry/StringWriterRegistry.hpp
index 1cc8e98cd5d45f97c3e539f22258d411e6448204..376cc96f95cec7220508b01b8d19de0c75c6f271 100644
--- a/alib2str/src/registry/StringWriterRegistry.hpp
+++ b/alib2str/src/registry/StringWriterRegistry.hpp
@@ -8,10 +8,10 @@
 #ifndef _STRING_WRITER_REGISTRY_HPP_
 #define _STRING_WRITER_REGISTRY_HPP_
 
-#include <memory>
-#include <string>
-#include <set>
-#include <map>
+#include <alib/memory>
+#include <alib/string>
+#include <alib/set>
+#include <alib/map>
 
 #include <exception/CommonException.h>
 #include <abstraction/OperationAbstraction.hpp>
diff --git a/alib2str/src/string/StringFromStringLexer.h b/alib2str/src/string/StringFromStringLexer.h
index 96f6e3d4d45b97594e4beabf3ad31dc5195246a6..03af658f3733b01a569c3f2ee0412348779409ae 100644
--- a/alib2str/src/string/StringFromStringLexer.h
+++ b/alib2str/src/string/StringFromStringLexer.h
@@ -8,8 +8,8 @@
 #ifndef STRING_FROM_STRING_LEXER_H_
 #define STRING_FROM_STRING_LEXER_H_
 
-#include <string>
-#include <istream>
+#include <alib/string>
+#include <alib/istream>
 
 namespace string {
 
diff --git a/alib2str/src/string/string/common/StringFromStringParserCommon.h b/alib2str/src/string/string/common/StringFromStringParserCommon.h
index 24e78302b49b9c0fd7116ad3949dce8ffcd39f7e..112f185473be2e733b766829a60f68ff80fc6b20 100644
--- a/alib2str/src/string/string/common/StringFromStringParserCommon.h
+++ b/alib2str/src/string/string/common/StringFromStringParserCommon.h
@@ -8,7 +8,7 @@
 #ifndef _STRING_FROM_STRING_PARSER_COMMON_H_
 #define _STRING_FROM_STRING_PARSER_COMMON_H_
 
-#include <vector>
+#include <alib/vector>
 
 #include <core/stringApi.hpp>
 
diff --git a/alib2str/src/string/string/common/StringToStringComposerCommon.h b/alib2str/src/string/string/common/StringToStringComposerCommon.h
index 5ebbd7ae33bed3f8670d176303294f0ae09f772d..4f113ac82e03d8e5a30ab1b64929840f6a390ff2 100644
--- a/alib2str/src/string/string/common/StringToStringComposerCommon.h
+++ b/alib2str/src/string/string/common/StringToStringComposerCommon.h
@@ -9,7 +9,7 @@
 #define STRING_TO_STRING_COMPOSER_COMMON_H_
 
 #include <ostream>
-#include <vector>
+#include <alib/vector>
 
 #include <core/stringApi.hpp>
 
diff --git a/alib2str/src/tree/TreeFromStringLexer.h b/alib2str/src/tree/TreeFromStringLexer.h
index c3ef262aa58b3f392b288ce32efca6c94c5ff3d5..b8cf904b0e2a228eabd974fc5707971626d41b27 100644
--- a/alib2str/src/tree/TreeFromStringLexer.h
+++ b/alib2str/src/tree/TreeFromStringLexer.h
@@ -8,8 +8,8 @@
 #ifndef TREE_FROM_STRING_LEXER_H_
 #define TREE_FROM_STRING_LEXER_H_
 
-#include <string>
-#include <istream>
+#include <alib/string>
+#include <alib/istream>
 
 namespace tree {
 
diff --git a/alib2str/src/tree/string/common/TreeFromStringParserCommon.h b/alib2str/src/tree/string/common/TreeFromStringParserCommon.h
index 1c5e82d790d486e07b2caa2815f542a7a1962765..2427768944bd9cca450abaab4f1f4244160b1370 100644
--- a/alib2str/src/tree/string/common/TreeFromStringParserCommon.h
+++ b/alib2str/src/tree/string/common/TreeFromStringParserCommon.h
@@ -8,7 +8,7 @@
 #ifndef _TREE_FROM_STRING_PARSER_COMMON_H_
 #define _TREE_FROM_STRING_PARSER_COMMON_H_
 
-#include <vector>
+#include <alib/vector>
 
 #include <core/stringApi.hpp>
 
diff --git a/alib2str/src/tree/string/common/TreeToStringComposerCommon.h b/alib2str/src/tree/string/common/TreeToStringComposerCommon.h
index 122a420fe841d1f01930c82f360a3eaa94421081..89d743e8fbc74d7b0e03a00ebcfce0d25bbd4f5a 100644
--- a/alib2str/src/tree/string/common/TreeToStringComposerCommon.h
+++ b/alib2str/src/tree/string/common/TreeToStringComposerCommon.h
@@ -9,7 +9,7 @@
 #define _TREE_TO_STRING_COMPOSER_COMMON_H_
 
 #include <ostream>
-#include <vector>
+#include <alib/vector>
 
 #include <core/stringApi.hpp>
 
diff --git a/alib2str/test-src/grammar/GrammarTest.cpp b/alib2str/test-src/grammar/GrammarTest.cpp
index 198fe871f67d4cec14f8c1b97eb2768228f732fc..41cb94e9023189c0c173c96ac8fa20dfd4c3c498 100644
--- a/alib2str/test-src/grammar/GrammarTest.cpp
+++ b/alib2str/test-src/grammar/GrammarTest.cpp
@@ -1,4 +1,4 @@
-#include <list>
+#include <alib/list>
 #include "GrammarTest.h"
 
 #include "sax/SaxParseInterface.h"
diff --git a/alib2str/test-src/regexp/RegExpTest.cpp b/alib2str/test-src/regexp/RegExpTest.cpp
index 97b2e931e0589afe93562f91f82ae5bb35f8ddd8..391b13176b06f8d7408d5b13d363bc4d6a0e468e 100644
--- a/alib2str/test-src/regexp/RegExpTest.cpp
+++ b/alib2str/test-src/regexp/RegExpTest.cpp
@@ -1,4 +1,4 @@
-#include <list>
+#include <alib/list>
 #include "RegExpTest.h"
 
 #include "sax/SaxParseInterface.h"
diff --git a/alib2str/test-src/string/StringTest.cpp b/alib2str/test-src/string/StringTest.cpp
index 8a77711b15d1ebfc618e72a73f93899c81721b32..1ce818feb23aa370f8e1682cd1f558a503438902 100644
--- a/alib2str/test-src/string/StringTest.cpp
+++ b/alib2str/test-src/string/StringTest.cpp
@@ -1,4 +1,4 @@
-#include <list>
+#include <alib/list>
 #include "StringTest.h"
 
 #include "sax/SaxParseInterface.h"
diff --git a/alib2str/test-src/tree/TreeTest.cpp b/alib2str/test-src/tree/TreeTest.cpp
index c67bd5cb6dbe89b427dd51b2720c75cef281732a..d927cfc35faecd12e7d318a9e251a8e1dcf63d72 100644
--- a/alib2str/test-src/tree/TreeTest.cpp
+++ b/alib2str/test-src/tree/TreeTest.cpp
@@ -1,4 +1,4 @@
-#include <list>
+#include <alib/list>
 #include "TreeTest.h"
 
 #include "sax/SaxParseInterface.h"