@@ -1094,24 +1094,15 @@
 	if (pathCStringLength == 0)
 		return ret;
 
 	pool = objc_autoreleasePoolPush();
 
-#if !defined(_WIN32) && !defined(__DJGPP__)
-	if (_s->cString[pathCStringLength - 1] == OF_PATH_DELIMITER)
-#else
-	if (_s->cString[pathCStringLength - 1] == '/' ||
-	    _s->cString[pathCStringLength - 1] == '\\')
-#endif
+	if (OF_IS_PATH_DELIMITER(_s->cString[pathCStringLength - 1]))
 		pathCStringLength--;
 
 	for (i = 0; i < pathCStringLength; i++) {
-#if !defined(_WIN32) && !defined(__DJGPP__)
-		if (_s->cString[i] == OF_PATH_DELIMITER) {
-#else
-		if (_s->cString[i] == '/' || _s->cString[i] == '\\') {
-#endif
+		if (OF_IS_PATH_DELIMITER(_s->cString[i])) {
 			[ret addObject:
 			    [OFString stringWithUTF8String: _s->cString + last
 						    length: i - last]];
 			last = i + 1;
 		}
@@ -1133,24 +1124,15 @@
 	ssize_t i;
 
 	if (pathCStringLength == 0)
 		return @"";
 
-#if !defined(_WIN32) && !defined(__DJGPP__)
-	if (_s->cString[pathCStringLength - 1] == OF_PATH_DELIMITER)
-#else
-	if (_s->cString[pathCStringLength - 1] == '/' ||
-	    _s->cString[pathCStringLength - 1] == '\\')
-#endif
+	if (OF_IS_PATH_DELIMITER(_s->cString[pathCStringLength - 1]))
 		pathCStringLength--;
 
 	for (i = pathCStringLength - 1; i >= 0; i--) {
-#if !defined(_WIN32) && !defined(__DJGPP__)
-		if (_s->cString[i] == OF_PATH_DELIMITER) {
-#else
-		if (_s->cString[i] == '/' || _s->cString[i] == '\\') {
-#endif
+		if (OF_IS_PATH_DELIMITER(_s->cString[i])) {
 			i++;
 			break;
 		}
 	}
 
@@ -1170,36 +1152,23 @@
 	size_t i, pathCStringLength = _s->cStringLength;
 
 	if (pathCStringLength == 0)
 		return @"";
 
-#if !defined(_WIN32) && !defined(__DJGPP__)
-	if (_s->cString[pathCStringLength - 1] == OF_PATH_DELIMITER)
-#else
-	if (_s->cString[pathCStringLength - 1] == '/' ||
-	    _s->cString[pathCStringLength - 1] == '\\')
-#endif
+	if (OF_IS_PATH_DELIMITER(_s->cString[pathCStringLength - 1]))
 		pathCStringLength--;
 
 	if (pathCStringLength == 0)
 		return [OFString stringWithUTF8String: _s->cString
 					       length: 1];
 
 	for (i = pathCStringLength - 1; i >= 1; i--)
-#if !defined(_WIN32) && !defined(__DJGPP__)
-		if (_s->cString[i] == OF_PATH_DELIMITER)
-#else
-		if (_s->cString[i] == '/' || _s->cString[i] == '\\')
-#endif
+		if (OF_IS_PATH_DELIMITER(_s->cString[i]))
 			return [OFString stringWithUTF8String: _s->cString
 						       length: i];
 
-#if !defined(_WIN32) && !defined(__DJGPP__)
-	if (_s->cString[0] == OF_PATH_DELIMITER)
-#else
-	if (_s->cString[0] == '/' || _s->cString[0] == '\\')
-#endif
+	if (OF_IS_PATH_DELIMITER(_s->cString[0]))
 		return [OFString stringWithUTF8String: _s->cString
 					       length: 1];
 
 	return @".";
 }