diff --git a/src/Components/Modules/Gamepad.cpp b/src/Components/Modules/Gamepad.cpp
index bb8055b1..5ba7a66b 100644
--- a/src/Components/Modules/Gamepad.cpp
+++ b/src/Components/Modules/Gamepad.cpp
@@ -1,8 +1,5 @@
 #include "STDInclude.hpp"
 
-#include <limits>
-#include <cmath>
-
 namespace Components
 {
     Game::ButtonToCodeMap_t Gamepad::buttonList[]
diff --git a/src/STDInclude.hpp b/src/STDInclude.hpp
index 36f7d469..208e0cab 100644
--- a/src/STDInclude.hpp
+++ b/src/STDInclude.hpp
@@ -40,6 +40,8 @@
 #include <unordered_map>
 #include <queue>
 #include <algorithm>
+#include <limits>
+#include <cmath>
 
 // Experimental C++17 features
 #include <filesystem>