@@ -76,11 +76,11 @@
  *	       enumeration
  */
 typedef void (^of_string_line_enumeration_block_t)(OFString *line, bool *stop);
 #endif
 
-@class OFArray;
+@class OFArray OF_GENERIC(ObjectType);
 @class OFURL;
 
 /*!
  * @class OFString OFString.h ObjFW/OFString.h
  *
@@ -324,11 +324,11 @@
  * @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*)components;
++ (OFString*)pathWithComponents: (OFArray OF_GENERIC(OFString*)*)components;
 
 /*!
  * @brief Initializes an already allocated OFString from a UTF-8 encoded C
  *	  string.
  *
@@ -881,11 +881,12 @@
  * @brief Separates an OFString into an OFArray of OFStrings.
  *
  * @param delimiter The delimiter for separating
  * @return An autoreleased OFArray with the separated string
  */
-- (OFArray*)componentsSeparatedByString: (OFString*)delimiter;
+- (OFArray OF_GENERIC(OFString*)*)componentsSeparatedByString:
+    (OFString*)delimiter;
 
 /*!
  * @brief Separates an OFString into an OFArray of OFStrings.
  *
  * @param delimiter The delimiter for separating
@@ -894,19 +895,20 @@
  *		  Value                  | Description
  *		  -----------------------|----------------------
  * 		  `OF_STRING_SKIP_EMPTY` | Skip empty components
  * @return An autoreleased OFArray with the separated string
  */
-- (OFArray*)componentsSeparatedByString: (OFString*)delimiter
-				options: (int)options;
+- (OFArray OF_GENERIC(OFString*)*)
+    componentsSeparatedByString: (OFString*)delimiter
+			options: (int)options;
 
 /*!
  * @brief Returns the components of the path.
  *
  * @return The components of the path
  */
-- (OFArray*)pathComponents;
+- (OFArray OF_GENERIC(OFString*)*)pathComponents;
 
 /*!
  * @brief Returns the last component of the path.
  *
  * @return The last component of the path