Index: ObjFW.xcodeproj/project.pbxproj
==================================================================
--- ObjFW.xcodeproj/project.pbxproj
+++ ObjFW.xcodeproj/project.pbxproj
@@ -736,10 +736,11 @@
 		4B745BA4168B25E600A6C20E /* OFSystemInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFSystemInfo.m; path = src/OFSystemInfo.m; sourceTree = "<group>"; };
 		4B7DD58118942FE200990FD6 /* socket_helpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = socket_helpers.h; path = src/socket_helpers.h; sourceTree = "<group>"; };
 		4B7DD5831894358400990FD6 /* OFMoveItemFailedException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFMoveItemFailedException.h; path = src/exceptions/OFMoveItemFailedException.h; sourceTree = "<group>"; };
 		4B7DD5841894358400990FD6 /* OFMoveItemFailedException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFMoveItemFailedException.m; path = src/exceptions/OFMoveItemFailedException.m; sourceTree = "<group>"; };
 		4B7DD58718943D4A00990FD6 /* socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = socket.h; path = src/socket.h; sourceTree = "<group>"; };
+		4B7DD58918944A7900990FD6 /* apple-forwarding-arm64.S */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; name = "apple-forwarding-arm64.S"; path = "src/forwarding/apple-forwarding-arm64.S"; sourceTree = "<group>"; };
 		4B7FF3B2133CED6100000324 /* OFConditionStillWaitingException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFConditionStillWaitingException.h; path = src/exceptions/OFConditionStillWaitingException.h; sourceTree = "<group>"; };
 		4B7FF3B3133CED6100000324 /* OFConditionStillWaitingException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFConditionStillWaitingException.m; path = src/exceptions/OFConditionStillWaitingException.m; sourceTree = "<group>"; };
 		4B837D7716829C5F007A3E83 /* block.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = block.h; path = src/block.h; sourceTree = "<group>"; };
 		4B837D7816829C5F007A3E83 /* instance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = instance.h; path = src/instance.h; sourceTree = "<group>"; };
 		4B83F0F2142FDEFD00E4A821 /* OFStreamObserver_kqueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFStreamObserver_kqueue.h; path = src/OFStreamObserver_kqueue.h; sourceTree = "<group>"; };
@@ -1117,10 +1118,11 @@
 		4B5C112717E9AAC1003C917F /* Forwarding */ = {
 			isa = PBXGroup;
 			children = (
 				4B5C112D17E9AAF6003C917F /* Supporting Files */,
 				4B5C112817E9AAED003C917F /* apple-forwarding-arm.S */,
+				4B7DD58918944A7900990FD6 /* apple-forwarding-arm64.S */,
 				4B5C112917E9AAED003C917F /* apple-forwarding-i386.S */,
 				4B5C112A17E9AAED003C917F /* apple-forwarding-ppc.S */,
 				4B5C112B17E9AAED003C917F /* apple-forwarding-x86_64.S */,
 				4B5C112C17E9AAED003C917F /* forwarding.S */,
 			);

Index: src/OFStreamObserver.m
==================================================================
--- src/OFStreamObserver.m
+++ src/OFStreamObserver.m
@@ -16,12 +16,10 @@
 
 #include "config.h"
 
 #define __NO_EXT_QNX
 
-#include <unistd.h>
-
 #include <assert.h>
 
 #import "OFStreamObserver.h"
 #import "OFStreamObserver+Private.h"
 #import "OFArray.h"

Index: src/OFStreamObserver_kqueue.m
==================================================================
--- src/OFStreamObserver_kqueue.m
+++ src/OFStreamObserver_kqueue.m
@@ -15,11 +15,10 @@
  */
 
 #include "config.h"
 
 #include <math.h>
-#include <unistd.h>
 #include <errno.h>
 
 #include <assert.h>
 
 #include <sys/types.h>
@@ -35,10 +34,11 @@
 #import "OFOutOfMemoryException.h"
 #import "OFOutOfRangeException.h"
 
 #import "autorelease.h"
 #import "macros.h"
+#import "socket_helpers.h"
 
 #define EVENTLIST_SIZE 64
 
 @implementation OFStreamObserver_kqueue
 - init

Index: src/OFStreamObserver_poll.m
==================================================================
--- src/OFStreamObserver_poll.m
+++ src/OFStreamObserver_poll.m
@@ -16,12 +16,10 @@
 
 #include "config.h"
 
 #define __NO_EXT_QNX
 
-#include <unistd.h>
-
 #ifdef HAVE_POLL_H
 # include <poll.h>
 #endif
 
 #import "OFStreamObserver.h"

Index: src/OFStreamObserver_select.m
==================================================================
--- src/OFStreamObserver_select.m
+++ src/OFStreamObserver_select.m
@@ -18,11 +18,10 @@
 
 #define __NO_EXT_QNX
 
 #include <string.h>
 #include <math.h>
-#include <unistd.h>
 
 #include <sys/time.h>
 
 #import "OFStreamObserver.h"
 #import "OFStreamObserver+Private.h"
@@ -30,10 +29,11 @@
 #import "OFStream.h"
 #import "OFArray.h"
 
 #import "autorelease.h"
 #import "macros.h"
+#import "socket_helpers.h"
 
 @implementation OFStreamObserver_select
 - init
 {
 	self = [super init];

Index: src/OFStreamSocket.m
==================================================================
--- src/OFStreamSocket.m
+++ src/OFStreamSocket.m
@@ -18,12 +18,10 @@
 
 #define __NO_EXT_QNX
 
 #include <string.h>
 
-#include <unistd.h>
-
 #include <errno.h>
 
 #import "OFStreamSocket.h"
 
 #import "OFInitializationFailedException.h"

Index: src/OFTCPSocket.m
==================================================================
--- src/OFTCPSocket.m
+++ src/OFTCPSocket.m
@@ -21,12 +21,10 @@
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <unistd.h>
-
 #import "OFTCPSocket.h"
 #import "OFTCPSocket+SOCKS5.h"
 #import "OFString.h"
 #import "OFThread.h"
 #import "OFTimer.h"

Index: src/socket_helpers.h
==================================================================
--- src/socket_helpers.h
+++ src/socket_helpers.h
@@ -11,10 +11,12 @@
  * Alternatively, it may be distributed under the terms of the GNU General
  * Public License, either version 2 or 3, which can be found in the file
  * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
  * file.
  */
+
+#include <unistd.h>
 
 #ifdef HAVE_NETINET_IN_H
 # include <netinet/in.h>
 #endif
 #ifdef HAVE_ARPA_INET_H