diff --git a/libraries/libstratosphere/include/stratosphere.hpp b/libraries/libstratosphere/include/stratosphere.hpp
index d4666602a..bc5547f97 100644
--- a/libraries/libstratosphere/include/stratosphere.hpp
+++ b/libraries/libstratosphere/include/stratosphere.hpp
@@ -24,10 +24,6 @@
 /* libvapours (pulls in util, svc, results). */
 #include <vapours.hpp>
 
-#if defined(ATMOSPHERE_OS_WINDOWS)
-#include <stratosphere/windows.hpp>
-#endif
-
 /* Libstratosphere diagnostics. */
 #include <stratosphere/diag.hpp>
 
diff --git a/libraries/libstratosphere/source/crypto/crypto_csrng.os.windows.cpp b/libraries/libstratosphere/source/crypto/crypto_csrng.os.windows.cpp
index ef5707457..a75f0b60c 100644
--- a/libraries/libstratosphere/source/crypto/crypto_csrng.os.windows.cpp
+++ b/libraries/libstratosphere/source/crypto/crypto_csrng.os.windows.cpp
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <stratosphere.hpp>
+#include <stratosphere/windows.hpp>
 #include <ntstatus.h>
 #include <bcrypt.h>
 
diff --git a/libraries/libstratosphere/source/diag/impl/diag_backtrace_impl.os.generic.cpp b/libraries/libstratosphere/source/diag/impl/diag_backtrace_impl.os.generic.cpp
index 9cd49070a..db9a076af 100644
--- a/libraries/libstratosphere/source/diag/impl/diag_backtrace_impl.os.generic.cpp
+++ b/libraries/libstratosphere/source/diag/impl/diag_backtrace_impl.os.generic.cpp
@@ -15,7 +15,9 @@
  */
 #include <stratosphere.hpp>
 
-#if defined(ATMOSPHERE_OS_LINUX) || defined(ATMOSPHERE_OS_MACOS)
+#if defined(ATMOSPHERE_OS_WINDOWS)
+#include <stratosphere/windows.hpp>
+#elif defined(ATMOSPHERE_OS_LINUX) || defined(ATMOSPHERE_OS_MACOS)
 #include <fcntl.h>
 #include <unistd.h>
 #endif
diff --git a/libraries/libstratosphere/source/diag/impl/diag_default_abort_observer.cpp b/libraries/libstratosphere/source/diag/impl/diag_default_abort_observer.cpp
index 4c0224808..3e3817455 100644
--- a/libraries/libstratosphere/source/diag/impl/diag_default_abort_observer.cpp
+++ b/libraries/libstratosphere/source/diag/impl/diag_default_abort_observer.cpp
@@ -16,6 +16,10 @@
 #include <stratosphere.hpp>
 #include "diag_dump_stack_trace.hpp"
 
