diff --git a/alib2aux/src/access/PairSetFirst.h b/alib2aux/src/access/PairSetFirst.h
index f52555a960178521867923007ca835aea0a80cf6..21f7a794ff2d09fb6cefa922a594e4ba84a7532a 100644
--- a/alib2aux/src/access/PairSetFirst.h
+++ b/alib2aux/src/access/PairSetFirst.h
@@ -8,8 +8,8 @@
 #ifndef PAIR_SET_FIRST_H_
 #define PAIR_SET_FIRST_H_
 
-#include <set>
-#include <pair>
+#include <alib/set>
+#include <alib/pair>
 
 namespace dataAccess {
 
diff --git a/alib2aux/src/access/PairSetSecond.h b/alib2aux/src/access/PairSetSecond.h
index 8101f7d1f40489ff32c30be8dbeee4a02488e59e..dc91f7f8aad228983f63200bcb4a4fff8173b32b 100644
--- a/alib2aux/src/access/PairSetSecond.h
+++ b/alib2aux/src/access/PairSetSecond.h
@@ -8,8 +8,8 @@
 #ifndef PAIR_SET_FIRST_H_
 #define PAIR_SET_FIRST_H_
 
-#include <set>
-#include <pair>
+#include <alib/set>
+#include <alib/pair>
 
 namespace dataAccess {
 
diff --git a/alib2aux/src/compare/AutomatonDiff.h b/alib2aux/src/compare/AutomatonDiff.h
index 88ce063c6d8ca6fcf21c56e79eeb606c96c659d9..fbe277211ce9a4920b4f08c1cbd5b8f96583fd02 100644
--- a/alib2aux/src/compare/AutomatonDiff.h
+++ b/alib2aux/src/compare/AutomatonDiff.h
@@ -11,12 +11,12 @@
 #include <compare/DiffAux.h>
 #include <compare/AutomatonCompare.h>
 
-#include <set>
-#include <list>
-#include <map>
-#include <utility>
-#include <vector>
-#include <iostream>
+#include <alib/set>
+#include <alib/list>
+#include <alib/map>
+#include <alib/utility>
+#include <alib/vector>
+#include <alib/iostream>
 #include <ostream>
 
 #include "automaton/FSM/DFA.h"
diff --git a/alib2aux/src/compare/DiffAux.h b/alib2aux/src/compare/DiffAux.h
index 2696cd796c04973dfb7a2b0ddd23188973ef76c7..bda970ef39b6062ca6ba2750f8075ba574fedc32 100644
--- a/alib2aux/src/compare/DiffAux.h
+++ b/alib2aux/src/compare/DiffAux.h
@@ -8,11 +8,11 @@
 #ifndef _DIFF_AUX_H_
 #define _DIFF_AUX_H_
 
-#include <set>
-#include <list>
-#include <map>
-#include <vector>
-#include <algorithm>
+#include <alib/set>
+#include <alib/list>
+#include <alib/map>
+#include <alib/vector>
+#include <alib/algorithm>
 
 namespace compare {
 
diff --git a/alib2aux/src/compare/GrammarDiff.h b/alib2aux/src/compare/GrammarDiff.h
index fc437cae666bd2941080936d503406a77d03dcad..bb1e77673499521c325abfc6d3fe5fdf92c5b111 100644
--- a/alib2aux/src/compare/GrammarDiff.h
+++ b/alib2aux/src/compare/GrammarDiff.h
@@ -11,15 +11,15 @@
 #include <compare/DiffAux.h>
 #include <compare/GrammarCompare.h>
 
-#include <set>
-#include <map>
-#include <list>
-#include <utility>
-#include <vector>
-#include <typeinfo>
-#include <iostream>
+#include <alib/set>
+#include <alib/map>
+#include <alib/list>
+#include <alib/utility>
+#include <alib/vector>
+#include <alib/typeinfo>
+#include <alib/iostream>
 #include <ostream>
-#include <algorithm>
+#include <alib/algorithm>
 
 #include "grammar/Regular/LeftLG.h"
 #include "grammar/Regular/LeftRG.h"
diff --git a/alib2aux/src/compare/StringDiff.h b/alib2aux/src/compare/StringDiff.h
index 91390d53b44d97ca94f10ceb70bbc8331d648643..c51cd35e35bcf139fa7bb27b237440639c9c13bf 100644
--- a/alib2aux/src/compare/StringDiff.h
+++ b/alib2aux/src/compare/StringDiff.h
@@ -11,8 +11,8 @@
 #include <compare/DiffAux.h>
 #include <compare/StringCompare.h>
 
-#include <utility>
-#include <vector>
+#include <alib/utility>
+#include <alib/vector>
 #include <ostream>
 
 #include "string/CyclicString.h"
diff --git a/alib2aux/src/convert/DotConverter.h b/alib2aux/src/convert/DotConverter.h
index 9a76566ea798731de667a8d01dd71616112fb293..344c70acc3f199658d108f840dfcf24ffb08fbf0 100644
--- a/alib2aux/src/convert/DotConverter.h
+++ b/alib2aux/src/convert/DotConverter.h
@@ -9,12 +9,12 @@
 #define DOT_CONVERTER_H_
 
 #include <ostream>
-#include <set>
-#include <map>
-#include <list>
-#include <utility>
-#include <vector>
-#include <typeinfo>
+#include <alib/set>
+#include <alib/map>
+#include <alib/list>
+#include <alib/utility>
+#include <alib/vector>
+#include <alib/typeinfo>
 
 #include <exception/CommonException.h>
 #include <string/String.h>
diff --git a/alib2aux/src/convert/GasTexConverter.h b/alib2aux/src/convert/GasTexConverter.h
index 6b514c4b381f270f3e9aeeb29e3a9d4014be835b..d928c26fe78b07de61093b3c34e44e234cc63aff 100644
--- a/alib2aux/src/convert/GasTexConverter.h
+++ b/alib2aux/src/convert/GasTexConverter.h
@@ -9,11 +9,11 @@
 #define GAS_TEX_CONVERTER_H_
 
 #include <ostream>
-#include <map>
-#include <utility>
-#include <vector>
-#include <set>
-#include <typeinfo>
+#include <alib/map>
+#include <alib/utility>
+#include <alib/vector>
+#include <alib/set>
+#include <alib/typeinfo>
 
 #include <exception/CommonException.h>
 #include <string/String.h>
diff --git a/alib2aux/src/convert/LatexTable.h b/alib2aux/src/convert/LatexTable.h
index 28e87d7959c09a253fa352211f6c2af5e6f10c8a..97e81ed4a9d07460b906637cbaf9cfa99e91b210 100644
--- a/alib2aux/src/convert/LatexTable.h
+++ b/alib2aux/src/convert/LatexTable.h
@@ -9,11 +9,11 @@
 #define LATEX_TABLE_H_
 
 #include <ostream>
-#include <set>
-#include <map>
-#include <list>
-#include <utility>
-#include <vector>
+#include <alib/set>
+#include <alib/map>
+#include <alib/list>
+#include <alib/utility>
+#include <alib/vector>
 
 #include <exception/CommonException.h>
 #include <string/String.h>
diff --git a/alib2aux/src/convert/TikZConverter.h b/alib2aux/src/convert/TikZConverter.h
index 45466a2d81fe73b17110c65b18bdf98c0423ad8b..73563243079515615bfd17a5b52b2cf9d437642e 100644
--- a/alib2aux/src/convert/TikZConverter.h
+++ b/alib2aux/src/convert/TikZConverter.h
@@ -9,12 +9,12 @@
 #define TIKZ_CONVERTER_H_
 
 #include <ostream>
-#include <set>
-#include <list>
-#include <vector>
-#include <typeinfo>
-#include <map>
-#include <utility>
+#include <alib/set>
+#include <alib/list>
+#include <alib/vector>
+#include <alib/typeinfo>
+#include <alib/map>
+#include <alib/utility>
 
 #include <exception/CommonException.h>
 #include <string/String.h>