diff --git a/4J.Input/4J_Input.cpp b/4J.Input/4J_Input.cpp
index f66f90d27..def8bdc75 100644
--- a/4J.Input/4J_Input.cpp
+++ b/4J.Input/4J_Input.cpp
@@ -571,7 +571,7 @@ void C_4JInput::SetJoypadStickAxisMap(int, unsigned int, unsigned int) {}
 void C_4JInput::SetJoypadStickTriggerMap(int, unsigned int, unsigned int) {}
 void C_4JInput::SetKeyRepeatRate(float, float) {}
 void C_4JInput::SetDebugSequence(const char*, int (*)(void*), void*) {}
-FLOAT C_4JInput::GetIdleSeconds(int) { return 0.f; }
+float C_4JInput::GetIdleSeconds(int) { return 0.f; }
 bool C_4JInput::IsPadConnected(int iPad) { return iPad == 0; }
 
 // Silly check, we check if we have a keyboard.
diff --git a/4J.Input/4J_Input.h b/4J.Input/4J_Input.h
index 85ee8b5bd..cdaef7292 100644
--- a/4J.Input/4J_Input.h
+++ b/4J.Input/4J_Input.h
@@ -53,7 +53,7 @@ enum EKeyboardResult {
 };
 
 typedef struct _STRING_VERIFY_RESPONSE {
-    WORD wNumStrings;
+    std::uint16_t wNumStrings;
     HRESULT* pStringResult;
 } STRING_VERIFY_RESPONSE;
 
@@ -96,7 +96,7 @@ public:
     void SetKeyRepeatRate(float fRepeatDelaySecs, float fRepeatRateSecs);
     void SetDebugSequence(const char* chSequenceA, int (*Func)(void*),
                           void* lpParam);
-    FLOAT GetIdleSeconds(int iPad);
+    float GetIdleSeconds(int iPad);
     bool IsPadConnected(int iPad);
 
     // In-Game values which may have been remapped due to Southpaw, swap