Index: src/hid/OHDualSenseGamepad+Private.h
==================================================================
--- src/hid/OHDualSenseGamepad+Private.h
+++ src/hid/OHDualSenseGamepad+Private.h
@@ -27,9 +27,9 @@
 
 @interface OHDualSenseGamepad ()
 #if defined(OF_LINUX) && defined(OF_HAVE_FILES)
     <OHEvdevMapping>
 #endif
-- (instancetype)oh_init OF_METHOD_FAMILY(init) OF_DESIGNATED_INITIALIZER;
+- (instancetype)oh_init OF_METHOD_FAMILY(init);
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/hid/OHDualShock4Gamepad+Private.h
==================================================================
--- src/hid/OHDualShock4Gamepad+Private.h
+++ src/hid/OHDualShock4Gamepad+Private.h
@@ -27,9 +27,9 @@
 
 @interface OHDualShock4Gamepad ()
 #if defined(OF_LINUX) && defined(OF_HAVE_FILES)
     <OHEvdevMapping>
 #endif
-- (instancetype)oh_init OF_METHOD_FAMILY(init) OF_DESIGNATED_INITIALIZER;
+- (instancetype)oh_init OF_METHOD_FAMILY(init);
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/hid/OHEmulatedGameControllerAxis.h
==================================================================
--- src/hid/OHEmulatedGameControllerAxis.h
+++ src/hid/OHEmulatedGameControllerAxis.h
@@ -32,9 +32,9 @@
 - (instancetype)oh_initWithName: (OFString *)name
 			 analog: (bool)analog OF_UNAVAILABLE;
 - (instancetype)
     oh_initWithNegativeButton: (OHGameControllerButton *)negativeButton
 	       positiveButton: (OHGameControllerButton *)positiveButton
-    OF_METHOD_FAMILY(init) OF_DESIGNATED_INITIALIZER;
+    OF_METHOD_FAMILY(init);
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/hid/OHEmulatedGameControllerButton.h
==================================================================
--- src/hid/OHEmulatedGameControllerButton.h
+++ src/hid/OHEmulatedGameControllerButton.h
@@ -31,10 +31,9 @@
 }
 
 - (instancetype)oh_initWithName: (OFString *)name
 			 analog: (bool)analog OF_UNAVAILABLE;
 - (instancetype)oh_initWithAxis: (OHGameControllerAxis *)axis
-		       positive: (bool)positive
-    OF_METHOD_FAMILY(init) OF_DESIGNATED_INITIALIZER;
+		       positive: (bool)positive OF_METHOD_FAMILY(init);
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/hid/OHEmulatedGameControllerTriggerButton.h
==================================================================
--- src/hid/OHEmulatedGameControllerTriggerButton.h
+++ src/hid/OHEmulatedGameControllerTriggerButton.h
@@ -37,9 +37,9 @@
 			     axis: (OHGameControllerAxis *)axis;
 - (instancetype)oh_initWithName: (OFString *)name
 			 analog: (bool)analog OF_UNAVAILABLE;
 - (instancetype)oh_initWithName: (OFString *)name
 			   axis: (OHGameControllerAxis *)axis
-    OF_METHOD_FAMILY(init) OF_DESIGNATED_INITIALIZER;
+    OF_METHOD_FAMILY(init);
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/hid/OHEvdevGameController.h
==================================================================
--- src/hid/OHEvdevGameController.h
+++ src/hid/OHEvdevGameController.h
@@ -37,12 +37,11 @@
 	OFString *_name;
 	id <OHGameControllerProfile, OHEvdevMapping> _profile;
 }
 
 - (instancetype)oh_init OF_UNAVAILABLE;
-- (instancetype)oh_initWithPath: (OFString *)path
-    OF_METHOD_FAMILY(init) OF_DESIGNATED_INITIALIZER;
+- (instancetype)oh_initWithPath: (OFString *)path OF_METHOD_FAMILY(init);
 - (void)oh_pollState;
 @end
 
 extern const uint16_t OHEvdevButtonIDs[];
 extern const size_t OHNumEvdevButtonIDs;

Index: src/hid/OHEvdevGameControllerProfile.h
==================================================================
--- src/hid/OHEvdevGameControllerProfile.h
+++ src/hid/OHEvdevGameControllerProfile.h
@@ -35,10 +35,9 @@
 
 - (instancetype)oh_initWithKeyBits: (unsigned long *)keyBits
 			    evBits: (unsigned long *)evBits
 			   absBits: (unsigned long *)absBits
 			  vendorID: (uint16_t)vendorID
-			 productID: (uint16_t)productID
-    OF_METHOD_FAMILY(init) OF_DESIGNATED_INITIALIZER;
+			 productID: (uint16_t)productID OF_METHOD_FAMILY(init);
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/hid/OHGameController+Private.h
==================================================================
--- src/hid/OHGameController+Private.h
+++ src/hid/OHGameController+Private.h
@@ -20,9 +20,9 @@
 #import "OHGameController.h"
 
 OF_ASSUME_NONNULL_BEGIN
 
 @interface OHGameController ()
