Index: src/OFDataArray.m
==================================================================
--- src/OFDataArray.m
+++ src/OFDataArray.m
@@ -48,11 +48,12 @@
 #import "OFUnsupportedProtocolException.h"
 
 #import "base64.h"
 
 /* References for static linking */
-void _references_to_categories_of_OFDataArray(void)
+void
+_references_to_categories_of_OFDataArray(void)
 {
 	_OFDataArray_MessagePackValue_reference = 1;
 	_OFDataArray_Hashing_reference = 1;
 }
 

Index: src/OFObject.m
==================================================================
--- src/OFObject.m
+++ src/OFObject.m
@@ -206,11 +206,12 @@
 	return [[object description]
 	    cStringWithEncoding: [OFSystemInfo native8BitEncoding]];
 }
 
 /* References for static linking */
-void _references_to_categories_of_OFObject(void)
+void
+_references_to_categories_of_OFObject(void)
 {
 	_OFObject_Serialization_reference = 1;
 }
 
 @implementation OFObject

Index: src/OFStdIOStream.m
==================================================================
--- src/OFStdIOStream.m
+++ src/OFStdIOStream.m
@@ -27,14 +27,26 @@
 
 #import "OFStdIOStream.h"
 #import "OFStdIOStream+Private.h"
 #import "OFDate.h"
 #import "OFApplication.h"
+#ifdef OF_WINDOWS
+# include "OFStdIOStream_Win32Console.h"
+#endif
 
 #import "OFOutOfRangeException.h"
 #import "OFReadFailedException.h"
 #import "OFWriteFailedException.h"
+
+/* References for static linking */
+#ifdef OF_WINDOWS
+void
+_reference_to_OFStdIOStream_Win32Console(void)
+{
+	[OFStdIOStream_Win32Console class];
+}
+#endif
 
 OFStdIOStream *of_stdin = nil;
 OFStdIOStream *of_stdout = nil;
 OFStdIOStream *of_stderr = nil;
 

Index: src/OFString.m
==================================================================
--- src/OFString.m
+++ src/OFString.m
@@ -83,21 +83,23 @@
     bool);
 extern bool of_unicode_to_codepage_437(const of_unichar_t*, uint8_t*, size_t,
     bool);
 
 /* References for static linking */
-void _references_to_categories_of_OFString(void)
+void
+_references_to_categories_of_OFString(void)
 {
 	_OFString_Hashing_reference = 1;
 	_OFString_JSONValue_reference = 1;
 	_OFString_Serialization_reference = 1;
 	_OFString_URLEncoding_reference = 1;
 	_OFString_XMLEscaping_reference = 1;
 	_OFString_XMLUnescaping_reference = 1;
 }
 
-void _reference_to_OFConstantString(void)
+void
+_reference_to_OFConstantString(void)
 {
 	[OFConstantString class];
 }
 
 size_t

Index: src/OFTCPSocket.m
==================================================================
--- src/OFTCPSocket.m
+++ src/OFTCPSocket.m
@@ -50,11 +50,12 @@
 #import "socket.h"
 #import "socket_helpers.h"
 #import "resolver.h"
 
 /* References for static linking */
-void _references_to_categories_of_OFTCPSocket(void)
+void
+_references_to_categories_of_OFTCPSocket(void)
 {
 	_OFTCPSocket_SOCKS5_reference = 1;
 }
 
 Class of_tls_socket_class = Nil;

Index: src/OFXMLElement.m
==================================================================
--- src/OFXMLElement.m
+++ src/OFXMLElement.m
@@ -36,11 +36,12 @@
 #import "OFInvalidFormatException.h"
 #import "OFMalformedXMLException.h"
 #import "OFUnboundNamespaceException.h"
 
 /* References for static linking */
-void _references_to_categories_of_OFXMLElement(void)
+void
+_references_to_categories_of_OFXMLElement(void)
 {
 	_OFXMLElement_Serialization_reference = 1;
 }
 
 static Class charactersClass = Nil;