diff --git a/include/spdlog/cfg/argv.h b/include/spdlog/cfg/argv.h
index d2ef1af7..556ab736 100644
--- a/include/spdlog/cfg/argv.h
+++ b/include/spdlog/cfg/argv.h
@@ -2,7 +2,6 @@
 // Distributed under the MIT License (http://opensource.org/licenses/MIT)
 
 #pragma once
-#include "../details/registry.h"
 #include "./helpers.h"
 
 //
diff --git a/include/spdlog/sinks/ansicolor_sink.h b/include/spdlog/sinks/ansicolor_sink.h
index 2a76ae4e..1e8dd1b2 100644
--- a/include/spdlog/sinks/ansicolor_sink.h
+++ b/include/spdlog/sinks/ansicolor_sink.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <array>
-#include <memory>
 #include <mutex>
 #include <string>
 
diff --git a/include/spdlog/sinks/msvc_sink.h b/include/spdlog/sinks/msvc_sink.h
index 7baf1dac..3a9e58bc 100644
--- a/include/spdlog/sinks/msvc_sink.h
+++ b/include/spdlog/sinks/msvc_sink.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <mutex>
-#include <string>
 
 #include "../details/null_mutex.h"
 #include "./base_sink.h"
diff --git a/include/spdlog/sinks/null_sink.h b/include/spdlog/sinks/null_sink.h
index 2d028b0b..72ea281b 100644
--- a/include/spdlog/sinks/null_sink.h
+++ b/include/spdlog/sinks/null_sink.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include <mutex>
-
 #include "../details/null_mutex.h"
 #include "../details/synchronous_factory.h"
 #include "./base_sink.h"
diff --git a/include/spdlog/sinks/ringbuffer_sink.h b/include/spdlog/sinks/ringbuffer_sink.h
index 87d7ecb9..90d02764 100644
--- a/include/spdlog/sinks/ringbuffer_sink.h
+++ b/include/spdlog/sinks/ringbuffer_sink.h
@@ -5,8 +5,7 @@
 
 #include <functional>
 #include <mutex>
-#include <string>
-#include <vector>
+#include <string_view>
 
 #include "../details/circular_q.h"
 #include "../details/log_msg_buffer.h"
diff --git a/include/spdlog/sinks/rotating_file_sink.h b/include/spdlog/sinks/rotating_file_sink.h
index 4b0380e3..71804ad5 100644
--- a/include/spdlog/sinks/rotating_file_sink.h
+++ b/include/spdlog/sinks/rotating_file_sink.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <chrono>
 #include <mutex>
 #include <string>
 
diff --git a/src/cfg/helpers.cpp b/src/cfg/helpers.cpp
index 30546068..29e9c961 100644
--- a/src/cfg/helpers.cpp
+++ b/src/cfg/helpers.cpp
@@ -9,7 +9,6 @@
 #include <utility>
 
 #include "spdlog/details/registry.h"
-#include "spdlog/spdlog.h"
 
 namespace spdlog {
 namespace cfg {