@@ -253,11 +253,11 @@
 
 - (void)setProtocolVersion: (of_http_request_protocol_version_t)protocolVersion
 {
 	if (protocolVersion.major != 1 || protocolVersion.minor > 1)
 		@throw [OFUnsupportedVersionException exceptionWithVersion:
-		    [OFString stringWithFormat: @"%u.%u",
+		    [OFString stringWithFormat: @"%hhu.%hhu",
 						protocolVersion.major,
 						protocolVersion.minor]];
 
 	_protocolVersion = protocolVersion;
 }
@@ -278,24 +278,24 @@
 		@throw [OFInvalidFormatException exception];
 
 	major = [components.firstObject unsignedLongLongValue];
 	minor = [components.lastObject unsignedLongLongValue];
 
-	if (major > UINT8_MAX || minor > UINT8_MAX)
+	if (major > UCHAR_MAX || minor > UCHAR_MAX)
 		@throw [OFOutOfRangeException exception];
 
-	protocolVersion.major = (uint8_t)major;
-	protocolVersion.minor = (uint8_t)minor;
+	protocolVersion.major = (unsigned char)major;
+	protocolVersion.minor = (unsigned char)minor;
 
 	self.protocolVersion = protocolVersion;
 
 	objc_autoreleasePoolPop(pool);
 }
 
 - (OFString *)protocolVersionString
 {
-	return [OFString stringWithFormat: @"%u.%u",
+	return [OFString stringWithFormat: @"%hhu.%hhu",
 					   _protocolVersion.major,
 					   _protocolVersion.minor];
 }
 
 - (OFString *)string