diff --git a/include/cpptrace/from_current.hpp b/include/cpptrace/from_current.hpp
index 032f75e2..667db100 100644
--- a/include/cpptrace/from_current.hpp
+++ b/include/cpptrace/from_current.hpp
@@ -6,7 +6,7 @@
 #include <utility>
 
 #ifdef _MSC_VER
- #include <windows.h>
+ #include <excpt.h>
 #endif
 
 #include <cpptrace/basic.hpp>
@@ -43,11 +43,11 @@ CPPTRACE_BEGIN_NAMESPACE
 
         #ifdef _MSC_VER
          CPPTRACE_EXPORT CPPTRACE_FORCE_NO_INLINE
-         int maybe_collect_trace(EXCEPTION_POINTERS* exception_ptrs, int filter_result);
+         int maybe_collect_trace(_EXCEPTION_POINTERS* exception_ptrs, int filter_result);
          CPPTRACE_EXPORT CPPTRACE_FORCE_NO_INLINE
-         void maybe_collect_trace(EXCEPTION_POINTERS* exception_ptrs, const std::type_info& type_info);
+         void maybe_collect_trace(_EXCEPTION_POINTERS* exception_ptrs, const std::type_info& type_info);
          template<typename E>
-         CPPTRACE_FORCE_NO_INLINE inline int exception_filter(EXCEPTION_POINTERS* exception_ptrs) {
+         CPPTRACE_FORCE_NO_INLINE inline int exception_filter(_EXCEPTION_POINTERS* exception_ptrs) {
              maybe_collect_trace(exception_ptrs, typeid(E));
              return EXCEPTION_CONTINUE_SEARCH;
          }
diff --git a/src/from_current.cpp b/src/from_current.cpp
index bc22da0a..c620523c 100644
--- a/src/from_current.cpp
+++ b/src/from_current.cpp
@@ -14,6 +14,13 @@
 #include "logging.hpp"
 #include "unwind/unwind.hpp"
 
+#if IS_WINDOWS
+ #ifndef WIN32_LEAN_AND_MEAN
+  #define WIN32_LEAN_AND_MEAN
+ #endif
+ #include <windows.h>
+#endif
+
 #ifndef _MSC_VER
  #include <cstring>
 #endif
diff --git a/test/unit/tracing/from_current.cpp b/test/unit/tracing/from_current.cpp
index add6ffba..dc9e2211 100644
--- a/test/unit/tracing/from_current.cpp
+++ b/test/unit/tracing/from_current.cpp
@@ -1,6 +1,10 @@
 #include <algorithm>
 #include <string>
 
+#ifdef _MSC_VER
+ #include <windows.h>
+#endif
+
 #include <gtest/gtest.h>
 #include <gtest/gtest-matchers.h>
 #include <gmock/gmock.h>