Index: src/hid/OHDualSenseGamepad.h
==================================================================
--- src/hid/OHDualSenseGamepad.h
+++ src/hid/OHDualSenseGamepad.h
@@ -22,13 +22,13 @@
 # import "OHEvdevGameController.h"
 #endif
 
 OF_ASSUME_NONNULL_BEGIN
 
-@interface OHDualSenseGamepad: OFObject <OHExtendedGamepad,
+@interface OHDualSenseGamepad: OFObject <OHExtendedGamepad
 #if defined(OF_LINUX) && defined(OF_HAVE_FILES)
-    OHEvdevMapping
+    , OHEvdevMapping
 #endif
 >
 {
 	OFDictionary OF_GENERIC(OFString *, OHGameControllerButton *) *_buttons;
 	OFDictionary OF_GENERIC(OFString *, OHGameControllerDirectionalPad *)

Index: src/hid/OHDualShock4Gamepad.h
==================================================================
--- src/hid/OHDualShock4Gamepad.h
+++ src/hid/OHDualShock4Gamepad.h
@@ -22,13 +22,13 @@
 # import "OHEvdevGameController.h"
 #endif
 
 OF_ASSUME_NONNULL_BEGIN
 
-@interface OHDualShock4Gamepad: OFObject <OHExtendedGamepad,
+@interface OHDualShock4Gamepad: OFObject <OHExtendedGamepad
 #if defined(OF_LINUX) && defined(OF_HAVE_FILES)
-    OHEvdevMapping
+    , OHEvdevMapping
 #endif
 >
 {
 	OFDictionary OF_GENERIC(OFString *, OHGameControllerButton *) *_buttons;
 	OFDictionary OF_GENERIC(OFString *, OHGameControllerDirectionalPad *)

Index: src/hid/OHStadiaGamepad.h
==================================================================
--- src/hid/OHStadiaGamepad.h
+++ src/hid/OHStadiaGamepad.h
@@ -22,13 +22,13 @@
 # import "OHEvdevGameController.h"
 #endif
 
 OF_ASSUME_NONNULL_BEGIN
 
-@interface OHStadiaGamepad: OFObject <OHExtendedGamepad,
+@interface OHStadiaGamepad: OFObject <OHExtendedGamepad
 #if defined(OF_LINUX) && defined(OF_HAVE_FILES)
-    OHEvdevMapping
+    , OHEvdevMapping
 #endif
 >
 {
 	OFDictionary OF_GENERIC(OFString *, OHGameControllerButton *) *_buttons;
 	OFDictionary OF_GENERIC(OFString *, OHGameControllerDirectionalPad *)