diff --git a/src/crashhandler_windows.cpp b/src/crashhandler_windows.cpp
index 2873a14..acaebc6 100644
--- a/src/crashhandler_windows.cpp
+++ b/src/crashhandler_windows.cpp
@@ -11,16 +11,12 @@
 #endif
 
 #include <windows.h>
-#include <intrin.h>
 #include <csignal>
-#include <cstring>
-#include <cstdlib>
 #include <sstream>
 #include <atomic>
 #include <process.h> // getpid
 #include "g3log/crashhandler.hpp"
 #include "g3log/stacktrace_windows.hpp"
-#include "g3log/logmessage.hpp"
 #include "g3log/logcapture.hpp"
 
 #define getpid _getpid
diff --git a/src/g3log.cpp b/src/g3log.cpp
index f3e3a65..197b2b5 100644
--- a/src/g3log.cpp
+++ b/src/g3log.cpp
@@ -26,9 +26,7 @@
 #include "g3log/loglevels.hpp"
 
 
-#include <cstdio>    // vsnprintf
 #include <mutex>
-#include <csignal>
 #include <memory>
 #include <iostream>
 #include <thread>
diff --git a/src/g3log/crashhandler.hpp b/src/g3log/crashhandler.hpp
index 1b7995a..b5e3685 100644
--- a/src/g3log/crashhandler.hpp
+++ b/src/g3log/crashhandler.hpp
@@ -8,8 +8,6 @@
  * For more information see g3log/LICENSE or refer refer to http://unlicense.org
  * ============================================================================*/
 #include <string>
-#include <csignal>
-#include <map>
 #include "g3log/loglevels.hpp"
 #include "g3log/generated_definitions.hpp"
 
diff --git a/src/g3log/future.hpp b/src/g3log/future.hpp
index ed50ef0..ece1143 100644
--- a/src/g3log/future.hpp
+++ b/src/g3log/future.hpp
@@ -26,7 +26,6 @@
 
 
 #include <future>
-#include "g3log/active.hpp"
 #include "g3log/moveoncopy.hpp"
 #include "g3log/stlpatch_future.hpp"
 
diff --git a/src/g3log/g3log.hpp b/src/g3log/g3log.hpp
index 52c0d8a..37aa75e 100644
--- a/src/g3log/g3log.hpp
+++ b/src/g3log/g3log.hpp
@@ -26,7 +26,6 @@
 #include "g3log/logmessage.hpp"
 
 #include <string>
-#include <cstdarg>
 #include <functional>
 
 
diff --git a/src/g3log/loglevels.hpp b/src/g3log/loglevels.hpp
index 56512f0..6a74311 100644
--- a/src/g3log/loglevels.hpp
+++ b/src/g3log/loglevels.hpp
@@ -23,7 +23,6 @@
 #endif
 
 #include <string>
-#include <algorithm>
 
 
 // Levels for logging, made so that it would be easy to change, remove, add levels -- KjellKod
diff --git a/src/g3log/logmessage.hpp b/src/g3log/logmessage.hpp
index 9d43e14..790ddb2 100644
--- a/src/g3log/logmessage.hpp
+++ b/src/g3log/logmessage.hpp
@@ -17,7 +17,6 @@
 
 #include <string>
 #include <sstream>
-#include <chrono>
 #include <thread>
 #include <memory>
 
diff --git a/src/g3log/logworker.hpp b/src/g3log/logworker.hpp
index a1e49e0..a214730 100644
--- a/src/g3log/logworker.hpp
+++ b/src/g3log/logworker.hpp
@@ -11,7 +11,6 @@
  *
  * PUBLIC DOMAIN and Not copywrited. First published at KjellKod.cc
  * ********************************************* */
-#include "g3log/g3log.hpp"
 #include "g3log/sinkwrapper.hpp"
 #include "g3log/sinkhandle.hpp"
 #include "g3log/filesink.hpp"
@@ -20,7 +19,6 @@
 
 #include <memory>
 #include <string>
-#include <utility>
 #include <vector>
 
 
diff --git a/src/g3log/sinkhandle.hpp b/src/g3log/sinkhandle.hpp
index 794df86..308aa6e 100644
--- a/src/g3log/sinkhandle.hpp
+++ b/src/g3log/sinkhandle.hpp
@@ -11,7 +11,6 @@
 #include "g3log/sink.hpp"
 
 #include <memory>
-#include <functional>
 #include <type_traits>
 
 namespace g3 {
diff --git a/src/g3log/std2_make_unique.hpp b/src/g3log/std2_make_unique.hpp
index 1b26181..325ed63 100644
--- a/src/g3log/std2_make_unique.hpp
+++ b/src/g3log/std2_make_unique.hpp
@@ -20,7 +20,6 @@
 #pragma once
 
 #include <memory>
-#include <utility>
 #include <type_traits>
 
 namespace std2 {
diff --git a/src/loglevels.cpp b/src/loglevels.cpp
index 7fefe6c..72e3bf3 100644
--- a/src/loglevels.cpp
+++ b/src/loglevels.cpp
@@ -7,7 +7,6 @@
 * ============================================================================*/
 
 #include "g3log/loglevels.hpp"
-#include "g3log/g3log.hpp"
 #include <atomic>
 #include <cassert>
 #include <map>
diff --git a/src/logmessage.cpp b/src/logmessage.cpp
index 2202170..7d112b4 100644
--- a/src/logmessage.cpp
+++ b/src/logmessage.cpp
@@ -9,8 +9,6 @@
 #include "g3log/logmessage.hpp"
 #include "g3log/crashhandler.hpp"
 #include "g3log/time.hpp"
-#include "g3log/std2_make_unique.hpp"
-#include <algorithm>
 #include <mutex>
 
 namespace {
diff --git a/src/logworker.cpp b/src/logworker.cpp
index db38e31..95d5e57 100644
--- a/src/logworker.cpp
+++ b/src/logworker.cpp
@@ -10,13 +10,10 @@
 #include "g3log/logmessage.hpp"
 #include "g3log/active.hpp"
 #include "g3log/g3log.hpp"
-#include "g3log/time.hpp"
 #include "g3log/future.hpp"
 #include "g3log/crashhandler.hpp"
 
 #include <iostream>
-#include <cassert>
-#include <functional>
 
 
 namespace g3 {
diff --git a/src/stacktrace_windows.cpp b/src/stacktrace_windows.cpp
index 13a0932..3387ca5 100644
--- a/src/stacktrace_windows.cpp
+++ b/src/stacktrace_windows.cpp
@@ -13,16 +13,13 @@
  * ============================================================================*/
 
 #include "g3log/stacktrace_windows.hpp"
-#include "g3log/g3log.hpp"
 
 #include <windows.h>
 #include <dbghelp.h>
 #include <map>
 #include <memory>
-#include <atomic>
 #include <cassert>
 #include <vector>
-#include <cstdlib>
 #include <mutex>
 
 
diff --git a/src/time.cpp b/src/time.cpp
index 9c7b796..fa5aef4 100644
--- a/src/time.cpp
+++ b/src/time.cpp
@@ -11,7 +11,6 @@
 #include <sstream>
 #include <string>
 #include <chrono>
-#include <thread>
 #include <cassert>
 #include <iomanip>