diff --git a/alib2algo/src/string/simplify/NormalizeRotation.cpp b/alib2algo/src/string/simplify/NormalizeRotation.cpp
index 1e22575f1b8818dcb8beef6eda4469eba3f94afd..7eaedbcd504373faf96dc588ac5af3c26435c32c 100644
--- a/alib2algo/src/string/simplify/NormalizeRotation.cpp
+++ b/alib2algo/src/string/simplify/NormalizeRotation.cpp
@@ -8,6 +8,10 @@
 #include "NormalizeRotation.h"
 #include <exception/AlibException.h>
 
+#include <string/Epsilon.h>
+#include <string/LinearString.h>
+#include <string/CyclicString.h>
+
 namespace string {
 
 namespace simplify {
diff --git a/alib2algo/src/string/simplify/NormalizeRotation.h b/alib2algo/src/string/simplify/NormalizeRotation.h
index 097d4bbbd58334d70b1ef0275766f612213cbdea..1a426dd51aa0b7b04a5bc3ddf6dd81bc02f2b5ea 100644
--- a/alib2algo/src/string/simplify/NormalizeRotation.h
+++ b/alib2algo/src/string/simplify/NormalizeRotation.h
@@ -8,7 +8,6 @@
 #ifndef _NORMALIZE_ROTATION_H__
 #define _NORMALIZE_ROTATION_H__
 
-#include <string/CyclicString.h>
 #include <string/String.h>
 
 namespace string {
diff --git a/alib2algo/src/stringology/exact/BadCharacterShiftTable.h b/alib2algo/src/stringology/exact/BadCharacterShiftTable.h
index 1341d5343eb3e30538ff6bf9cc81ab8422c02713..e7a4d02457205c0d51a82080862f2a9d85cc6237 100644
--- a/alib2algo/src/stringology/exact/BadCharacterShiftTable.h
+++ b/alib2algo/src/stringology/exact/BadCharacterShiftTable.h
@@ -10,6 +10,7 @@
 
 #include <string/String.h>
 
+#include <set>
 #include <map>
 
 namespace stringology {
diff --git a/alib2algo/src/stringology/exact/BoyerMooreHorspool.h b/alib2algo/src/stringology/exact/BoyerMooreHorspool.h
index b009922e1555bd820087ff65fb0f2606415e6246..db9276d3137c61959ee3772ebf5a34b4076925e9 100644
--- a/alib2algo/src/stringology/exact/BoyerMooreHorspool.h
+++ b/alib2algo/src/stringology/exact/BoyerMooreHorspool.h
@@ -9,6 +9,7 @@
 #define _BOYER_MOORE_HORSPOOL_H
 
 #include <string/String.h>
+#include <set>
 
 namespace stringology {
 
diff --git a/alib2algo/src/stringology/exact/ExactFactorMatch.h b/alib2algo/src/stringology/exact/ExactFactorMatch.h
index df9f5a12982323db87c97b2cdfd3ccf58f8d76b4..99ff150395b46e6ec9a3b5ea42c5df798531ea66 100644
--- a/alib2algo/src/stringology/exact/ExactFactorMatch.h
+++ b/alib2algo/src/stringology/exact/ExactFactorMatch.h
@@ -9,6 +9,7 @@
 #define _EXACT_MATCH_H__
 
 #include <string/String.h>
+#include <set>
 
 namespace stringology {