@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2008-2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2008-2022 Jonathan Schleifer <js@nil.im>
  *
  * All rights reserved.
  *
  * This file is part of ObjFW. It may be distributed under the terms of the
  * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
@@ -48,12 +48,10 @@
 /**
  * @struct OFFastEnumerationState OFEnumerator.h ObjFW/OFEnumerator.h
  *
  * @brief State information for fast enumerations.
  */
-#define OFFastEnumerationState NSFastEnumerationState
-#ifndef NSINTEGER_DEFINED
 typedef struct {
 	/** Arbitrary state information for the enumeration */
 	unsigned long state;
 	/** Pointer to a C array of objects to return */
 	id __unsafe_unretained _Nullable *_Nullable itemsPtr;
@@ -60,10 +58,12 @@
 	/** Arbitrary state information to detect mutations */
 	unsigned long *_Nullable mutationsPtr;
 	/** Additional arbitrary state information */
 	unsigned long extra[5];
 } OFFastEnumerationState;
+#ifndef NSINTEGER_DEFINED
+typedef OFFastEnumerationState NSFastEnumerationState;
 #endif
 
 /**
  * @protocol OFFastEnumeration OFEnumerator.h ObjFW/OFEnumerator.h
  *