@@ -76,29 +76,29 @@
 	of_tcp_socket_async_connect_block_t _block;
 # endif
 	OFException *_exception;
 }
 
-- initWithSourceThread: (OFThread*)sourceThread
-		socket: (OFTCPSocket*)socket
-		  host: (OFString*)host
+- initWithSourceThread: (OFThread *)sourceThread
+		socket: (OFTCPSocket *)socket
+		  host: (OFString *)host
 		  port: (uint16_t)port
 		target: (id)target
 	      selector: (SEL)selector;
 # ifdef OF_HAVE_BLOCKS
-- initWithSourceThread: (OFThread*)sourceThread
-		socket: (OFTCPSocket*)socket
-		  host: (OFString*)host
+- initWithSourceThread: (OFThread *)sourceThread
+		socket: (OFTCPSocket *)socket
+		  host: (OFString *)host
 		  port: (uint16_t)port
 		 block: (of_tcp_socket_async_connect_block_t)block;
 # endif
 @end
 
 @implementation OFTCPSocket_ConnectThread
-- initWithSourceThread: (OFThread*)sourceThread
-		socket: (OFTCPSocket*)socket
-		  host: (OFString*)host
+- initWithSourceThread: (OFThread *)sourceThread
+		socket: (OFTCPSocket *)socket
+		  host: (OFString *)host
 		  port: (uint16_t)port
 		target: (id)target
 	      selector: (SEL)selector
 {
 	self = [super init];
@@ -117,13 +117,13 @@
 
 	return self;
 }
 
 # ifdef OF_HAVE_BLOCKS
