diff --git a/include/spdlog/details/console_globals.h b/include/spdlog/details/console_globals.h
index 9c552106..52a8929a 100644
--- a/include/spdlog/details/console_globals.h
+++ b/include/spdlog/details/console_globals.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
+#include "null_mutex.h"
 #include <mutex>
-#include <spdlog/details/null_mutex.h>
 
 namespace spdlog {
 namespace details {
diff --git a/include/spdlog/details/file_helper.h b/include/spdlog/details/file_helper.h
index 50ebf61f..6d406ac6 100644
--- a/include/spdlog/details/file_helper.h
+++ b/include/spdlog/details/file_helper.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <spdlog/common.h>
+#include "../common.h"
 #include <tuple>
 
 namespace spdlog {
diff --git a/include/spdlog/details/fmt_helper.h b/include/spdlog/details/fmt_helper.h
index 62812d72..1786a124 100644
--- a/include/spdlog/details/fmt_helper.h
+++ b/include/spdlog/details/fmt_helper.h
@@ -2,10 +2,11 @@
 // Distributed under the MIT License (http://opensource.org/licenses/MIT)
 #pragma once
 
+#include "../common.h"
+#include "../fmt/fmt.h"
+
 #include <chrono>
 #include <iterator>
-#include <spdlog/common.h>
-#include <spdlog/fmt/fmt.h>
 #include <type_traits>
 
 #ifdef SPDLOG_USE_STD_FORMAT
diff --git a/include/spdlog/details/log_msg.h b/include/spdlog/details/log_msg.h
index 581be209..b7f0b51d 100644
--- a/include/spdlog/details/log_msg.h
+++ b/include/spdlog/details/log_msg.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <spdlog/common.h>
+#include "../common.h"
 #include <string>
 
 namespace spdlog {
diff --git a/include/spdlog/details/log_msg_buffer.h b/include/spdlog/details/log_msg_buffer.h
index e7057836..fc7b2cbd 100644
--- a/include/spdlog/details/log_msg_buffer.h
+++ b/include/spdlog/details/log_msg_buffer.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <spdlog/details/log_msg.h>
+#include "log_msg.h"
 
 namespace spdlog {
 namespace details {
diff --git a/include/spdlog/details/mpmc_blocking_q.h b/include/spdlog/details/mpmc_blocking_q.h
index 5a474bf3..5ef71c1c 100644
--- a/include/spdlog/details/mpmc_blocking_q.h
+++ b/include/spdlog/details/mpmc_blocking_q.h
@@ -10,7 +10,7 @@
 // dequeue_for(..) - will block until the queue is not empty or timeout have
 // passed.
 
-#include <spdlog/details/circular_q.h>
+#include "circular_q.h"
 
 #include <atomic>
 #include <condition_variable>
diff --git a/include/spdlog/details/os.h b/include/spdlog/details/os.h
index a63b0179..16aa695d 100644
--- a/include/spdlog/details/os.h
+++ b/include/spdlog/details/os.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
+#include "../common.h"
 #include <ctime>  // std::time_t
-#include <spdlog/common.h>
 
 namespace spdlog {
 namespace details {
diff --git a/include/spdlog/details/periodic_worker.h b/include/spdlog/details/periodic_worker.h
index 9866a509..767d3643 100644
--- a/include/spdlog/details/periodic_worker.h
+++ b/include/spdlog/details/periodic_worker.h
@@ -10,14 +10,14 @@
 //    stops and joins the thread on destruction (if the thread is executing a callback, wait for it
 //    to finish first).
 
+#include "../common.h"
+
 #include <chrono>
 #include <condition_variable>
 #include <functional>
 #include <mutex>
 #include <thread>
 
-#include <spdlog/common.h>
-
 namespace spdlog {
 namespace details {
 
diff --git a/include/spdlog/details/registry.h b/include/spdlog/details/registry.h
index f1f8b5cf..a4b21643 100644
--- a/include/spdlog/details/registry.h
+++ b/include/spdlog/details/registry.h
@@ -8,8 +8,8 @@
 // If user requests a non existing logger, nullptr will be returned
 // This class is thread safe
 
-#include <spdlog/common.h>
-#include <spdlog/details/periodic_worker.h>
+#include "../common.h"
+#include "periodic_worker.h"
 
 #include <chrono>
 #include <functional>
diff --git a/include/spdlog/details/tcp_client-windows.h b/include/spdlog/details/tcp_client-windows.h
index bf8f7b87..b4fc626f 100644
--- a/include/spdlog/details/tcp_client-windows.h
+++ b/include/spdlog/details/tcp_client-windows.h
@@ -5,8 +5,8 @@
 
 #define WIN32_LEAN_AND_MEAN
 // tcp client helper
-#include <spdlog/common.h>
-#include <spdlog/details/os.h>
+#include "../common.h"
+#include "os.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/include/spdlog/details/tcp_client.h b/include/spdlog/details/tcp_client.h
index 9d3c40d5..93d55c21 100644
--- a/include/spdlog/details/tcp_client.h
+++ b/include/spdlog/details/tcp_client.h
@@ -8,8 +8,8 @@
 #endif
 
 // tcp client helper
-#include <spdlog/common.h>
-#include <spdlog/details/os.h>
+#include "../common.h"
+#include "os.h"
 
 #include <arpa/inet.h>
 #include <netdb.h>
diff --git a/include/spdlog/details/thread_pool.h b/include/spdlog/details/thread_pool.h
index 58693b53..f94af769 100644
--- a/include/spdlog/details/thread_pool.h
+++ b/include/spdlog/details/thread_pool.h
@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include <spdlog/async.h>
-#include <spdlog/details/log_msg_buffer.h>
-#include <spdlog/details/mpmc_blocking_q.h>
-#include <spdlog/details/os.h>
+#include "../async.h"
+#include "log_msg_buffer.h"
+#include "mpmc_blocking_q.h"
+#include "os.h"
 
 #include <chrono>
 #include <functional>
diff --git a/include/spdlog/details/udp_client-windows.h b/include/spdlog/details/udp_client-windows.h
index 8b7c2232..64ae411e 100644
--- a/include/spdlog/details/udp_client-windows.h
+++ b/include/spdlog/details/udp_client-windows.h
@@ -6,8 +6,9 @@
 // Helper RAII over winsock udp client socket.
 // Will throw on construction if socket creation failed.
 
-#include <spdlog/common.h>
-#include <spdlog/details/os.h>
+#include "../common.h"
+#include "os.h"
+
 #include <spdlog/details/windows_include.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/include/spdlog/details/udp_client.h b/include/spdlog/details/udp_client.h
index 95826f5d..60bbdefa 100644
--- a/include/spdlog/details/udp_client.h
+++ b/include/spdlog/details/udp_client.h
@@ -6,6 +6,10 @@
 // Helper RAII over unix udp client socket.
 // Will throw on construction if the socket creation failed.
 
+#include "../common.h"
+#include "os.h"
+
+
 #ifdef _WIN32
     #error "include udp_client-windows.h instead"
 #endif
@@ -15,11 +19,8 @@
 #include <netdb.h>
 #include <netinet/in.h>
 #include <netinet/udp.h>
-#include <spdlog/common.h>
-#include <spdlog/details/os.h>
 #include <sys/socket.h>
 #include <unistd.h>
-
 #include <string>
 
 namespace spdlog {
diff --git a/include/spdlog/sinks/android_sink.h b/include/spdlog/sinks/android_sink.h
index 8a90fb57..aa527cfc 100644
--- a/include/spdlog/sinks/android_sink.h
+++ b/include/spdlog/sinks/android_sink.h
@@ -5,11 +5,11 @@
 
 #ifdef __ANDROID__
 
-    #include <spdlog/details/fmt_helper.h>
-    #include <spdlog/details/null_mutex.h>
-    #include <spdlog/details/os.h>
-    #include <spdlog/details/synchronous_factory.h>
-    #include <spdlog/sinks/base_sink.h>
+    #include "../details/fmt_helper.h"
+    #include "../details/null_mutex.h"
+    #include "os.h"
+    #include "../details/synchronous_factory.h"
+    #include "base_sink.h"
 
     #include <android/log.h>
     #include <chrono>
diff --git a/include/spdlog/sinks/ansicolor_sink.h b/include/spdlog/sinks/ansicolor_sink.h
index e7150806..e5f5c873 100644
--- a/include/spdlog/sinks/ansicolor_sink.h
+++ b/include/spdlog/sinks/ansicolor_sink.h
@@ -6,9 +6,9 @@
 #include <array>
 #include <memory>
 #include <mutex>
-#include <spdlog/details/console_globals.h>
-#include <spdlog/details/null_mutex.h>
-#include <spdlog/sinks/sink.h>
+#include "../details/console_globals.h"
+#include "../details/null_mutex.h"
+#include "sink.h"
 #include <string>
 
 namespace spdlog {
diff --git a/include/spdlog/sinks/base_sink.h b/include/spdlog/sinks/base_sink.h
index 60a1e307..50a7494b 100644
--- a/include/spdlog/sinks/base_sink.h
+++ b/include/spdlog/sinks/base_sink.h
@@ -9,9 +9,9 @@
 // implementers..
 //
 
-#include <spdlog/common.h>
-#include <spdlog/details/log_msg.h>
-#include <spdlog/sinks/sink.h>
+#include "../common.h"
+#include "../details/log_msg.h"
+#include "sink.h"
 
 namespace spdlog {
 namespace sinks {
diff --git a/include/spdlog/sinks/basic_file_sink.h b/include/spdlog/sinks/basic_file_sink.h
index f87df9b3..5c4a590c 100644
--- a/include/spdlog/sinks/basic_file_sink.h
+++ b/include/spdlog/sinks/basic_file_sink.h
@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include <spdlog/details/file_helper.h>
-#include <spdlog/details/null_mutex.h>
-#include <spdlog/details/synchronous_factory.h>
-#include <spdlog/sinks/base_sink.h>
+#include "../details/file_helper.h"
+#include "../details/null_mutex.h"
+#include "../details/synchronous_factory.h"
+#include "base_sink.h"
 
 #include <mutex>
 #include <string>
diff --git a/include/spdlog/sinks/callback_sink.h b/include/spdlog/sinks/callback_sink.h
index 71668ef2..cc87d741 100644
--- a/include/spdlog/sinks/callback_sink.h
+++ b/include/spdlog/sinks/callback_sink.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <spdlog/details/null_mutex.h>
-#include <spdlog/details/synchronous_factory.h>
-#include <spdlog/sinks/base_sink.h>
+#include "../details/null_mutex.h"
+#include "../details/synchronous_factory.h"
+#include "base_sink.h"
 
 #include <mutex>
 #include <string>
diff --git a/include/spdlog/sinks/daily_file_sink.h b/include/spdlog/sinks/daily_file_sink.h
index b25538d4..5331cc7d 100644
--- a/include/spdlog/sinks/daily_file_sink.h
+++ b/include/spdlog/sinks/daily_file_sink.h
@@ -3,15 +3,15 @@
 
 #pragma once
 
-#include <spdlog/common.h>
-#include <spdlog/details/circular_q.h>
-#include <spdlog/details/file_helper.h>
-#include <spdlog/details/null_mutex.h>
-#include <spdlog/details/os.h>
-#include <spdlog/details/synchronous_factory.h>
-#include <spdlog/fmt/chrono.h>
-#include <spdlog/fmt/fmt.h>
-#include <spdlog/sinks/base_sink.h>
+#include "../common.h"
+#include "../details/circular_q.h"
+#include "../details/file_helper.h"
+#include "../details/null_mutex.h"
+#include "../details/os.h"
+#include "../details/synchronous_factory.h"
+#include "../fmt/chrono.h"
+#include "../fmt/fmt.h"
+#include "base_sink.h"
 
 #include <chrono>
 #include <cstdio>
diff --git a/include/spdlog/sinks/dist_sink.h b/include/spdlog/sinks/dist_sink.h
index e759d2e7..3d3206f1 100644
--- a/include/spdlog/sinks/dist_sink.h
+++ b/include/spdlog/sinks/dist_sink.h
@@ -4,9 +4,9 @@
 #pragma once
 
 #include "base_sink.h"
-#include <spdlog/details/log_msg.h>
-#include <spdlog/details/null_mutex.h>
-#include <spdlog/pattern_formatter.h>
+#include "../details/log_msg.h"
+#include "../details/null_mutex.h"
+#include "../pattern_formatter.h"
 
 #include <algorithm>
 #include <memory>
diff --git a/include/spdlog/sinks/dup_filter_sink.h b/include/spdlog/sinks/dup_filter_sink.h
index a9e71025..d3e36bd8 100644
--- a/include/spdlog/sinks/dup_filter_sink.h
+++ b/include/spdlog/sinks/dup_filter_sink.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #include "dist_sink.h"
-#include <spdlog/details/log_msg.h>
-#include <spdlog/details/null_mutex.h>
+#include "../details/log_msg.h"
+#include "../details/null_mutex.h"
 
 #include <chrono>
 #include <cstdio>
diff --git a/include/spdlog/sinks/hourly_file_sink.h b/include/spdlog/sinks/hourly_file_sink.h
index 1f138925..f390d7d5 100644
--- a/include/spdlog/sinks/hourly_file_sink.h
+++ b/include/spdlog/sinks/hourly_file_sink.h
@@ -3,14 +3,14 @@
 
 #pragma once
 
-#include <spdlog/common.h>
-#include <spdlog/details/circular_q.h>
-#include <spdlog/details/file_helper.h>
-#include <spdlog/details/null_mutex.h>
-#include <spdlog/details/os.h>
-#include <spdlog/details/synchronous_factory.h>
-#include <spdlog/fmt/fmt.h>
-#include <spdlog/sinks/base_sink.h>
+#include "../common.h"
+#include "../details/circular_q.h"
+#include "../details/file_helper.h"
+#include "../details/null_mutex.h"
+#include "../details/os.h"
+#include "../details/synchronous_factory.h"
+#include "../fmt/fmt.h"
+#include "base_sink.h"
 
 #include <chrono>
 #include <cstdio>
diff --git a/include/spdlog/sinks/kafka_sink.h b/include/spdlog/sinks/kafka_sink.h
index 91e98786..6e5020cb 100644
--- a/include/spdlog/sinks/kafka_sink.h
+++ b/include/spdlog/sinks/kafka_sink.h
@@ -10,13 +10,14 @@
 // https://github.com/confluentinc/librdkafka
 //
 
-#include "spdlog/async.h"
-#include "spdlog/details/log_msg.h"
-#include "spdlog/details/null_mutex.h"
-#include "spdlog/details/synchronous_factory.h"
-#include "spdlog/sinks/base_sink.h"
+#include "base_sink.h"
+#include "../async.h"
+#include "../details/log_msg.h"
+#include "../details/null_mutex.h"
+#include "../details/synchronous_factory.h"
+
 #include <mutex>
-#include <spdlog/common.h>
+#include "../common.h"
 
 // kafka header
 #include <librdkafka/rdkafkacpp.h>
diff --git a/include/spdlog/sinks/mongo_sink.h b/include/spdlog/sinks/mongo_sink.h
index 1210f1e0..b6a212a4 100644
--- a/include/spdlog/sinks/mongo_sink.h
+++ b/include/spdlog/sinks/mongo_sink.h
@@ -10,10 +10,10 @@
 // http://mongocxx.org/mongocxx-v3/installation/
 //
 
-#include "spdlog/common.h"
-#include "spdlog/details/log_msg.h"
-#include "spdlog/sinks/base_sink.h"
-#include <spdlog/details/synchronous_factory.h>
+#include "base_sink.h"
+#include "../common.h"
+#include "../details/log_msg.h"
+#include "../details/synchronous_factory.h"
 
 #include <bsoncxx/builder/stream/document.hpp>
 #include <bsoncxx/types.hpp>
@@ -78,7 +78,7 @@ private:
     std::unique_ptr<mongocxx::client> client_ = nullptr;
 };
 
-#include "spdlog/details/null_mutex.h"
+#include "../details/null_mutex.h"
 #include <mutex>
 using mongo_sink_mt = mongo_sink<std::mutex>;
 using mongo_sink_st = mongo_sink<spdlog::details::null_mutex>;
diff --git a/include/spdlog/sinks/msvc_sink.h b/include/spdlog/sinks/msvc_sink.h
index 3845674f..3c176b69 100644
--- a/include/spdlog/sinks/msvc_sink.h
+++ b/include/spdlog/sinks/msvc_sink.h
@@ -5,8 +5,8 @@
 
 #if defined(_WIN32)
 
-    #include <spdlog/details/null_mutex.h>
-    #include <spdlog/sinks/base_sink.h>
+    #include "../details/null_mutex.h"
+    #include "base_sink.h"
 
     #include <mutex>
     #include <string>
diff --git a/include/spdlog/sinks/null_sink.h b/include/spdlog/sinks/null_sink.h
index c51247fe..fc016a45 100644
--- a/include/spdlog/sinks/null_sink.h
+++ b/include/spdlog/sinks/null_sink.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <spdlog/details/null_mutex.h>
-#include <spdlog/details/synchronous_factory.h>
-#include <spdlog/sinks/base_sink.h>
+#include "../details/null_mutex.h"
+#include "../details/synchronous_factory.h"
+#include "base_sink.h"
 
 #include <mutex>
 
diff --git a/include/spdlog/sinks/ostream_sink.h b/include/spdlog/sinks/ostream_sink.h
index 6af9dd09..041a8821 100644
--- a/include/spdlog/sinks/ostream_sink.h
+++ b/include/spdlog/sinks/ostream_sink.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <spdlog/details/null_mutex.h>
-#include <spdlog/sinks/base_sink.h>
+#include "../details/null_mutex.h"
+#include "base_sink.h"
 
 #include <mutex>
 #include <ostream>
diff --git a/include/spdlog/sinks/qt_sinks.h b/include/spdlog/sinks/qt_sinks.h
index 830d3727..fd8b0278 100644
--- a/include/spdlog/sinks/qt_sinks.h
+++ b/include/spdlog/sinks/qt_sinks.h
@@ -12,10 +12,10 @@
 // QObject, and then use a standard signal/slot.
 //
 
-#include "spdlog/common.h"
-#include "spdlog/details/log_msg.h"
-#include "spdlog/details/synchronous_factory.h"
-#include "spdlog/sinks/base_sink.h"
+#include "../common.h"
+#include "../details/log_msg.h"
+#include "../details/synchronous_factory.h"
+#include "base_sink.h"
 #include <array>
 
 #include <QPlainTextEdit>
@@ -225,7 +225,7 @@ protected:
     std::array<QTextCharFormat, level::n_levels> colors_;
 };
 
-#include "spdlog/details/null_mutex.h"
+#include "../details/null_mutex.h"
 #include <mutex>
 
 using qt_sink_mt = qt_sink<std::mutex>;
diff --git a/include/spdlog/sinks/ringbuffer_sink.h b/include/spdlog/sinks/ringbuffer_sink.h
index 9ce2fc9d..2b64c52f 100644
--- a/include/spdlog/sinks/ringbuffer_sink.h
+++ b/include/spdlog/sinks/ringbuffer_sink.h
@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include "spdlog/details/circular_q.h"
-#include "spdlog/details/log_msg_buffer.h"
-#include "spdlog/details/null_mutex.h"
-#include "spdlog/sinks/base_sink.h"
+#include "base_sink.h"
+#include "../details/circular_q.h"
+#include "../details/log_msg_buffer.h"
+#include "../details/null_mutex.h"
 
 #include <functional>
 #include <mutex>
diff --git a/include/spdlog/sinks/rotating_file_sink.h b/include/spdlog/sinks/rotating_file_sink.h
index 5ce477cc..31eae472 100644
--- a/include/spdlog/sinks/rotating_file_sink.h
+++ b/include/spdlog/sinks/rotating_file_sink.h
@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include <spdlog/details/file_helper.h>
-#include <spdlog/details/null_mutex.h>
-#include <spdlog/details/synchronous_factory.h>
-#include <spdlog/sinks/base_sink.h>
+#include "../details/file_helper.h"
+#include "../details/null_mutex.h"
+#include "../details/synchronous_factory.h"
+#include "base_sink.h"
 
 #include <chrono>
 #include <mutex>
diff --git a/include/spdlog/sinks/sink.h b/include/spdlog/sinks/sink.h
index 0bd37521..b6a4c5c1 100644
--- a/include/spdlog/sinks/sink.h
+++ b/include/spdlog/sinks/sink.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <spdlog/details/log_msg.h>
-#include <spdlog/formatter.h>
+#include "../details/log_msg.h"
+#include "../formatter.h"
 
 namespace spdlog {
 namespace sinks {
diff --git a/include/spdlog/sinks/stdout_color_sinks.h b/include/spdlog/sinks/stdout_color_sinks.h
index 5b674119..79ae4ddf 100644
--- a/include/spdlog/sinks/stdout_color_sinks.h
+++ b/include/spdlog/sinks/stdout_color_sinks.h
@@ -4,13 +4,13 @@
 #pragma once
 
 #ifdef _WIN32
-    #include <spdlog/sinks/wincolor_sink.h>
+    #include "wincolor_sink.h"
 #else
-    #include <spdlog/sinks/ansicolor_sink.h>
+    #include "ansicolor_sink.h"
 #endif
 
-#include <spdlog/async.h>
-#include <spdlog/details/synchronous_factory.h>
+#include "../async.h"
+#include "../details/synchronous_factory.h"
 
 namespace spdlog {
 namespace sinks {
diff --git a/include/spdlog/sinks/stdout_sinks.h b/include/spdlog/sinks/stdout_sinks.h
index 64b487ab..8dd59058 100644
--- a/include/spdlog/sinks/stdout_sinks.h
+++ b/include/spdlog/sinks/stdout_sinks.h
@@ -3,13 +3,14 @@
 
 #pragma once
 
+#include "../details/console_globals.h"
+#include "../details/synchronous_factory.h"
+#include "sink.h"
+
 #include <cstdio>
-#include <spdlog/details/console_globals.h>
-#include <spdlog/details/synchronous_factory.h>
-#include <spdlog/sinks/sink.h>
 
 #ifdef _WIN32
-    #include <spdlog/details/windows_include.h>
+    #include "../details/windows_include.h"
 #endif
 
 namespace spdlog {
diff --git a/include/spdlog/sinks/syslog_sink.h b/include/spdlog/sinks/syslog_sink.h
index 87cac33a..5b1d2818 100644
--- a/include/spdlog/sinks/syslog_sink.h
+++ b/include/spdlog/sinks/syslog_sink.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <spdlog/details/null_mutex.h>
-#include <spdlog/details/synchronous_factory.h>
-#include <spdlog/sinks/base_sink.h>
+#include "../details/null_mutex.h"
+#include "../details/synchronous_factory.h"
+#include "base_sink.h"
 
 #include <array>
 #include <string>
diff --git a/include/spdlog/sinks/systemd_sink.h b/include/spdlog/sinks/systemd_sink.h
index 17f36445..fcf52346 100644
--- a/include/spdlog/sinks/systemd_sink.h
+++ b/include/spdlog/sinks/systemd_sink.h
@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include <spdlog/details/null_mutex.h>
-#include <spdlog/details/os.h>
-#include <spdlog/details/synchronous_factory.h>
-#include <spdlog/sinks/base_sink.h>
+#include "../details/null_mutex.h"
+#include "../details/os.h"
+#include "../details/synchronous_factory.h"
+#include "base_sink.h"
 
 #include <array>
 #ifndef SD_JOURNAL_SUPPRESS_LOCATION
diff --git a/include/spdlog/sinks/tcp_sink.h b/include/spdlog/sinks/tcp_sink.h
index 25349645..65e3e19f 100644
--- a/include/spdlog/sinks/tcp_sink.h
+++ b/include/spdlog/sinks/tcp_sink.h
@@ -3,13 +3,13 @@
 
 #pragma once
 
-#include <spdlog/common.h>
-#include <spdlog/details/null_mutex.h>
-#include <spdlog/sinks/base_sink.h>
+#include "../common.h"
+#include "../details/null_mutex.h"
+#include "base_sink.h"
 #ifdef _WIN32
-    #include <spdlog/details/tcp_client-windows.h>
+    #include "../details/tcp_client-windows.h"
 #else
-    #include <spdlog/details/tcp_client.h>
+    #include "../details/tcp_client.h"
 #endif
 
 #include <chrono>
diff --git a/include/spdlog/sinks/udp_sink.h b/include/spdlog/sinks/udp_sink.h
index 4bff0fd2..7780acb1 100644
--- a/include/spdlog/sinks/udp_sink.h
+++ b/include/spdlog/sinks/udp_sink.h
@@ -3,13 +3,13 @@
 
 #pragma once
 
-#include <spdlog/common.h>
-#include <spdlog/details/null_mutex.h>
-#include <spdlog/sinks/base_sink.h>
+#include "../common.h"
+#include "../details/null_mutex.h"
+#include "base_sink.h"
 #ifdef _WIN32
-    #include <spdlog/details/udp_client-windows.h>
+    #include "../details/udp_client-windows.h"
 #else
-    #include <spdlog/details/udp_client.h>
+    #include "../details/udp_client.h"
 #endif
 
 #include <chrono>
diff --git a/include/spdlog/sinks/win_eventlog_sink.h b/include/spdlog/sinks/win_eventlog_sink.h
index 3507bf2c..c8781099 100644
--- a/include/spdlog/sinks/win_eventlog_sink.h
+++ b/include/spdlog/sinks/win_eventlog_sink.h
@@ -32,11 +32,12 @@ Windows Registry Editor Version 5.00
 -----------------------------------------------------------------------------------------*/
 
 #pragma once
+#ifdef _WIN32
 
-#include <spdlog/details/null_mutex.h>
-#include <spdlog/sinks/base_sink.h>
+#include "../details/null_mutex.h"
+#include "base_sink.h"
 
-#include <spdlog/details/windows_include.h>
+#include "../details/windows_include.h"
 #include <winbase.h>
 
 #include <mutex>
@@ -249,3 +250,5 @@ using win_eventlog_sink_st = win_eventlog::win_eventlog_sink<details::null_mutex
 
 }  // namespace sinks
 }  // namespace spdlog
+
+#endif
\ No newline at end of file
diff --git a/include/spdlog/sinks/wincolor_sink.h b/include/spdlog/sinks/wincolor_sink.h
index 76fcaac0..e9b02869 100644
--- a/include/spdlog/sinks/wincolor_sink.h
+++ b/include/spdlog/sinks/wincolor_sink.h
@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include <spdlog/common.h>
-#include <spdlog/details/console_globals.h>
-#include <spdlog/details/null_mutex.h>
-#include <spdlog/sinks/sink.h>
+#include "../common.h"
+#include "../details/console_globals.h"
+#include "../details/null_mutex.h"
+#include "sink.h"
 
 #include <array>
 #include <cstdint>
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8bf85e35..62af1100 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -47,7 +47,9 @@ set(SPDLOG_UTESTS_SOURCES
     test_circular_q.cpp
     test_ringbuffer_sink.cpp
     test_source_location.cpp
-    test_log_level.cpp)
+    test_log_level.cpp
+    test_include_sinks.cpp
+)
 
 if(NOT SPDLOG_NO_EXCEPTIONS)
     list(APPEND SPDLOG_UTESTS_SOURCES test_errors.cpp)
diff --git a/tests/test_include_sinks.cpp b/tests/test_include_sinks.cpp
new file mode 100644
index 00000000..adff1864
--- /dev/null
+++ b/tests/test_include_sinks.cpp
@@ -0,0 +1,22 @@
+#include <spdlog/sinks/android_sink.h>
+#include <spdlog/sinks/ansicolor_sink.h>
+#include <spdlog/sinks/base_sink.h>
+#include <spdlog/sinks/basic_file_sink.h>
+#include <spdlog/sinks/callback_sink.h>
+#include <spdlog/sinks/daily_file_sink.h>
+#include <spdlog/sinks/dist_sink.h>
+#include <spdlog/sinks/dup_filter_sink.h>
+#include <spdlog/sinks/hourly_file_sink.h>
+#include <spdlog/sinks/msvc_sink.h>
+#include <spdlog/sinks/null_sink.h>
+#include <spdlog/sinks/ostream_sink.h>
+#include <spdlog/sinks/ringbuffer_sink.h>
+#include <spdlog/sinks/rotating_file_sink.h>
+#include <spdlog/sinks/sink.h>
+#include <spdlog/sinks/stdout_color_sinks.h>
+#include <spdlog/sinks/stdout_sinks.h>
+#include <spdlog/sinks/syslog_sink.h>
+#include <spdlog/sinks/tcp_sink.h>
+#include <spdlog/sinks/udp_sink.h>
+#include <spdlog/sinks/wincolor_sink.h>
+#include <spdlog/sinks/win_eventlog_sink.h>