diff --git a/src/input/input_handler.cpp b/src/input/input_handler.cpp
index 9bab958f67c..813e62fdcfb 100644
--- a/src/input/input_handler.cpp
+++ b/src/input/input_handler.cpp
@@ -222,7 +222,10 @@ void ParseInputConfig(const std::string game_id = "") {
         lineCount++;
 
         // Strip the ; and whitespace
-        line.erase(std::remove(line.begin(), line.end(), ' '), line.end());
+        line.erase(std::remove_if(line.begin(), line.end(),
+                                  [](unsigned char c) { return std::isspace(c); }),
+                   line.end());
+
         if (line.empty()) {
             continue;
         }
diff --git a/src/input/input_mouse.cpp b/src/input/input_mouse.cpp
index f36a70098e7..11feaeebbb7 100644
--- a/src/input/input_mouse.cpp
+++ b/src/input/input_mouse.cpp
@@ -1,10 +1,11 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "input_mouse.h"
+#include <cmath>
 
 #include "common/types.h"
-#include "controller.h"
+#include "input/controller.h"
+#include "input_mouse.h"
 
 #include "SDL3/SDL.h"
 
@@ -70,4 +71,4 @@ Uint32 MousePolling(void* param, Uint32 id, Uint32 interval) {
     return interval;
 }
 
-} // namespace Input
\ No newline at end of file
+} // namespace Input