@@ -342,11 +342,11 @@
 
 #ifndef OF_WINDOWS
 	instance = calloc(1, PRE_IVARS_ALIGN + instanceSize +
 	    extraAlignment + extraSize);
 #else
-	instance = _aligned_malloc(PRE_IVARS_ALIGN + instanceSize +
+	instance = __mingw_aligned_malloc(PRE_IVARS_ALIGN + instanceSize +
 	    extraAlignment + extraSize, OF_BIGGEST_ALIGNMENT);
 	memset(instance, 0, PRE_IVARS_ALIGN + instanceSize + extraAlignment +
 	    extraSize);
 #endif
 
@@ -362,11 +362,11 @@
 	if OF_UNLIKELY (OFSpinlockNew(
 	    &((struct PreIvars *)instance)->retainCountSpinlock) != 0) {
 # ifndef OF_WINDOWS
 		free(instance);
 # else
-		_aligned_free(instance);
+		__mingw_aligned_free(instance);
 # endif
 		@throw [OFInitializationFailedException
 		    exceptionWithClass: class];
 	}
 #endif
@@ -379,11 +379,11 @@
 		    ((char *)instance - PRE_IVARS_ALIGN))->retainCountSpinlock);
 #endif
 #ifndef OF_WINDOWS
 		free((char *)instance - PRE_IVARS_ALIGN);
 #else
-		_aligned_free((char *)instance - PRE_IVARS_ALIGN);
+		__mingw_aligned_free((char *)instance - PRE_IVARS_ALIGN);
 #endif
 		@throw [OFInitializationFailedException
 		    exceptionWithClass: class];
 	}
 
@@ -1250,11 +1250,11 @@
 #endif
 
 #ifndef OF_WINDOWS
 	free((char *)self - PRE_IVARS_ALIGN);
 #else
-	_aligned_free((char *)self - PRE_IVARS_ALIGN);
+	__mingw_aligned_free((char *)self - PRE_IVARS_ALIGN);
 #endif
 }
 
 /* Required to use properties with the Apple runtime */
 - (id)copyWithZone: (void *)zone