diff --git a/components/crashcatcher/windows_crashcatcher.cpp b/components/crashcatcher/windows_crashcatcher.cpp
index eea6ac40ad..e9eb60e845 100644
--- a/components/crashcatcher/windows_crashcatcher.cpp
+++ b/components/crashcatcher/windows_crashcatcher.cpp
@@ -1,10 +1,11 @@
+#include "windows_crashcatcher.hpp"
+
 #include <cassert>
 #include <cwchar>
 #include <iostream>
 #include <sstream>
 #include <thread>
 
-#include "windows_crashcatcher.hpp"
 #include "windows_crashmonitor.hpp"
 #include "windows_crashshm.hpp"
 #include <SDL_messagebox.h>
diff --git a/components/crashcatcher/windows_crashmonitor.cpp b/components/crashcatcher/windows_crashmonitor.cpp
index 336210391a..50d3fc08a1 100644
--- a/components/crashcatcher/windows_crashmonitor.cpp
+++ b/components/crashcatcher/windows_crashmonitor.cpp
@@ -1,3 +1,5 @@
+#include "windows_crashmonitor.hpp"
+
 #undef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
@@ -12,7 +14,6 @@
 #include <SDL_messagebox.h>
 
 #include "windows_crashcatcher.hpp"
-#include "windows_crashmonitor.hpp"
 #include "windows_crashshm.hpp"
 #include <components/debug/debuglog.hpp>
 
diff --git a/components/crashcatcher/windows_crashmonitor.hpp b/components/crashcatcher/windows_crashmonitor.hpp
index b520e309b0..871346d292 100644
--- a/components/crashcatcher/windows_crashmonitor.hpp
+++ b/components/crashcatcher/windows_crashmonitor.hpp
@@ -1,7 +1,9 @@
 #ifndef WINDOWS_CRASHMONITOR_HPP
 #define WINDOWS_CRASHMONITOR_HPP
 
-#include <windef.h>
+#undef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
 
 namespace Crash
 {