diff --git a/alib2common/src/base/CommonBase.hpp b/alib2common/src/base/CommonBase.hpp
index d7e878e7415856d044e84c35cff15e8c97c2089d..856f0af9bbf669a5817e9bd608b81dee87657cda 100644
--- a/alib2common/src/base/CommonBase.hpp
+++ b/alib2common/src/base/CommonBase.hpp
@@ -8,8 +8,8 @@
 #ifndef COMMON_BASE_H_
 #define COMMON_BASE_H_
 
-#include <typeinfo>
-#include <typeindex>
+#include <alib/typeinfo>
+#include <alib/typeindex>
 #include <ostream>
 #include <stdexcept>
 
diff --git a/alib2common/src/base/WrapperBase.hpp b/alib2common/src/base/WrapperBase.hpp
index c056cc2db12ce1227b667df97b858ff435b1463d..a86d36dbbe1bdfa3ff9b266de9b199ba36d4067a 100644
--- a/alib2common/src/base/WrapperBase.hpp
+++ b/alib2common/src/base/WrapperBase.hpp
@@ -9,7 +9,7 @@
 #define WRAPPER_BASE_H_
 
 #include <ostream>
-#include <memory>
+#include <alib/memory>
 
 namespace alib {
 
diff --git a/alib2common/src/common/createUnique.hpp b/alib2common/src/common/createUnique.hpp
index aede9466c74833cb988cca55679df7c01e4eadec..fac85d8c7ee42e481dc42507138acd9193fba45c 100644
--- a/alib2common/src/common/createUnique.hpp
+++ b/alib2common/src/common/createUnique.hpp
@@ -8,11 +8,11 @@
 #ifndef CREATE_UNIQUE_H_
 #define CREATE_UNIQUE_H_
 
-#include <type_traits>
-#include <set>
+#include <alib/type_traits>
+#include <alib/set>
 #include "exception/CommonException.h"
 #include <climits>
-#include <algorithm>
+#include <alib/algorithm>
 
 namespace common {
 
diff --git a/alib2common/src/container/ObjectsDeque.h b/alib2common/src/container/ObjectsDeque.h
index 86142b77a1a5343ac5b1bf792139733fbc819b73..e1716b5b176fd9247253a47c7b1d43ea722f0f6c 100644
--- a/alib2common/src/container/ObjectsDeque.h
+++ b/alib2common/src/container/ObjectsDeque.h
@@ -8,8 +8,8 @@
 #ifndef OBJECTS_DEQUE_H_
 #define OBJECTS_DEQUE_H_
 
-#include <deque>
-#include <string>
+#include <alib/deque>
+#include <alib/string>
 #include <sstream>
 
 #include "ContainerBase.h"
diff --git a/alib2common/src/container/ObjectsList.h b/alib2common/src/container/ObjectsList.h
index 1c1646ffc92b6bc4c076b14f0f4200a8f7843e23..8a09d6aca53e1b28cde06d34647b5aa5ec55df5f 100644
--- a/alib2common/src/container/ObjectsList.h
+++ b/alib2common/src/container/ObjectsList.h
@@ -8,8 +8,8 @@
 #ifndef OBJECTS_LIST_H_
 #define OBJECTS_LIST_H_
 
-#include <list>
-#include <string>
+#include <alib/list>
+#include <alib/string>
 #include <sstream>
 
 #include "ContainerBase.h"
diff --git a/alib2common/src/container/ObjectsMap.h b/alib2common/src/container/ObjectsMap.h
index 7ecf0540d24010870b41b78f53e8c6a7764b109b..bc86ece61281bc8b65427dc6cc7771ce163a66fd 100644
--- a/alib2common/src/container/ObjectsMap.h
+++ b/alib2common/src/container/ObjectsMap.h
@@ -8,8 +8,8 @@
 #ifndef OBJECTS_MAP_H_
 #define OBJECTS_MAP_H_
 
-#include <map>
-#include <string>
+#include <alib/map>
+#include <alib/string>
 #include <sstream>
 
 #include "ContainerBase.h"
diff --git a/alib2common/src/container/ObjectsPair.h b/alib2common/src/container/ObjectsPair.h
index d35d354aa32e300eacefb0f499ba8d8860953a83..054ad78d2d93b2162a9f3cb93fab8fd1854551c2 100644
--- a/alib2common/src/container/ObjectsPair.h
+++ b/alib2common/src/container/ObjectsPair.h
@@ -8,8 +8,8 @@
 #ifndef OBJECTS_PAIR_H_
 #define OBJECTS_PAIR_H_
 
-#include <pair>
-#include <string>
+#include <alib/pair>
+#include <alib/string>
 #include <sstream>
 
 #include "ContainerBase.h"
diff --git a/alib2common/src/container/ObjectsSet.h b/alib2common/src/container/ObjectsSet.h
index 1fc34c166a29843944f62a2262126bad0ad09979..512c308cff7118ce75d5a10b60fe8a3bd48679e4 100644
--- a/alib2common/src/container/ObjectsSet.h
+++ b/alib2common/src/container/ObjectsSet.h
@@ -8,8 +8,8 @@
 #ifndef OBJECTS_SET_H_
 #define OBJECTS_SET_H_
 
-#include <set>
-#include <string>
+#include <alib/set>
+#include <alib/string>
 #include <sstream>
 
 #include "ContainerBase.h"
diff --git a/alib2common/src/container/ObjectsTree.h b/alib2common/src/container/ObjectsTree.h
index c88821d4bb19bfeb08cd02cba4826435c047491e..0211a8ff4af1f0f2bdf5eac3ce2314778e72e5d8 100644
--- a/alib2common/src/container/ObjectsTree.h
+++ b/alib2common/src/container/ObjectsTree.h
@@ -8,8 +8,8 @@
 #ifndef OBJECTS_TREE_H_
 #define OBJECTS_TREE_H_
 
-#include <tree>
-#include <string>
+#include <alib/tree>
+#include <alib/string>
 #include <sstream>
 
 #include "ContainerBase.h"
diff --git a/alib2common/src/container/ObjectsTrie.h b/alib2common/src/container/ObjectsTrie.h
index 515894b3bbb386547174f8da9a92fe6f324ed55c..4fcaf6836df03630183c9bb164223b47e94a5179 100644
--- a/alib2common/src/container/ObjectsTrie.h
+++ b/alib2common/src/container/ObjectsTrie.h
@@ -8,8 +8,8 @@
 #ifndef OBJECTS_TRIE_H_
 #define OBJECTS_TRIE_H_
 
-#include <trie>
-#include <string>
+#include <alib/trie>
+#include <alib/string>
 #include <sstream>
 
 #include "ContainerBase.h"
diff --git a/alib2common/src/container/ObjectsVector.h b/alib2common/src/container/ObjectsVector.h
index 15c0537f0e460f8830561b40fa724884da90f9d6..c9804f762a3ddedca79167deba331409f2f3888a 100644
--- a/alib2common/src/container/ObjectsVector.h
+++ b/alib2common/src/container/ObjectsVector.h
@@ -8,8 +8,8 @@
 #ifndef OBJECTS_VECTOR_H_
 #define OBJECTS_VECTOR_H_
 
-#include <vector>
-#include <string>
+#include <alib/vector>
+#include <alib/string>
 #include <sstream>
 
 #include "ContainerBase.h"
diff --git a/alib2common/src/core/components.hpp b/alib2common/src/core/components.hpp
index a5b919d3d733db0117f111d693859ac0167c6c71..0fa2029c8d031103a213c830ba840ab236a25140 100644
--- a/alib2common/src/core/components.hpp
+++ b/alib2common/src/core/components.hpp
@@ -8,7 +8,7 @@
 #ifndef _COMPONENTS_HPP_
 #define _COMPONENTS_HPP_
 
-#include <typeinfo>
+#include <alib/typeinfo>
 #include <exception/CommonException.h>
 #include <registry/AlgorithmRegistry.hpp>
 
diff --git a/alib2common/src/core/components/setComponents.hpp b/alib2common/src/core/components/setComponents.hpp
index 5ad62ccf67be5e48de9617dfdca159c6688dc744..5b540a92d7d255b3b855350a0ae516fe3edaa140 100644
--- a/alib2common/src/core/components/setComponents.hpp
+++ b/alib2common/src/core/components/setComponents.hpp
@@ -8,8 +8,8 @@
 #ifndef _SET_COMPONENT_HPP_
 #define _SET_COMPONENT_HPP_
 
-#include <algorithm>
-#include <typeinfo>
+#include <alib/algorithm>
+#include <alib/typeinfo>
 #include <exception/CommonException.h>
 #include <registry/AlgorithmRegistry.hpp>
 
diff --git a/alib2common/src/core/visitor.hpp b/alib2common/src/core/visitor.hpp
index 62accfff55261f2dd9d40f60bc133d532f603f54..f928ba61fb0dc8b1a3aa825e9ac0f52f182c46d3 100644
--- a/alib2common/src/core/visitor.hpp
+++ b/alib2common/src/core/visitor.hpp
@@ -8,7 +8,7 @@
 #ifndef VISITOR_HPP_
 #define VISITOR_HPP_
 
-#include <utility>
+#include <alib/utility>
 
 namespace alib {
 
diff --git a/alib2common/src/debug/sigHandler.cpp b/alib2common/src/debug/sigHandler.cpp
index e7a791c314e95309d839c9295fc901c0fdeaf852..7ba1605402ebb68306cc770125a1c2f3c3f8d043 100644
--- a/alib2common/src/debug/sigHandler.cpp
+++ b/alib2common/src/debug/sigHandler.cpp
@@ -7,7 +7,7 @@
 #include "sigHandler.h"
 
 #include "simpleStacktrace.h"
-#include <iostream>
+#include <alib/iostream>
 #include <global/GlobalData.h>
 
 namespace ext {
diff --git a/alib2common/src/debug/sigHandler.h b/alib2common/src/debug/sigHandler.h
index 0d304c3afc2a98422e85b590e44096a0e4ab9d89..50fbfccf72ed195d014a3748d9c7b911d38932fc 100644
--- a/alib2common/src/debug/sigHandler.h
+++ b/alib2common/src/debug/sigHandler.h
@@ -1,7 +1,7 @@
 #ifndef SIG_HANDLER_H_
 #define SIG_HANDLER_H_
 
-#include <string>
+#include <alib/string>
 
 namespace ext {
 
diff --git a/alib2common/src/debug/simpleStacktrace.cpp b/alib2common/src/debug/simpleStacktrace.cpp
index 4d1775f416e90f2f1f35fe72b7b485fa0192ef71..9dc06a21500f4efaa40197a4756aaf8aff402feb 100644
--- a/alib2common/src/debug/simpleStacktrace.cpp
+++ b/alib2common/src/debug/simpleStacktrace.cpp
@@ -12,8 +12,8 @@
 #include <cstring>
 
 #include <sstream>
-#include <string>
-#include <map>
+#include <alib/string>
+#include <alib/map>
 
 namespace ext {
 
diff --git a/alib2common/src/debug/simpleStacktrace.h b/alib2common/src/debug/simpleStacktrace.h
index 4c5ffaf396b272191ccfecb357e68e1f4c9ad939..695600d4532fb6b3cbf73ecc517bb83452431c21 100644
--- a/alib2common/src/debug/simpleStacktrace.h
+++ b/alib2common/src/debug/simpleStacktrace.h
@@ -4,7 +4,7 @@
 #ifndef _SIMPLE_STACKTRACE_H_
 #define _SIMPLE_STACKTRACE_H_
 
-#include <string>
+#include <alib/string>
 
 namespace ext {
 
diff --git a/alib2common/src/exception/CommonException.h b/alib2common/src/exception/CommonException.h
index cb827b20b445f5635a8b1b85950f134b93a0064d..008d3d959134f8655f6de7f59132b214015925e6 100644
--- a/alib2common/src/exception/CommonException.h
+++ b/alib2common/src/exception/CommonException.h
@@ -9,7 +9,7 @@
 #define COMMON_EXCEPTION_H_
 
 #include <exception>
-#include <string>
+#include <alib/string>
 #include <ostream>
 
 #include "../object/ObjectBase.h"
diff --git a/alib2common/src/global/GlobalData.cpp b/alib2common/src/global/GlobalData.cpp
index 2c9d72971f166834ecc5f11f4e96e0d591b02ff2..d718b0e34464e500cb7e7c79ad9f06b18e6952f3 100644
--- a/alib2common/src/global/GlobalData.cpp
+++ b/alib2common/src/global/GlobalData.cpp
@@ -8,8 +8,8 @@
 #include "GlobalData.h"
 #include <cstdlib>
 
-#include <iostream>
-#include <string>
+#include <alib/iostream>
+#include <alib/string>
 
 namespace common {
 
diff --git a/alib2common/src/global/GlobalData.h b/alib2common/src/global/GlobalData.h
index 6e81223596634076c7804ccfed0604a7448f5144..2b5b9f886760fb37a6271322283c4ac742b6c34f 100644
--- a/alib2common/src/global/GlobalData.h
+++ b/alib2common/src/global/GlobalData.h
@@ -8,8 +8,8 @@
 #ifndef _GLOBAL_DATA_H_
 #define _GLOBAL_DATA_H_
 
-#include <functional>
-#include <istream>
+#include <alib/functional>
+#include <alib/istream>
 #include <ostream>
 
 namespace common {
diff --git a/alib2common/src/object/ObjectBase.h b/alib2common/src/object/ObjectBase.h
index 94d49656bc25caed8fd13794b073db306c7681a8..7a92f0ff3a7d6bbced109fa81509e26e317c5ba7 100644
--- a/alib2common/src/object/ObjectBase.h
+++ b/alib2common/src/object/ObjectBase.h
@@ -8,7 +8,7 @@
 #ifndef OBJECT_BASE_H_
 #define OBJECT_BASE_H_
 
-#include <memory>
+#include <alib/memory>
 #include "../base/CommonBase.hpp"
 
 namespace alib {
diff --git a/alib2common/src/primitive/String.h b/alib2common/src/primitive/String.h
index 4bcead0a5cad0be30299b905e9fcf0167ffa6dd5..47606b87ce128e07abff517de56d7fa33ded5da3 100644
--- a/alib2common/src/primitive/String.h
+++ b/alib2common/src/primitive/String.h
@@ -9,7 +9,7 @@
 #define PRIMITIVE_STRING_H_
 
 #include "PrimitiveBase.h"
-#include <string>
+#include <alib/string>
 
 namespace primitive {
 
diff --git a/alib2common/test-src/container/ContainerTest.cpp b/alib2common/test-src/container/ContainerTest.cpp
index 6c1720fd17e7fb8d77ad21347b80ebd97fb5fddd..ff9f665565137679b39e3078f1bf593843d50807 100644
--- a/alib2common/test-src/container/ContainerTest.cpp
+++ b/alib2common/test-src/container/ContainerTest.cpp
@@ -4,7 +4,7 @@
 #include "container/ObjectsSet.h"
 #include "container/ObjectsDeque.h"
 
-#include <type_traits>
+#include <alib/type_traits>
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( ContainerTest, "container" );
 CPPUNIT_TEST_SUITE_REGISTRATION ( ContainerTest );
diff --git a/alib2common/test-src/core/ComponentsTest.cpp b/alib2common/test-src/core/ComponentsTest.cpp
index 65b7c91ce8cd7a7c5363344cdfca5a9a8c0b6349..af67abb5ffafcdab65c10aae440b20a07a5b4337 100644
--- a/alib2common/test-src/core/ComponentsTest.cpp
+++ b/alib2common/test-src/core/ComponentsTest.cpp
@@ -1,8 +1,8 @@
 #include "ComponentsTest.h"
 #include <core/components.hpp>
 
-#include <set>
-#include <linear_set>
+#include <alib/set>
+#include <alib/linear_set>
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( ComponentsTest, "alphabet" );
 CPPUNIT_TEST_SUITE_REGISTRATION ( ComponentsTest );
diff --git a/alib2common/test-src/object/ObjectTest.cpp b/alib2common/test-src/object/ObjectTest.cpp
index adb4e7f26cec1e8849262d7bebac43666baa4482..45987d2a3bad5d0bd48db0fe754a01dadf378dd5 100644
--- a/alib2common/test-src/object/ObjectTest.cpp
+++ b/alib2common/test-src/object/ObjectTest.cpp
@@ -1,10 +1,10 @@
-#include <list>
+#include <alib/list>
 #include "ObjectTest.h"
 
 #include "object/Object.h"
 #include <primitive/Unsigned.h>
 
-#include <type_traits>
+#include <alib/type_traits>
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( ObjectTest, "object" );
 CPPUNIT_TEST_SUITE_REGISTRATION ( ObjectTest );