diff --git a/alib2cli/src/ast/args/BindedArg.h b/alib2cli/src/ast/args/BindedArg.h
index 84246fbdd5d37bc1e2942edd86acca6d744ef037..6fc62b2f87e85217e92f2fe5eb14f400e2ab3c74 100644
--- a/alib2cli/src/ast/args/BindedArg.h
+++ b/alib2cli/src/ast/args/BindedArg.h
@@ -2,7 +2,7 @@
 #define _CLI_BINDED_ARG_H__H_
 
 #include <ast/Arg.h>
-#include <string>
+#include <alib/string>
 
 namespace cli {
 
diff --git a/alib2cli/src/ast/args/ImmediateArg.h b/alib2cli/src/ast/args/ImmediateArg.h
index 1d03f5784beb13ddfcb50a834bf161abea6d4ec6..dc2cb67cf2d365dceb0799304416093140a1eb1f 100644
--- a/alib2cli/src/ast/args/ImmediateArg.h
+++ b/alib2cli/src/ast/args/ImmediateArg.h
@@ -2,7 +2,7 @@
 #define _CLI_IMMEDIATE_ARG_H__H_
 
 #include <ast/Arg.h>
-#include <string>
+#include <alib/string>
 
 namespace cli {
 
diff --git a/alib2cli/src/ast/statements/ContainerStatement.cpp b/alib2cli/src/ast/statements/ContainerStatement.cpp
index cd561878e43677dae2fc369b4af2f13135cbce6a..6ca725f574b250f039eab5fc24a475e59c3df6b0 100644
--- a/alib2cli/src/ast/statements/ContainerStatement.cpp
+++ b/alib2cli/src/ast/statements/ContainerStatement.cpp
@@ -4,7 +4,7 @@
 #include <ast/Arg.h>
 #include <common/CastHelper.h>
 #include <exception>
-#include <iostream>
+#include <alib/iostream>
 
 namespace cli {
 
diff --git a/alib2cli/src/ast/statements/VariableStatement.h b/alib2cli/src/ast/statements/VariableStatement.h
index 7600ae112f3834b3aa6afdc692b144b5f7619230..09ee0b7cc688d8c1f37df30d96af6e17ec581308 100644
--- a/alib2cli/src/ast/statements/VariableStatement.h
+++ b/alib2cli/src/ast/statements/VariableStatement.h
@@ -1,7 +1,7 @@
 #ifndef _CLI_VARIABLE_STATEMENT_H_
 #define _CLI_VARIABLE_STATEMENT_H_
 
-#include <string>
+#include <alib/string>
 #include <ast/Statement.h>
 
 namespace cli {
diff --git a/alib2cli/src/builtin/Dot.cpp b/alib2cli/src/builtin/Dot.cpp
index 1fdbb4eae3646767c523fd466a16808f06038843..9f6932e1e5cafd030577d2d1c79e33331ed92809 100644
--- a/alib2cli/src/builtin/Dot.cpp
+++ b/alib2cli/src/builtin/Dot.cpp
@@ -8,7 +8,7 @@
 #include "Dot.h"
 #include <registration/AlgoRegistration.hpp>
 #include <cstdlib>
-#include <algorithm>
+#include <alib/algorithm>
 #include <cctype>
 
 #include <exception/CommonException.h>
diff --git a/alib2cli/src/builtin/Dot.h b/alib2cli/src/builtin/Dot.h
index 788cdabe55c12896ccf91e1514f5aaf54263bcc2..1d9a250cac55aa14025713a2870a888da16fd80d 100644
--- a/alib2cli/src/builtin/Dot.h
+++ b/alib2cli/src/builtin/Dot.h
@@ -8,8 +8,8 @@
 #ifndef _DOT_H_
 #define _DOT_H_
 
-#include <string>
-#include <vector>
+#include <alib/string>
+#include <alib/vector>
 
 namespace cli {
 
diff --git a/alib2cli/src/builtin/ReadFile.h b/alib2cli/src/builtin/ReadFile.h
index 4611821e4b364970f3bd504bdb772377e85ed028..28d47dd51ff47e510e7f957d6b89e5a56d1dff3c 100644
--- a/alib2cli/src/builtin/ReadFile.h
+++ b/alib2cli/src/builtin/ReadFile.h
@@ -8,7 +8,7 @@
 #ifndef _READ_FILE_H_
 #define _READ_FILE_H_
 
-#include <string>
+#include <alib/string>
 
 namespace cli {
 
diff --git a/alib2cli/src/builtin/WriteFile.h b/alib2cli/src/builtin/WriteFile.h
index c968cd1c2a0979a67e96b7019b9966afac6f020f..83a04ed7a2d9c0318187f55cb6eb713a4d1a72f1 100644
--- a/alib2cli/src/builtin/WriteFile.h
+++ b/alib2cli/src/builtin/WriteFile.h
@@ -8,7 +8,7 @@
 #ifndef _WRITE_FILE_H_
 #define _WRITE_FILE_H_
 
-#include <string>
+#include <alib/string>
 
 namespace cli {
 
diff --git a/alib2cli/src/environment/Environment.h b/alib2cli/src/environment/Environment.h
index af23b72f4d89c6442fe7f3e9e37feb0930061693..7eea7201cdd27db6842581a34ff04ac773f054e2 100644
--- a/alib2cli/src/environment/Environment.h
+++ b/alib2cli/src/environment/Environment.h
@@ -1,9 +1,9 @@
 #ifndef _ENVIRONMENT_H_
 #define _ENVIRONMENT_H_
 
-#include <string>
-#include <map>
-#include <memory>
+#include <alib/string>
+#include <alib/map>
+#include <alib/memory>
 
 #include <abstraction/OperationAbstraction.hpp>
 #include <exception/CommonException.h>
diff --git a/alib2cli/src/lexer/Lexer.h b/alib2cli/src/lexer/Lexer.h
index 654cafeeb487bb4202ca178e3eb4f29c3f03d14f..0c669cc1268d6f1e27ecd66927e58ba2fee1568a 100644
--- a/alib2cli/src/lexer/Lexer.h
+++ b/alib2cli/src/lexer/Lexer.h
@@ -1,8 +1,8 @@
 #ifndef __CLI_LEXER_H_
 #define __CLI_LEXER_H_
 
-#include <string>
-#include <iostream>
+#include <alib/string>
+#include <alib/iostream>
 
 namespace cli {
 
diff --git a/alib2cli/src/parser/Parser.h b/alib2cli/src/parser/Parser.h
index 054e31c1ab61ba5574ea78e730ed7015d05c8b92..64d326889849b999444ae12f85b29d7272df5357 100644
--- a/alib2cli/src/parser/Parser.h
+++ b/alib2cli/src/parser/Parser.h
@@ -17,7 +17,7 @@
 
 #include <exception/CommonException.h>
 
-#include <algorithm>
+#include <alib/algorithm>
 
 namespace cli {
 
diff --git a/alib2cli/test-src/cli/CliTest.cpp b/alib2cli/test-src/cli/CliTest.cpp
index 1d52ebd016c1c13ef0a245b263d3fd3ac586be3c..9840822ae6b5928d5865179cb103c1b19d4018a4 100644
--- a/alib2cli/test-src/cli/CliTest.cpp
+++ b/alib2cli/test-src/cli/CliTest.cpp
@@ -1,6 +1,6 @@
 #include "CliTest.h"
 
-#include <iostream>
+#include <alib/iostream>
 
 #include <lexer/Lexer.h>
 #include <parser/Parser.h>