Index: src/OFApplication.m
==================================================================
--- src/OFApplication.m
+++ src/OFApplication.m
@@ -94,11 +94,12 @@
 	if ([delegate respondsToSelector: @selector(applicationWillTerminate)])
 		[delegate applicationWillTerminate];
 
 	[delegate release];
 
-#if defined(OF_HAVE_THREADS) && defined(OF_HAVE_SOCKETS) && defined(OF_AMIGAOS)
+#if defined(OF_HAVE_THREADS) && defined(OF_HAVE_SOCKETS) && \
+    defined(OF_AMIGAOS) && !defined(OF_MORPHOS)
 	of_socket_deinit();
 #endif
 }
 
 int

Index: src/OFThread.m
==================================================================
--- src/OFThread.m
+++ src/OFThread.m
@@ -144,11 +144,11 @@
 	objc_autoreleasePoolPop((void *)(uintptr_t)-1);
 #else
 	objc_autoreleasePoolPop(thread->_pool);
 #endif
 
-#if defined(OF_AMIGAOS) && defined(OF_HAVE_SOCKETS)
+#if defined(OF_AMIGAOS) && !defined(OF_MORPHOS) && defined(OF_HAVE_SOCKETS)
 	if (thread.supportsSockets)
 		of_socket_deinit();
 #endif
 
 	thread->_running = OF_THREAD_WAITING_FOR_JOIN;

Index: src/socket.h
==================================================================
--- src/socket.h
+++ src/socket.h
@@ -290,20 +290,20 @@
 extern void of_socket_address_get_ipx_node(
     const of_socket_address_t *_Nonnull address,
     unsigned char node[_Nonnull IPX_NODE_LEN]);
 
 extern bool of_socket_init(void);
-#if defined(OF_HAVE_THREADS) && defined(OF_AMIGAOS)
+#if defined(OF_HAVE_THREADS) && defined(OF_AMIGAOS) && !defined(OF_MORPHOS)
 extern void of_socket_deinit(void);
 #endif
 extern int of_socket_errno(void);
 #if !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
 extern int of_getsockname(of_socket_t sock, struct sockaddr *restrict addr,
     socklen_t *restrict addrLen);
 #endif
 
-#if defined(OF_HAVE_THREADS) && defined(OF_AMIGAOS)
+#if defined(OF_HAVE_THREADS) && defined(OF_AMIGAOS) && !defined(OF_MORPHOS)
 extern of_tlskey_t of_socket_base_key;
 # ifdef OF_AMIGAOS4
 extern of_tlskey_t of_socket_interface_key;
 # endif
 #endif

Index: src/socket.m
==================================================================
--- src/socket.m
+++ src/socket.m
@@ -36,11 +36,11 @@
 #import "OFUnlockFailedException.h"
 
 #import "socket.h"
 #import "socket_helpers.h"
 #ifdef OF_HAVE_THREADS
-# ifndef OF_AMIGAOS
+# if !defined(OF_AMIGAOS) || defined(OF_MORPHOS)
 #  import "mutex.h"
 # else
 #  import "tlskey.h"
 # endif
 #endif
@@ -53,19 +53,19 @@
 #ifdef OF_NINTENDO_3DS
 # include <3ds/types.h>
 # include <3ds/services/soc.h>
 #endif
 
-#if defined(OF_HAVE_THREADS) && !defined(OF_AMIGAOS)
+#if defined(OF_HAVE_THREADS) && (!defined(OF_AMIGAOS) || defined(OF_MORPHOS))
 static of_mutex_t mutex;
 #endif
-#if !defined(OF_AMIGAOS) || !defined(OF_HAVE_THREADS)
+#if !defined(OF_AMIGAOS) || defined(OF_MORPHOS) || !defined(OF_HAVE_THREADS)
 static bool initSuccessful = false;
 #endif
 
 #ifdef OF_AMIGAOS
-# ifdef OF_HAVE_THREADS
+# if defined(OF_HAVE_THREADS) && !defined(OF_MORPHOS)
 of_tlskey_t of_socket_base_key;
 #  ifdef OF_AMIGAOS4
 of_tlskey_t of_socket_interface_key;
 #  endif
 # else