-- (instancetype)oh_init OF_METHOD_FAMILY(init) OF_DESIGNATED_INITIALIZER;
+- (instancetype)oh_init OF_METHOD_FAMILY(init);
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/hid/OHGameControllerElement+Private.h
==================================================================
--- src/hid/OHGameControllerElement+Private.h
+++ src/hid/OHGameControllerElement+Private.h
@@ -22,10 +22,9 @@
 OF_ASSUME_NONNULL_BEGIN
 
 @interface OHGameControllerElement ()
 + (instancetype)oh_elementWithName: (OFString *)name analog: (bool)analog;
 - (instancetype)oh_initWithName: (OFString *)name
-			 analog: (bool)analog
-    OF_METHOD_FAMILY(init) OF_DESIGNATED_INITIALIZER;
+			 analog: (bool)analog OF_METHOD_FAMILY(init);
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/hid/OHJoyConPair.h
==================================================================
--- src/hid/OHJoyConPair.h
+++ src/hid/OHJoyConPair.h
@@ -61,10 +61,9 @@
  * @param leftJoyCon The left Joy-Con for the pair
  * @param rightJoyCon The right Joy-Con for the pair
  * @return An initialized Joy-Con pair
  */
 - (instancetype)initWithLeftJoyCon: (OHLeftJoyCon *)leftJoyCon
-		       rightJoyCon: (OHRightJoyCon *)rightJoyCon
-    OF_DESIGNATED_INITIALIZER;
+		       rightJoyCon: (OHRightJoyCon *)rightJoyCon;
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/hid/OHLeftJoyCon+Private.h
==================================================================
--- src/hid/OHLeftJoyCon+Private.h
+++ src/hid/OHLeftJoyCon+Private.h
@@ -27,9 +27,9 @@
 
 @interface OHLeftJoyCon ()
 #if defined(OF_LINUX) && defined(OF_HAVE_FILES)
     <OHEvdevMapping>
 #endif
-- (instancetype)oh_init OF_METHOD_FAMILY(init) OF_DESIGNATED_INITIALIZER;
+- (instancetype)oh_init OF_METHOD_FAMILY(init);
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/hid/OHN64Controller+Private.h
==================================================================
--- src/hid/OHN64Controller+Private.h
+++ src/hid/OHN64Controller+Private.h
@@ -27,9 +27,9 @@
 
 @interface OHN64Controller ()
 #if defined(OF_LINUX) && defined(OF_HAVE_FILES)
     <OHEvdevMapping>
 #endif
-- (instancetype)oh_init OF_METHOD_FAMILY(init) OF_DESIGNATED_INITIALIZER;
+- (instancetype)oh_init OF_METHOD_FAMILY(init);
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/hid/OHNintendo3DSExtendedGamepad+Private.h
==================================================================
--- src/hid/OHNintendo3DSExtendedGamepad+Private.h
+++ src/hid/OHNintendo3DSExtendedGamepad+Private.h
@@ -20,9 +20,9 @@
 #import "OHNintendo3DSExtendedGamepad.h"
 
 OF_ASSUME_NONNULL_BEGIN
 
 @interface OHNintendo3DSExtendedGamepad ()
-- (instancetype)oh_init OF_METHOD_FAMILY(init) OF_DESIGNATED_INITIALIZER;
+- (instancetype)oh_init OF_METHOD_FAMILY(init);
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/hid/OHNintendoDSGamepad+Private.h
==================================================================
--- src/hid/OHNintendoDSGamepad+Private.h
+++ src/hid/OHNintendoDSGamepad+Private.h
@@ -20,9 +20,9 @@
 #import "OHNintendoDSGamepad.h"
 
 OF_ASSUME_NONNULL_BEGIN
 
 @interface OHNintendoDSGamepad ()
-- (instancetype)oh_init OF_METHOD_FAMILY(init) OF_DESIGNATED_INITIALIZER;
+- (instancetype)oh_init OF_METHOD_FAMILY(init);
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/hid/OHNintendoSwitchExtendedGamepad+Private.h
==================================================================
--- src/hid/OHNintendoSwitchExtendedGamepad+Private.h
+++ src/hid/OHNintendoSwitchExtendedGamepad+Private.h
@@ -20,9 +20,9 @@
 #import "OHNintendoSwitchExtendedGamepad.h"
 
 OF_ASSUME_NONNULL_BEGIN
 
 @interface OHNintendoSwitchExtendedGamepad ()
