Index: src/runtime/morphos-clib.h
==================================================================
--- src/runtime/morphos-clib.h
+++ src/runtime/morphos-clib.h
@@ -50,11 +50,11 @@
 bool glue_class_respondsToSelector(Class, SEL);
 bool glue_class_conformsToProtocol(Class, Protocol *);
 IMP glue_class_getMethodImplementation(Class, SEL);
 IMP glue_class_getMethodImplementation_stret(Class, SEL);
 Method glue_class_getInstanceMethod(Class, SEL);
-bool glue_class_addMethod(Class class_, SEL selector, IMP, const char *);
+bool glue_class_addMethod(Class, SEL, IMP, const char *);
 IMP glue_class_replaceMethod(Class, SEL, IMP, const char *);
 Class glue_object_getClass(id);
 Class glue_object_setClass(id, Class);
 const char *glue_object_getClassName(id);
 const char *glue_protocol_getName(Protocol *);
@@ -61,21 +61,21 @@
 bool glue_protocol_isEqual(Protocol *, Protocol *);
 bool glue_protocol_conformsToProtocol(Protocol *, Protocol *);
 objc_uncaught_exception_handler_t glue_objc_setUncaughtExceptionHandler(objc_uncaught_exception_handler_t);
 void glue_objc_setForwardHandler(IMP, IMP);
 void glue_objc_setEnumerationMutationHandler(objc_enumeration_mutation_handler_t);
-id _Nullable glue_objc_constructInstance(Class class_, void *bytes);
+id glue_objc_constructInstance(Class, void *);
 void glue_objc_exit(void);
-Ivar *glue_class_copyIvarList(Class class_, unsigned int *outCount);
-const char *glue_ivar_getName(Ivar ivar);
-const char *glue_ivar_getTypeEncoding(Ivar ivar);
-ptrdiff_t glue_ivar_getOffset(Ivar ivar);
-Method *glue_class_copyMethodList(Class class_, unsigned int *outCount);
-SEL glue_method_getName(Method method);
-const char *glue_method_getTypeEncoding(Method method);
-objc_property_t *glue_class_copyPropertyList(Class class_, unsigned int *outCount);
-const char *glue_property_getName(objc_property_t property);
-char *glue_property_copyAttributeValue(objc_property_t property, const char *name);
-void *glue_objc_destructInstance(id object);
+Ivar *glue_class_copyIvarList(Class, unsigned int *);
+const char *glue_ivar_getName(Ivar);
+const char *glue_ivar_getTypeEncoding(Ivar);
+ptrdiff_t glue_ivar_getOffset(Ivar);
+Method *glue_class_copyMethodList(Class, unsigned int *);
+SEL glue_method_getName(Method);
+const char *glue_method_getTypeEncoding(Method);
+objc_property_t *glue_class_copyPropertyList(Class, unsigned int *);
+const char *glue_property_getName(objc_property_t);
+char *glue_property_copyAttributeValue(objc_property_t, const char *);
+void *glue_objc_destructInstance(id);
 void *glue_objc_autoreleasePoolPush(void);
-void glue_objc_autoreleasePoolPop(void *pool);
-id glue__objc_rootAutorelease(id object);
+void glue_objc_autoreleasePoolPop(void *);
+id glue__objc_rootAutorelease(id);

Index: src/runtime/morphos.fd
==================================================================
--- src/runtime/morphos.fd
+++ src/runtime/morphos.fd
@@ -76,9 +76,9 @@
 glue_method_getTypeEncoding(method)(sysv,r12base)
 glue_class_copyPropertyList(class_,outCount)(sysv,r12base)
 glue_property_getName(property)(sysv,r12base)
 glue_property_copyAttributeValue(property,name)(sysv,r12base)
 glue_objc_destructInstance(object)(sysv,r12base)
-objc_autoreleasePoolPush()(sysv,r12base)
-objc_autoreleasePoolPop(pool)(sysv,r12base)
-_objc_rootAutorelease(object)(sysv,r12base)
+glue_objc_autoreleasePoolPush()(sysv,r12base)
+glue_objc_autoreleasePoolPop(pool)(sysv,r12base)
+glue__objc_rootAutorelease(object)(sysv,r12base)
 ##end

Index: src/socket.m
==================================================================
--- src/socket.m
+++ src/socket.m
@@ -56,11 +56,11 @@
 #endif
 
 #if defined(OF_HAVE_THREADS) && !defined(OF_AMIGAOS)
 static of_mutex_t mutex;
 #endif
-#ifndef OF_AMIGAOS
+#if !defined(OF_AMIGAOS) || !defined(OF_HAVE_THREADS)
 static bool initSuccessful = false;
 #else
 # ifdef OF_HAVE_THREADS
 of_tlskey_t of_socket_base_key;
 #  ifdef OF_AMIGAOS4

Index: src/socket_helpers.h
==================================================================
--- src/socket_helpers.h
+++ src/socket_helpers.h
@@ -47,11 +47,15 @@
 #ifndef SOCK_CLOEXEC
 # define SOCK_CLOEXEC 0
 #endif
 
 #if defined(OF_AMIGAOS)
-# include <proto/bsdsocket.h>
+# ifdef OF_MORPHOS
+#  include <proto/socket.h>
+# else
+#  include <proto/bsdsocket.h>
+# endif
 # 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