diff --git a/Chaos/Cipher/Arc4/Arc4Crypt.hpp b/Chaos/Cipher/Arc4/Arc4Crypt.hpp
index 88ce26b..f7da4ab 100644
--- a/Chaos/Cipher/Arc4/Arc4Crypt.hpp
+++ b/Chaos/Cipher/Arc4/Arc4Crypt.hpp
@@ -1,6 +1,9 @@
 #ifndef CHAOS_CIPHER_ARC4_ARC4CRYPT_HPP
 #define CHAOS_CIPHER_ARC4_ARC4CRYPT_HPP
 
+#include <cstdint>
+#include <algorithm>
+
 #include "Arc4Gen.hpp"
 #include "Service/SeArray.hpp"
 #include "Service/ChaosException.hpp"
diff --git a/Chaos/Cipher/Arc4/Arc4Gen.hpp b/Chaos/Cipher/Arc4/Arc4Gen.hpp
index af2e833..f3f54f8 100644
--- a/Chaos/Cipher/Arc4/Arc4Gen.hpp
+++ b/Chaos/Cipher/Arc4/Arc4Gen.hpp
@@ -4,6 +4,7 @@
 #include <array>
 #include <cstdint>
 #include <vector>
+#include <utility>
 
 #include "Service/ChaosException.hpp"
 
diff --git a/Chaos/Cipher/Block/Des/DesCrypt.hpp b/Chaos/Cipher/Block/Des/DesCrypt.hpp
index a9e50c5..f303c50 100644
--- a/Chaos/Cipher/Block/Des/DesCrypt.hpp
+++ b/Chaos/Cipher/Block/Des/DesCrypt.hpp
@@ -3,6 +3,9 @@
 
 #include <algorithm>
 #include <utility>
+#include <cstdint>
+#include <iterator>
+#include <cstddef>
 
 #include "Service/ChaosException.hpp"
 #include "Service/SeArray.hpp"
diff --git a/Chaos/Hash/Md4.hpp b/Chaos/Hash/Md4.hpp
index e4c1268..5387cae 100644
--- a/Chaos/Hash/Md4.hpp
+++ b/Chaos/Hash/Md4.hpp
@@ -4,6 +4,8 @@
 #include <cstdint>
 #include <array>
 #include <string>
+#include <cstdio>
+#include <cstddef>
 
 #include "Hash.hpp"
 #include "Hasher.hpp"
diff --git a/Chaos/Hash/Md5.hpp b/Chaos/Hash/Md5.hpp
index 9ea28ce..2ef7149 100644
--- a/Chaos/Hash/Md5.hpp
+++ b/Chaos/Hash/Md5.hpp
@@ -4,6 +4,8 @@
 #include <cstdint>
 #include <array>
 #include <string>
+#include <cstdio>
+#include <cstddef>
 
 #include "Hash.hpp"
 #include "Hasher.hpp"
diff --git a/Chaos/Hash/Sha1.hpp b/Chaos/Hash/Sha1.hpp
index 1dd74a7..d8adf50 100644
--- a/Chaos/Hash/Sha1.hpp
+++ b/Chaos/Hash/Sha1.hpp
@@ -4,6 +4,10 @@
 #include <cstdint>
 #include <array>
 #include <string>
+#include <cstddef>
+#include <cstdio>
+#include <tuple>
+#include <algorithm>
 
 #include "Hash.hpp"
 #include "Hasher.hpp"
diff --git a/Chaos/Service/ChaosException.hpp b/Chaos/Service/ChaosException.hpp
index 761c406..888dedc 100644
--- a/Chaos/Service/ChaosException.hpp
+++ b/Chaos/Service/ChaosException.hpp
@@ -2,6 +2,7 @@
 #define CHAOS_SERVICE_CHAOSEXCEPTION_HPP
 
 #include <string>
