diff --git a/include/spdlog/async_logger.h b/include/spdlog/async_logger.h
index c60763a0..be215010 100644
--- a/include/spdlog/async_logger.h
+++ b/include/spdlog/async_logger.h
@@ -20,6 +20,8 @@
 
 #include <chrono>
 #include <functional>
+#include <string>
+#include <memory>
 
 namespace spdlog
 {
diff --git a/include/spdlog/common.h b/include/spdlog/common.h
index bae8b2b1..269c8817 100644
--- a/include/spdlog/common.h
+++ b/include/spdlog/common.h
@@ -9,6 +9,7 @@
 #include <initializer_list>
 #include <chrono>
 #include <memory>
+#include <exception>
 
 //visual studio does not support noexcept yet
 #ifndef _MSC_VER
@@ -94,4 +95,4 @@ private:
 
 };
 
-} //spdlog
\ No newline at end of file
+} //spdlog
diff --git a/include/spdlog/details/async_log_helper.h b/include/spdlog/details/async_log_helper.h
index 90a6b95c..8e9c906d 100644
--- a/include/spdlog/details/async_log_helper.h
+++ b/include/spdlog/details/async_log_helper.h
@@ -23,8 +23,12 @@
 #include <spdlog/formatter.h>
 
 #include <chrono>
-#include <thread>
+#include <exception>
 #include <functional>
+#include <memory>
+#include <string>
+#include <thread>
+#include <utility>
 #include <vector>
 
 namespace spdlog
diff --git a/include/spdlog/details/async_logger_impl.h b/include/spdlog/details/async_logger_impl.h
index e2a9239b..140d45f4 100644
--- a/include/spdlog/details/async_logger_impl.h
+++ b/include/spdlog/details/async_logger_impl.h
@@ -11,6 +11,10 @@
 #include <spdlog/details/async_log_helper.h>
 #include <spdlog/async_logger.h>
 
