@@ -28,11 +28,10 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <limits.h>
 
-#include "block.h"
 #include "macros.h"
 #include "once.h"
 
 /*
  * Some versions of MinGW require <winsock2.h> to be included before
@@ -1314,12 +1313,14 @@
 #ifdef __cplusplus
 }
 #endif
 
 OF_ASSUME_NONNULL_END
+
+#include "OFBlock.h"
 
 #ifdef __OBJC__
 # import "OFObject+KeyValueCoding.h"
 # import "OFObject+Serialization.h"
 #endif
 
 #endif