diff --git a/alib2std/src/extensions/clone.hpp b/alib2std/src/extensions/clone.hpp
index d5780a92a939d4bd32e4d16ff8422789311bdb2a..fb6787b053b860bd6ca68fcd03993582f3fea3de 100644
--- a/alib2std/src/extensions/clone.hpp
+++ b/alib2std/src/extensions/clone.hpp
@@ -8,7 +8,6 @@
 #ifndef __CLONE_HPP_
 #define __CLONE_HPP_
 
-#include <type_traits>
 #include "type_traits.hpp"
 
 namespace std {
diff --git a/alib2std/src/extensions/forward_tree.hpp b/alib2std/src/extensions/forward_tree.hpp
index 816dc992fdfe0af418c8bc0acf668d7ef895a6aa..1976209bf76e7249ea62e80722cc0d5fc83b6c9f 100644
--- a/alib2std/src/extensions/forward_tree.hpp
+++ b/alib2std/src/extensions/forward_tree.hpp
@@ -12,7 +12,6 @@
 #include <vector>
 #include <deque>
 #include <tuple>
-#include <iterator>
 #include <string>
 #include <sstream>
 
diff --git a/alib2std/src/extensions/memory.hpp b/alib2std/src/extensions/memory.hpp
index c4882c7903045ef0c545c80813950d8b271d661c..b65e7d0f8cf1a2b6518f9a1739c942e9cb430151 100644
--- a/alib2std/src/extensions/memory.hpp
+++ b/alib2std/src/extensions/memory.hpp
@@ -9,7 +9,6 @@
 #define __MEMORY_HPP_
 
 #include <memory>
-#include <type_traits>
 #include <utility>
 
 #include "compare.hpp"
diff --git a/alib2std/src/extensions/pair.hpp b/alib2std/src/extensions/pair.hpp
index 921ce06b93d2f61f284953a468c3c623b1bc4b47..c8c0aed93a0d20bfe7cb930459e8ec9a48c1c4db 100644
--- a/alib2std/src/extensions/pair.hpp
+++ b/alib2std/src/extensions/pair.hpp
@@ -8,9 +8,6 @@
 #ifndef __PAIR_HPP_
 #define __PAIR_HPP_
 
-#include <utility>
-#include <type_traits>
-#include <cstddef>
 #include <string>
 #include <sstream>
 
diff --git a/alib2std/src/extensions/tree.hpp b/alib2std/src/extensions/tree.hpp
index 17a92b10703a6ce504a17bca6bb118b08bcbdc22..3341e953057723e35df1c07d907342e875a284a7 100644
--- a/alib2std/src/extensions/tree.hpp
+++ b/alib2std/src/extensions/tree.hpp
@@ -11,7 +11,6 @@
 #include <memory>
 #include <vector>
 #include <deque>
-#include <iterator>
 #include <string>
 #include <sstream>
 
diff --git a/alib2std/src/extensions/tree_base.hpp b/alib2std/src/extensions/tree_base.hpp
index c2578e028eacb27548766819359f479df6e3ee27..be705b975c58f4306ee942fad11100b6e8c25c83 100644
--- a/alib2std/src/extensions/tree_base.hpp
+++ b/alib2std/src/extensions/tree_base.hpp
@@ -8,7 +8,6 @@
 #ifndef __TREE_BASE_HPP_
 #define __TREE_BASE_HPP_
 
-#include <tuple>
 #include "tuple.hpp"
 
 namespace std {
diff --git a/alib2std/src/extensions/trie.hpp b/alib2std/src/extensions/trie.hpp
index 66d6ffe203b3d37091aa61d33f6d6a101abbec81..9c9d6906c3ac80cfd02a306c3a30ab82db51c20a 100644
--- a/alib2std/src/extensions/trie.hpp
+++ b/alib2std/src/extensions/trie.hpp
@@ -10,7 +10,6 @@
 
 #include <memory>
 #include <map>
-#include <tuple>
 #include <iterator>
 #include <string>
 #include <sstream>
diff --git a/alib2std/src/extensions/typeinfo.cpp b/alib2std/src/extensions/typeinfo.cpp
index 70c866c5f1eb6eb348510555d94cb6bfb6e6feb9..a3e10a6a7715ecc7a41cd0a76922141b3d9ac0ea 100644
--- a/alib2std/src/extensions/typeinfo.cpp
+++ b/alib2std/src/extensions/typeinfo.cpp
@@ -6,6 +6,8 @@
  */
 
 #include <typeinfo>
+#include <cstdlib>
+#include <cxxabi.h>
 
 namespace std {
 
diff --git a/alib2std/src/extensions/typeinfo.hpp b/alib2std/src/extensions/typeinfo.hpp
index 4072683db2bcaa4b605a02afbb70300b58243018..c82de1a7b50aff39baa503b77e6ed371bc4dfe5c 100644
--- a/alib2std/src/extensions/typeinfo.hpp
+++ b/alib2std/src/extensions/typeinfo.hpp
@@ -9,12 +9,10 @@
 #define __TYPEINFO_HPP_
 
 #include <typeinfo>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <cxxabi.h>
 #include <typeindex>
 #include <string>
+#include <cstdio>
+#include <cstring>
 
 namespace std {
 
diff --git a/alib2std/src/extensions/variant.hpp b/alib2std/src/extensions/variant.hpp
index 6f3aaac4876c1a936275c736e0c189973b316a7c..88fb2815a39b74991f16caee2678f341a4ff6c41 100644
--- a/alib2std/src/extensions/variant.hpp
+++ b/alib2std/src/extensions/variant.hpp
@@ -14,7 +14,6 @@
 #include <iostream>
 #include <utility>
 #include <typeinfo>
-#include <type_traits>
 #include <string>
 #include <cstring>
 #include <sstream>