@@ -22,16 +22,16 @@
 #endif
 
 #include <sys/types.h>
 
 #import "OFStream.h"
+#import "OFString.h"
 
 #ifdef _WIN32
 # include <windows.h>
 #endif
 
-@class OFString;
 @class OFArray;
 @class OFDictionary;
 
 /*!
  * @brief A class for stream-like communication with a newly created process.
@@ -165,11 +165,11 @@
       environment: (OFDictionary*)environment;
 
 #ifndef _WIN32
 - (char**)OF_environmentForDictionary: (OFDictionary*)dictionary;
 #else
-- (uint16_t*)OF_environmentForDictionary: (OFDictionary*)dictionary;
+- (of_char16_t*)OF_environmentForDictionary: (OFDictionary*)dictionary;
 #endif
 
 /*!
  * @brief Closes the write direction of the process.
  *