+#if defined(ATMOSPHERE_OS_WINDOWS)
+#include <stratosphere/windows.hpp>
+#endif
+
 namespace ams::diag::impl {
 
     #if defined(AMS_BUILD_FOR_DEBUGGING) || defined(AMS_BUILD_FOR_DEBUGGING)
diff --git a/libraries/libstratosphere/source/diag/impl/diag_symbol_impl.os.windows.cpp b/libraries/libstratosphere/source/diag/impl/diag_symbol_impl.os.windows.cpp
index 15d9ea6ae..20660f6b2 100644
--- a/libraries/libstratosphere/source/diag/impl/diag_symbol_impl.os.windows.cpp
+++ b/libraries/libstratosphere/source/diag/impl/diag_symbol_impl.os.windows.cpp
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <stratosphere.hpp>
+#include <stratosphere/windows.hpp>
 #include "diag_symbol_impl.hpp"
 
 #include <cxxabi.h>
diff --git a/libraries/libstratosphere/source/fssrv/impl/fssrv_utility.cpp b/libraries/libstratosphere/source/fssrv/impl/fssrv_utility.cpp
index fe99a9288..d5489b4ea 100644
--- a/libraries/libstratosphere/source/fssrv/impl/fssrv_utility.cpp
+++ b/libraries/libstratosphere/source/fssrv/impl/fssrv_utility.cpp
@@ -16,7 +16,10 @@
 #include <stratosphere.hpp>
 #include "fssrv_utility.hpp"
 
-#if defined(ATMOSPHERE_OS_LINUX)
+
+#if defined(ATMOSPHERE_OS_WINDOWS)
+#include <stratosphere/windows.hpp>
+#elif defined(ATMOSPHERE_OS_LINUX)
 #include <unistd.h>
 #elif defined(ATMOSPHERE_OS_MACOS)
 #include <unistd.h>
diff --git a/libraries/libstratosphere/source/fssystem/fssystem_local_file_system.cpp b/libraries/libstratosphere/source/fssystem/fssystem_local_file_system.cpp
index 256132691..6c258a890 100644
--- a/libraries/libstratosphere/source/fssystem/fssystem_local_file_system.cpp
+++ b/libraries/libstratosphere/source/fssystem/fssystem_local_file_system.cpp
@@ -15,6 +15,7 @@
  */
 #include <stratosphere.hpp>
 #if defined(ATMOSPHERE_OS_WINDOWS)
+#include <stratosphere/windows.hpp>
 #include <winerror.h>
 #include <winioctl.h>
 #elif defined(ATMOSPHERE_OS_LINUX) || defined(ATMOSPHERE_OS_MACOS)
diff --git a/libraries/libstratosphere/source/mem/impl/mem_impl_platform.os.windows.cpp b/libraries/libstratosphere/source/mem/impl/mem_impl_platform.os.windows.cpp
index 7f4424485..cfa31163f 100644
--- a/libraries/libstratosphere/source/mem/impl/mem_impl_platform.os.windows.cpp
+++ b/libraries/libstratosphere/source/mem/impl/mem_impl_platform.os.windows.cpp
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <stratosphere.hpp>
+#include <stratosphere/windows.hpp>
 #include <VersionHelpers.h>
 #include "mem_impl_platform.hpp"
 
diff --git a/libraries/libstratosphere/source/os/impl/os_debug_impl.os.windows.hpp b/libraries/libstratosphere/source/os/impl/os_debug_impl.os.windows.hpp
index 7e596f36d..7d25d64a7 100644
--- a/libraries/libstratosphere/source/os/impl/os_debug_impl.os.windows.hpp
+++ b/libraries/libstratosphere/source/os/impl/os_debug_impl.os.windows.hpp
@@ -15,6 +15,7 @@
  */
 #pragma once
 #include <stratosphere.hpp>
+#include <stratosphere/windows.hpp>
 
 namespace ams::os::impl {
 
diff --git a/libraries/libstratosphere/source/os/impl/os_giant_lock.os.windows.cpp b/libraries/libstratosphere/source/os/impl/os_giant_lock.os.windows.cpp
index 2116689cc..1fb56adf0 100644
--- a/libraries/libstratosphere/source/os/impl/os_giant_lock.os.windows.cpp
+++ b/libraries/libstratosphere/source/os/impl/os_giant_lock.os.windows.cpp
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <stratosphere.hpp>
+#include <stratosphere/windows.hpp>
 #include "os_giant_lock.os.windows.hpp"
 
 namespace ams::os::impl {
diff --git a/libraries/libstratosphere/source/os/impl/os_inter_process_event_impl.os.windows.cpp b/libraries/libstratosphere/source/os/impl/os_inter_process_event_impl.os.windows.cpp
index dc7d2caed..7041d95c6 100644
--- a/libraries/libstratosphere/source/os/impl/os_inter_process_event_impl.os.windows.cpp
+++ b/libraries/libstratosphere/source/os/impl/os_inter_process_event_impl.os.windows.cpp
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <stratosphere.hpp>
+#include <stratosphere/windows.hpp>
 #include "os_inter_process_event.hpp"
 #include "os_inter_process_event_impl.os.windows.hpp"
 #include "os_giant_lock.hpp"
diff --git a/libraries/libstratosphere/source/os/impl/os_internal_condition_variable_impl.os.windows.cpp b/libraries/libstratosphere/source/os/impl/os_internal_condition_variable_impl.os.windows.cpp
index d683e9696..2ffcc89c2 100644
--- a/libraries/libstratosphere/source/os/impl/os_internal_condition_variable_impl.os.windows.cpp
+++ b/libraries/libstratosphere/source/os/impl/os_internal_condition_variable_impl.os.windows.cpp
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <stratosphere.hpp>
+#include <stratosphere/windows.hpp>
 #include "os_internal_critical_section_impl.os.windows.hpp"
 #include "os_timeout_helper.hpp"
 #include "os_thread_manager.hpp"
diff --git a/libraries/libstratosphere/source/os/impl/os_internal_critical_section_impl.os.windows.cpp b/libraries/libstratosphere/source/os/impl/os_internal_critical_section_impl.os.windows.cpp
index 2ede6cedf..7acb21936 100644
--- a/libraries/libstratosphere/source/os/impl/os_internal_critical_section_impl.os.windows.cpp
+++ b/libraries/libstratosphere/source/os/impl/os_internal_critical_section_impl.os.windows.cpp
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <stratosphere.hpp>
+#include <stratosphere/windows.hpp>
 #include "os_internal_critical_section_impl.os.windows.hpp"
 
 namespace ams::os::impl {
diff --git a/libraries/libstratosphere/source/os/impl/os_native_handle_impl.os.windows.hpp b/libraries/libstratosphere/source/os/impl/os_native_handle_impl.os.windows.hpp
index e181cb478..6451a4ca7 100644
--- a/libraries/libstratosphere/source/os/impl/os_native_handle_impl.os.windows.hpp
+++ b/libraries/libstratosphere/source/os/impl/os_native_handle_impl.os.windows.hpp
@@ -15,6 +15,7 @@
  */
 #pragma once
 #include <stratosphere.hpp>
+#include <stratosphere/windows.hpp>
 
 namespace ams::os::impl {
 
diff --git a/libraries/libstratosphere/source/os/impl/os_process_handle_impl.os.windows.hpp b/libraries/libstratosphere/source/os/impl/os_process_handle_impl.os.windows.hpp
index 5146698ca..78fa40479 100644
--- a/libraries/libstratosphere/source/os/impl/os_process_handle_impl.os.windows.hpp
+++ b/libraries/libstratosphere/source/os/impl/os_process_handle_impl.os.windows.hpp
@@ -15,6 +15,7 @@
  */
 #pragma once
 #include <stratosphere.hpp>
+#include <stratosphere/windows.hpp>
 
 namespace ams::os::impl {
 
diff --git a/libraries/libstratosphere/source/os/impl/os_thread_manager_impl.os.windows.hpp b/libraries/libstratosphere/source/os/impl/os_thread_manager_impl.os.windows.hpp
index b7a8ae4ad..1b47aae28 100644
--- a/libraries/libstratosphere/source/os/impl/os_thread_manager_impl.os.windows.hpp
+++ b/libraries/libstratosphere/source/os/impl/os_thread_manager_impl.os.windows.hpp
@@ -22,7 +22,7 @@ namespace ams::os::impl {
         NON_COPYABLE(ThreadManagerWindowsImpl);
         NON_MOVEABLE(ThreadManagerWindowsImpl);
         private:
-            DWORD m_tls_index;
+            u32 m_tls_index;
         public:
             explicit ThreadManagerWindowsImpl(ThreadType *main_thread);
 
diff --git a/libraries/libstratosphere/source/os/impl/os_tick_manager_impl.os.windows.hpp b/libraries/libstratosphere/source/os/impl/os_tick_manager_impl.os.windows.hpp
index e09ca29fd..88cccf0c6 100644
--- a/libraries/libstratosphere/source/os/impl/os_tick_manager_impl.os.windows.hpp
+++ b/libraries/libstratosphere/source/os/impl/os_tick_manager_impl.os.windows.hpp
@@ -15,6 +15,11 @@
  */
 #pragma once
 #include <stratosphere.hpp>
+
+#if defined(ATMOSPHERE_OS_WINDOWS)
+#include <stratosphere/windows.hpp>
+#endif
+
 #include <mmsystem.h>
 
 namespace ams::os::impl {