@@ -28,12 +28,12 @@
 
 #ifdef _WIN32
 # include <windows.h>
 #endif
 
-@class OFArray;
-@class OFDictionary;
+@class OFArray OF_GENERIC(ObjectType);
+@class OFDictionary OF_GENERIC(KeyType, ObjectType);
 
 /*!
  * @class OFProcess OFProcess.h ObjFW/OFProcess.h
  *
  * @brief A class for stream-like communication with a newly created process.
@@ -68,11 +68,11 @@
  *		  search path specified in PATH is used.
  * @param arguments The arguments to pass to the program, or nil
  * @return A new, autoreleased OFProcess.
  */
 + (instancetype)processWithProgram: (OFString*)program
-			 arguments: (OFArray*)arguments;
+			 arguments: (OFArray OF_GENERIC(OFString*)*)arguments;
 
 /*!
  * @brief Creates a new OFProcess with the specified program, program name and
  *	  arguments and invokes the program.
  *
@@ -83,11 +83,11 @@
  * @param arguments The arguments to pass to the program, or nil
  * @return A new, autoreleased OFProcess.
  */
 + (instancetype)processWithProgram: (OFString*)program
 		       programName: (OFString*)programName
-			 arguments: (OFArray*)arguments;
+			 arguments: (OFArray OF_GENERIC(OFString*)*)arguments;
 
 /*!
  * @brief Creates a new OFProcess with the specified program, program name,
  *	  arguments and environment and invokes the program.
  *
@@ -103,12 +103,13 @@
  *		      first, copy it, modify it and then pass it.
  * @return A new, autoreleased OFProcess.
  */
 + (instancetype)processWithProgram: (OFString*)program
 		       programName: (OFString*)programName
-			 arguments: (OFArray*)arguments
-		       environment: (OFDictionary*)environment;
+			 arguments: (OFArray OF_GENERIC(OFString*)*)arguments
+		       environment: (OFDictionary OF_GENERIC(OFString*,
+					OFString*)*)environment;
 
 /*!
  * @brief Initializes an already allocated OFProcess with the specified program
  *	  and invokes the program.
  *
@@ -126,11 +127,11 @@
  *		  search path specified in PATH is used.
  * @param arguments The arguments to pass to the program, or nil
  * @return An initialized OFProcess.
  */
 - initWithProgram: (OFString*)program
-	arguments: (OFArray*)arguments;
+	arguments: (OFArray OF_GENERIC(OFString*)*)arguments;
 
 /*!
  * @brief Initializes an already allocated OFProcess with the specified program,
  *	  program name and arguments and invokes the program.
  *
@@ -141,11 +142,11 @@
  * @param arguments The arguments to pass to the program, or nil
  * @return An initialized OFProcess.
  */
 - initWithProgram: (OFString*)program
       programName: (OFString*)programName
-	arguments: (OFArray*)arguments;
+	arguments: (OFArray OF_GENERIC(OFString*)*)arguments;
 
 /*!
  * @brief Initializes an already allocated OFProcess with the specified program,
  *	  program name, arguments and environment and invokes the program.
  *
@@ -161,12 +162,12 @@
  *		      first, copy it, modify it and then pass it.
  * @return An initialized OFProcess.
  */
 - initWithProgram: (OFString*)program
       programName: (OFString*)programName
-	arguments: (OFArray*)arguments
-      environment: (OFDictionary*)environment;
+	arguments: (OFArray OF_GENERIC(OFString*)*)arguments
+      environment: (OFDictionary OF_GENERIC(OFString*, OFString*)*)environment;
 
 /*!
  * @brief Closes the write direction of the process.
  *
  * This method needs to be called for some programs before data can be read,