diff --git a/src/crashhandler_windows.cpp b/src/crashhandler_windows.cpp
index cc57bfa..2873a14 100644
--- a/src/crashhandler_windows.cpp
+++ b/src/crashhandler_windows.cpp
@@ -13,11 +13,14 @@
 #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/crashhandler.hpp b/src/g3log/crashhandler.hpp
index 6f2edc5..f535f4e 100644
--- a/src/g3log/crashhandler.hpp
+++ b/src/g3log/crashhandler.hpp
@@ -7,7 +7,9 @@
  *
  * For more information see g3log/LICENSE or refer refer to http://unlicense.org
  * ============================================================================*/
+#include <cstdio>
 #include <string>
+#include <csignal>
 #include <map>
 #include "g3log/loglevels.hpp"
 #include "g3log/generated_definitions.hpp"
diff --git a/src/g3log/loglevels.hpp b/src/g3log/loglevels.hpp
index 55ca88f..5d72563 100644
--- a/src/g3log/loglevels.hpp
+++ b/src/g3log/loglevels.hpp
@@ -23,6 +23,7 @@
 #endif
 
 #include <string>
+#include <cstdarg>
 #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 790ddb2..9d43e14 100644
--- a/src/g3log/logmessage.hpp
+++ b/src/g3log/logmessage.hpp
@@ -17,6 +17,7 @@
 
 #include <string>
 #include <sstream>
+#include <chrono>
 #include <thread>
 #include <memory>
 
diff --git a/src/g3log/logworker.hpp b/src/g3log/logworker.hpp
index 9c5bb72..a1e49e0 100644
--- a/src/g3log/logworker.hpp
+++ b/src/g3log/logworker.hpp
@@ -20,6 +20,7 @@
 
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 
diff --git a/src/g3log/sinkhandle.hpp b/src/g3log/sinkhandle.hpp
index 308aa6e..794df86 100644
--- a/src/g3log/sinkhandle.hpp
+++ b/src/g3log/sinkhandle.hpp
@@ -11,6 +11,7 @@
 #include "g3log/sink.hpp"
 
 #include <memory>
+#include <functional>
 #include <type_traits>
 
 namespace g3 {
diff --git a/src/logworker.cpp b/src/logworker.cpp
index 95d5e57..8c7d95a 100644
--- a/src/logworker.cpp
+++ b/src/logworker.cpp
@@ -14,7 +14,8 @@
 #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 3387ca5..13a0932 100644
--- a/src/stacktrace_windows.cpp
+++ b/src/stacktrace_windows.cpp
@@ -13,13 +13,16 @@
  * ============================================================================*/
 
 #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 fa5aef4..9c7b796 100644
--- a/src/time.cpp
+++ b/src/time.cpp
@@ -11,6 +11,7 @@
 #include <sstream>
 #include <string>
 #include <chrono>
+#include <thread>
 #include <cassert>
 #include <iomanip>