diff --git a/alib2xml/src/common/XmlComposerHelper.h b/alib2xml/src/common/XmlComposerHelper.h
index 56959174c4f4bcf6b19f39bab15056a4a943dcf8..8575ed854b6db9c1ad56f134c40db8f1bf67567f 100644
--- a/alib2xml/src/common/XmlComposerHelper.h
+++ b/alib2xml/src/common/XmlComposerHelper.h
@@ -8,8 +8,8 @@
 #ifndef _XML_COMPOSER_HELPER_HPP_
 #define _XML_COMPOSER_HELPER_HPP_
 
-#include <string>
-#include <memory>
+#include <alib/string>
+#include <alib/memory>
 #include <abstraction/OperationAbstraction.hpp>
 
 namespace abstraction {
diff --git a/alib2xml/src/common/XmlParserHelper.h b/alib2xml/src/common/XmlParserHelper.h
index 63aafec34e2a6e61b12784bf7aa57d54b3cff64a..ab52575ebaaddad34596ed043d7558df26dc0ec3 100644
--- a/alib2xml/src/common/XmlParserHelper.h
+++ b/alib2xml/src/common/XmlParserHelper.h
@@ -8,8 +8,8 @@
 #ifndef _XML_PARSER_HELPER_HPP_
 #define _XML_PARSER_HELPER_HPP_
 
-#include <string>
-#include <memory>
+#include <alib/string>
+#include <alib/memory>
 #include <abstraction/OperationAbstraction.hpp>
 
 namespace abstraction {
diff --git a/alib2xml/src/container/xml/ObjectsBitset.h b/alib2xml/src/container/xml/ObjectsBitset.h
index c4177f51ff808a3f9205d2c0f19790573e92a28a..8276fed937db214d5907f935f297a3c527626e17 100644
--- a/alib2xml/src/container/xml/ObjectsBitset.h
+++ b/alib2xml/src/container/xml/ObjectsBitset.h
@@ -8,7 +8,7 @@
 #ifndef OBJECTS_BITSET_H_
 #define OBJECTS_BITSET_H_
 
-#include <bitset>
+#include <alib/bitset>
 #include <core/xmlApi.hpp>
 
 #include <primitive/xml/Bool.h>
diff --git a/alib2xml/src/container/xml/ObjectsTuple.h b/alib2xml/src/container/xml/ObjectsTuple.h
index 534eb55476582bdaecf89c75ab7469f93dcfe6cf..9d638c346cffb19aab42bde7e44c828ab6054523 100644
--- a/alib2xml/src/container/xml/ObjectsTuple.h
+++ b/alib2xml/src/container/xml/ObjectsTuple.h
@@ -8,8 +8,8 @@
 #ifndef _XML_OBJECTS_TUPLE_H_
 #define _XML_OBJECTS_TUPLE_H_
 
-#include <tuple>
-#include <string>
+#include <alib/tuple>
+#include <alib/string>
 
 #include <core/xmlApi.hpp>
 
diff --git a/alib2xml/src/container/xml/ObjectsVariant.h b/alib2xml/src/container/xml/ObjectsVariant.h
index 835dc4fd27c55e98e702c6d63cd76b7887b1061d..18be602e1c61d16bf126b1c68b83719e2f307d03 100644
--- a/alib2xml/src/container/xml/ObjectsVariant.h
+++ b/alib2xml/src/container/xml/ObjectsVariant.h
@@ -8,7 +8,7 @@
 #ifndef _XML_OBJECTS_VARIANT_H_
 #define _XML_OBJECTS_VARIANT_H_
 
-#include <variant>
+#include <alib/variant>
 #include <exception/CommonException.h>
 #include <core/xmlApi.hpp>
 
diff --git a/alib2xml/src/core/xmlApi.hpp b/alib2xml/src/core/xmlApi.hpp
index e2a72879f385cba69b348d8cb7be0144e55b37b4..6408bb0f9861c3ce97c3d526e7e50491a1c8b097 100644
--- a/alib2xml/src/core/xmlApi.hpp
+++ b/alib2xml/src/core/xmlApi.hpp
@@ -8,11 +8,11 @@
 #ifndef XML_API_HPP_
 #define XML_API_HPP_
 
-#include <functional>
-#include <deque>
-#include <map>
-#include <string>
-#include <memory>
+#include <alib/functional>
+#include <alib/deque>
+#include <alib/map>
+#include <alib/string>
+#include <alib/memory>
 #include "sax/Token.h"
 #include "sax/FromXMLParserHelper.h"
 
diff --git a/alib2xml/src/exception/xml/CommonException.h b/alib2xml/src/exception/xml/CommonException.h
index 33665963b2f5bc9833ce4e28f6394d90dac728b5..6f10d5aa91c1f32dcdfb5ce9cb0e4f2677e029a0 100644
--- a/alib2xml/src/exception/xml/CommonException.h
+++ b/alib2xml/src/exception/xml/CommonException.h
@@ -9,7 +9,7 @@
 #define _XML_COMMON_EXCEPTION_H_
 
 #include <exception/CommonException.h>
-#include <string>
+#include <alib/string>
 #include <core/xmlApi.hpp>
 
 namespace alib {
diff --git a/alib2xml/src/factory/XmlDataFactory.hpp b/alib2xml/src/factory/XmlDataFactory.hpp
index 36c8a387ded8c06abe7d393e33884e7813037083..ffad09f98afdb24e2ff1af5499c95c12ffd572f9 100644
--- a/alib2xml/src/factory/XmlDataFactory.hpp
+++ b/alib2xml/src/factory/XmlDataFactory.hpp
@@ -8,8 +8,8 @@
 #ifndef XML_DATA_FACTORY_HPP_
 #define XML_DATA_FACTORY_HPP_
 
-#include <string>
-#include <deque>
+#include <alib/string>
+#include <alib/deque>
 #include <measure>
 
 #include <sax/Token.h>
diff --git a/alib2xml/src/registry/XmlComposerRegistry.hpp b/alib2xml/src/registry/XmlComposerRegistry.hpp
index 89b4ed56d5fe14150c24d20ef80e22761ef43cdc..90bbe6696e94633b4461312cbcf72c2746b4e355 100644
--- a/alib2xml/src/registry/XmlComposerRegistry.hpp
+++ b/alib2xml/src/registry/XmlComposerRegistry.hpp
@@ -8,10 +8,10 @@
 #ifndef _XML_COMPOSER_REGISTRY_HPP_
 #define _XML_COMPOSER_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/alib2xml/src/registry/XmlContainerParserRegistry.cpp b/alib2xml/src/registry/XmlContainerParserRegistry.cpp
index 24ff67bdedd8bc5690145c6dd6aee985cd6dee4f..f696ab13845496d84f8c33384b7a52781dae0649 100644
--- a/alib2xml/src/registry/XmlContainerParserRegistry.cpp
+++ b/alib2xml/src/registry/XmlContainerParserRegistry.cpp
@@ -6,7 +6,7 @@
  */
 
 #include <registry/XmlContainerParserRegistry.hpp>
-#include <foreach>
+#include <alib/foreach>
 
 namespace abstraction {
 
diff --git a/alib2xml/src/registry/XmlContainerParserRegistry.hpp b/alib2xml/src/registry/XmlContainerParserRegistry.hpp
index 31b385bb701cd6d241773400edfc9a98847674f6..29f462baa65c40622a50728edef30bb06b686b67 100644
--- a/alib2xml/src/registry/XmlContainerParserRegistry.hpp
+++ b/alib2xml/src/registry/XmlContainerParserRegistry.hpp
@@ -8,12 +8,12 @@
 #ifndef _XML_CONTAINER_REGISTRY_HPP_
 #define _XML_CONTAINER_REGISTRY_HPP_
 
-#include <functional>
-#include <memory>
-#include <vector>
-#include <string>
-#include <set>
-#include <map>
+#include <alib/functional>
+#include <alib/memory>
+#include <alib/vector>
+#include <alib/string>
+#include <alib/set>
+#include <alib/map>
 
 #include <exception/CommonException.h>
 #include <abstraction/OperationAbstraction.hpp>
diff --git a/alib2xml/src/registry/XmlParserRegistry.hpp b/alib2xml/src/registry/XmlParserRegistry.hpp
index 46f9a2538e28775d7bffe212f8f33f166bdf2a12..81841b08a6eacb3f02fecedaf6c64db8bd0942e4 100644
--- a/alib2xml/src/registry/XmlParserRegistry.hpp
+++ b/alib2xml/src/registry/XmlParserRegistry.hpp
@@ -8,9 +8,9 @@
 #ifndef _XML_PARSER_REGISTRY_HPP_
 #define _XML_PARSER_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/alib2xml/src/registry/XmlRegistry.h b/alib2xml/src/registry/XmlRegistry.h
index 634cb2c2e538ec2f7c23eacf3db9af138e0ba9c0..391753507b0493e5a59f8dd0977d68902af4fc89 100644
--- a/alib2xml/src/registry/XmlRegistry.h
+++ b/alib2xml/src/registry/XmlRegistry.h
@@ -15,7 +15,7 @@
 #include <abstraction/UnaryOperationAbstraction.hpp>
 #include <abstraction/BinaryOperationAbstraction.hpp>
 
-#include <deque>
+#include <alib/deque>
 #include <sax/Token.h>
 
 namespace abstraction {
diff --git a/alib2xml/src/sax/FromXMLParserHelper.h b/alib2xml/src/sax/FromXMLParserHelper.h
index 000be9b8b1ff65ed34ec903898b9ba6510692447..eafe664ce0ad9fd2456b34fdfc2053abd2cc2af8 100644
--- a/alib2xml/src/sax/FromXMLParserHelper.h
+++ b/alib2xml/src/sax/FromXMLParserHelper.h
@@ -10,8 +10,8 @@
 
 #include <tclap/MultiArg.h>
 #include <tclap/ValueArg.h>
-#include <string>
-#include <deque>
+#include <alib/string>
+#include <alib/deque>
 #include "Token.h"
 
 namespace sax {
diff --git a/alib2xml/src/sax/SaxComposeInterface.cpp b/alib2xml/src/sax/SaxComposeInterface.cpp
index 28f38712dc5c904c433d1e0cca55536572054d99..eda471667b8c27c510092fb1e4ae91fbf3066561 100644
--- a/alib2xml/src/sax/SaxComposeInterface.cpp
+++ b/alib2xml/src/sax/SaxComposeInterface.cpp
@@ -7,11 +7,11 @@
 
 #include "SaxComposeInterface.h"
 
-#include <string>
-#include <iostream>
+#include <alib/string>
+#include <alib/iostream>
 #include <fstream>
 #include <sstream>
-#include <deque>
+#include <alib/deque>
 #include "ComposerException.h"
 #include <measure>
 
diff --git a/alib2xml/src/sax/SaxComposeInterface.h b/alib2xml/src/sax/SaxComposeInterface.h
index 343e37ec287efd1b6e1d3ca7ded7a2292c6fb81a..c894e9ab0d3aeeb66b34c27fd7f4b35c44614820 100644
--- a/alib2xml/src/sax/SaxComposeInterface.h
+++ b/alib2xml/src/sax/SaxComposeInterface.h
@@ -9,7 +9,7 @@
 #define SAX_COMPOSE_INTERFACE_H_
 
 #include <libxml/xmlwriter.h>
-#include <deque>
+#include <alib/deque>
 #include "Token.h"
 
 namespace sax {
diff --git a/alib2xml/src/sax/SaxParseInterface.cpp b/alib2xml/src/sax/SaxParseInterface.cpp
index bf88dbf791a22b9430de08cbca0e97c5dbdf454b..204fade1291c6e79acd142b6c68d63bc787fd036 100644
--- a/alib2xml/src/sax/SaxParseInterface.cpp
+++ b/alib2xml/src/sax/SaxParseInterface.cpp
@@ -7,11 +7,11 @@
 
 #include "SaxParseInterface.h"
 
-#include <string>
+#include <alib/string>
 #include <cstring>
 #include <cstdlib>
-#include <iostream>
-#include <algorithm>
+#include <alib/iostream>
+#include <alib/algorithm>
 #include <exception/CommonException.h>
 #include <measure>
 
diff --git a/alib2xml/src/sax/SaxParseInterface.h b/alib2xml/src/sax/SaxParseInterface.h
index efde5ec404c5643b596c5589dfd046030fa86aa3..d844330fd313a3272311c64329a2f41f93e3f46d 100644
--- a/alib2xml/src/sax/SaxParseInterface.h
+++ b/alib2xml/src/sax/SaxParseInterface.h
@@ -9,7 +9,7 @@
 #define SAX_PARSE_INTERFACE_H_
 
 #include <libxml/xmlreader.h>
-#include <deque>
+#include <alib/deque>
 #include "Token.h"
 
 namespace sax {
diff --git a/alib2xml/src/sax/Token.cpp b/alib2xml/src/sax/Token.cpp
index 631c25c2008b160633d832ea786a6342118fb6ac..5b1f3ea64c7898958a5c333ae3be58a5665f1d08 100644
--- a/alib2xml/src/sax/Token.cpp
+++ b/alib2xml/src/sax/Token.cpp
@@ -7,7 +7,7 @@
 
 #include "Token.h"
 #include <sstream>
-#include <iostream>
+#include <alib/iostream>
 
 namespace sax {
 
diff --git a/alib2xml/src/sax/Token.h b/alib2xml/src/sax/Token.h
index 9d85e119baed941457ac8cf4d7782ea9330a2012..895e151ba9362aa559b6a337fd7c2aebc2be19d8 100644
--- a/alib2xml/src/sax/Token.h
+++ b/alib2xml/src/sax/Token.h
@@ -8,7 +8,7 @@
 #ifndef TOKEN_H_
 #define TOKEN_H_
 
-#include <string>
+#include <alib/string>
 #include <ostream>
 
 namespace sax {
diff --git a/alib2xml/test-src/primitive/PrimitiveTest.cpp b/alib2xml/test-src/primitive/PrimitiveTest.cpp
index e84505ab9dcc165e5cf0c084ac9a70048e09a039..9e5e73b34622e8b5fff2353445a60f2d6146388b 100644
--- a/alib2xml/test-src/primitive/PrimitiveTest.cpp
+++ b/alib2xml/test-src/primitive/PrimitiveTest.cpp
@@ -1,4 +1,4 @@
-#include <list>
+#include <alib/list>
 #include "PrimitiveTest.h"
 
 #include <primitive/Primitive.h>
diff --git a/alib2xml/test-src/sax/SaxTest.cpp b/alib2xml/test-src/sax/SaxTest.cpp
index 66c35765137fac5d9180ff8572c9f10fac39457d..e3532c4236680c6244552976e16c4b3025c766f1 100644
--- a/alib2xml/test-src/sax/SaxTest.cpp
+++ b/alib2xml/test-src/sax/SaxTest.cpp
@@ -1,6 +1,6 @@
 #include "SaxTest.h"
-#include <string>
-#include <iostream>
+#include <alib/string>
+#include <alib/iostream>
 
 #include "sax/SaxParseInterface.h"
 #include "sax/SaxComposeInterface.h"