@@ -136,25 +136,10 @@
 /*!
  * @brief The number of bytes the string needs in UTF-8 encoding.
  */
 @property (readonly, nonatomic) size_t UTF8StringLength;
 
-/*!
- * @brief The components of the string when interpreted as a path.
- */
-@property (readonly, nonatomic) OFArray OF_GENERIC(OFString *) *pathComponents;
-
-/*!
- * @brief The last path component of the string when interpreted as a path.
- */
-@property (readonly, nonatomic) OFString *lastPathComponent;
-
-/*!
- * @brief The file extension of string when interpreted as a path.
- */
-@property (readonly, nonatomic) OFString *pathExtension;
-
 /*!
  * @brief The string in uppercase.
  */
 @property (readonly, nonatomic) OFString *uppercaseString;
 
@@ -225,25 +210,10 @@
  * If the string contains any non-number characters, an
  * OFInvalidEncodingException is thrown.
  */
 @property (readonly, nonatomic) double doubleValue;
 
-/*!
- * @brief The directory name of the string when interpreted as a path.
- */
-@property (readonly, nonatomic) OFString *stringByDeletingLastPathComponent;
-
-/*!
- * @brief The string with the file extension of the path removed.
- */
-@property (readonly, nonatomic) OFString *stringByDeletingPathExtension;
-
-/*!
- * @brief The string interpreted as a path with relative sub paths resolved.
- */
-@property (readonly, nonatomic) OFString *stringByStandardizingPath;
-
 /*!
  * @brief The string interpreted as a URL path with relative sub paths resolved.
  *
  * This works similar to @ref stringByStandardizingPath, but is intended for
  * standardization of paths that are part of a URL.
@@ -574,18 +544,10 @@
  */
 + (instancetype)stringWithContentsOfURL: (OFURL *)URL
 			       encoding: (of_string_encoding_t)encoding;
 #endif
 
-/*!
- * @brief Creates a path from the specified path components.
- *
- * @param components An array of components for the path
- * @return A new autoreleased OFString
- */
-+ (OFString *)pathWithComponents: (OFArray OF_GENERIC(OFString *) *)components;
-
 /*!
  * @brief Initializes an already allocated OFString from a UTF-8 encoded C
  *	  string.
  *
  * @param UTF8String A UTF-8 encoded C string to initialize the OFString with
@@ -1074,18 +1036,10 @@
  * @return A new, autoreleased OFString with the specified format appended
  */
 - (OFString *)stringByAppendingFormat: (OFConstantString *)format
 			    arguments: (va_list)arguments;
 
-/*!
- * @brief Creates a new string by appending a path component.
- *
- * @param component The path component to append
- * @return A new, autoreleased OFString with the path component appended
- */
-- (OFString *)stringByAppendingPathComponent: (OFString *)component;
-
 /*!
  * @brief Creates a new string by appending a URL path component.
  *
  * @param component The URL path component to append
  * @return A new, autoreleased OFString with the URL path component appended
@@ -1263,10 +1217,13 @@
 
 #import "OFConstantString.h"
 #import "OFMutableString.h"
 #import "OFString+CryptoHashing.h"
 #import "OFString+JSONValue.h"
+#ifdef OF_HAVE_FILES
+# import "OFString+PathAdditions.h"
+#endif
 #import "OFString+Serialization.h"
 #import "OFString+URLEncoding.h"
 #import "OFString+XMLEscaping.h"
 #import "OFString+XMLUnescaping.h"