diff --git a/hal/include/HAL/cpp/priority_mutex.h b/hal/include/HAL/cpp/priority_mutex.h
index 1a5d070e93..a73e37d645 100644
--- a/hal/include/HAL/cpp/priority_mutex.h
+++ b/hal/include/HAL/cpp/priority_mutex.h
@@ -10,7 +10,7 @@
 // Allows usage with std::lock_guard without including <mutex> separately
 #include <mutex>
 
-#ifdef FRC_SIMULATOR
+#if defined(FRC_SIMULATOR) || defined(_WIN32)
 // We do not want to use pthreads if in the simulator; however, in the
 // simulator, we do not care about priority inversion.
 typedef std::mutex priority_mutex;
diff --git a/ni-libraries/include/FRC_NetworkCommunication/FRCComm.h b/ni-libraries/include/FRC_NetworkCommunication/FRCComm.h
index a44930abda..f60c8ba7d5 100644
--- a/ni-libraries/include/FRC_NetworkCommunication/FRCComm.h
+++ b/ni-libraries/include/FRC_NetworkCommunication/FRCComm.h
@@ -15,7 +15,7 @@
 #define __FRC_COMM_H__
 
 #ifdef _WIN32
-# include <windows.h>
+#include <windows.h>
 #ifdef USE_THRIFT
 #  define EXPORT_FUNC
 # else
diff --git a/ni-libraries/include/FRC_NetworkCommunication/LoadOut.h b/ni-libraries/include/FRC_NetworkCommunication/LoadOut.h
index 38cba2672d..97fbe51b27 100644
--- a/ni-libraries/include/FRC_NetworkCommunication/LoadOut.h
+++ b/ni-libraries/include/FRC_NetworkCommunication/LoadOut.h
@@ -3,7 +3,7 @@
 #define __LoadOut_h__
 
 #ifdef _WIN32
-#include <vxWorks_compat.h>
+#include <windows.h>
 #define EXPORT_FUNC __declspec(dllexport) __cdecl
 #elif defined (__vxworks)
 #include <vxWorks.h>
diff --git a/ni-libraries/ni-libraries.gradle b/ni-libraries/ni-libraries.gradle
index 0d29658270..95254ac264 100644
--- a/ni-libraries/ni-libraries.gradle
+++ b/ni-libraries/ni-libraries.gradle
@@ -16,7 +16,8 @@ task patchNiLibraries() {
         netTree.each {File file ->
             String contents = file.getText('UTF-8') 
             contents = contents.replaceAll('#ifdef WIN32', '#ifdef _WIN32')
-            contents = contents.replaceAll('# include <vxWorks_compat.h>', '# include <windows.h>')
+            contents = contents.replaceAll('# include <vxWorks_compat.h>', '#include <windows.h>')
+            contents = contents.replaceAll('#include <vxWorks_compat.h>', '#include <windows.h>')
             file.write(contents, 'UTF-8')
         }