diff --git a/src/input_common/controller_state.h b/src/input_common/controller_state.h
index 533bd6c5d..65eec9d6c 100644
--- a/src/input_common/controller_state.h
+++ b/src/input_common/controller_state.h
@@ -5,32 +5,16 @@
 #pragma once
 
 #include "common/common_types.h"
+#include "core/hle/service/hid/hid.h"
 
 namespace InputCommon {
 
-    enum ControllerButtons {
-        A = 0,
-        B,
-        X,
-        Y,
-        L,
-        R,
-        ZL,
-        ZR,
-        START,
-        SELECT,
-        HOME,
-        DPAD_LEFT,
-        DPAD_RIGHT,
-        DPAD_UP,
-        DPAD_DOWN
-    };
-
     struct ControllerState {
-        bool buttons[15];
+    	Service::HID::PadState jpad_state;
         s16 circle_pad_x;
         s16 circle_pad_y;
         u16 touch_screen_x;
         u16 touch_screen_y;
     };
+
 } //namespace
diff --git a/src/input_common/input_common.h b/src/input_common/input_common.h
index b6c7c6850..d13500555 100644
--- a/src/input_common/input_common.h
+++ b/src/input_common/input_common.h
@@ -6,7 +6,6 @@
 
 #include "common/common_types.h"
 #include "controller_state.h"
-#include "core/hle/service/hid/hid.h"
 
 namespace InputCommon {
 
@@ -32,7 +31,7 @@ public:
 
 private:
 
-    ///Internal view this specific object will have of 3DS input states, NOT the same as Service::HID::PadState!
+    ///Internal view this specific object will have of 3DS input states
     ControllerState controller_state;
 
     ///Internal name of currently selected device