@@ -28,10 +28,11 @@
 #import "OFDictionary.h"
 #import "OFMessagePackExtension.h"
 #ifdef OF_HAVE_THREADS
 # import "OFMutex.h"
 #endif
+#import "OFStrPTime.h"
 #import "OFString.h"
 #import "OFSystemInfo.h"
 #import "OFXMLElement.h"
 
 #import "OFInitializationFailedException.h"
@@ -38,12 +39,10 @@
 #import "OFInvalidArgumentException.h"
 #import "OFInvalidFormatException.h"
 #import "OFOutOfMemoryException.h"
 #import "OFOutOfRangeException.h"
 
-#import "of_strptime.h"
-
 #ifdef OF_AMIGAOS_M68K
 /* amiga-gcc does not have trunc() */
 # define trunc(x) ((int64_t)(x))
 #endif
 
@@ -447,11 +446,11 @@
 	void *pool = objc_autoreleasePoolPush();
 	const char *UTF8String = string.UTF8String;
 	struct tm tm = { .tm_isdst = -1 };
 	short tz = 0;
 
-	if (of_strptime(UTF8String, format.UTF8String, &tm, &tz) !=
+	if (OFStrPTime(UTF8String, format.UTF8String, &tm, &tz) !=
 	    UTF8String + string.UTF8StringLength)
 		@throw [OFInvalidFormatException exception];
 
 	objc_autoreleasePoolPop(pool);
 
@@ -463,18 +462,18 @@
 {
 	void *pool = objc_autoreleasePoolPush();
 	const char *UTF8String = string.UTF8String;
 	struct tm tm = { .tm_isdst = -1 };
 	/*
-	 * of_strptime() can never set this to SHRT_MAX, no matter what is
+	 * OFStrPTime() can never set this to SHRT_MAX, no matter what is
 	 * passed to it, so this is a safe way to figure out if the date
 	 * contains a time zone.
 	 */
 	short tz = SHRT_MAX;
 	OFTimeInterval seconds;
 
-	if (of_strptime(UTF8String, format.UTF8String, &tm, &tz) !=
+	if (OFStrPTime(UTF8String, format.UTF8String, &tm, &tz) !=
 	    UTF8String + string.UTF8StringLength)
 		@throw [OFInvalidFormatException exception];
 
 	if (tz == SHRT_MAX) {
 #ifdef OF_WINDOWS