diff --git a/platform/windows/sub_process_windows.cpp b/platform/windows/sub_process_windows.cpp
index 1d75b1015..0a6528795 100644
--- a/platform/windows/sub_process_windows.cpp
+++ b/platform/windows/sub_process_windows.cpp
@@ -32,8 +32,6 @@
 
 #include "core/containers/local_vector.h"
 
-#include "os_windows.h"
-
 // TODO clean these up
 #include <wchar.h>
 #include <avrt.h>
diff --git a/platform/windows/sub_process_windows.h b/platform/windows/sub_process_windows.h
index c7852272e..e75786962 100644
--- a/platform/windows/sub_process_windows.h
+++ b/platform/windows/sub_process_windows.h
@@ -33,17 +33,7 @@
 
 #include "core/os/sub_process.h"
 
-// TODO clean these up
-#include <dwmapi.h>
-#include <fcntl.h>
-#include <io.h>
-#include <shellapi.h>
-#include <stdio.h>
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <windowsx.h>
-
-typedef HANDLE(WINAPI *WTOpenPtr)(HWND p_window, LOGCONTEXTW *p_ctx, BOOL p_enable);
+#include "os_windows.h"
 
 class SubProcessWindows : public SubProcess {
 public: