Index: src/hid/OHDualSenseGamepad.h
==================================================================
--- src/hid/OHDualSenseGamepad.h
+++ src/hid/OHDualSenseGamepad.h
@@ -27,8 +27,13 @@
 @interface OHDualSenseGamepad: OFObject <OHExtendedGamepad,
 #if defined(OF_LINUX) && defined(OF_HAVE_FILES)
     OHEvdevMapping
 #endif
 >
+{
+	OFDictionary OF_GENERIC(OFString *, OHGameControllerButton *) *_buttons;
+	OFDictionary OF_GENERIC(OFString *, OHGameControllerDirectionalPad *)
+	    *_directionalPads;
+}
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/hid/OHDualShock4Gamepad.h
==================================================================
--- src/hid/OHDualShock4Gamepad.h
+++ src/hid/OHDualShock4Gamepad.h
@@ -27,8 +27,13 @@
 @interface OHDualShock4Gamepad: OFObject <OHExtendedGamepad,
 #if defined(OF_LINUX) && defined(OF_HAVE_FILES)
     OHEvdevMapping
 #endif
 >
+{
+	OFDictionary OF_GENERIC(OFString *, OHGameControllerButton *) *_buttons;
+	OFDictionary OF_GENERIC(OFString *, OHGameControllerDirectionalPad *)
+	    *_directionalPads;
+}
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/hid/OHStadiaGamepad.h
==================================================================
--- src/hid/OHStadiaGamepad.h
+++ src/hid/OHStadiaGamepad.h
@@ -27,8 +27,13 @@
 @interface OHStadiaGamepad: OFObject <OHExtendedGamepad,
 #if defined(OF_LINUX) && defined(OF_HAVE_FILES)
     OHEvdevMapping
 #endif
 >
+{
+	OFDictionary OF_GENERIC(OFString *, OHGameControllerButton *) *_buttons;
+	OFDictionary OF_GENERIC(OFString *, OHGameControllerDirectionalPad *)
+	    *_directionalPads;
+}
 @end
 
 OF_ASSUME_NONNULL_END