diff --git a/hal/windows/WindowsGamepad.cpp b/hal/windows/WindowsGamepad.cpp
index d5ed6d9953ba..fba857c20bac 100644
--- a/hal/windows/WindowsGamepad.cpp
+++ b/hal/windows/WindowsGamepad.cpp
@@ -12,7 +12,7 @@
 #include <windows.h>
 #include <hidsdi.h>
 #include <stdio.h>
-#include <Xinput.h>
+#include <xinput.h>
 
 #include "nsIComponentManager.h"
 #include "nsIObserver.h"
@@ -745,7 +745,7 @@ WindowsGamepadService::GetRawGamepad(HANDLE handle)
     }
   }
 
-  gamepad.numAxes = std::min(axes.Length(), kMaxAxes);
+  gamepad.numAxes = std::min<size_t>(axes.Length(), kMaxAxes);
   for (unsigned i = 0; i < gamepad.numAxes; i++) {
     if (i >= kMaxAxes) {
       break;