+#include <utility>
 
 namespace Chaos::Service
 {
diff --git a/Chaos/Service/SeArray.hpp b/Chaos/Service/SeArray.hpp
index 77a7f50..986e04e 100644
--- a/Chaos/Service/SeArray.hpp
+++ b/Chaos/Service/SeArray.hpp
@@ -3,6 +3,7 @@
 
 #include <array>
 #include <type_traits>
+#include <cstddef>
 
 namespace Chaos::Service
 {
diff --git a/ChaosTests/Cipher/Arc4CryptTests.cpp b/ChaosTests/Cipher/Arc4CryptTests.cpp
index 9375c38..200931f 100644
--- a/ChaosTests/Cipher/Arc4CryptTests.cpp
+++ b/ChaosTests/Cipher/Arc4CryptTests.cpp
@@ -2,6 +2,8 @@
 #include <vector>
 #include <string>
 #include <array>
+#include <cstdint>
+#include <cstring>
 
 #include "Cipher/Arc4/Arc4Crypt.hpp"
 #include "Service/ChaosException.hpp"
diff --git a/ChaosTests/Cipher/Arc4GenTests.cpp b/ChaosTests/Cipher/Arc4GenTests.cpp
index 988d694..81fe1b1 100644
--- a/ChaosTests/Cipher/Arc4GenTests.cpp
+++ b/ChaosTests/Cipher/Arc4GenTests.cpp
@@ -1,6 +1,11 @@
 #include <gtest/gtest.h>
+#include <cstdint>
+#include <array>
+#include <iterator>
+#include <cstring>
 
 #include "Cipher/Arc4/Arc4Gen.hpp"
+#include "Service/ChaosException.hpp"
 
 using namespace Chaos::Cipher::Arc4;
 
diff --git a/ChaosTests/Cipher/DesCryptTests.cpp b/ChaosTests/Cipher/DesCryptTests.cpp
index 9a06d00..6d4e7f7 100644
--- a/ChaosTests/Cipher/DesCryptTests.cpp
+++ b/ChaosTests/Cipher/DesCryptTests.cpp
@@ -1,7 +1,12 @@
 #include <gtest/gtest.h>
+#include <cstdint>
+#include <array>
+#include <vector>
 
 #include "Cipher/Block/Des/DesCrypt.hpp"
 #include "Cipher/Block/Encryptor.hpp"
+#include "Cipher/Block/Decryptor.hpp"
+#include "Service/ChaosException.hpp"
 
 using namespace Chaos::Cipher::Block::Des;
 using namespace Chaos::Cipher::Block;
diff --git a/ChaosTests/Hash/Md4HasherTests.cpp b/ChaosTests/Hash/Md4HasherTests.cpp
index f234dd3..ab50e04 100644
--- a/ChaosTests/Hash/Md4HasherTests.cpp
+++ b/ChaosTests/Hash/Md4HasherTests.cpp
@@ -1,4 +1,6 @@
 #include <gtest/gtest.h>
+#include <cstring>
+#include <string>
 
 #include "Hash/Md4.hpp"
 
diff --git a/ChaosTests/Hash/Md5HasherTests.cpp b/ChaosTests/Hash/Md5HasherTests.cpp
index c17ef33..e2a4c6c 100644
--- a/ChaosTests/Hash/Md5HasherTests.cpp
+++ b/ChaosTests/Hash/Md5HasherTests.cpp
@@ -1,4 +1,6 @@
 #include <gtest/gtest.h>
+#include <cstring>
+#include <string>
 
 #include "Hash/Md5.hpp"
 
diff --git a/ChaosTests/Hash/Sha1HasherTests.cpp b/ChaosTests/Hash/Sha1HasherTests.cpp
index 2fce13a..38dccf5 100644
--- a/ChaosTests/Hash/Sha1HasherTests.cpp
+++ b/ChaosTests/Hash/Sha1HasherTests.cpp
@@ -1,4 +1,6 @@
 #include <gtest/gtest.h>
+#include <cstring>
+#include <string>
 
 #include "Hash/Sha1.hpp"
 
diff --git a/ChaosTests/Mac/HmacTests.cpp b/ChaosTests/Mac/HmacTests.cpp
index a782bd6..7882697 100644
--- a/ChaosTests/Mac/HmacTests.cpp
+++ b/ChaosTests/Mac/HmacTests.cpp
@@ -1,8 +1,12 @@
 #include <gtest/gtest.h>
+#include <cstring>
+#include <string>
+#include <cstdint>
 
 #include "Hash/Md5.hpp"
 #include "Hash/Sha1.hpp"
 #include "Mac/Hmac.hpp"
+#include "Service/ChaosException.hpp"
 
 using namespace Chaos::Mac::Hmac;
 using namespace Chaos::Hash::Md5;
diff --git a/ChaosTests/Padding/PadderIso7816Tests.cpp b/ChaosTests/Padding/PadderIso7816Tests.cpp
index e29b0c0..bd03976 100644
--- a/ChaosTests/Padding/PadderIso7816Tests.cpp
+++ b/ChaosTests/Padding/PadderIso7816Tests.cpp
@@ -4,6 +4,7 @@
 #include <vector>
 
 #include "Padding/PadderIso7816.hpp"
+#include "Padding/Padder.hpp"
 
 using namespace Chaos::Padding;
 
diff --git a/ChaosTests/Padding/PadderPkcs7Tests.cpp b/ChaosTests/Padding/PadderPkcs7Tests.cpp
index eed60bd..0e656e7 100644
--- a/ChaosTests/Padding/PadderPkcs7Tests.cpp
+++ b/ChaosTests/Padding/PadderPkcs7Tests.cpp
@@ -4,6 +4,7 @@
 #include <vector>
 
 #include "Padding/PadderPkcs7.hpp"
+#include "Padding/Padder.hpp"
 #include "Service/ChaosException.hpp"
 
 using namespace Chaos::Padding;
diff --git a/ChaosTests/Service/SeArrayTests.cpp b/ChaosTests/Service/SeArrayTests.cpp
index aa08a12..ae224c0 100644
--- a/ChaosTests/Service/SeArrayTests.cpp
+++ b/ChaosTests/Service/SeArrayTests.cpp
@@ -1,6 +1,7 @@
 #include <gtest/gtest.h>
 #include <cstdint>
 #include <iterator>
+#include <cstddef>
 
 #include "Service/SeArray.hpp"