diff --git a/alib2abstraction/src/abstraction/AlgorithmAbstraction.hpp b/alib2abstraction/src/abstraction/AlgorithmAbstraction.hpp
index 8db992392b4b9b190afeca9010844963d22595e6..8f90a0a43da1648c86fb292ab5600d6d1d442492 100644
--- a/alib2abstraction/src/abstraction/AlgorithmAbstraction.hpp
+++ b/alib2abstraction/src/abstraction/AlgorithmAbstraction.hpp
@@ -9,7 +9,7 @@
 #define _ALGORITHM_ABSTRACTION_HPP_
 
 #include <abstraction/NaryOperationAbstraction.hpp>
-#include <memory>
+#include <alib/memory>
 #include <registry/Registry.h>
 
 namespace abstraction {
diff --git a/alib2abstraction/src/abstraction/AnyaryOperationAbstraction.hpp b/alib2abstraction/src/abstraction/AnyaryOperationAbstraction.hpp
index 698d4360ae26d5c410d4f690feca10f58102512c..146d14ca5ff47c1d983364ffa0871623443da9f2 100644
--- a/alib2abstraction/src/abstraction/AnyaryOperationAbstraction.hpp
+++ b/alib2abstraction/src/abstraction/AnyaryOperationAbstraction.hpp
@@ -9,7 +9,7 @@
 #define _ANYARY_OPERATION_ABSTRACTION_HPP_
 
 #include <abstraction/ValueOperationAbstraction.hpp>
-#include <memory>
+#include <alib/memory>
 #include <registry/Registry.h>
 
 namespace abstraction {
diff --git a/alib2abstraction/src/abstraction/MemberAbstraction.hpp b/alib2abstraction/src/abstraction/MemberAbstraction.hpp
index f4d57c8a66e2503af307425392193a1c9ab98a30..a8ec3a2b2e8e13fdcd611affeba2507a8eb62710 100644
--- a/alib2abstraction/src/abstraction/MemberAbstraction.hpp
+++ b/alib2abstraction/src/abstraction/MemberAbstraction.hpp
@@ -9,7 +9,7 @@
 #define _MEMBER_ABSTRACTION_HPP_
 
 #include <abstraction/NaryOperationAbstraction.hpp>
-#include <memory>
+#include <alib/memory>
 #include <registry/Registry.h>
 
 namespace abstraction {
diff --git a/alib2abstraction/src/abstraction/NaryOperationAbstraction.hpp b/alib2abstraction/src/abstraction/NaryOperationAbstraction.hpp
index 87ba1c106f510f661dbd41e19efd9b0aa6e22ad3..ecdec0cf73ad3abe79e33471d2ee297e0786996b 100644
--- a/alib2abstraction/src/abstraction/NaryOperationAbstraction.hpp
+++ b/alib2abstraction/src/abstraction/NaryOperationAbstraction.hpp
@@ -9,8 +9,8 @@
 #define _NARY_OPERATION_ABSTRACTION_HPP_
 
 #include <abstraction/ValueOperationAbstraction.hpp>
-#include <tuple>
-#include <memory>
+#include <alib/tuple>
+#include <alib/memory>
 #include <registry/Registry.h>
 
 namespace abstraction {
diff --git a/alib2abstraction/src/abstraction/OperationAbstraction.hpp b/alib2abstraction/src/abstraction/OperationAbstraction.hpp
index c52a7e2e368e6f29909e1416b13ab8734dbf8743..a0a78d926c4e1f7f10b6f6e789fa338647d66fb3 100644
--- a/alib2abstraction/src/abstraction/OperationAbstraction.hpp
+++ b/alib2abstraction/src/abstraction/OperationAbstraction.hpp
@@ -8,9 +8,9 @@
 #ifndef _OPERATION_ABSTRACTION_HPP_
 #define _OPERATION_ABSTRACTION_HPP_
 
-#include <memory>
-#include <string>
-#include <typeindex>
+#include <alib/memory>
+#include <alib/string>
+#include <alib/typeindex>
 
 namespace abstraction {
 
diff --git a/alib2abstraction/src/abstraction/SetAbstraction.hpp b/alib2abstraction/src/abstraction/SetAbstraction.hpp
index c25caca61e33bbd367aa1367dd24c7aefe3a1d1c..9807e8bb92c633a89940144640794f42bc979519 100644
--- a/alib2abstraction/src/abstraction/SetAbstraction.hpp
+++ b/alib2abstraction/src/abstraction/SetAbstraction.hpp
@@ -9,7 +9,7 @@
 #define _SET_ABSTRACTION_HPP_
 
 #include <abstraction/AnyaryOperationAbstraction.hpp>
-#include <memory>
+#include <alib/memory>
 
 namespace abstraction {
 
diff --git a/alib2abstraction/src/abstraction/ValueOperationAbstraction.hpp b/alib2abstraction/src/abstraction/ValueOperationAbstraction.hpp
index f3dd73afd02aad74f320068b379d0deedb8a7225..a5a40030e9762d159370855725a12f9f30b51991 100644
--- a/alib2abstraction/src/abstraction/ValueOperationAbstraction.hpp
+++ b/alib2abstraction/src/abstraction/ValueOperationAbstraction.hpp
@@ -9,10 +9,10 @@
 #define _VALUE_OPERATION_ABSTRACTION_HPP_
 
 #include <abstraction/OperationAbstraction.hpp>
-#include <tuple>
-#include <memory>
-#include <typeindex>
-#include <variant>
+#include <alib/tuple>
+#include <alib/memory>
+#include <alib/typeindex>
+#include <alib/variant>
 #include <abstraction/ValueProvider.hpp>
 
 namespace abstraction {
diff --git a/alib2abstraction/src/abstraction/ValueProvider.hpp b/alib2abstraction/src/abstraction/ValueProvider.hpp
index ecfd4b2431f39302158fe307be908ebb553c6d26..843c405f54e02cd931e3e74b791bc3bc32caf848 100644
--- a/alib2abstraction/src/abstraction/ValueProvider.hpp
+++ b/alib2abstraction/src/abstraction/ValueProvider.hpp
@@ -9,7 +9,7 @@
 #define _VALUE_PROVIDER_HPP_
 
 #include <exception>
-#include <utility>
+#include <alib/utility>
 
 namespace abstraction {
 
diff --git a/alib2abstraction/src/common/AlgorithmCategories.hpp b/alib2abstraction/src/common/AlgorithmCategories.hpp
index f534e9d4e2f33d1c90f48a9846f3ce3e03b9f7c0..6ff26b49e9e23b01b835155199e3084a1b695862 100644
--- a/alib2abstraction/src/common/AlgorithmCategories.hpp
+++ b/alib2abstraction/src/common/AlgorithmCategories.hpp
@@ -1,7 +1,7 @@
 #ifndef _ALGORITHM_CATEGORY_HPP_
 #define _ALGORITHM_CATEGORY_HPP_
 
-#include <string>
+#include <alib/string>
 
 namespace abstraction {
 
diff --git a/alib2abstraction/src/common/AlgorithmHelper.h b/alib2abstraction/src/common/AlgorithmHelper.h
index f46556a1fde46b13bd43129235b5f03ce1922fab..576c240e7a71e2c14fbd7a4b5105639b8ed98064 100644
--- a/alib2abstraction/src/common/AlgorithmHelper.h
+++ b/alib2abstraction/src/common/AlgorithmHelper.h
@@ -8,9 +8,9 @@
 #ifndef _ALGORITHM_HELPER_HPP_
 #define _ALGORITHM_HELPER_HPP_
 
-#include <string>
-#include <memory>
-#include <vector>
+#include <alib/string>
+#include <alib/memory>
+#include <alib/vector>
 #include <common/AlgorithmCategories.hpp>
 
 namespace abstraction {
diff --git a/alib2abstraction/src/common/ParamQualifiers.hpp b/alib2abstraction/src/common/ParamQualifiers.hpp
index ab729b9dd0cd07dee8c05576ed07c2659b04a5a8..01fea43d2bc039f45080558fc235ab17c29acb68 100644
--- a/alib2abstraction/src/common/ParamQualifiers.hpp
+++ b/alib2abstraction/src/common/ParamQualifiers.hpp
@@ -1,8 +1,8 @@
 #ifndef _PARAM_QUALIFIERS_HPP_
 #define _PARAM_QUALIFIERS_HPP_
 
-#include <set>
-#include <type_traits>
+#include <alib/set>
+#include <alib/type_traits>
 
 namespace abstraction {
 
diff --git a/alib2abstraction/src/registry/AlgorithmRegistry.cpp b/alib2abstraction/src/registry/AlgorithmRegistry.cpp
index f4480b9831897734ef0ce896dc961801ba9a5c55..8fe49aa6d98c3e554eccbd8795b88c573362b10c 100644
--- a/alib2abstraction/src/registry/AlgorithmRegistry.cpp
+++ b/alib2abstraction/src/registry/AlgorithmRegistry.cpp
@@ -7,8 +7,8 @@
 
 #include <registry/AlgorithmRegistry.hpp>
 #include <registry/CastRegistry.hpp>
-#include <foreach>
-#include <typeinfo>
+#include <alib/foreach>
+#include <alib/typeinfo>
 
 namespace abstraction {
 
diff --git a/alib2abstraction/src/registry/AlgorithmRegistry.hpp b/alib2abstraction/src/registry/AlgorithmRegistry.hpp
index 1c82d37003af50b1b54995e828163a69d0e55f7b..16e2286a9ca9036a9abe2757126ee9f36836c15c 100644
--- a/alib2abstraction/src/registry/AlgorithmRegistry.hpp
+++ b/alib2abstraction/src/registry/AlgorithmRegistry.hpp
@@ -8,16 +8,16 @@
 #ifndef _ALGORITHM_REGISTRY_HPP_
 #define _ALGORITHM_REGISTRY_HPP_
 
-#include <functional>
-#include <memory>
-#include <vector>
-#include <string>
-#include <set>
-#include <map>
-#include <tuple>
-#include <algorithm>
+#include <alib/functional>
+#include <alib/memory>
+#include <alib/vector>
+#include <alib/string>
+#include <alib/set>
+#include <alib/map>
+#include <alib/tuple>
+#include <alib/algorithm>
 #include <exception>
-#include <typeinfo>
+#include <alib/typeinfo>
 
 #include <abstraction/OperationAbstraction.hpp>
 
diff --git a/alib2abstraction/src/registry/CastRegistry.cpp b/alib2abstraction/src/registry/CastRegistry.cpp
index c511a78b5b66b37194030cdff528d26884c86caa..53c19198ccd4cf51a16b96521cd99d560885a63c 100644
--- a/alib2abstraction/src/registry/CastRegistry.cpp
+++ b/alib2abstraction/src/registry/CastRegistry.cpp
@@ -6,8 +6,8 @@
  */
 
 #include <registry/CastRegistry.hpp>
-#include <algorithm>
-#include <typeinfo>
+#include <alib/algorithm>
+#include <alib/typeinfo>
 
 namespace abstraction {
 
diff --git a/alib2abstraction/src/registry/CastRegistry.hpp b/alib2abstraction/src/registry/CastRegistry.hpp
index 4875cfeae780d57f1aba0f0e3e9f9ec9c43029f5..804864291ef7a43d354041a752d4880dd0ef8c5e 100644
--- a/alib2abstraction/src/registry/CastRegistry.hpp
+++ b/alib2abstraction/src/registry/CastRegistry.hpp
@@ -8,15 +8,15 @@
 #ifndef _CAST_REGISTRY_HPP_
 #define _CAST_REGISTRY_HPP_
 
-#include <memory>
-#include <string>
-#include <set>
-#include <map>
-#include <functional>
+#include <alib/memory>
+#include <alib/string>
+#include <alib/set>
+#include <alib/map>
+#include <alib/functional>
 
 #include <exception>
 #include <abstraction/OperationAbstraction.hpp>
-#include <typeinfo>
+#include <alib/typeinfo>
 
 namespace abstraction {
 
diff --git a/alib2abstraction/src/registry/ContainerRegistry.cpp b/alib2abstraction/src/registry/ContainerRegistry.cpp
index 3551ebc87e33c3e93bd3ed3a917af6afa7e1d4a2..430acd89d8acc5cefc8c28e6b8862418b061f5ff 100644
--- a/alib2abstraction/src/registry/ContainerRegistry.cpp
+++ b/alib2abstraction/src/registry/ContainerRegistry.cpp
@@ -6,8 +6,8 @@
  */
 
 #include <registry/ContainerRegistry.hpp>
-#include <algorithm>
-#include <typeinfo>
+#include <alib/algorithm>
+#include <alib/typeinfo>
 
 namespace abstraction {
 
diff --git a/alib2abstraction/src/registry/ContainerRegistry.hpp b/alib2abstraction/src/registry/ContainerRegistry.hpp
index 9e2443bada1464aff10ad8575d739b4ef60a8c32..748b0631cbfdb427b12f92a2efa62e710b3e6f1c 100644
--- a/alib2abstraction/src/registry/ContainerRegistry.hpp
+++ b/alib2abstraction/src/registry/ContainerRegistry.hpp
@@ -8,12 +8,12 @@
 #ifndef _CONTAINER_REGISTRY_HPP_
 #define _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>
 #include <abstraction/OperationAbstraction.hpp>
diff --git a/alib2abstraction/src/registry/ImmediateRegistry.hpp b/alib2abstraction/src/registry/ImmediateRegistry.hpp
index d70b5160440413607940977a992a076233af65ad..71f8aed4efab6be1e7661c7d35a94943a1d0e62c 100644
--- a/alib2abstraction/src/registry/ImmediateRegistry.hpp
+++ b/alib2abstraction/src/registry/ImmediateRegistry.hpp
@@ -8,9 +8,9 @@
 #ifndef _IMMEDIATE_REGISTRY_HPP_
 #define _IMMEDIATE_REGISTRY_HPP_
 
-#include <memory>
-#include <string>
-#include <map>
+#include <alib/memory>
+#include <alib/string>
+#include <alib/map>
 
 #include <exception>
 #include <abstraction/OperationAbstraction.hpp>
diff --git a/alib2abstraction/src/registry/NormalizeRegistry.hpp b/alib2abstraction/src/registry/NormalizeRegistry.hpp
index 531b1b31af81a6205d035deafefc1ddafa2245be..131661a7f7982fd48b36cf7539065e27ebf77d44 100644
--- a/alib2abstraction/src/registry/NormalizeRegistry.hpp
+++ b/alib2abstraction/src/registry/NormalizeRegistry.hpp
@@ -8,9 +8,9 @@
 #ifndef _NORMALIZE_REGISTRY_HPP_
 #define _NORMALIZE_REGISTRY_HPP_
 
-#include <memory>
-#include <string>
-#include <map>
+#include <alib/memory>
+#include <alib/string>
+#include <alib/map>
 
 #include <abstraction/OperationAbstraction.hpp>
 
diff --git a/alib2abstraction/src/registry/Registry.h b/alib2abstraction/src/registry/Registry.h
index 7595c8bab814fed36f6f0ef89aa6a5428c1b1fea..c0fc8b6e3499fda2e7fb056b68ffc185740974ac 100644
--- a/alib2abstraction/src/registry/Registry.h
+++ b/alib2abstraction/src/registry/Registry.h
@@ -12,8 +12,8 @@
 #include <common/ParamQualifiers.hpp>
 #include <common/AlgorithmCategories.hpp>
 
-#include <pair>
-#include <tuple>
+#include <alib/pair>
+#include <alib/tuple>
 
 namespace abstraction {
 
diff --git a/alib2abstraction/src/registry/ValuePrinterRegistry.hpp b/alib2abstraction/src/registry/ValuePrinterRegistry.hpp
index c36fd4254e2d80452b017877d8bc4503958484f5..ed21d121bf3cf7c81aba3c209e45092591078a0e 100644
--- a/alib2abstraction/src/registry/ValuePrinterRegistry.hpp
+++ b/alib2abstraction/src/registry/ValuePrinterRegistry.hpp
@@ -8,9 +8,9 @@
 #ifndef _VALUE_PRINTER_REGISTRY_HPP_
 #define _VALUE_PRINTER_REGISTRY_HPP_
 
-#include <memory>
-#include <string>
-#include <map>
+#include <alib/memory>
+#include <alib/string>
+#include <alib/map>
 
 #include <abstraction/OperationAbstraction.hpp>