@@ -74,11 +74,11 @@
 struct SocketIFace *ISocket = NULL;
 #  endif
 # endif
 #endif
 
-#if defined(OF_HAVE_THREADS) && defined(OF_AMIGAOS)
+#if defined(OF_HAVE_THREADS) && defined(OF_AMIGAOS) && !defined(OF_MORPHOS)
 OF_CONSTRUCTOR()
 {
 	if (!of_tlskey_new(&of_socket_base_key))
 		@throw [OFInitializationFailedException exception];
 
@@ -87,11 +87,11 @@
 		@throw [OFInitializationFailedException exception];
 # endif
 }
 #endif
 
-#if !defined(OF_AMIGAOS) || !defined(OF_HAVE_THREADS)
+#if !defined(OF_AMIGAOS) || defined(OF_MORPHOS) || !defined(OF_HAVE_THREADS)
 static void
 init(void)
 {
 # if defined(OF_WINDOWS)
 	WSADATA wsa;
@@ -122,11 +122,11 @@
 		return;
 
 	atexit((void (*)(void))socExit);
 # endif
 
-# if defined(OF_HAVE_THREADS) && !defined(OF_AMIGAOS)
+# if defined(OF_HAVE_THREADS) && (!defined(OF_AMIGAOS) || defined(OF_MORPHOS))
 	if (!of_mutex_new(&mutex))
 		return;
 
 #  ifdef OF_WII
 	if (!of_spinlock_new(&spinlock))
@@ -152,11 +152,11 @@
 #endif
 
 bool
 of_socket_init(void)
 {
-#if !defined(OF_AMIGAOS) || !defined(OF_HAVE_THREADS)
+#if !defined(OF_AMIGAOS) || defined(OF_MORPHOS) || !defined(OF_HAVE_THREADS)
 	static of_once_t onceControl = OF_ONCE_INIT;
 	of_once(&onceControl, init);
 
 	return initSuccessful;
 #else
@@ -201,11 +201,11 @@
 
 	return true;
 #endif
 }
 
-#if defined(OF_HAVE_THREADS) && defined(OF_AMIGAOS)
+#if defined(OF_HAVE_THREADS) && defined(OF_AMIGAOS) && !defined(OF_MORPHOS)
 void
 of_socket_deinit(void)
 {
 	struct Library *socketBase = of_tlskey_get(of_socket_base_key);
 # ifdef OF_AMIGAOS4
@@ -326,19 +326,19 @@
 of_getsockname(of_socket_t sock, struct sockaddr *restrict addr,
     socklen_t *restrict addrLen)
 {
 	int ret;
 
-# if defined(OF_HAVE_THREADS) && !defined(OF_AMIGAOS)
+# if defined(OF_HAVE_THREADS) && (!defined(OF_AMIGAOS) || defined(OF_MORPHOS))
 	if (!of_mutex_lock(&mutex))
 		@throw [OFLockFailedException exception];
 
 # endif
 
 	ret = getsockname(sock, addr, addrLen);
 
-# if defined(OF_HAVE_THREADS) && !defined(OF_AMIGAOS)
+# if defined(OF_HAVE_THREADS) && (!defined(OF_AMIGAOS) || defined(OF_MORPHOS))
 	if (!of_mutex_unlock(&mutex))
 		@throw [OFUnlockFailedException exception];
 # endif
 
 	return ret;

Index: src/socket_helpers.h
==================================================================
--- src/socket_helpers.h
+++ src/socket_helpers.h
@@ -57,11 +57,11 @@
 # include <sys/filio.h>
 # define closesocket(sock) CloseSocket(sock)
 # define ioctlsocket(fd, req, arg) IoctlSocket(fd, req, arg)
 # define hstrerror(err) "unknown (no hstrerror)"
 # define SOCKET_ERROR -1
-# ifdef OF_HAVE_THREADS
+# if defined(OF_HAVE_THREADS) && !defined(OF_MORPHOS)
 #  define SocketBase ((struct Library *)of_tlskey_get(of_socket_base_key))
 #  ifdef OF_AMIGAOS4
 #   define ISocket \
 	((struct SocketIFace *)of_tlskey_get(of_socket_interface_key))
 #  endif