+#include <string>
+#include <functional>
+#include <chrono>
+#include <memory>
 
 template<class It>
 inline spdlog::async_logger::async_logger(const std::string& logger_name,
diff --git a/include/spdlog/details/file_helper.h b/include/spdlog/details/file_helper.h
index 62323c4d..e563d006 100644
--- a/include/spdlog/details/file_helper.h
+++ b/include/spdlog/details/file_helper.h
@@ -13,9 +13,10 @@
 #include <spdlog/details/os.h>
 #include <spdlog/details/log_msg.h>
 
+#include <chrono>
+#include <cstdio>
 #include <string>
 #include <thread>
-#include <chrono>
 
 namespace spdlog
 {
diff --git a/include/spdlog/details/line_logger_impl.h b/include/spdlog/details/line_logger_impl.h
index 88f88b5b..d61225af 100644
--- a/include/spdlog/details/line_logger_impl.h
+++ b/include/spdlog/details/line_logger_impl.h
@@ -9,6 +9,9 @@
 #include <spdlog/common.h>
 #include <spdlog/logger.h>
 
+#include <string>
+#include <utility>
+
 // Line logger class - aggregates operator<< calls to fast ostream
 // and logs upon destruction
 
diff --git a/include/spdlog/details/log_msg.h b/include/spdlog/details/log_msg.h
index b0f00f29..0d50b684 100644
--- a/include/spdlog/details/log_msg.h
+++ b/include/spdlog/details/log_msg.h
@@ -8,7 +8,8 @@
 #include <spdlog/common.h>
 #include <spdlog/details/format.h>
 
-#include <thread>
+#include <string>
+#include <utility>
 
 namespace spdlog
 {
diff --git a/include/spdlog/details/logger_impl.h b/include/spdlog/details/logger_impl.h
index f6292f37..c0963828 100644
--- a/include/spdlog/details/logger_impl.h
+++ b/include/spdlog/details/logger_impl.h
@@ -7,6 +7,10 @@
 
 #include <spdlog/logger.h>
 
+#include <atomic>
+#include <memory>
+#include <string>
+
 // create logger with given name, sinks and the default pattern formatter
 // all other ctors will call this one
 template<class It>
diff --git a/include/spdlog/details/mpmc_bounded_q.h b/include/spdlog/details/mpmc_bounded_q.h
index 3115e706..ad14d6f2 100644
--- a/include/spdlog/details/mpmc_bounded_q.h
+++ b/include/spdlog/details/mpmc_bounded_q.h
@@ -46,6 +46,7 @@ Distributed under the MIT License (http://opensource.org/licenses/MIT)
 #include <spdlog/common.h>
 
 #include <atomic>
+#include <utility>
 
 namespace spdlog
 {
diff --git a/include/spdlog/details/os.h b/include/spdlog/details/os.h
index d8328c39..ac05a3b0 100644
--- a/include/spdlog/details/os.h
+++ b/include/spdlog/details/os.h
@@ -6,9 +6,10 @@
 
 #include <spdlog/common.h>
 
-#include <string>
 #include <cstdio>
 #include <ctime>
+#include <functional>
+#include <string>
 
 #ifdef _WIN32
 # ifndef WIN32_LEAN_AND_MEAN
@@ -24,6 +25,7 @@
 #include <sys/syscall.h> //Use gettid() syscall under linux to get thread id
 #include <sys/stat.h>
 #include <unistd.h>
+#include <chrono>
 #else
 #include <thread>
 #endif
diff --git a/include/spdlog/details/pattern_formatter_impl.h b/include/spdlog/details/pattern_formatter_impl.h
index 8738324c..c4855132 100644
--- a/include/spdlog/details/pattern_formatter_impl.h
+++ b/include/spdlog/details/pattern_formatter_impl.h
@@ -9,12 +9,14 @@
 #include <spdlog/details/log_msg.h>
 #include <spdlog/details/os.h>
 
-#include <string>
 #include <chrono>
+#include <ctime>
 #include <memory>
-#include <vector>
-#include <thread>
 #include <mutex>
+#include <string>
+#include <thread>
+#include <utility>
+#include <vector>
 
 namespace spdlog
 {
diff --git a/include/spdlog/details/registry.h b/include/spdlog/details/registry.h
index c5171ec5..f225e6c9 100644
--- a/include/spdlog/details/registry.h
+++ b/include/spdlog/details/registry.h
@@ -15,10 +15,12 @@
 #include <spdlog/async_logger.h>
 #include <spdlog/common.h>
 
-#include <string>
-#include <mutex>
-#include <unordered_map>
+#include <chrono>
 #include <functional>
+#include <memory>
+#include <mutex>
+#include <string>
+#include <unordered_map>
 
 namespace spdlog
 {
diff --git a/include/spdlog/details/spdlog_impl.h b/include/spdlog/details/spdlog_impl.h
index 8bc1894c..e3c966dc 100644
--- a/include/spdlog/details/spdlog_impl.h
+++ b/include/spdlog/details/spdlog_impl.h
@@ -14,6 +14,11 @@
 #include <spdlog/sinks/stdout_sinks.h>
 #include <spdlog/sinks/syslog_sink.h>
 
+#include <chrono>
+#include <functional>
+#include <memory>
+#include <string>
+
 inline void spdlog::register_logger(std::shared_ptr<logger> logger)
 {
     return details::registry::instance().register_logger(logger);
diff --git a/include/spdlog/formatter.h b/include/spdlog/formatter.h
index 5a5bad2d..0ffcec03 100644
--- a/include/spdlog/formatter.h
+++ b/include/spdlog/formatter.h
@@ -8,6 +8,8 @@
 #include <spdlog/details/log_msg.h>
 
 #include <vector>
+#include <string>
+#include <memory>
 
 namespace spdlog
 {
diff --git a/include/spdlog/logger.h b/include/spdlog/logger.h
index 76770096..ebd2dd06 100644
--- a/include/spdlog/logger.h
+++ b/include/spdlog/logger.h
@@ -18,6 +18,8 @@
 
 #include <vector>
 #include <memory>
+#include <atomic>
+#include <string>
 
 namespace spdlog
 {
diff --git a/include/spdlog/sinks/android_sink.h b/include/spdlog/sinks/android_sink.h
index c6cbc272..885f78da 100644
--- a/include/spdlog/sinks/android_sink.h
+++ b/include/spdlog/sinks/android_sink.h
@@ -13,6 +13,7 @@
 #include <android/log.h>
 
 #include <mutex>
+#include <string>
 
 namespace spdlog
 {
diff --git a/include/spdlog/sinks/base_sink.h b/include/spdlog/sinks/base_sink.h
index 1fb8ed9b..615bb6f0 100644
--- a/include/spdlog/sinks/base_sink.h
+++ b/include/spdlog/sinks/base_sink.h
@@ -15,9 +15,7 @@
 #include <spdlog/common.h>
 #include <spdlog/details/log_msg.h>
 
-#include <string>
 #include <mutex>
-#include <atomic>
 
 namespace spdlog
 {
diff --git a/include/spdlog/sinks/dist_sink.h b/include/spdlog/sinks/dist_sink.h
index 1f3884b1..0e7cfc1e 100644
--- a/include/spdlog/sinks/dist_sink.h
+++ b/include/spdlog/sinks/dist_sink.h
@@ -13,7 +13,7 @@
 #include <algorithm>
 #include <memory>
 #include <mutex>
-#include <list>
+#include <vector>
 
 namespace spdlog
 {
diff --git a/include/spdlog/sinks/file_sinks.h b/include/spdlog/sinks/file_sinks.h
index c6f9a2df..c3d214fa 100644
--- a/include/spdlog/sinks/file_sinks.h
+++ b/include/spdlog/sinks/file_sinks.h
@@ -10,7 +10,12 @@
 #include <spdlog/details/file_helper.h>
 #include <spdlog/details/format.h>
 
+#include <algorithm>
+#include <chrono>
+#include <cstdio>
+#include <ctime>
 #include <mutex>
+#include <string>
 
 namespace spdlog
 {
diff --git a/include/spdlog/sinks/ostream_sink.h b/include/spdlog/sinks/ostream_sink.h
index f9337f6b..feb5efa1 100644
--- a/include/spdlog/sinks/ostream_sink.h
+++ b/include/spdlog/sinks/ostream_sink.h
@@ -10,7 +10,6 @@
 
 #include <ostream>
 #include <mutex>
-#include <memory>
 
 namespace spdlog
 {
diff --git a/include/spdlog/sinks/stdout_sinks.h b/include/spdlog/sinks/stdout_sinks.h
index ddb32b64..85db334f 100644
--- a/include/spdlog/sinks/stdout_sinks.h
+++ b/include/spdlog/sinks/stdout_sinks.h
@@ -9,6 +9,7 @@
 #include <spdlog/details/null_mutex.h>
 
 #include <iostream>
+#include <memory>
 #include <mutex>
 
 namespace spdlog
diff --git a/include/spdlog/spdlog.h b/include/spdlog/spdlog.h
index dda736ff..b92a239f 100644
--- a/include/spdlog/spdlog.h
+++ b/include/spdlog/spdlog.h
@@ -12,6 +12,11 @@
 #include <spdlog/common.h>
 #include <spdlog/logger.h>
 
+#include <memory>
+#include <functional>
+#include <chrono>
+#include <string>
+
 namespace spdlog
 {
 // Return an existing logger or nullptr if a logger with such name doesn't exist.