-- (instancetype)oh_init OF_METHOD_FAMILY(init) OF_DESIGNATED_INITIALIZER;
+- (instancetype)oh_init OF_METHOD_FAMILY(init);
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/hid/OHNintendoSwitchGameController.h
==================================================================
--- src/hid/OHNintendoSwitchGameController.h
+++ src/hid/OHNintendoSwitchGameController.h
@@ -32,10 +32,9 @@
 	PadState _pad;
 	OHNintendoSwitchExtendedGamepad *_extendedGamepad;
 }
 
 - (instancetype)oh_init OF_UNAVAILABLE;
-- (instancetype)oh_initWithIndex: (size_t)index
-    OF_METHOD_FAMILY(init) OF_DESIGNATED_INITIALIZER;
+- (instancetype)oh_initWithIndex: (size_t)index OF_METHOD_FAMILY(init);
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/hid/OHRightJoyCon+Private.h
==================================================================
--- src/hid/OHRightJoyCon+Private.h
+++ src/hid/OHRightJoyCon+Private.h
@@ -27,9 +27,9 @@
 
 @interface OHRightJoyCon ()
 #if defined(OF_LINUX) && defined(OF_HAVE_FILES)
     <OHEvdevMapping>
 #endif
-- (instancetype)oh_init OF_METHOD_FAMILY(init) OF_DESIGNATED_INITIALIZER;
+- (instancetype)oh_init OF_METHOD_FAMILY(init);
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/hid/OHStadiaGamepad+Private.h
==================================================================
--- src/hid/OHStadiaGamepad+Private.h
+++ src/hid/OHStadiaGamepad+Private.h
@@ -27,9 +27,9 @@
 
 @interface OHStadiaGamepad ()
 #if defined(OF_LINUX) && defined(OF_HAVE_FILES)
     <OHEvdevMapping>
 #endif
-- (instancetype)oh_init OF_METHOD_FAMILY(init) OF_DESIGNATED_INITIALIZER;
+- (instancetype)oh_init OF_METHOD_FAMILY(init);
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/hid/OHWiiClassicController+Private.h
==================================================================
--- src/hid/OHWiiClassicController+Private.h
+++ src/hid/OHWiiClassicController+Private.h
@@ -20,9 +20,9 @@
 #import "OHWiiClassicController.h"
 
 OF_ASSUME_NONNULL_BEGIN
 
 @interface OHWiiClassicController ()
-- (instancetype)oh_init OF_METHOD_FAMILY(init) OF_DESIGNATED_INITIALIZER;
+- (instancetype)oh_init OF_METHOD_FAMILY(init);
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/hid/OHWiiGameController.h
==================================================================
--- src/hid/OHWiiGameController.h
+++ src/hid/OHWiiGameController.h
@@ -28,10 +28,9 @@
 	id <OHGameControllerProfile> _profile;
 }
 
 - (instancetype)oh_init OF_UNAVAILABLE;
 - (instancetype)oh_initWithIndex: (int32_t)index
-			    type: (uint32_t)type
-    OF_METHOD_FAMILY(init) OF_DESIGNATED_INITIALIZER;
+			    type: (uint32_t)type OF_METHOD_FAMILY(init);
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/hid/OHWiimote+Private.h
==================================================================
--- src/hid/OHWiimote+Private.h
+++ src/hid/OHWiimote+Private.h
@@ -20,9 +20,9 @@
 #import "OHWiimote.h"
 
 OF_ASSUME_NONNULL_BEGIN
 
 @interface OHWiimote ()
-- (instancetype)oh_init OF_METHOD_FAMILY(init) OF_DESIGNATED_INITIALIZER;
+- (instancetype)oh_init OF_METHOD_FAMILY(init);
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/hid/OHXInputGameController.h
==================================================================
--- src/hid/OHXInputGameController.h
+++ src/hid/OHXInputGameController.h
@@ -31,10 +31,9 @@
 	OFNumber *_Nullable _vendorID, *_Nullable _productID;
 	OHXboxGamepad *_extendedGamepad;
 }
 
 - (instancetype)oh_init OF_UNAVAILABLE;
-- (instancetype)oh_initWithIndex: (DWORD)index
-    OF_METHOD_FAMILY(init) OF_DESIGNATED_INITIALIZER;
+- (instancetype)oh_initWithIndex: (DWORD)index OF_METHOD_FAMILY(init);
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/hid/OHXboxGamepad+Private.h
==================================================================
--- src/hid/OHXboxGamepad+Private.h
+++ src/hid/OHXboxGamepad+Private.h
@@ -21,9 +21,9 @@
 
 OF_ASSUME_NONNULL_BEGIN
 
 @interface OHXboxGamepad ()
 - (instancetype)oh_initWithHasGuideButton: (bool)hasGuideButton
-    OF_METHOD_FAMILY(init) OF_DESIGNATED_INITIALIZER;
+    OF_METHOD_FAMILY(init);
 @end
 
 OF_ASSUME_NONNULL_END