-- initWithSourceThread: (OFThread*)sourceThread
-		socket: (OFTCPSocket*)socket
-		  host: (OFString*)host
+- initWithSourceThread: (OFThread *)sourceThread
+		socket: (OFTCPSocket *)socket
+		  host: (OFString *)host
 		  port: (uint16_t)port
 		 block: (of_tcp_socket_async_connect_block_t)block
 {
 	self = [super init];
 
@@ -163,12 +163,12 @@
 # ifdef OF_HAVE_BLOCKS
 	if (_block != NULL)
 		_block(_socket, _exception);
 	else {
 # endif
-		void (*func)(id, SEL, OFTCPSocket*, OFException*) =
-		    (void(*)(id, SEL, OFTCPSocket*, OFException*))[_target
+		void (*func)(id, SEL, OFTCPSocket *, OFException *) =
+		    (void (*)(id, SEL, OFTCPSocket *, OFException *))[_target
 		    methodForSelector: _selector];
 
 		func(_target, _selector, _socket, _exception);
 # ifdef OF_HAVE_BLOCKS
 	}
@@ -198,18 +198,18 @@
 #endif
 
 @implementation OFTCPSocket
 @synthesize SOCKS5Host = _SOCKS5Host, SOCKS5Port = _SOCKS5Port;
 
-+ (void)setSOCKS5Host: (OFString*)host
++ (void)setSOCKS5Host: (OFString *)host
 {
 	id old = defaultSOCKS5Host;
 	defaultSOCKS5Host = [host copy];
 	[old release];
 }
 
-+ (OFString*)SOCKS5Host
++ (OFString *)SOCKS5Host
 {
 	return [[defaultSOCKS5Host copy] autorelease];
 }
 
 + (void)setSOCKS5Port: (uint16_t)port
@@ -243,11 +243,11 @@
 	[_SOCKS5Host release];
 
 	[super dealloc];
 }
 
-- (void)connectToHost: (OFString*)host
+- (void)connectToHost: (OFString *)host
 		 port: (uint16_t)port
 {
 	OFString *destinationHost = host;
 	uint16_t destinationPort = port;
 	of_resolver_result_t **results, **iter;
@@ -308,11 +308,11 @@
 		[self OF_SOCKS5ConnectToHost: destinationHost
 					port: destinationPort];
 }
 
 #ifdef OF_HAVE_THREADS
-- (void)asyncConnectToHost: (OFString*)host
+- (void)asyncConnectToHost: (OFString *)host
 		      port: (uint16_t)port
 		    target: (id)target
 		  selector: (SEL)selector
 {
 	void *pool = objc_autoreleasePoolPush();
@@ -327,11 +327,11 @@
 
 	objc_autoreleasePoolPop(pool);
 }
 
 # ifdef OF_HAVE_BLOCKS
-- (void)asyncConnectToHost: (OFString*)host
+- (void)asyncConnectToHost: (OFString *)host
 		      port: (uint16_t)port
 		     block: (of_tcp_socket_async_connect_block_t)block
 {
 	void *pool = objc_autoreleasePoolPush();
 
@@ -345,11 +345,11 @@
 	objc_autoreleasePoolPop(pool);
 }
 # endif
 #endif
 
-- (uint16_t)bindToHost: (OFString*)host
+- (uint16_t)bindToHost: (OFString *)host
 		  port: (uint16_t)port
 {
 	of_resolver_result_t **results;
 	const int one = 1;
 #if !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
@@ -389,11 +389,11 @@
 		if ((flags = fcntl(_socket, F_GETFD, 0)) != -1)
 			fcntl(_socket, F_SETFD, flags | FD_CLOEXEC);
 #endif
 
 		setsockopt(_socket, SOL_SOCKET, SO_REUSEADDR,
-		    (const char*)&one, (socklen_t)sizeof(one));
+		    (const char *)&one, (socklen_t)sizeof(one));
 
 #if defined(OF_WII) || defined(OF_NINTENDO_3DS)
 		if (port != 0) {
 #endif
 			if (bind(_socket, results[0]->address,
@@ -418,17 +418,17 @@
 				while (rnd < 1024)
 					rnd = (uint16_t)rand();
 
 				switch (results[0]->family) {
 				case AF_INET:
-					((struct sockaddr_in*)
+					((struct sockaddr_in *)
 					    results[0]->address)->sin_port =
 					    OF_BSWAP16_IF_LE(rnd);
 					break;
 # ifdef HAVE_IPV6
 				case AF_INET6:
-					((struct sockaddr_in6*)
+					((struct sockaddr_in6 *)
 					    results[0]->address)->sin6_port =
 					    OF_BSWAP16_IF_LE(rnd);
 					break;
 # endif
 				default:
@@ -466,11 +466,11 @@
 	if (port > 0)
 		return port;
 
 #if !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
 	addrLen = (socklen_t)sizeof(addr.storage);
-	if (of_getsockname(_socket, (struct sockaddr*)&addr.storage,
+	if (of_getsockname(_socket, (struct sockaddr *)&addr.storage,
 	    &addrLen) != 0) {
 		int errNo = of_socket_errno();
 
 		close(_socket);
 		_socket = INVALID_SOCKET;
@@ -584,11 +584,11 @@
 	[OFRunLoop OF_addAsyncAcceptForTCPSocket: self
 					   block: block];
 }
 #endif
 
-- (OFString*)remoteAddress
+- (OFString *)remoteAddress
 {
 	OFString *ret;
 
 	if (_socket == INVALID_SOCKET)
 		@throw [OFNotOpenException exceptionWithObject: self];
@@ -610,11 +610,11 @@
 - (void)setKeepAliveEnabled: (bool)enabled
 {
 	int v = enabled;
 
 	if (setsockopt(_socket, SOL_SOCKET, SO_KEEPALIVE,
-	    (char*)&v, (socklen_t)sizeof(v)) != 0)
+	    (char *)&v, (socklen_t)sizeof(v)) != 0)
 		@throw [OFSetOptionFailedException
 		    exceptionWithStream: self
 				  errNo: of_socket_errno()];
 }
 
@@ -622,11 +622,11 @@
 {
 	int v;
 	socklen_t len = sizeof(v);
 
 	if (getsockopt(_socket, SOL_SOCKET, SO_KEEPALIVE,
-	    (char*)&v, &len) != 0 || len != sizeof(v))
+	    (char *)&v, &len) != 0 || len != sizeof(v))
 		@throw [OFGetOptionFailedException
 		    exceptionWithStream: self
 				  errNo: of_socket_errno()];
 
 	return v;
@@ -637,11 +637,11 @@
 - (void)setTCPNoDelayEnabled: (bool)enabled
 {
 	int v = enabled;
 
 	if (setsockopt(_socket, IPPROTO_TCP, TCP_NODELAY,
-	    (char*)&v, (socklen_t)sizeof(v)) != 0)
+	    (char *)&v, (socklen_t)sizeof(v)) != 0)
 		@throw [OFSetOptionFailedException
 		    exceptionWithStream: self
 				  errNo: of_socket_errno()];
 }
 
@@ -649,11 +649,11 @@
 {
 	int v;
 	socklen_t len = sizeof(v);
 
 	if (getsockopt(_socket, IPPROTO_TCP, TCP_NODELAY,
-	    (char*)&v, &len) != 0 || len != sizeof(v))
+	    (char *)&v, &len) != 0 || len != sizeof(v))
 		@throw [OFGetOptionFailedException
 		    exceptionWithStream: self
 				  errNo: of_socket_errno()];
 
 	return v;