diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h
index e5c212aa5..2d1614747 100644
--- a/src/core/hle/service/hid/controllers/npad.h
+++ b/src/core/hle/service/hid/controllers/npad.h
@@ -6,16 +6,10 @@
 
 #include <array>
 #include "common/common_types.h"
+#include "core/frontend/input.h"
 #include "core/hle/service/hid/controllers/controller_base.h"
 #include "core/settings.h"
 
-namespace Input {
-template <typename StatusType>
-class InputDevice;
-using ButtonDevice = InputDevice<bool>;
-using AnalogDevice = InputDevice<std::tuple<float, float>>;
-} // namespace Input
-
 namespace Service::HID {
 
 class Controller_NPad final : public ControllerBase {
diff --git a/src/core/hle/service/hid/controllers/touchscreen.h b/src/core/hle/service/hid/controllers/touchscreen.h
index 82a3d4a1a..1d97b6c2a 100644
--- a/src/core/hle/service/hid/controllers/touchscreen.h
+++ b/src/core/hle/service/hid/controllers/touchscreen.h
@@ -7,14 +7,9 @@
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/swap.h"
+#include "core/frontend/input.h"
 #include "core/hle/service/hid/controllers/controller_base.h"
 
-namespace Input {
-template <typename StatusType>
-class InputDevice;
-using TouchDevice = InputDevice<std::tuple<float, float, bool>>;
-} // namespace Input
-
 namespace Service::HID {
 class Controller_Touchscreen final : public ControllerBase {
 public: