diff --git a/CMakeLists.txt b/CMakeLists.txt
index 818b8f1d4..95dee8333 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,8 +25,8 @@ if (${CMAKE_C_COMPILER_ID} STREQUAL "Clang" AND NOT ${CMAKE_C_COMPILER_VERSION}
 	SET(IGNORED_WARNINGS "${IGNORED_WARNINGS} -Wno-expansion-to-defined")
 endif (${CMAKE_C_COMPILER_ID} STREQUAL "Clang" AND NOT ${CMAKE_C_COMPILER_VERSION} VERSION_LESS "3.9")
 
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m${BITS} -D__APPLE_CC__ ${IGNORED_WARNINGS}")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m${BITS} -D__APPLE_CPP__ ${IGNORED_WARNINGS}")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m${BITS} ${IGNORED_WARNINGS}")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m${BITS} ${IGNORED_WARNINGS}")
 
 SET(CMAKE_ASM_FLAGS "-m${BITS}")
 SET(CMAKE_ASM-ATT_FLAGS "-m${BITS}")
@@ -34,7 +34,7 @@ SET(CMAKE_ASM-ATT_FLAGS "-m${BITS}")
 message(STATUS "Building for ${CMAKE_SYSTEM_PROCESSOR}, CFLAGS: ${CMAKE_C_FLAGS}, libdir: ${CMAKE_INSTALL_LIBDIR}")
 
 # --as-needed breaks Darling
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-as-needed")
+#set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-as-needed")
 
 if (BITS EQUAL 32)
 	# Prevent building Darling executables (e.g. Bash)
diff --git a/kernel-include/sys/cdefs.h b/kernel-include/sys/cdefs.h
index 99b8835fc..ad3c85079 100644
--- a/kernel-include/sys/cdefs.h
+++ b/kernel-include/sys/cdefs.h
@@ -418,7 +418,7 @@
 /*
  * symbol versioning macros
  */
-#ifndef DARLING
+#ifndef DARLING__DISABLED
 #define __DARWIN_ALIAS(sym)		__asm("_" __STRING(sym) __DARWIN_SUF_UNIX03)
 #define __DARWIN_ALIAS_C(sym)		__asm("_" __STRING(sym) __DARWIN_SUF_NON_CANCELABLE __DARWIN_SUF_UNIX03)
 #define __DARWIN_ALIAS_I(sym)		__asm("_" __STRING(sym) __DARWIN_SUF_64_BIT_INO_T __DARWIN_SUF_UNIX03)
diff --git a/platform-include/architecture/i386/asm_help.h b/platform-include/architecture/i386/asm_help.h
index a47bd05c7..ff2751226 100644
--- a/platform-include/architecture/i386/asm_help.h
+++ b/platform-include/architecture/i386/asm_help.h
@@ -304,7 +304,7 @@ name:
 
 #if defined(__DYNAMIC__)
 #if defined(__i386__)
-#ifndef DARLING
+#ifndef DARLING__DISABLED
 #define PICIFY(var)					\
 	call	1f					; \
 1:							; \
@@ -332,11 +332,11 @@ name:
 	call	*%edx
 #elif defined(__x86_64__)
 #define CALL_EXTERN_AGAIN(func)	\
-	call	func@PLT
+	call	func
 #endif
 
 #if defined(__i386__)
-#ifndef DARLING
+#ifndef DARLING__DISABLED
 #define NON_LAZY_STUB(var)	\
 .section __IMPORT,__pointers,non_lazy_symbol_pointers	; \
 L ## var ## __non_lazy_ptr:	; \
@@ -361,7 +361,7 @@ L ## var ## __non_lazy_ptr:	; \
 	NON_LAZY_STUB(func)
 #elif defined(__x86_64__)
 #define BRANCH_EXTERN(func)	\
-	jmp	func@PLT
+	jmp	func
 #endif
 
 #if defined(__i386__)
@@ -384,7 +384,7 @@ L ## var ## __non_lazy_ptr:	; \
 #endif
 
 #if defined(__i386__)
-#ifndef DARLING
+#ifndef DARLING__DISABLED
 #define EXTERN_TO_REG(var, reg)				\
 	call	1f					; \
 1:							; \
@@ -409,7 +409,7 @@ L ## var ## __non_lazy_ptr:	; \
 #endif
 
 #else
-#define BRANCH_EXTERN(func)	jmp	func@PLT
+#define BRANCH_EXTERN(func)	jmp	func
 #define PUSH_EXTERN(var)	push	var@GOTPCREL
 #define CALL_EXTERN(func)	call	func@PLT
 #define CALL_EXTERN_AGAIN(func)	call	func@PLT
diff --git a/platform-include/sys/cdefs.h b/platform-include/sys/cdefs.h
index 61bb2b1d6..cca5e4603 100644
--- a/platform-include/sys/cdefs.h
+++ b/platform-include/sys/cdefs.h
@@ -485,7 +485,7 @@
 /*
  * symbol versioning macros
  */
-#ifndef DARLING
+#ifndef DARLING__DISABLED
 #define __DARWIN_ALIAS(sym)		__asm("_" __STRING(sym) __DARWIN_SUF_UNIX03)
 #define __DARWIN_ALIAS_C(sym)		__asm("_" __STRING(sym) __DARWIN_SUF_NON_CANCELABLE __DARWIN_SUF_UNIX03)
 #define __DARWIN_ALIAS_I(sym)		__asm("_" __STRING(sym) __DARWIN_SUF_64_BIT_INO_T __DARWIN_SUF_UNIX03)
diff --git a/platform-include/sys/fcntl.h b/platform-include/sys/fcntl.h
index a916ee953..411e56827 100644
--- a/platform-include/sys/fcntl.h
+++ b/platform-include/sys/fcntl.h
@@ -1,5 +1,6 @@
+// Modified by Lubos Dolezel for Darling
 /*
- * Copyright (c) 2000-2013 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -77,13 +78,30 @@
  */
 #include <sys/_types.h>
 #include <sys/cdefs.h>
+#ifndef KERNEL
 #include <Availability.h>
+#endif
 
 /* We should not be exporting size_t here.  Temporary for gcc bootstrapping. */
-#include <sys/_types/_size_t.h>
-#include <sys/_types/_mode_t.h>
-#include <sys/_types/_off_t.h>
-#include <sys/_types/_pid_t.h>
+#ifndef _SIZE_T
+#define _SIZE_T
+typedef __darwin_size_t	size_t;
+#endif
+
+#ifndef	_MODE_T
+typedef	__darwin_mode_t	mode_t;
+#define _MODE_T
+#endif
+
+#ifndef _OFF_T
+typedef __darwin_off_t	off_t;
+#define _OFF_T
+#endif
+
+#ifndef _PID_T
+typedef __darwin_pid_t	pid_t;
+#define _PID_T
+#endif
 
 /*
  * File status flags: these are used by open(2), fcntl(2).
@@ -112,9 +130,9 @@
 #endif
 #define	O_NONBLOCK	0x0004		/* no delay */
 #define	O_APPEND	0x0008		/* set append mode */
-
-#include <sys/_types/_o_sync.h>
-
+#ifndef O_SYNC		/* allow simultaneous inclusion of <aio.h> */
+#define	O_SYNC		0x0080		/* synch I/O file integrity */
+#endif
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 #define	O_SHLOCK	0x0010		/* open with shared file lock */
 #define	O_EXLOCK	0x0020		/* open with exclusive file lock */
@@ -125,44 +143,50 @@
 #define	O_CREAT		0x0200		/* create if nonexistant */
 #define	O_TRUNC		0x0400		/* truncate to zero length */
 #define	O_EXCL		0x0800		/* error if already exists */
-
-#if __DARWIN_C_LEVEL >= 200809L 
-/*
- * Descriptor value for the current working directory
- */
-#define AT_FDCWD	-2
-
-/*
- * Flags for the at functions
- */
-#define AT_EACCESS		0x0010	/* Use effective ids in access check */
-#define AT_SYMLINK_NOFOLLOW	0x0020	/* Act on the symlink itself not the target */
-#define AT_SYMLINK_FOLLOW	0x0040	/* Act on target of symlink */
-#define AT_REMOVEDIR		0x0080	/* Path refers to directory */
+#ifdef KERNEL
+#define	FMARK		0x1000		/* mark during gc() */
+#define	FDEFER		0x2000		/* defer for next gc pass */
+#define	FHASLOCK	0x4000		/* descriptor holds advisory lock */
 #endif
-
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 #define	O_EVTONLY	0x8000		/* descriptor requested for event notifications only */
 #endif
 
+#ifdef KERNEL
+#define	FWASWRITTEN	0x10000		/* descriptor was written */
+#endif
 
 #define	O_NOCTTY	0x20000		/* don't assign controlling terminal */
 
+#ifdef KERNEL
+#define FNOCACHE	0x40000		/* fcntl(F_NOCACHE, 1) */
+#define FNORDAHEAD	0x80000		/* fcntl(F_RDAHEAD, 0) */
+#endif
 
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 #define O_DIRECTORY	0x100000
 #define O_SYMLINK	0x200000	/* allow open of a symlink */
 #endif
 
-#include <sys/_types/_o_dsync.h>
+#ifndef O_DSYNC		/* allow simultaneous inclusion of <aio.h> */
+#define		O_DSYNC	0x400000	/* synch I/O data integrity */
+#endif
 
+#ifdef KERNEL
+#define FNODIRECT	0x800000	/* fcntl(F_NODIRECT, 1) */
+#endif
 
 #if __DARWIN_C_LEVEL >= 200809L
 #define	O_CLOEXEC	0x1000000	/* implicitly set FD_CLOEXEC */
 #endif
 
+#ifdef KERNEL
+#define FENCRYPTED	0x2000000
+#endif
 
-
+#ifdef KERNEL
+#define FSINGLE_WRITER	0x4000000       /* fcntl(F_SINGLE_WRITER, 1) */
+#endif
 
 /* Data Protection Flags */
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
@@ -170,6 +194,16 @@
 #endif
 
 
+#ifdef KERNEL
+/* convert from open() flags to/from fflags; convert O_RD/WR to FREAD/FWRITE */
+#define	FFLAGS(oflags)	((oflags) + 1)
+#define	OFLAGS(fflags)	((fflags) - 1)
+
+/* bits to save after open */
+#define	FMASK		(FREAD|FWRITE|FAPPEND|FASYNC|FFSYNC|FFDSYNC|FNONBLOCK)
+/* bits settable by fcntl(F_SETFL, ...) */
+#define	FCNTLFLAGS	(FAPPEND|FASYNC|FFSYNC|FFDSYNC|FNONBLOCK)
+#endif
 
 /*
  * The O_* flags used to have only F* names, which were used in the kernel
@@ -211,9 +245,7 @@
 #define	F_GETLK		7		/* get record locking information */
 #define	F_SETLK		8		/* set record locking information */
 #define	F_SETLKW	9		/* F_SETLK; wait if blocked */
-#if __DARWIN_C_LEVEL >= __DARWIN_C_FULL
-#define F_SETLKWTIMEOUT 10		/* F_SETLK; wait if blocked, return on timeout */
-#endif /* __DARWIN_C_LEVEL >= __DARWIN_C_FULL */
+#define F_SETLKWTIMEOUT	10
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 #define F_FLUSH_DATA    40
 #define F_CHKCLEAN      41              /* Used for regression test */
@@ -221,9 +253,8 @@
 #define F_SETSIZE       43		/* Truncate a file without zeroing space */	
 #define F_RDADVISE      44              /* Issue an advisory read async with no copy to user */
 #define F_RDAHEAD       45              /* turn read ahead off/on for this fd */
-/*
- * 46,47 used to be F_READBOOTSTRAP and F_WRITEBOOTSTRAP 
- */
+#define F_READBOOTSTRAP 46              /* Read bootstrap from disk */
+#define F_WRITEBOOTSTRAP 47             /* Write bootstrap on disk */
 #define F_NOCACHE       48              /* turn data caching off/on for this fd */
 #define F_LOG2PHYS	49		/* file offset to device offset */
 #define F_GETPATH       50              /* return the full path of the fd */
@@ -233,9 +264,15 @@
 #define F_THAW_FS       54              /* "thaw" all fs operations */
 #define	F_GLOBAL_NOCACHE 55		/* turn data caching off/on (globally) for this file */
 
+#ifdef PRIVATE
+#define	F_OPENFROM	56		/* SPI: open a file relative to fd (must be a dir) */
+#define	F_UNLINKFROM	57		/* SPI: open a file relative to fd (must be a dir) */
+#define	F_CHECK_OPENEVT 58		/* SPI: if a process is marked OPENEVT, or in O_EVTONLY on opens of this vnode */
+#endif /* PRIVATE */
 
 #define F_ADDSIGS	59		/* add detached signatures */
 
+#define F_MARKDEPENDENCY 60             /* this process hosts the device supporting the fs backing this fd */
 
 #define F_ADDFILESIGS	61		/* add signature from same file (used by dyld for shared libs) */
 
@@ -251,11 +288,19 @@
 
 /* See F_DUPFD_CLOEXEC below for 67 */
 
+#ifdef PRIVATE
+#define F_SETSTATICCONTENT 		68		/* 
+										 * indicate to the filesystem/storage driver that the content to be 
+										 * written is usually static.  a nonzero value enables it, 0 disables it.
+										 */
+#define F_MOVEDATAEXTENTS	69		/* Swap only the data associated with two files */
+#endif
 
 #define F_SETBACKINGSTORE	70	/* Mark the file as being the backing store for another filesystem */
 #define F_GETPATH_MTMINFO	71 	/* return the full path of the FD, but error in specific mtmd circumstances */
 
-#define F_GETCODEDIR		72	/* Returns the code directory, with associated hashes, to the caller */
+#define F_GETCODEDIR		72
+/* 72 is free.  It used to be F_GETENCRYPTEDDATA, which is now removed. */
 
 #define F_SETNOSIGPIPE		73	/* No SIGPIPE generated on EPIPE */
 #define F_GETNOSIGPIPE		74	/* Status of SIGPIPE for this fd */
@@ -267,9 +312,7 @@
 
 #define F_GETPROTECTIONLEVEL	77	/* Get the protection version number for this filesystem */
 
-#define F_FINDSIGS		78	/* Add detached code signatures (used by dyld for shared libs) */
-
-
+#define F_FINDSIGS			78
 
 // FS-specific fcntl()'s numbers begin at 0x00010000 and go up
 #define FCNTL_FS_SPECIFIC_BASE  0x00010000
@@ -287,19 +330,71 @@
 #define	F_RDLCK		1		/* shared or read lock */
 #define	F_UNLCK		2		/* unlock */
 #define	F_WRLCK		3		/* exclusive or write lock */
-
+#ifdef KERNEL
+#define	F_WAIT		0x010		/* Wait until lock is granted */
+#define	F_FLOCK		0x020	 	/* Use flock(2) semantics for lock */
+#define	F_POSIX		0x040	 	/* Use POSIX semantics for lock */
+#define	F_PROV		0x080		/* Non-coalesced provisional lock */
+#define F_WAKE1_SAFE    0x100           /* its safe to only wake one waiter */
+#define	F_ABORT		0x200		/* lock attempt aborted (force umount) */
+#endif
 
 /*
  * [XSI] The values used for l_whence shall be defined as described
  * in <unistd.h>
  */
-#include <sys/_types/_seek_set.h>
+#ifndef SEEK_SET
+#define	SEEK_SET	0	/* set file offset to offset */
+#define	SEEK_CUR	1	/* set file offset to current plus offset */
+#define	SEEK_END	2	/* set file offset to EOF plus offset */
+#endif	/* !SEEK_SET */
 
 /*
  * [XSI] The symbolic names for file modes for use as values of mode_t
  * shall be defined as described in <sys/stat.h>
  */
-#include <sys/_types/_s_ifmt.h>
+#ifndef S_IFMT
+/* File type */
+#define	S_IFMT		0170000		/* [XSI] type of file mask */
+#define	S_IFIFO		0010000		/* [XSI] named pipe (fifo) */
+#define	S_IFCHR		0020000		/* [XSI] character special */
+#define	S_IFDIR		0040000		/* [XSI] directory */
+#define	S_IFBLK		0060000		/* [XSI] block special */
+#define	S_IFREG		0100000		/* [XSI] regular */
+#define	S_IFLNK		0120000		/* [XSI] symbolic link */
+#define	S_IFSOCK	0140000		/* [XSI] socket */
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#define	S_IFWHT		0160000		/* OBSOLETE: whiteout */
+#endif
+
+/* File mode */
+/* Read, write, execute/search by owner */
+#define	S_IRWXU		0000700		/* [XSI] RWX mask for owner */
+#define	S_IRUSR		0000400		/* [XSI] R for owner */
+#define	S_IWUSR		0000200		/* [XSI] W for owner */
+#define	S_IXUSR		0000100		/* [XSI] X for owner */
+/* Read, write, execute/search by group */
+#define	S_IRWXG		0000070		/* [XSI] RWX mask for group */
+#define	S_IRGRP		0000040		/* [XSI] R for group */
+#define	S_IWGRP		0000020		/* [XSI] W for group */
+#define	S_IXGRP		0000010		/* [XSI] X for group */
+/* Read, write, execute/search by others */
+#define	S_IRWXO		0000007		/* [XSI] RWX mask for other */
+#define	S_IROTH		0000004		/* [XSI] R for other */
+#define	S_IWOTH		0000002		/* [XSI] W for other */
+#define	S_IXOTH		0000001		/* [XSI] X for other */
+
+#define	S_ISUID		0004000		/* [XSI] set user id on execution */
+#define	S_ISGID		0002000		/* [XSI] set group id on execution */
+#define	S_ISVTX		0001000		/* [XSI] directory restrcted delete */
+
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#define	S_ISTXT		S_ISVTX		/* sticky bit: not supported */
+#define	S_IREAD		S_IRUSR		/* backward compatability */
+#define	S_IWRITE	S_IWUSR		/* backward compatability */
+#define	S_IEXEC		S_IXUSR		/* backward compatability */
+#endif
+#endif	/* !S_IFMT */
 
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 /* allocate flags (F_PREALLOCATE) */
@@ -326,43 +421,24 @@ struct flock {
 	short	l_whence;	/* type of l_start */
 };
 
-#include <sys/_types/_timespec.h>
-
-#if __DARWIN_C_LEVEL >= __DARWIN_C_FULL
-/*
- * Advisory file segment locking with time out -
- * Information passed to system by user for F_SETLKWTIMEOUT
- */
-struct flocktimeout {
-	struct flock    fl;             /* flock passed for file locking */
-	struct timespec timeout;        /* timespec struct for timeout */
-};
-#endif /* __DARWIN_C_LEVEL >= __DARWIN_C_FULL */
-
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 /*
  * advisory file read data type -
  * information passed by user to system
  */
 
+#ifdef KERNEL
+#pragma pack(4) /* prevent structure padding in kernel */
+#endif /* KERNEL */
 
 struct radvisory {
        off_t   ra_offset;
        int     ra_count;
 };
 
-
-/** Information the user passes in to get the codeblobs out of the kernel */
-typedef struct fcodeblobs {
-	void 		*f_cd_hash;
-	size_t		f_hash_size;
-	void		*f_cd_buffer;
-	size_t		f_cd_size;
-	unsigned int	*f_out_size;
-	int		f_arch;
-	int		__padding;
-} fcodeblobs_t;
-
+#ifdef KERNEL
+#pragma pack()
+#endif /* KERNEL */
 
 /*
  * detached code signatures data type -
@@ -375,6 +451,26 @@ typedef struct fsignatures {
 	void		*fs_blob_start;
 	size_t		fs_blob_size;
 } fsignatures_t;
+#ifdef KERNEL
+/* LP64 version of fsignatures.  all pointers 
+ * grow when we're dealing with a 64-bit process.
+ * WARNING - keep in sync with fsignatures
+ */
+
+typedef struct user32_fsignatures {
+	off_t		fs_file_start;
+	user32_addr_t	fs_blob_start;
+	user32_size_t	fs_blob_size;
+} user32_fsignatures_t;
+
+typedef struct user_fsignatures {
+	off_t		fs_file_start;	/* offset of Mach-O image in FAT file */
+	user_addr_t	fs_blob_start;	/* F_ADDSIGS: mem address of signature*/
+					/* F_ADDFILESIGS: offset of signature */
+					/*                in Mach-O image     */
+	user_size_t	fs_blob_size;	/* size of signature blob             */
+} user_fsignatures_t;
+#endif /* KERNEL */
 
 /* lock operations for flock(2) */
 #define	LOCK_SH		0x01		/* shared file lock */
@@ -400,6 +496,25 @@ typedef struct fbootstraptransfer {
   void *fbt_buffer;             /* IN: buffer to be read/written */
 } fbootstraptransfer_t;
 
+#ifdef KERNEL
+/* LP64 version of fbootstraptransfer.  all pointers 
+ * grow when we're dealing with a 64-bit process.
+ * WARNING - keep in sync with fbootstraptransfer
+ */
+
+typedef struct user32_fbootstraptransfer {
+  off_t fbt_offset;             /* IN: offset to start read/write */
+  user32_size_t fbt_length;          /* IN: number of bytes to transfer */
+  user32_addr_t fbt_buffer;             /* IN: buffer to be read/written */
+} user32_fbootstraptransfer_t;
+
+typedef struct user_fbootstraptransfer {
+  off_t fbt_offset;             /* IN: offset to start read/write */
+  user_size_t fbt_length;		/* IN: number of bytes to transfer */
+  user_addr_t fbt_buffer;		/* IN: buffer to be read/written */
+} user_fbootstraptransfer_t;
+
+#endif // KERNEL
 
 /*
  * For F_LOG2PHYS this information is passed back to user
@@ -439,14 +554,48 @@ struct log2phys {
 #define	O_POPUP	   0x80000000   /* force window to popup on open */
 #define	O_ALERT	   0x20000000	/* small, clean popup window */
 
+#ifdef PRIVATE
+/*
+ * SPI: Argument data for F_OPENFROM
+ */
+struct fopenfrom {
+	unsigned int	o_flags;	/* same as open(2) */
+	mode_t		o_mode;		/* same as open(2) */
+	char *		o_pathname;	/* relative pathname */
+};
+
+#ifdef KERNEL
+/*
+ * LP64 version of fopenfrom.  Memory pointers 
+ * grow when we're dealing with a 64-bit process.
+ *
+ * WARNING - keep in sync with fopenfrom (above)
+ */
+struct user32_fopenfrom {
+	unsigned int	o_flags;
+	mode_t		o_mode;
+	user32_addr_t	o_pathname;
+};
 
-#endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
+struct user_fopenfrom {
+	unsigned int	o_flags;
+	mode_t		o_mode;
+	user_addr_t	o_pathname;
+};
+#endif /* KERNEL */
 
+#endif /* PRIVATE */
 
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
 
-#include <sys/_types/_filesec_t.h>
+#ifndef KERNEL
 
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#ifndef _FILESEC_T
+struct _filesec;
+typedef struct _filesec	*filesec_t;
+#define _FILESEC_T
+#endif
 typedef enum {
 	FILESEC_OWNER = 1,
 	FILESEC_GROUP = 2,
@@ -466,22 +615,29 @@ typedef enum {
 
 __BEGIN_DECLS
 int	open(const char *, int, ...) __DARWIN_ALIAS_C(open);
-#if __DARWIN_C_LEVEL >= 200809L
-int	openat(int, const char *, int, ...) __DARWIN_NOCANCEL(openat) __OSX_AVAILABLE_STARTING(__MAC_10_10, __IPHONE_8_0);
-#endif
-#ifndef LIBC_ALIAS_CREAT
 int	creat(const char *, mode_t) __DARWIN_ALIAS_C(creat);
-#else
-int	creat(const char *, mode_t) LIBC_ALIAS_C(creat);
-#endif
 int	fcntl(int, int, ...) __DARWIN_ALIAS_C(fcntl);
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 
+#ifdef PRIVATE
+/*
+ * These definitions are retained temporarily for compatibility.
+ * If you want to use fileports, please use
+ *	#include <sys/fileport.h>
+ * or
+ *	#include <System/sys/fileport.h>
+ */
+#ifndef _FILEPORT_T
+#define _FILEPORT_T
+typedef __darwin_mach_port_t fileport_t;
+#define FILEPORT_NULL ((fileport_t)0)
+#endif /* _FILEPORT_T */
+
+int     fileport_makeport(int, fileport_t*);
+int     fileport_makefd(fileport_t);
+#endif /* PRIVATE */
 int	openx_np(const char *, int, filesec_t);
-/* 
- * data-protected non-portable open(2) :
- int open_dprotected_np(user_addr_t path, int flags, int class, int dpflags, int mode)
- */ 
+/* data-protected non-portable open(2) */
 int open_dprotected_np ( const char *, int, int, int, ...);
 int	flock(int, int);
 filesec_t filesec_init(void);
@@ -495,5 +651,6 @@ int	filesec_unset_property(filesec_t, filesec_property_t) __OSX_AVAILABLE_STARTI
 #define _FILESEC_REMOVE_ACL	((void *)1)
 #endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
 __END_DECLS
+#endif
 
 #endif /* !_SYS_FCNTL_H_ */
diff --git a/platform-include/sys/resource.h b/platform-include/sys/resource.h
index 4bead7ba8..6a4164fa8 100644
--- a/platform-include/sys/resource.h
+++ b/platform-include/sys/resource.h
@@ -72,12 +72,18 @@
 #include <stdint.h>
 #endif /* __DARWIN_C_LEVEL >= __DARWIN_C_FULL */
 
+#ifndef KERNEL
 #include <Availability.h>
+#endif
 
 /* [XSI] The timeval structure shall be defined as described in
  * <sys/time.h>
  */
 #include <sys/_types/_timeval.h>
+#ifdef KERNEL
+#include <sys/_types/_user32_timeval.h>
+#include <sys/_types/_user64_timeval.h>
+#endif
 
 /* The id_t type shall be defined as described in <sys/types.h> */
 #include <sys/_types/_id_t.h>
@@ -105,6 +111,21 @@ typedef __uint64_t	rlim_t;
 #define	PRIO_DARWIN_THREAD	3		/* Second argument is always 0 (current thread) */
 #define	PRIO_DARWIN_PROCESS	4		/* Second argument is a PID */
 
+#ifdef PRIVATE
+
+#define PRIO_DARWIN_GPU		5		/* Second argument is a PID */
+
+#define PRIO_DARWIN_GPU_ALLOW   0x1
+#define PRIO_DARWIN_GPU_DENY    0x2
+
+#define PRIO_DARWIN_ROLE        6               /* Second argument is a PID */
+
+#define PRIO_DARWIN_ROLE_DEFAULT        0x0     /* Default state */
+#define PRIO_DARWIN_ROLE_UI_FOCAL       0x1     /* On  screen,     focal UI */
+#define PRIO_DARWIN_ROLE_UI             0x2     /* On  screen, non-focal UI */
+#define PRIO_DARWIN_ROLE_NON_UI         0x3     /* Off screen, non-focal UI */
+
+#endif /* PRIVATE */
 
 /*
  * Range limitations for the value of the third parameter to setpriority().
@@ -282,6 +303,61 @@ typedef struct rusage_info_v3 rusage_info_current;
 
 #endif /* __DARWIN_C_LEVEL >= __DARWIN_C_FULL */
 
+#ifdef KERNEL
+
+struct rusage_superset {
+	struct rusage 			ru;
+	rusage_info_current 	ri;
+};
+
+struct rusage_info_child {
+	uint64_t ri_child_user_time;
+	uint64_t ri_child_system_time;
+	uint64_t ri_child_pkg_idle_wkups;
+	uint64_t ri_child_interrupt_wkups;
+	uint64_t ri_child_pageins;
+	uint64_t ri_child_elapsed_abstime;
+};
+
+struct	user64_rusage {
+	struct user64_timeval ru_utime;	/* user time used */
+	struct user64_timeval ru_stime;	/* system time used */
+	user64_long_t	ru_maxrss;		/* max resident set size */
+	user64_long_t	ru_ixrss;		/* integral shared memory size */
+	user64_long_t	ru_idrss;		/* integral unshared data " */
+	user64_long_t	ru_isrss;		/* integral unshared stack " */
+	user64_long_t	ru_minflt;		/* page reclaims */
+	user64_long_t	ru_majflt;		/* page faults */
+	user64_long_t	ru_nswap;		/* swaps */
+	user64_long_t	ru_inblock;		/* block input operations */
+	user64_long_t	ru_oublock;		/* block output operations */
+	user64_long_t	ru_msgsnd;		/* messages sent */
+	user64_long_t	ru_msgrcv;		/* messages received */
+	user64_long_t	ru_nsignals;	/* signals received */
+	user64_long_t	ru_nvcsw;		/* voluntary context switches */
+	user64_long_t	ru_nivcsw;		/* involuntary " */
+};
+
+struct	user32_rusage {
+	struct user32_timeval ru_utime;	/* user time used */
+	struct user32_timeval ru_stime;	/* system time used */
+	user32_long_t	ru_maxrss;		/* max resident set size */
+	user32_long_t	ru_ixrss;		/* integral shared memory size */
+	user32_long_t	ru_idrss;		/* integral unshared data " */
+	user32_long_t	ru_isrss;		/* integral unshared stack " */
+	user32_long_t	ru_minflt;		/* page reclaims */
+	user32_long_t	ru_majflt;		/* page faults */
+	user32_long_t	ru_nswap;		/* swaps */
+	user32_long_t	ru_inblock;		/* block input operations */
+	user32_long_t	ru_oublock;		/* block output operations */
+	user32_long_t	ru_msgsnd;		/* messages sent */
+	user32_long_t	ru_msgrcv;		/* messages received */
+	user32_long_t	ru_nsignals;	/* signals received */
+	user32_long_t	ru_nvcsw;		/* voluntary context switches */
+	user32_long_t	ru_nivcsw;		/* involuntary " */
+};
+
+#endif /* KERNEL */
 
 
 /*****
@@ -357,6 +433,9 @@ struct proc_rlimit_control_wakeupmon {
 
 /* I/O type */
 #define IOPOL_TYPE_DISK	0
+#if PRIVATE
+#define IOPOL_TYPE_VFS_HFS_CASE_SENSITIVITY 1
+#endif
 
 /* scope */
 #define IOPOL_SCOPE_PROCESS   0
@@ -375,9 +454,36 @@ struct proc_rlimit_control_wakeupmon {
 #define IOPOL_APPLICATION       IOPOL_STANDARD
 #define IOPOL_NORMAL            IOPOL_IMPORTANT
 
+#if PRIVATE
+#define IOPOL_VFS_HFS_CASE_SENSITIVITY_DEFAULT	0
+#define IOPOL_VFS_HFS_CASE_SENSITIVITY_FORCE_CASE_SENSITIVE	1
+#endif
+
+#ifdef PRIVATE
+/*
+ * Structures for use in communicating via iopolicysys() between Libc and the
+ * kernel.  Not to be used by user programs directly.
+ */
+
+/*
+ * the command to iopolicysys()
+ */
+#define	IOPOL_CMD_GET		0x00000001	/* Get I/O policy */
+#define	IOPOL_CMD_SET		0x00000002	/* Set I/O policy */
+
+/*
+ * Second parameter to iopolicysys()
+ */
+struct _iopol_param_t {
+	int iop_scope;	/* current process or a thread */
+	int iop_iotype;
+	int iop_policy;
+};
 
+#endif	/* PRIVATE */
 #endif /* __DARWIN_C_LEVEL >= __DARWIN_C_FULL */
 
+#ifndef KERNEL
 
 __BEGIN_DECLS
 int	getpriority(int, id_t);
@@ -393,4 +499,5 @@ int	setiopolicy_np(int, int, int) __OSX_AVAILABLE_STARTING(__MAC_10_5, __IPHONE_
 int	setrlimit(int, const struct rlimit *) __DARWIN_ALIAS(setrlimit);
 __END_DECLS
 
+#endif	/* !KERNEL */
 #endif	/* !_SYS_RESOURCE_H_ */
diff --git a/platform-include/sys/syscall.h b/platform-include/sys/syscall.h
index 8d59550b6..665988edc 100644
--- a/platform-include/sys/syscall.h
+++ b/platform-include/sys/syscall.h
@@ -29,7 +29,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from /SourceCache/xnu/xnu-2782.1.97/bsd/kern/syscalls.master
+ * created from /Library/Caches/com.apple.xbs/Sources/xnu/xnu-3248.40.184/bsd/kern/syscalls.master
  */
 
 #ifndef _SYS_SYSCALL_H_
@@ -215,8 +215,8 @@
 			/* 175  old gc_control */
 			/* 176  old add_profil */
 			/* 177  */
-			/* 178  */
-			/* 179  */
+#define	SYS_kdebug_trace_string 178
+#define	SYS_kdebug_trace64 179
 #define	SYS_kdebug_trace   180
 #define	SYS_setgid         181
 #define	SYS_setegid        182
@@ -411,7 +411,7 @@
 #define	SYS___old_semwait_signal_nocancel 371
 #define	SYS_thread_selfid  372
 #define	SYS_ledger         373
-			/* 374  */
+#define	SYS_kevent_qos     374
 			/* 375  */
 			/* 376  */
 			/* 377  */
@@ -428,11 +428,11 @@
 #define	SYS___mac_get_fd   388
 #define	SYS___mac_set_fd   389
 #define	SYS___mac_get_pid  390
-#define	SYS___mac_get_lcid 391
-#define	SYS___mac_get_lctx 392
-#define	SYS___mac_set_lctx 393
-#define	SYS_setlcid        394
-#define	SYS_getlcid        395
+			/* 391  */
+			/* 392  */
+			/* 393  */
+#define	SYS_pselect        394
+#define	SYS_pselect_nocancel 395
 #define	SYS_read_nocancel  396
 #define	SYS_write_nocancel 397
 #define	SYS_open_nocancel  398
@@ -482,7 +482,7 @@
 #define	SYS_guarded_close_np 442
 #define	SYS_guarded_kqueue_np 443
 #define	SYS_change_fdguard_np 444
-			/* 445  old __proc_suppress */
+#define	SYS_usrctl         445
 #define	SYS_proc_rlimit_control 446
 #define	SYS_connectx       447
 #define	SYS_disconnectx    448
@@ -527,7 +527,17 @@
 #define	SYS_guarded_writev_np 487
 #define	SYS_rename_ext     488
 #define	SYS_mremap_encrypted 489
-#define	SYS_MAXSYSCALL	490
+#define	SYS_netagent_trigger 490
+#define	SYS_stack_snapshot_with_config 491
+#define	SYS_microstackshot 492
+#define	SYS_grab_pgo_data  493
+#define	SYS_persona        494
+			/* 495  */
+			/* 496  */
+			/* 497  */
+			/* 498  */
+#define	SYS_work_interval_ctl 499
+#define	SYS_MAXSYSCALL	500
 
 #endif /* __APPLE_API_PRIVATE */
 #endif /* !_SYS_SYSCALL_H_ */
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 346359bf8..0cc0f2606 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,7 +17,6 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
 
 add_subdirectory(bootstrap_cmds)
 add_subdirectory(external/cctools-port/cctools/ld64/src)
-add_subdirectory(kernel)
 add_subdirectory(util)
 add_subdirectory(libmach-o)
 add_subdirectory(libdyld)
@@ -37,6 +36,9 @@ if (FRAMEWORK_APPKIT)
 endif (FRAMEWORK_APPKIT)
 add_subdirectory(IOKit)
 
+add_definitions(-target x86_64-apple-darwin11)
+include(darling_lib)
+
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/libc/include")
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/libm/Source")
 include_directories("${DARLING_TOP_DIRECTORY}/platform-include")
@@ -45,6 +47,7 @@ include_directories("${DARLING_TOP_DIRECTORY}/kernel-include")
 include_directories("${DARLING_TOP_DIRECTORY}/compiler-include")
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/duct/include")
 
+add_subdirectory(kernel)
 add_subdirectory(libc)
 add_subdirectory(libm)
 add_subdirectory(libgcc)
@@ -103,7 +106,7 @@ add_subdirectory(external/libauto)
 add_subdirectory(external/libarchive/libarchive)
 add_subdirectory(external/apr)
 add_subdirectory(external/corecrypto)
-add_subdirectory(external/security) # work in progress
+#add_subdirectory(external/security) # work in progress
 add_subdirectory(sandbox)
 add_subdirectory(Cocoa)
 add_subdirectory(external/file/file)
diff --git a/src/duct/src/CMakeLists.txt b/src/duct/src/CMakeLists.txt
index c8d5ed7e7..8b54fd744 100644
--- a/src/duct/src/CMakeLists.txt
+++ b/src/duct/src/CMakeLists.txt
@@ -16,13 +16,13 @@ add_definitions(-D__APPLE__ -D__DYNAMIC__)
 add_definitions(-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1080)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc -D__DARWIN_UNIX03 -fPIC -w")
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,--unresolved-symbols=ignore-all -Wl,--version-script=${DARLING_TOP_DIRECTORY}/darwin.map")
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib")
 
 SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling")
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
-add_library(system_duct SHARED commpage.c libnotify.c numcpus.c
+add_darling_library(system_duct SHARED commpage.c libnotify.c numcpus.c
 	CRGetCrashLogMessage.c acl.c bootstrap.c dyld.c dns_sd.c
 	sa_dst_compare.c asl.c)
 
diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt
index 3a7ba0970..4619f6966 100644
--- a/src/kernel/CMakeLists.txt
+++ b/src/kernel/CMakeLists.txt
@@ -9,15 +9,15 @@ endif(COMMAND cmake_policy)
 add_subdirectory(emulation/linux)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse -msse2 -msse3 -w -fblocks -ggdb")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__DARWIN_UNIX03 -fPIC -w -nostdinc")
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/darwin.map")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__DARWIN_UNIX03 -fPIC -w -nostdinc -Wl,-undefined,suppress -Wl,-flat_namespace")
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib")
 
 include_directories(${DARLING_TOP_DIRECTORY}/kernel-include)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 add_definitions(-DTARGET_OS_MAC=1)
 add_definitions(-DHAVE_STDINT_H=1)
-add_definitions(-D__APPLE__ -D__DYNAMIC__)
+add_definitions(-D__APPLE__ -D__DYNAMIC__ -DPRIVATE)
 
 add_subdirectory(libsyscall)
 add_subdirectory(mach_server/client)
@@ -26,7 +26,7 @@ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
-add_library(system_kernel SHARED
+add_darling_library(system_kernel SHARED
 	$<TARGET_OBJECTS:libsyscall>
 	#$<TARGET_OBJECTS:kqueue>
 	$<TARGET_OBJECTS:emulation>
diff --git a/src/kernel/emulation/linux/bsdthread/bsdthread_create.c b/src/kernel/emulation/linux/bsdthread/bsdthread_create.c
index b0c5ba1e8..1128a8fc3 100644
--- a/src/kernel/emulation/linux/bsdthread/bsdthread_create.c
+++ b/src/kernel/emulation/linux/bsdthread/bsdthread_create.c
@@ -93,7 +93,7 @@ int darling_thread_create(void** stack, void* entry_point, uintptr_t arg3,
 			"testl %0, %0\n" // if in parent thread, jump away
 			"jne 1f\n"
 			"subq $40, %%rsp\n" // protect what we have stored on stack
-			"call thread_self_trap@PLT\n" // get thread_self Mach port
+			"call _thread_self_trap\n" // get thread_self Mach port
 			"addq $40, %%rsp\n"
 			"movl %%eax, %%esi\n" // thread_self is 2nd arg to pthread_entry_point
 			"movq %%rsp, %%rdi\n" // pthread_self as 1st arg
diff --git a/src/kernel/emulation/linux/linux-syscall.S b/src/kernel/emulation/linux/linux-syscall.S
index 67d5301db..ff1580fb4 100644
--- a/src/kernel/emulation/linux/linux-syscall.S
+++ b/src/kernel/emulation/linux/linux-syscall.S
@@ -1,7 +1,7 @@
 .text
-.globl linux_syscall
+.globl _linux_syscall
 
-linux_syscall:
+_linux_syscall:
 
 #if defined(__x86_64__)
 
diff --git a/src/kernel/emulation/linux/signal/sig_restorer.S b/src/kernel/emulation/linux/signal/sig_restorer.S
index cdeb124be..3d66927a4 100644
--- a/src/kernel/emulation/linux/signal/sig_restorer.S
+++ b/src/kernel/emulation/linux/signal/sig_restorer.S
@@ -1,6 +1,6 @@
 .text
 .globl sig_restorer
-.hidden sig_restorer
+.private_extern sig_restorer
 
 #ifdef __x86_64__
 sig_restorer:
diff --git a/src/kernel/emulation/linux/syscalls-table.S b/src/kernel/emulation/linux/syscalls-table.S
index 3d0baea00..bcaa95ac7 100644
--- a/src/kernel/emulation/linux/syscalls-table.S
+++ b/src/kernel/emulation/linux/syscalls-table.S
@@ -4,7 +4,7 @@
 #if defined(__x86_64__)
 
 __darling_bsd_syscall:
-	movq    __bsd_syscall_table@GOTPCREL(%rip), %r10
+	movq    ___bsd_syscall_table@GOTPCREL(%rip), %r10
 	movq	(%r10,%rax,8), %r10
 	test	%r10, %r10
 	jz		.no_sys
@@ -18,7 +18,7 @@ __darling_bsd_syscall:
 	ret
 .no_sys:
 	movq	%rax, %rdi
-	call	__unknown_syscall@PLT
+	call	___unknown_syscall
 	ret
 
 #elif defined(__i386__)
@@ -33,7 +33,7 @@ __darling_bsd_syscall:
 	popl	%ecx
 .Ltmp0:
 	addl	$_GLOBAL_OFFSET_TABLE_+(.Ltmp0-.L0$pb), %ecx
-	movl	__bsd_syscall_table@GOT(%ecx), %ecx
+	movl	___bsd_syscall_table@GOT(%ecx), %ecx
 	andl	$0xffff, %eax // Because there is some extra stuff in upper bytes we don't need
 	movl	(%ecx,%eax,4), %eax
 	test	%eax, %eax
@@ -51,7 +51,7 @@ __darling_bsd_syscall:
 	ret
 .no_sys:
 	pushl	%ecx
-	call	__unknown_syscall@PLT
+	call	__unknown_syscall
 	addl	$4, %esp
 	ret
 
diff --git a/src/kernel/libsyscall/CMakeLists.txt b/src/kernel/libsyscall/CMakeLists.txt
index 09473b2c0..cefff2971 100644
--- a/src/kernel/libsyscall/CMakeLists.txt
+++ b/src/kernel/libsyscall/CMakeLists.txt
@@ -118,7 +118,7 @@ set(syscall_sources
 	${syscall_legacy_sources}
 
 	custom/errno.c
-	custom/var_errno.c
+	#custom/var_errno.c
 	
 	# MIG generated files
 	${CMAKE_CURRENT_BINARY_DIR}/mach/excUser.c
@@ -168,394 +168,401 @@ set(syscall_sources
 )
 if (BITS EQUAL 64)
 set (syscall_sources ${syscall_sources}
-	sys_x86-64/__accept_nocancel.S
-	sys_x86-64/__accept.S
-	sys_x86-64/__access_extended.S
-	sys_x86-64/access.S
-	sys_x86-64/acct.S
-	sys_x86-64/adjtime.S
-	sys_x86-64/aio_cancel.S
-	sys_x86-64/aio_error.S
-	sys_x86-64/aio_fsync.S
-	sys_x86-64/aio_read.S
-	sys_x86-64/aio_return.S
-	sys_x86-64/__aio_suspend_nocancel.S
-	sys_x86-64/aio_suspend.S
-	sys_x86-64/aio_write.S
-	sys_x86-64/auditctl.S
-	sys_x86-64/auditon.S
-	sys_x86-64/audit.S
-	sys_x86-64/audit_session_join.S
-	sys_x86-64/audit_session_port.S
-	sys_x86-64/audit_session_self.S
-	sys_x86-64/__bind.S
-	sys_x86-64/__bsdthread_create.S
-	sys_x86-64/__bsdthread_ctl.S
-	sys_x86-64/__bsdthread_register.S
-	sys_x86-64/__bsdthread_terminate.S
-	sys_x86-64/change_fdguard_np.S
-	sys_x86-64/chdir.S
-	sys_x86-64/chflags.S
-	sys_x86-64/__chmod_extended.S
-	sys_x86-64/__chmod.S
-	sys_x86-64/chown.S
-	sys_x86-64/chroot.S
-	sys_x86-64/__chud.S
-	sys_x86-64/__close_nocancel.S
-	sys_x86-64/close.S
-	sys_x86-64/__coalition_info.S
-	sys_x86-64/__coalition.S
-	sys_x86-64/__connect_nocancel.S
-	sys_x86-64/__connect.S
-	sys_x86-64/connectx.S
-	sys_x86-64/__copyfile.S
-	sys_x86-64/csops_audittoken.S
-	sys_x86-64/csops.S
-	sys_x86-64/__csrctl.S
+	sys_x86-64/___accept_nocancel.S                                                                                                                                                                                                              
+	sys_x86-64/___accept.S
+	sys_x86-64/___access_extended.S
+	sys_x86-64/_access.S
+	sys_x86-64/_acct.S
+	sys_x86-64/_adjtime.S
+	sys_x86-64/_aio_cancel.S
+	sys_x86-64/_aio_error.S
+	sys_x86-64/_aio_fsync.S
+	sys_x86-64/_aio_read.S
+	sys_x86-64/_aio_return.S
+	sys_x86-64/___aio_suspend_nocancel.S
+	sys_x86-64/_aio_suspend.S
+	sys_x86-64/_aio_write.S
+	sys_x86-64/_auditctl.S
+	sys_x86-64/_auditon.S
+	sys_x86-64/_audit.S
+	sys_x86-64/_audit_session_join.S
+	sys_x86-64/_audit_session_port.S
+	sys_x86-64/_audit_session_self.S
+	sys_x86-64/___bind.S
+	sys_x86-64/___bsdthread_create.S
+	sys_x86-64/___bsdthread_ctl.S
+	sys_x86-64/___bsdthread_register.S
+	sys_x86-64/___bsdthread_terminate.S
+	sys_x86-64/___close_nocancel.S
+	sys_x86-64/_close.S
+	sys_x86-64/___coalition_info.S
+	sys_x86-64/___coalition.S
+	sys_x86-64/___connect_nocancel.S
+	sys_x86-64/___connect.S
+	sys_x86-64/_connectx.S
+	sys_x86-64/___copyfile.S
+	sys_x86-64/_csops_audittoken.S
+	sys_x86-64/_csops.S
+	sys_x86-64/___csrctl.S
 	sys_x86-64/custom.S
-	sys_x86-64/__delete.S
-	sys_x86-64/__disable_threadsignal.S
-	sys_x86-64/disconnectx.S
-	sys_x86-64/dup2.S
-	sys_x86-64/dup.S
-	sys_x86-64/exchangedata.S
-	sys_x86-64/execve.S
-	sys_x86-64/__exit.S
-	sys_x86-64/faccessat.S
-	sys_x86-64/fchdir.S
-	sys_x86-64/fchflags.S
-	sys_x86-64/fchmodat.S
-	sys_x86-64/__fchmod_extended.S
-	sys_x86-64/__fchmod.S
-	sys_x86-64/fchownat.S
-	sys_x86-64/fchown.S
-	sys_x86-64/__fcntl_nocancel.S
-	sys_x86-64/__fcntl.S
-	sys_x86-64/fdatasync.S
-	sys_x86-64/ffsctl.S
-	sys_x86-64/fgetattrlist.S
-	sys_x86-64/fgetxattr.S
-	sys_x86-64/fhopen.S
-	sys_x86-64/fileport_makefd.S
-	sys_x86-64/fileport_makeport.S
-	sys_x86-64/flistxattr.S
-	sys_x86-64/flock.S
-	sys_x86-64/__fork.S
-	sys_x86-64/fpathconf.S
-	sys_x86-64/fremovexattr.S
-	sys_x86-64/fsctl.S
-	sys_x86-64/fsetattrlist.S
-	sys_x86-64/fsetxattr.S
-	sys_x86-64/__fsgetpath.S
-	sys_x86-64/__fstat64_extended.S
-	sys_x86-64/fstat64.S
-	sys_x86-64/fstatat64.S
-	sys_x86-64/fstatat.S
-	sys_x86-64/__fstat_extended.S
-	sys_x86-64/fstatfs64.S
-	sys_x86-64/fstatfs.S
-	sys_x86-64/fstat.S
-	sys_x86-64/__fsync_nocancel.S
-	sys_x86-64/fsync.S
-	sys_x86-64/ftruncate.S
-	sys_x86-64/futimes.S
-	sys_x86-64/getattrlistat.S
-	sys_x86-64/getattrlistbulk.S
-	sys_x86-64/__getattrlist.S
-	sys_x86-64/getaudit_addr.S
-	sys_x86-64/getauid.S
-	sys_x86-64/__getdirentries64.S
-	sys_x86-64/getdirentriesattr.S
-	sys_x86-64/getdirentries.S
-	sys_x86-64/getdtablesize.S
-	sys_x86-64/getegid.S
-	sys_x86-64/geteuid.S
-	sys_x86-64/getfh.S
-	sys_x86-64/getfsstat64.S
-	sys_x86-64/getfsstat.S
-	sys_x86-64/getgid.S
-	sys_x86-64/getgroups.S
-	sys_x86-64/__gethostuuid.S
-	sys_x86-64/getitimer.S
-	sys_x86-64/__getlcid.S
-	sys_x86-64/__getlogin.S
-	sys_x86-64/__getpeername.S
-	sys_x86-64/getpgid.S
-	sys_x86-64/getpgrp.S
-	sys_x86-64/__getpid.S
-	sys_x86-64/getppid.S
-	sys_x86-64/getpriority.S
-	sys_x86-64/__getrlimit.S
-	sys_x86-64/getrusage.S
-	sys_x86-64/__getsgroups.S
-	sys_x86-64/getsid.S
-	sys_x86-64/__getsockname.S
-	sys_x86-64/getsockopt.S
-	sys_x86-64/__gettid.S
-	sys_x86-64/__gettimeofday.S
-	sys_x86-64/getuid.S
-	sys_x86-64/__getwgroups.S
-	sys_x86-64/getxattr.S
-	sys_x86-64/guarded_close_np.S
-	sys_x86-64/guarded_kqueue_np.S
-	sys_x86-64/__guarded_open_dprotected_np.S
-	sys_x86-64/__guarded_open_np.S
-	sys_x86-64/guarded_pwrite_np.S
-	sys_x86-64/guarded_write_np.S
-	sys_x86-64/guarded_writev_np.S
-	sys_x86-64/__identitysvc.S
-	sys_x86-64/__initgroups.S
-	sys_x86-64/__ioctl.S
-	sys_x86-64/__iopolicysys.S
-	sys_x86-64/issetugid.S
-	sys_x86-64/kas_info.S
-	sys_x86-64/__kdebug_trace.S
-	#sys_x86-64/kevent64.S
-	#sys_x86-64/kevent.S
-	sys_x86-64/__kill.S
-	#sys_x86-64/kqueue.S
-	sys_x86-64/__lchown.S
-	sys_x86-64/ledger.S
-	sys_x86-64/linkat.S
-	sys_x86-64/link.S
-	sys_x86-64/lio_listio.S
-	sys_x86-64/__listen.S
-	sys_x86-64/listxattr.S
-	sys_x86-64/__lseek.S
-	sys_x86-64/__lstat64_extended.S
-	sys_x86-64/lstat64.S
-	sys_x86-64/__lstat_extended.S
-	sys_x86-64/lstat.S
-	sys_x86-64/__mac_execve.S
-	sys_x86-64/__mac_get_fd.S
-	sys_x86-64/__mac_get_file.S
-	sys_x86-64/__mac_getfsstat.S
-	sys_x86-64/__mac_get_lcid.S
-	sys_x86-64/__mac_get_lctx.S
-	sys_x86-64/__mac_get_link.S
-	sys_x86-64/__mac_get_mount.S
-	sys_x86-64/__mac_get_pid.S
-	sys_x86-64/__mac_get_proc.S
-	sys_x86-64/__mac_mount.S
-	sys_x86-64/__mac_set_fd.S
-	sys_x86-64/__mac_set_file.S
-	sys_x86-64/__mac_set_lctx.S
-	sys_x86-64/__mac_set_link.S
-	sys_x86-64/__mac_set_proc.S
-	sys_x86-64/__mac_syscall.S
-	sys_x86-64/madvise.S
-	sys_x86-64/memorystatus_control.S
-	sys_x86-64/memorystatus_get_level.S
-	sys_x86-64/mincore.S
-	sys_x86-64/minherit.S
-	sys_x86-64/mkdirat.S
-	sys_x86-64/__mkdir_extended.S
-	sys_x86-64/mkdir.S
-	sys_x86-64/__mkfifo_extended.S
-	sys_x86-64/mkfifo.S
-	sys_x86-64/mknod.S
-	sys_x86-64/mlockall.S
-	sys_x86-64/mlock.S
-	sys_x86-64/__mmap.S
-	sys_x86-64/modwatch.S
-	sys_x86-64/mount.S
-	sys_x86-64/__mprotect.S
-	sys_x86-64/mremap_encrypted.S
-	sys_x86-64/__msgctl.S
-	sys_x86-64/msgget.S
-	sys_x86-64/__msgrcv_nocancel.S
-	sys_x86-64/msgrcv.S
-	sys_x86-64/__msgsnd_nocancel.S
-	sys_x86-64/msgsnd.S
-	sys_x86-64/__msgsys.S
-	sys_x86-64/__msync_nocancel.S
-	sys_x86-64/__msync.S
-	sys_x86-64/munlockall.S
-	sys_x86-64/munlock.S
-	sys_x86-64/__munmap.S
-	sys_x86-64/necp_match_policy.S
-	sys_x86-64/nfsclnt.S
-	sys_x86-64/nfssvc.S
-	sys_x86-64/____old_semwait_signal_nocancel.S
-	sys_x86-64/__old_semwait_signal.S
-	sys_x86-64/__openat_nocancel.S
-	sys_x86-64/__openat.S
-	sys_x86-64/openbyid_np.S
-	sys_x86-64/__open_dprotected_np.S
-	sys_x86-64/__open_extended.S
-	sys_x86-64/__open_nocancel.S
-	sys_x86-64/__open.S
-	sys_x86-64/pathconf.S
-	sys_x86-64/peeloff.S
-	sys_x86-64/pid_resume.S
-	sys_x86-64/pid_suspend.S
-	sys_x86-64/__pipe.S
-	sys_x86-64/__poll_nocancel.S
-	sys_x86-64/poll.S
-	sys_x86-64/__posix_spawn.S
-	sys_x86-64/__pread_nocancel.S
-	sys_x86-64/pread.S
-	sys_x86-64/__process_policy.S
-	sys_x86-64/__proc_info.S
-	sys_x86-64/proc_rlimit_control.S
-	sys_x86-64/proc_trace_log.S
-	sys_x86-64/proc_uuid_policy.S
-	sys_x86-64/__psynch_cvbroad.S
-	sys_x86-64/__psynch_cvclrprepost.S
-	sys_x86-64/__psynch_cvsignal.S
-	sys_x86-64/__psynch_cvwait.S
-	sys_x86-64/__psynch_mutexdrop.S
-	sys_x86-64/__psynch_mutexwait.S
-	sys_x86-64/__psynch_rw_downgrade.S
-	sys_x86-64/__psynch_rw_longrdlock.S
-	sys_x86-64/__psynch_rw_rdlock.S
-	sys_x86-64/__psynch_rw_unlock2.S
-	sys_x86-64/__psynch_rw_unlock.S
-	sys_x86-64/__psynch_rw_upgrade.S
-	sys_x86-64/__psynch_rw_wrlock.S
-	sys_x86-64/__psynch_rw_yieldwrlock.S
-	sys_x86-64/__pthread_canceled.S
-	sys_x86-64/__pthread_chdir.S
-	sys_x86-64/__pthread_fchdir.S
-	sys_x86-64/__pthread_kill.S
-	sys_x86-64/__pthread_markcancel.S
-	sys_x86-64/__pthread_sigmask.S
-	sys_x86-64/__ptrace.S
-	sys_x86-64/__pwrite_nocancel.S
-	sys_x86-64/pwrite.S
-	sys_x86-64/quotactl.S
-	sys_x86-64/quota.S
-	sys_x86-64/readlinkat.S
-	sys_x86-64/readlink.S
-	sys_x86-64/__read_nocancel.S
-	sys_x86-64/read.S
-	sys_x86-64/__readv_nocancel.S
-	sys_x86-64/readv.S
-	sys_x86-64/reboot.S
-	sys_x86-64/__recvfrom_nocancel.S
-	sys_x86-64/__recvfrom.S
-	sys_x86-64/__recvmsg_nocancel.S
-	sys_x86-64/__recvmsg.S
-	sys_x86-64/recvmsg_x.S
-	sys_x86-64/removexattr.S
-	sys_x86-64/__renameat.S
-	sys_x86-64/__rename_ext.S
-	sys_x86-64/__rename.S
-	sys_x86-64/revoke.S
-	sys_x86-64/__rmdir.S
-	sys_x86-64/searchfs.S
-	sys_x86-64/__select_nocancel.S
-	sys_x86-64/__select.S
-	sys_x86-64/sem_close.S
-	sys_x86-64/__semctl.S
-	sys_x86-64/semget.S
-	sys_x86-64/__sem_open.S
-	sys_x86-64/semop.S
-	sys_x86-64/sem_post.S
-	sys_x86-64/__semsys.S
-	sys_x86-64/sem_trywait.S
-	sys_x86-64/sem_unlink.S
-	sys_x86-64/__sem_wait_nocancel.S
-	sys_x86-64/sem_wait.S
-	sys_x86-64/__semwait_signal_nocancel.S
-	sys_x86-64/__semwait_signal.S
-	sys_x86-64/sendfile.S
-	sys_x86-64/__sendmsg_nocancel.S
-	sys_x86-64/__sendmsg.S
-	sys_x86-64/sendmsg_x.S
-	sys_x86-64/__sendto_nocancel.S
-	sys_x86-64/__sendto.S
-	sys_x86-64/__setattrlist.S
-	sys_x86-64/setaudit_addr.S
-	sys_x86-64/setauid.S
-	sys_x86-64/setegid.S
-	sys_x86-64/seteuid.S
-	sys_x86-64/setgid.S
-	sys_x86-64/setgroups.S
-	sys_x86-64/setitimer.S
-	sys_x86-64/__setlcid.S
-	sys_x86-64/__setlogin.S
-	sys_x86-64/setpgid.S
-	sys_x86-64/__setpriority.S
-	sys_x86-64/setprivexec.S
-	sys_x86-64/setquota.S
-	sys_x86-64/__setregid.S
-	sys_x86-64/__setreuid.S
-	sys_x86-64/__setrlimit.S
-	sys_x86-64/__setsgroups.S
-	sys_x86-64/setsid.S
-	sys_x86-64/setsockopt.S
-	sys_x86-64/__settid.S
-	sys_x86-64/__settid_with_pid.S
-	sys_x86-64/__settimeofday.S
-	sys_x86-64/setuid.S
-	sys_x86-64/__setwgroups.S
-	sys_x86-64/setxattr.S
-	sys_x86-64/__sfi_ctl.S
-	sys_x86-64/__sfi_pidctl.S
-	sys_x86-64/__shared_region_check_np.S
-	sys_x86-64/__shared_region_map_and_slide_np.S
-	sys_x86-64/shmat.S
-	sys_x86-64/__shmctl.S
-	sys_x86-64/shmdt.S
-	sys_x86-64/shmget.S
-	sys_x86-64/__shm_open.S
-	sys_x86-64/__shmsys.S
-	sys_x86-64/shm_unlink.S
-	sys_x86-64/shutdown.S
-	sys_x86-64/__sigaction.S
-	sys_x86-64/__sigaltstack.S
-	sys_x86-64/sigpending.S
-	sys_x86-64/sigprocmask.S
-	sys_x86-64/__sigreturn.S
-	sys_x86-64/__sigsuspend_nocancel.S
-	sys_x86-64/__sigsuspend.S
-	sys_x86-64/____sigwait_nocancel.S
-	sys_x86-64/__sigwait.S
-	sys_x86-64/socket_delegate.S
-	sys_x86-64/__socketpair.S
-	sys_x86-64/socket.S
-	sys_x86-64/__stack_snapshot.S
-	sys_x86-64/__stat64_extended.S
-	sys_x86-64/stat64.S
-	sys_x86-64/__stat_extended.S
-	sys_x86-64/statfs64.S
-	sys_x86-64/statfs.S
-	sys_x86-64/stat.S
-	sys_x86-64/swapon.S
-	sys_x86-64/symlinkat.S
-	sys_x86-64/symlink.S
-	sys_x86-64/sync.S
-	sys_x86-64/__syscall.S
-	sys_x86-64/__sysctlbyname.S
-	sys_x86-64/__sysctl.S
-	sys_x86-64/system_override.S
-	sys_x86-64/__telemetry.S
-	sys_x86-64/__thread_selfid.S
-	sys_x86-64/__thread_selfusage.S
-	sys_x86-64/truncate.S
-	sys_x86-64/__umask_extended.S
-	sys_x86-64/umask.S
-	sys_x86-64/undelete.S
-	sys_x86-64/__unlinkat.S
-	sys_x86-64/__unlink.S
-	sys_x86-64/unmount.S
-	sys_x86-64/utimes.S
-	sys_x86-64/__vfork.S
-	sys_x86-64/vfs_purge.S
-	sys_x86-64/vm_pressure_monitor.S
-	sys_x86-64/__wait4_nocancel.S
-	sys_x86-64/__wait4.S
-	sys_x86-64/waitevent.S
-	sys_x86-64/__waitid_nocancel.S
-	sys_x86-64/waitid.S
-	sys_x86-64/watchevent.S
-	sys_x86-64/__workq_kernreturn.S
-	sys_x86-64/__workq_open.S
-	sys_x86-64/__write_nocancel.S
-	sys_x86-64/write.S
-	sys_x86-64/__writev_nocancel.S
-	sys_x86-64/writev.S
+	sys_x86-64/___delete.S
+	sys_x86-64/___disable_threadsignal.S
+	sys_x86-64/_disconnectx.S
+	sys_x86-64/_dup.S
+	sys_x86-64/_dup2.S
+	sys_x86-64/_execve.S
+	sys_x86-64/_exchangedata.S
+	sys_x86-64/___exit.S
+	sys_x86-64/_faccessat.S
+	sys_x86-64/___fcntl_nocancel.S
+	sys_x86-64/___fcntl.S
+	sys_x86-64/_fdatasync.S
+	sys_x86-64/_ffsctl.S
+	sys_x86-64/_fgetattrlist.S
+	sys_x86-64/_fgetxattr.S
+	sys_x86-64/_fhopen.S
+	sys_x86-64/_fchdir.S
+	sys_x86-64/_fchflags.S
+	sys_x86-64/_fchmodat.S
+	sys_x86-64/___fchmod_extended.S
+	sys_x86-64/___fchmod.S
+	sys_x86-64/_fchownat.S
+	sys_x86-64/_fchown.S
+	sys_x86-64/_fileport_makefd.S
+	sys_x86-64/_fileport_makeport.S
+	sys_x86-64/_flistxattr.S
+	sys_x86-64/_flock.S
+	sys_x86-64/___fork.S
+	sys_x86-64/_fpathconf.S
+	sys_x86-64/_fremovexattr.S
+	sys_x86-64/_fsctl.S
+	sys_x86-64/_fsetattrlist.S
+	sys_x86-64/_fsetxattr.S
+	sys_x86-64/___fsgetpath.S
+	sys_x86-64/_fstatat.S
+	sys_x86-64/_fstatat64.S
+	sys_x86-64/___fstat_extended.S
+	sys_x86-64/_fstatfs.S
+	sys_x86-64/_fstatfs64.S
+	sys_x86-64/_fstat.S
+	sys_x86-64/___fstat64_extended.S
+	sys_x86-64/_fstat64.S
+	sys_x86-64/___fsync_nocancel.S
+	sys_x86-64/_fsync.S
+	sys_x86-64/_ftruncate.S
+	sys_x86-64/_futimes.S
+	sys_x86-64/_getattrlistat.S
+	sys_x86-64/_getattrlistbulk.S
+	sys_x86-64/___getattrlist.S
+	sys_x86-64/_getaudit_addr.S
+	sys_x86-64/_getauid.S
+	sys_x86-64/_getdirentriesattr.S
+	sys_x86-64/_getdirentries.S
+	sys_x86-64/___getdirentries64.S
+	sys_x86-64/_getdtablesize.S
+	sys_x86-64/_getegid.S
+	sys_x86-64/_geteuid.S
+	sys_x86-64/_getfh.S
+	sys_x86-64/_getfsstat.S
+	sys_x86-64/_getfsstat64.S
+	sys_x86-64/_getgid.S
+	sys_x86-64/_getgroups.S
+	sys_x86-64/___gethostuuid.S
+	sys_x86-64/_getitimer.S
+	sys_x86-64/___getlogin.S
+	sys_x86-64/___getpeername.S
+	sys_x86-64/_getpgid.S
+	sys_x86-64/_getpgrp.S
+	sys_x86-64/___getpid.S
+	sys_x86-64/_getppid.S
+	sys_x86-64/_getpriority.S
+	sys_x86-64/___getrlimit.S
+	sys_x86-64/_getrusage.S
+	sys_x86-64/___getsgroups.S
+	sys_x86-64/_getsid.S
+	sys_x86-64/___getsockname.S
+	sys_x86-64/_getsockopt.S
+	sys_x86-64/___gettid.S
+	sys_x86-64/___gettimeofday.S
+	sys_x86-64/_getuid.S
+	sys_x86-64/___getwgroups.S
+	sys_x86-64/_getxattr.S
+	sys_x86-64/_grab_pgo_data.S
+	sys_x86-64/_guarded_close_np.S
+	sys_x86-64/_guarded_kqueue_np.S
+	sys_x86-64/___guarded_open_dprotected_np.S
+	sys_x86-64/___guarded_open_np.S
+	sys_x86-64/_guarded_pwrite_np.S
+	sys_x86-64/_guarded_write_np.S
+	sys_x86-64/_guarded_writev_np.S
+	sys_x86-64/_change_fdguard_np.S
+	sys_x86-64/_chdir.S
+	sys_x86-64/_chflags.S
+	sys_x86-64/___chmod_extended.S
+	sys_x86-64/___chmod.S
+	sys_x86-64/_chown.S
+	sys_x86-64/_chroot.S
+	sys_x86-64/___chud.S
+	sys_x86-64/___identitysvc.S
+	sys_x86-64/___initgroups.S
+	sys_x86-64/___ioctl.S
+	sys_x86-64/___iopolicysys.S
+	sys_x86-64/_issetugid.S
+	sys_x86-64/_kas_info.S
+	sys_x86-64/___kdebug_trace.S
+	sys_x86-64/___kdebug_trace_string.S
+	sys_x86-64/___kdebug_trace64.S
+	#sys_x86-64/_kevent_qos.S
+	#sys_x86-64/_kevent.S
+	#sys_x86-64/_kevent64.S
+	sys_x86-64/___kill.S
+	#sys_x86-64/_kqueue.S
+	sys_x86-64/_ledger.S
+	sys_x86-64/___lchown.S
+	sys_x86-64/_linkat.S
+	sys_x86-64/_link.S
+	sys_x86-64/_lio_listio.S
+	sys_x86-64/___listen.S
+	sys_x86-64/_listxattr.S
+	sys_x86-64/___lseek.S
+	sys_x86-64/___lstat_extended.S
+	sys_x86-64/_lstat.S
+	sys_x86-64/___lstat64_extended.S
+	sys_x86-64/_lstat64.S
+	sys_x86-64/___mac_execve.S
+	sys_x86-64/___mac_get_fd.S
+	sys_x86-64/___mac_get_file.S
+	sys_x86-64/___mac_getfsstat.S
+	sys_x86-64/___mac_get_link.S
+	sys_x86-64/___mac_get_mount.S
+	sys_x86-64/___mac_get_pid.S
+	sys_x86-64/___mac_get_proc.S
+	sys_x86-64/___mac_mount.S
+	sys_x86-64/___mac_set_fd.S
+	sys_x86-64/___mac_set_file.S
+	sys_x86-64/___mac_set_link.S
+	sys_x86-64/___mac_set_proc.S
+	sys_x86-64/___mac_syscall.S
+	sys_x86-64/_madvise.S
+	sys_x86-64/_memorystatus_control.S
+	sys_x86-64/_memorystatus_get_level.S
+	sys_x86-64/___microstackshot.S
+	sys_x86-64/_mincore.S
+	sys_x86-64/_minherit.S
+	sys_x86-64/_mkdirat.S
+	sys_x86-64/___mkdir_extended.S
+	sys_x86-64/_mkdir.S
+	sys_x86-64/___mkfifo_extended.S
+	sys_x86-64/_mkfifo.S
+	sys_x86-64/_mknod.S
+	sys_x86-64/_mlockall.S
+	sys_x86-64/_mlock.S
+	sys_x86-64/___mmap.S
+	sys_x86-64/_modwatch.S
+	sys_x86-64/_mount.S
+	sys_x86-64/___mprotect.S
+	sys_x86-64/_mremap_encrypted.S
+	sys_x86-64/___msgctl.S
+	sys_x86-64/_msgget.S
+	sys_x86-64/___msgrcv_nocancel.S
+	sys_x86-64/_msgrcv.S
+	sys_x86-64/___msgsnd_nocancel.S
+	sys_x86-64/_msgsnd.S
+	sys_x86-64/___msgsys.S
+	sys_x86-64/___msync_nocancel.S
+	sys_x86-64/___msync.S
+	sys_x86-64/_munlockall.S
+	sys_x86-64/_munlock.S
+	sys_x86-64/___munmap.S
+	sys_x86-64/_necp_match_policy.S
+	sys_x86-64/_netagent_trigger.S
+	sys_x86-64/_nfsclnt.S
+	sys_x86-64/_nfssvc.S
+	sys_x86-64/_____old_semwait_signal_nocancel.S
+	sys_x86-64/___old_semwait_signal.S
+	sys_x86-64/___openat_nocancel.S
+	sys_x86-64/___openat.S
+	sys_x86-64/_openbyid_np.S
+	sys_x86-64/___open_dprotected_np.S
+	sys_x86-64/___open_extended.S
+	sys_x86-64/___open_nocancel.S
+	sys_x86-64/___open.S
+	sys_x86-64/_pathconf.S
+	sys_x86-64/_peeloff.S
+	sys_x86-64/___persona.S
+	sys_x86-64/_pid_resume.S
+	sys_x86-64/_pid_suspend.S
+	sys_x86-64/___pipe.S
+	sys_x86-64/___poll_nocancel.S
+	sys_x86-64/_poll.S
+	sys_x86-64/___posix_spawn.S
+	sys_x86-64/___pread_nocancel.S
+	sys_x86-64/_pread.S
+	sys_x86-64/___process_policy.S
+	sys_x86-64/___proc_info.S
+	sys_x86-64/_proc_rlimit_control.S
+	sys_x86-64/_proc_trace_log.S
+	sys_x86-64/_proc_uuid_policy.S
+	sys_x86-64/___pselect_nocancel.S
+	sys_x86-64/___pselect.S
+	sys_x86-64/___psynch_cvbroad.S
+	sys_x86-64/___psynch_cvclrprepost.S
+	sys_x86-64/___psynch_cvsignal.S
+	sys_x86-64/___psynch_cvwait.S
+	sys_x86-64/___psynch_mutexdrop.S
+	sys_x86-64/___psynch_mutexwait.S
+	sys_x86-64/___psynch_rw_downgrade.S
+	sys_x86-64/___psynch_rw_longrdlock.S
+	sys_x86-64/___psynch_rw_rdlock.S
+	sys_x86-64/___psynch_rw_unlock.S
+	sys_x86-64/___psynch_rw_unlock2.S
+	sys_x86-64/___psynch_rw_upgrade.S
+	sys_x86-64/___psynch_rw_wrlock.S
+	sys_x86-64/___psynch_rw_yieldwrlock.S
+	sys_x86-64/___pthread_canceled.S
+	sys_x86-64/___pthread_fchdir.S
+	sys_x86-64/___pthread_chdir.S
+	sys_x86-64/___pthread_kill.S
+	sys_x86-64/___pthread_markcancel.S
+	sys_x86-64/___pthread_sigmask.S
+	sys_x86-64/___ptrace.S
+	sys_x86-64/___pwrite_nocancel.S
+	sys_x86-64/_pwrite.S
+	sys_x86-64/_quotactl.S
+	sys_x86-64/_quota.S
+	sys_x86-64/_readlinkat.S
+	sys_x86-64/_readlink.S
+	sys_x86-64/___read_nocancel.S
+	sys_x86-64/_read.S
+	sys_x86-64/___readv_nocancel.S
+	sys_x86-64/_readv.S
+	sys_x86-64/_reboot.S
+	sys_x86-64/___recvfrom_nocancel.S
+	sys_x86-64/___recvfrom.S
+	sys_x86-64/___recvmsg_nocancel.S
+	sys_x86-64/___recvmsg.S
+	sys_x86-64/_recvmsg_x.S
+	sys_x86-64/_removexattr.S
+	sys_x86-64/___renameat.S
+	sys_x86-64/___rename_ext.S
+	sys_x86-64/___rename.S
+	sys_x86-64/_revoke.S
+	sys_x86-64/___rmdir.S
+	sys_x86-64/_searchfs.S
+	sys_x86-64/___select_nocancel.S
+	sys_x86-64/___select.S
+	sys_x86-64/_sem_close.S
+	sys_x86-64/___semctl.S
+	sys_x86-64/_semget.S
+	sys_x86-64/___sem_open.S
+	sys_x86-64/_semop.S
+	sys_x86-64/_sem_post.S
+	sys_x86-64/___semsys.S
+	sys_x86-64/_sem_trywait.S
+	sys_x86-64/_sem_unlink.S
+	sys_x86-64/___sem_wait_nocancel.S
+	sys_x86-64/_sem_wait.S
+	sys_x86-64/___semwait_signal_nocancel.S
+	sys_x86-64/___semwait_signal.S
+	sys_x86-64/_sendfile.S
+	sys_x86-64/___sendmsg_nocancel.S
+	sys_x86-64/___sendmsg.S
+	sys_x86-64/_sendmsg_x.S
+	sys_x86-64/___sendto_nocancel.S
+	sys_x86-64/___sendto.S
+	sys_x86-64/___setattrlist.S
+	sys_x86-64/_setaudit_addr.S
+	sys_x86-64/_setauid.S
+	sys_x86-64/_setegid.S
+	sys_x86-64/_seteuid.S
+	sys_x86-64/_setgid.S
+	sys_x86-64/_setgroups.S
+	sys_x86-64/_setitimer.S
+	sys_x86-64/___setlogin.S
+	sys_x86-64/_setpgid.S
+	sys_x86-64/___setpriority.S
+	sys_x86-64/_setprivexec.S
+	sys_x86-64/_setquota.S
+	sys_x86-64/___setregid.S
+	sys_x86-64/___setreuid.S
+	sys_x86-64/___setrlimit.S
+	sys_x86-64/___setsgroups.S
+	sys_x86-64/_setsid.S
+	sys_x86-64/_setsockopt.S
+	sys_x86-64/___settid.S
+	sys_x86-64/___settid_with_pid.S
+	sys_x86-64/___settimeofday.S
+	sys_x86-64/_setuid.S
+	sys_x86-64/___setwgroups.S
+	sys_x86-64/_setxattr.S
+	sys_x86-64/___sfi_ctl.S
+	sys_x86-64/___sfi_pidctl.S
+	sys_x86-64/___shared_region_check_np.S
+	sys_x86-64/___shared_region_map_and_slide_np.S
+	sys_x86-64/_shmat.S
+	sys_x86-64/___shmctl.S
+	sys_x86-64/_shmdt.S
+	sys_x86-64/_shmget.S
+	sys_x86-64/___shm_open.S
+	sys_x86-64/___shmsys.S
+	sys_x86-64/_shm_unlink.S
+	sys_x86-64/_shutdown.S
+	sys_x86-64/___sigaction.S
+	sys_x86-64/___sigaltstack.S
+	sys_x86-64/_sigpending.S
+	sys_x86-64/_sigprocmask.S
+	sys_x86-64/___sigreturn.S
+	sys_x86-64/___sigsuspend_nocancel.S
+	sys_x86-64/___sigsuspend.S
+	sys_x86-64/_____sigwait_nocancel.S
+	sys_x86-64/___sigwait.S
+	sys_x86-64/_socket_delegate.S
+	sys_x86-64/___socketpair.S
+	sys_x86-64/_socket.S
+	sys_x86-64/___stack_snapshot.S
+	sys_x86-64/___stack_snapshot_with_config.S
+	sys_x86-64/___stat_extended.S
+	sys_x86-64/_statfs.S
+	sys_x86-64/_statfs64.S
+	sys_x86-64/_stat.S
+	sys_x86-64/___stat64_extended.S
+	sys_x86-64/_stat64.S
+	sys_x86-64/_swapon.S
+	sys_x86-64/_symlinkat.S
+	sys_x86-64/_symlink.S
+	sys_x86-64/_sync.S
+	sys_x86-64/___syscall.S
+	sys_x86-64/___sysctlbyname.S
+	sys_x86-64/___sysctl.S
+	sys_x86-64/_system_override.S
+	sys_x86-64/___telemetry.S
+	sys_x86-64/___thread_selfid.S
+	sys_x86-64/___thread_selfusage.S
+	sys_x86-64/_truncate.S
+	sys_x86-64/___umask_extended.S
+	sys_x86-64/_umask.S
+	sys_x86-64/_undelete.S
+	sys_x86-64/___unlinkat.S
+	sys_x86-64/___unlink.S
+	sys_x86-64/_unmount.S
+	sys_x86-64/_usrctl.S
+	sys_x86-64/_utimes.S
+	sys_x86-64/___vfork.S
+	sys_x86-64/_vfs_purge.S
+	sys_x86-64/_vm_pressure_monitor.S
+	sys_x86-64/_waitevent.S
+	sys_x86-64/___waitid_nocancel.S
+	sys_x86-64/_waitid.S
+	sys_x86-64/___wait4_nocancel.S
+	sys_x86-64/___wait4.S
+	sys_x86-64/_watchevent.S
+	sys_x86-64/___work_interval_ctl.S
+	sys_x86-64/___workq_kernreturn.S
+	sys_x86-64/___workq_open.S
+	sys_x86-64/___write_nocancel.S
+	sys_x86-64/_write.S
+	sys_x86-64/___writev_nocancel.S
+	sys_x86-64/_writev.S
 )
 elseif(BITS EQUAL 32)
 
@@ -967,7 +974,7 @@ mig(mach/task.defs)
 mig(mach/thread_act.defs)
 mig(mach/vm_map.defs)
 
-set_source_files_properties(custom/errno.c PROPERTIES COMPILE_FLAGS "-no-integrated-as")
+#set_source_files_properties(custom/errno.c PROPERTIES COMPILE_FLAGS "-no-integrated-as")
 set_source_files_properties(${syscall_legacy_sources} PROPERTIES COMPILE_FLAGS "-U_DARWIN_C_SOURCE -U__DARWIN_UNIX03 -D__DARWIN_UNIX03=0 -U__DARWIN_C_LEVEL")
 set_source_files_properties(wrappers/legacy/select-pre1050.c PROPERTIES COMPILE_FLAGS "-U_DARWIN_C_SOURCE -DSYSCALL_PRE1050")
 set_source_files_properties(wrappers/cancelable/select-cancel.c PROPERTIES COMPILE_FLAGS "-U_DARWIN_C_SOURCE")
diff --git a/src/kernel/libsyscall/Platforms/MacOSX/i386/syscall.map b/src/kernel/libsyscall/Platforms/MacOSX/i386/syscall.map
index 4e7600e83..60976ed6d 100644
--- a/src/kernel/libsyscall/Platforms/MacOSX/i386/syscall.map
+++ b/src/kernel/libsyscall/Platforms/MacOSX/i386/syscall.map
@@ -1,100 +1,100 @@
-accept$NOCANCEL$UNIX2003	__accept_nocancel
-accept$UNIX2003	__accept
-aio_suspend	__aio_suspend_nocancel
-aio_suspend$NOCANCEL$UNIX2003	__aio_suspend_nocancel
-aio_suspend$UNIX2003	__aio_suspend
-bind$UNIX2003	__bind
-close	__close_nocancel
-close$NOCANCEL$UNIX2003	__close_nocancel
-close$UNIX2003	__close
-chmod __chmod
-connect$NOCANCEL$UNIX2003	__connect_nocancel
-connect$UNIX2003	__connect
-fcntl	__fcntl_nocancel
-fcntl$NOCANCEL$UNIX2003	__fcntl_nocancel
-fcntl$UNIX2003	__fcntl
-fstat$INODE64	__fstat64
-fstatat$INODE64	__fstatat64
-fstatfs$INODE64	__fstatfs64
-fsync	__fsync_nocancel
-fsync$NOCANCEL$UNIX2003	__fsync_nocancel
-fsync$UNIX2003	__fsync
-getattrlist$UNIX2003	__getattrlist
-getfsstat$INODE64	__getfsstat64
-getpeername$UNIX2003	__getpeername
-getsockname$UNIX2003	__getsockname
-lchown$UNIX2003	__lchown
-listen$UNIX2003	__listen
-lstat$INODE64	__lstat64
-mmap	__mmap
-mprotect$UNIX2003	__mprotect
-msgctl$UNIX2003	__msgctl
-msgrcv	__msgrcv_nocancel
-msgrcv$NOCANCEL$UNIX2003	__msgrcv_nocancel
-msgrcv$UNIX2003	__msgrcv
-msgsnd	__msgsnd_nocancel
-msgsnd$NOCANCEL$UNIX2003	__msgsnd_nocancel
-msgsnd$UNIX2003	__msgsnd
-msgsys	__msgsys
-msync$NOCANCEL$UNIX2003	__msync_nocancel
-msync$UNIX2003	__msync
-open$NOCANCEL$UNIX2003	__open_nocancel
-open$UNIX2003	__open
-openat$NOCANCEL	__openat_nocancel
-openat	__openat
-poll	__poll_nocancel
-poll$NOCANCEL$UNIX2003	__poll_nocancel
-poll$UNIX2003	__poll
-pread	__pread_nocancel
-pread$NOCANCEL$UNIX2003	__pread_nocancel
-pread$UNIX2003	__pread
-pwrite	__pwrite_nocancel
-pwrite$NOCANCEL$UNIX2003	__pwrite_nocancel
-pwrite$UNIX2003	__pwrite
-read	__read_nocancel
-read$NOCANCEL$UNIX2003	__read_nocancel
-read$UNIX2003	__read
-readv	__readv_nocancel
-readv$NOCANCEL$UNIX2003	__readv_nocancel
-readv$UNIX2003	__readv
-recvfrom$NOCANCEL$UNIX2003	__recvfrom_nocancel
-recvfrom$UNIX2003	__recvfrom
-recvmsg$NOCANCEL$UNIX2003	__recvmsg_nocancel
-recvmsg$UNIX2003	__recvmsg
-select$DARWIN_EXTSN	__select
-select$DARWIN_EXTSN$NOCANCEL	__select_nocancel
-sem_open	__sem_open
-sem_wait	__sem_wait_nocancel
-sem_wait$NOCANCEL$UNIX2003	__sem_wait_nocancel
-sem_wait$UNIX2003	__sem_wait
-semctl$UNIX2003	__semctl
-semsys		__semsys
-sendmsg$NOCANCEL$UNIX2003	__sendmsg_nocancel
-sendmsg$UNIX2003	__sendmsg
-sendto$NOCANCEL$UNIX2003	__sendto_nocancel
-sendto$UNIX2003	__sendto
-setattrlist$UNIX2003	__setattrlist
-setpgrp	__setpgid
-setregid$UNIX2003	__setregid
-setreuid$UNIX2003	__setreuid
-shmctl$UNIX2003	__shmctl
-shmsys 	__shmsys
-shm_open	__shm_open
-socketpair$UNIX2003	__socketpair
-stat$INODE64	__stat64
-statfs$INODE64	__statfs64
-waitid	__waitid_nocancel
-waitid$NOCANCEL$UNIX2003	__waitid_nocancel
-waitid$UNIX2003	__waitid
-write	__write_nocancel
-write$NOCANCEL$UNIX2003	__write_nocancel
-write$UNIX2003	__write
-writev	__writev_nocancel
-writev$NOCANCEL$UNIX2003	__writev_nocancel
-writev$UNIX2003	__writev
+_accept$NOCANCEL$UNIX2003	___accept_nocancel
+_accept$UNIX2003	___accept
+_aio_suspend	___aio_suspend_nocancel
+_aio_suspend$NOCANCEL$UNIX2003	___aio_suspend_nocancel
+_aio_suspend$UNIX2003	___aio_suspend
+_bind$UNIX2003	___bind
+_close	___close_nocancel
+_close$NOCANCEL$UNIX2003	___close_nocancel
+_close$UNIX2003	___close
+_chmod ___chmod
+_connect$NOCANCEL$UNIX2003	___connect_nocancel
+_connect$UNIX2003	___connect
+_fcntl	___fcntl_nocancel
+_fcntl$NOCANCEL$UNIX2003	___fcntl_nocancel
+_fcntl$UNIX2003	___fcntl
+_fstat$INODE64	___fstat64
+_fstatat$INODE64	___fstatat64
+_fstatfs$INODE64	___fstatfs64
+_fsync	___fsync_nocancel
+_fsync$NOCANCEL$UNIX2003	___fsync_nocancel
+_fsync$UNIX2003	___fsync
+_getattrlist$UNIX2003	___getattrlist
+_getfsstat$INODE64	___getfsstat64
+_getpeername$UNIX2003	___getpeername
+_getsockname$UNIX2003	___getsockname
+_lchown$UNIX2003	___lchown
+_listen$UNIX2003	___listen
+_lstat$INODE64	___lstat64
+_mmap	___mmap
+_mprotect$UNIX2003	___mprotect
+_msgctl$UNIX2003	___msgctl
+_msgrcv	___msgrcv_nocancel
+_msgrcv$NOCANCEL$UNIX2003	___msgrcv_nocancel
+_msgrcv$UNIX2003	___msgrcv
+_msgsnd	___msgsnd_nocancel
+_msgsnd$NOCANCEL$UNIX2003	___msgsnd_nocancel
+_msgsnd$UNIX2003	___msgsnd
+_msgsys	___msgsys
+_msync$NOCANCEL$UNIX2003	___msync_nocancel
+_msync$UNIX2003	___msync
+_open$NOCANCEL$UNIX2003	___open_nocancel
+_open$UNIX2003	___open
+_openat$NOCANCEL	___openat_nocancel
+_openat	___openat
+_poll	___poll_nocancel
+_poll$NOCANCEL$UNIX2003	___poll_nocancel
+_poll$UNIX2003	___poll
+_pread	___pread_nocancel
+_pread$NOCANCEL$UNIX2003	___pread_nocancel
+_pread$UNIX2003	___pread
+_pwrite	___pwrite_nocancel
+_pwrite$NOCANCEL$UNIX2003	___pwrite_nocancel
+_pwrite$UNIX2003	___pwrite
+_read	___read_nocancel
+_read$NOCANCEL$UNIX2003	___read_nocancel
+_read$UNIX2003	___read
+_readv	___readv_nocancel
+_readv$NOCANCEL$UNIX2003	___readv_nocancel
+_readv$UNIX2003	___readv
+_recvfrom$NOCANCEL$UNIX2003	___recvfrom_nocancel
+_recvfrom$UNIX2003	___recvfrom
+_recvmsg$NOCANCEL$UNIX2003	___recvmsg_nocancel
+_recvmsg$UNIX2003	___recvmsg
+_select$DARWIN_EXTSN	___select
+_select$DARWIN_EXTSN$NOCANCEL	___select_nocancel
+_sem_open	___sem_open
+_sem_wait	___sem_wait_nocancel
+_sem_wait$NOCANCEL$UNIX2003	___sem_wait_nocancel
+_sem_wait$UNIX2003	___sem_wait
+_semctl$UNIX2003	___semctl
+_semsys		___semsys
+_sendmsg$NOCANCEL$UNIX2003	___sendmsg_nocancel
+_sendmsg$UNIX2003	___sendmsg
+_sendto$NOCANCEL$UNIX2003	___sendto_nocancel
+_sendto$UNIX2003	___sendto
+_setattrlist$UNIX2003	___setattrlist
+_setpgrp	___setpgid
+_setregid$UNIX2003	___setregid
+_setreuid$UNIX2003	___setreuid
+_shmctl$UNIX2003	___shmctl
+_shmsys 	___shmsys
+_shm_open	___shm_open
+_socketpair$UNIX2003	___socketpair
+_stat$INODE64	___stat64
+_statfs$INODE64	___statfs64
+_waitid	___waitid_nocancel
+_waitid$NOCANCEL$UNIX2003	___waitid_nocancel
+_waitid$UNIX2003	___waitid
+_write	___write_nocancel
+_write$NOCANCEL$UNIX2003	___write_nocancel
+_write$UNIX2003	___write
+_writev	___writev_nocancel
+_writev$NOCANCEL$UNIX2003	___writev_nocancel
+_writev$UNIX2003	___writev
 
-ioctl  __ioctl
-sigaltstack __sigaltstack
-fchmod __fchmod
-setrlimit __setrlimit
-getrlimit __getrlimit
+_ioctl  ___ioctl
+_sigaltstack ___sigaltstack
+_fchmod ___fchmod
+_setrlimit ___setrlimit
+_getrlimit ___getrlimit
diff --git a/src/kernel/libsyscall/Platforms/MacOSX/x86_64/syscall.map b/src/kernel/libsyscall/Platforms/MacOSX/x86_64/syscall.map
index 2feaaa528..f606b2619 100644
--- a/src/kernel/libsyscall/Platforms/MacOSX/x86_64/syscall.map
+++ b/src/kernel/libsyscall/Platforms/MacOSX/x86_64/syscall.map
@@ -1,61 +1,61 @@
-accept$NOCANCEL	__accept_nocancel
-aio_suspend$NOCANCEL	__aio_suspend_nocancel
-close$NOCANCEL	__close_nocancel
-connect$NOCANCEL	__connect_nocancel
-fstat$INODE64	__fstat64
-fstatat$INODE64	__fstatat64
-fstatfs$INODE64	__fstatfs64
-fsync$NOCANCEL	__fsync_nocancel
-getfsstat$INODE64	__getfsstat64
-lstat$INODE64	__lstat64
-msgrcv$NOCANCEL	__msgrcv_nocancel
-msgsnd$NOCANCEL	__msgsnd_nocancel
-msgsys		__msgsys
-msync$NOCANCEL	__msync_nocancel
-open$NOCANCEL	__open_nocancel
-openat$NOCANCEL	__openat_nocancel
-poll$NOCANCEL	__poll_nocancel
-pread$NOCANCEL	__pread_nocancel
-pwrite$NOCANCEL	__pwrite_nocancel
-read$NOCANCEL	__read_nocancel
-readv$NOCANCEL	__readv_nocancel
-recvfrom$NOCANCEL	__recvfrom_nocancel
-recvmsg$NOCANCEL	__recvmsg_nocancel
-select$DARWIN_EXTSN	__select
-select$DARWIN_EXTSN$NOCANCEL	__select_nocancel
-sem_wait$NOCANCEL	__sem_wait_nocancel
-semsys		__semsys
-sendmsg$NOCANCEL	__sendmsg_nocancel
-sendto$NOCANCEL	__sendto_nocancel
-stat$INODE64	__stat64
-statfs$INODE64	__statfs64
-waitid$NOCANCEL	__waitid_nocancel
-write$NOCANCEL	__write_nocancel
-writev$NOCANCEL	__writev_nocancel
+_accept$NOCANCEL	___accept_nocancel
+_aio_suspend$NOCANCEL	___aio_suspend_nocancel
+_close$NOCANCEL	___close_nocancel
+_connect$NOCANCEL	___connect_nocancel
+_fstat$INODE64	___fstat64
+_fstatat$INODE64	___fstatat64
+_fstatfs$INODE64	___fstatfs64
+_fsync$NOCANCEL	___fsync_nocancel
+_getfsstat$INODE64	___getfsstat64
+_lstat$INODE64	___lstat64
+_msgrcv$NOCANCEL	___msgrcv_nocancel
+_msgsnd$NOCANCEL	___msgsnd_nocancel
+_msgsys		___msgsys
+_msync$NOCANCEL	___msync_nocancel
+_open$NOCANCEL	___open_nocancel
+_openat$NOCANCEL	___openat_nocancel
+_poll$NOCANCEL	___poll_nocancel
+_pread$NOCANCEL	___pread_nocancel
+_pwrite$NOCANCEL	___pwrite_nocancel
+_read$NOCANCEL	___read_nocancel
+_readv$NOCANCEL	___readv_nocancel
+_recvfrom$NOCANCEL	___recvfrom_nocancel
+_recvmsg$NOCANCEL	___recvmsg_nocancel
+_select$DARWIN_EXTSN	___select
+_select$DARWIN_EXTSN$NOCANCEL	___select_nocancel
+_sem_wait$NOCANCEL	___sem_wait_nocancel
+_semsys		___semsys
+_sendmsg$NOCANCEL	___sendmsg_nocancel
+_sendto$NOCANCEL	___sendto_nocancel
+_stat$INODE64	___stat64
+_statfs$INODE64	___statfs64
+_waitid$NOCANCEL	___waitid_nocancel
+_write$NOCANCEL	___write_nocancel
+_writev$NOCANCEL	___writev_nocancel
 
-accept	__accept
-bind	__bind
-connect	__connect
-getattrlist	__getattrlist
-getpeername	__getpeername
-getsockname	__getsockname
-lchown	__lchown
-listen	__listen
-mprotect	__mprotect
-msgctl	__msgctl
-msync	__msync
-open	__open
-openat	__openat
-recvfrom	__recvfrom
-recvmsg	__recvmsg
-semctl	__semctl
-sem_open __sem_open
-sendmsg	__sendmsg
-sendto	__sendto
-setattrlist	__setattrlist
-setregid	__setregid
-setreuid	__setreuid
-shmctl		__shmctl
-shmsys 	__shmsys
-shm_open	__shm_open
-socketpair	  __socketpair
+_accept	___accept
+_bind	___bind
+_connect	___connect
+_getattrlist	___getattrlist
+_getpeername	___getpeername
+_getsockname	___getsockname
+_lchown	___lchown
+_listen	___listen
+_mprotect	___mprotect
+_msgctl	___msgctl
+_msync	___msync
+_open	___open
+_openat	___openat
+_recvfrom	___recvfrom
+_recvmsg	___recvmsg
+_semctl	___semctl
+_sem_open ___sem_open
+_sendmsg	___sendmsg
+_sendto	___sendto
+_setattrlist	___setattrlist
+_setregid	___setregid
+_setreuid	___setreuid
+_shmctl		___shmctl
+_shmsys 	___shmsys
+_shm_open	___shm_open
+_socketpair	  ___socketpair
diff --git a/src/kernel/libsyscall/Platforms/syscall.map b/src/kernel/libsyscall/Platforms/syscall.map
index 4a6cb9e56..3c24170a5 100644
--- a/src/kernel/libsyscall/Platforms/syscall.map
+++ b/src/kernel/libsyscall/Platforms/syscall.map
@@ -1,16 +1,16 @@
-__sandbox_me	__mac_execve
-__sandbox_mm	__mac_mount
-__sandbox_ms	__mac_syscall
-__sandbox_msp	__mac_set_proc
-_exit	__exit
-accessx_np	__access_extended
-getsgroups_np	__getsgroups
-getwgroups_np	__getwgroups
+___sandbox_me	___mac_execve
+___sandbox_mm	___mac_mount
+___sandbox_ms	___mac_syscall
+___sandbox_msp	___mac_set_proc
+__exit	___exit
+_accessx_np	___access_extended
+_getsgroups_np	___getsgroups
+_getwgroups_np	___getwgroups
 # initgroups wrapper is defined in Libinfo
-initgroups
-posix_madvise	__madvise
-pthread_getugid_np	__gettid
-pthread_setugid_np	__settid
-setsgroups_np	__setsgroups
-setwgroups_np	__setwgroups
-wait4	__wait4_nocancel
+_initgroups
+_posix_madvise	___madvise
+_pthread_getugid_np	___gettid
+_pthread_setugid_np	___settid
+_setsgroups_np	___setsgroups
+_setwgroups_np	___setwgroups
+_wait4	___wait4_nocancel
diff --git a/src/kernel/libsyscall/custom/SYS.h b/src/kernel/libsyscall/custom/SYS.h
index 6a70d8e5e..9c0cee1e2 100644
--- a/src/kernel/libsyscall/custom/SYS.h
+++ b/src/kernel/libsyscall/custom/SYS.h
@@ -72,7 +72,7 @@
 #ifndef DARLING
 #define UNIX_SYSCALL_SYSENTER		call __sysenter_trap
 #else
-#define UNIX_SYSCALL_SYSENTER		call __darling_bsd_syscall@PLT
+#define UNIX_SYSCALL_SYSENTER		call __darling_bsd_syscall
 #endif
 
 #define UNIX_SYSCALL(name, nargs)			\
@@ -146,21 +146,21 @@ LEAF(pseudo, 0)					;\
 
 #define UNIX_SYSCALL(name, nargs)						 \
 	.globl	cerror								;\
-LEAF(name, 0)								;\
+LEAF(_#name, 0)								;\
 	movl	$ SYS_##name, %eax			;\
-	call __darling_bsd_syscall@PLT							;\
+	call __darling_bsd_syscall							;\
 	jnb		2f							;\
 	movq	%rax, %rdi							;\
-	BRANCH_EXTERN(cerror)							;\
+	BRANCH_EXTERN(_cerror)							;\
 2:
 
 #define UNIX_SYSCALL_NONAME(name, nargs, cerror)		 \
 	.globl	cerror								;\
 	movl	$ SYS_##name, %eax			;\
-	call __darling_bsd_syscall@PLT							;\
+	call __darling_bsd_syscall							;\
 	jnb		2f							;\
 	movq	%rax, %rdi							;\
-	BRANCH_EXTERN(cerror)						;\
+	BRANCH_EXTERN(_##cerror)						;\
 2:
 
 
diff --git a/src/kernel/libsyscall/custom/custom.s b/src/kernel/libsyscall/custom/custom.s
index 0c2bfe50f..c47e89953 100644
--- a/src/kernel/libsyscall/custom/custom.s
+++ b/src/kernel/libsyscall/custom/custom.s
@@ -69,7 +69,7 @@ _i386_get_ldt:
 	movl    $6,%eax
 	MACHDEP_SYSCALL_TRAP
 	jnb		2f
-	jmp		tramp_cerror@PLT
+	jmp		tramp_cerror
 2:	ret
 
 
@@ -79,7 +79,7 @@ _i386_set_ldt:
 	movl    $5,%eax
 	MACHDEP_SYSCALL_TRAP
 	jnb		2f
-	jmp		tramp_cerror@PLT
+	jmp		tramp_cerror
 2:	ret
 
 #elif defined(__x86_64__)
@@ -91,7 +91,7 @@ _i386_get_ldt:
 	MACHDEP_SYSCALL_TRAP
 	jnb		2f
 	movq	%rax, %rdi
-	jmp		cerror@PLT
+	jmp		cerror
 2:	ret
 
 
@@ -102,7 +102,7 @@ _i386_set_ldt:
 	MACHDEP_SYSCALL_TRAP
 	jnb		2f
 	movq	%rax, %rdi
-	jmp		cerror@PLT
+	jmp		cerror
 2:	ret
 
 #endif
diff --git a/src/kernel/libsyscall/custom/errno.c b/src/kernel/libsyscall/custom/errno.c
index 595d3c279..1337a0a92 100644
--- a/src/kernel/libsyscall/custom/errno.c
+++ b/src/kernel/libsyscall/custom/errno.c
@@ -43,13 +43,9 @@ typedef unsigned __int128 cerror_return_t;
 typedef uint64_t cerror_return_t;
 #endif
 
-extern void _pthread_exit_if_canceled(int error);
-
 #undef errno
-
-extern int darwin_errno;
-
-#define errno darwin_errno
+int errno;
+extern void _pthread_exit_if_canceled(int error);
 
 int *
 __error(void)
diff --git a/src/kernel/libsyscall/custom/var_errno.c b/src/kernel/libsyscall/custom/var_errno.c
deleted file mode 100644
index 3eb96ac5c..000000000
--- a/src/kernel/libsyscall/custom/var_errno.c
+++ /dev/null
@@ -1,12 +0,0 @@
-
-#if defined(__x86_64__) || defined(__i386__)
-__asm__(".section .bss\n"
-                ".global darwin_errno\n"
-                ".hidden darwin_errno\n"
-                ".symver darwin_errno, errno@DARWIN\n"
-                ".comm darwin_errno, 4\n"
-                "darwin_errno:\n"
-                    ".word 0\n");
-#else
-#	warning No darwin_errno definition!
-#endif
diff --git a/src/kernel/libsyscall/sys_i386/SYS.h b/src/kernel/libsyscall/sys_i386/SYS.h
index 934c6f48a..6c064a50a 100644
--- a/src/kernel/libsyscall/sys_i386/SYS.h
+++ b/src/kernel/libsyscall/sys_i386/SYS.h
@@ -158,7 +158,7 @@ LEAF(pseudo, 0)					;\
 	.globl	cerror								;\
 LEAF(name, 0)								;\
 	movl	$ SYS_##name, %eax			;\
-	call __darling_bsd_syscall@PLT							;\
+	call __darling_bsd_syscall							;\
 	cmpl    $-4095, %eax				;\
 	jb		3f							;\
 	movq	%rax, %rdi							;\
@@ -168,7 +168,7 @@ LEAF(name, 0)								;\
 #define UNIX_SYSCALL_NONAME(name, nargs, cerror)		 \
 	.globl	cerror								;\
 	movl	$ SYS_##name, %eax			;\
-	call __darling_bsd_syscall@PLT							;\
+	call __darling_bsd_syscall							;\
 	cmpl    $-4095, %eax				;\
 	jb		3f							;\
 	movq	%rax, %rdi							;\
diff --git a/src/kernel/libsyscall/sys_i386/custom.S b/src/kernel/libsyscall/sys_i386/custom.S
index 0c2bfe50f..c47e89953 100644
--- a/src/kernel/libsyscall/sys_i386/custom.S
+++ b/src/kernel/libsyscall/sys_i386/custom.S
@@ -69,7 +69,7 @@ _i386_get_ldt:
 	movl    $6,%eax
 	MACHDEP_SYSCALL_TRAP
 	jnb		2f
-	jmp		tramp_cerror@PLT
+	jmp		tramp_cerror
 2:	ret
 
 
@@ -79,7 +79,7 @@ _i386_set_ldt:
 	movl    $5,%eax
 	MACHDEP_SYSCALL_TRAP
 	jnb		2f
-	jmp		tramp_cerror@PLT
+	jmp		tramp_cerror
 2:	ret
 
 #elif defined(__x86_64__)
@@ -91,7 +91,7 @@ _i386_get_ldt:
 	MACHDEP_SYSCALL_TRAP
 	jnb		2f
 	movq	%rax, %rdi
-	jmp		cerror@PLT
+	jmp		cerror
 2:	ret
 
 
@@ -102,7 +102,7 @@ _i386_set_ldt:
 	MACHDEP_SYSCALL_TRAP
 	jnb		2f
 	movq	%rax, %rdi
-	jmp		cerror@PLT
+	jmp		cerror
 2:	ret
 
 #endif
diff --git a/src/kernel/libsyscall/sys_x86-64/SYS.h b/src/kernel/libsyscall/sys_x86-64/SYS.h
index cf25e7775..9c0cee1e2 100644
--- a/src/kernel/libsyscall/sys_x86-64/SYS.h
+++ b/src/kernel/libsyscall/sys_x86-64/SYS.h
@@ -72,7 +72,7 @@
 #ifndef DARLING
 #define UNIX_SYSCALL_SYSENTER		call __sysenter_trap
 #else
-#define UNIX_SYSCALL_SYSENTER		call __darling_bsd_syscall@PLT
+#define UNIX_SYSCALL_SYSENTER		call __darling_bsd_syscall
 #endif
 
 #define UNIX_SYSCALL(name, nargs)			\
@@ -146,27 +146,21 @@ LEAF(pseudo, 0)					;\
 
 #define UNIX_SYSCALL(name, nargs)						 \
 	.globl	cerror								;\
-	.type name, @function						;\
-LEAF(name, 0)								;\
+LEAF(_#name, 0)								;\
 	movl	$ SYS_##name, %eax			;\
-	call	__darling_bsd_syscall@PLT							;\
-	cmpq	$-4095, %rax			;\
-	jb		2f							;\
+	call __darling_bsd_syscall							;\
+	jnb		2f							;\
 	movq	%rax, %rdi							;\
-	negq	%rdi	;\
-	BRANCH_EXTERN(cerror)							;\
+	BRANCH_EXTERN(_cerror)							;\
 2:
 
 #define UNIX_SYSCALL_NONAME(name, nargs, cerror)		 \
 	.globl	cerror								;\
-	.type name, @function						;\
 	movl	$ SYS_##name, %eax			;\
-	call	__darling_bsd_syscall@PLT							;\
-	cmpq	$-4095, %rax				;\
-	jb		2f							;\
+	call __darling_bsd_syscall							;\
+	jnb		2f							;\
 	movq	%rax, %rdi							;\
-	negq	%rdi	;\
-	BRANCH_EXTERN(cerror)						;\
+	BRANCH_EXTERN(_##cerror)						;\
 2:
 
 
diff --git a/src/kernel/libsyscall/sys_x86-64/____old_semwait_signal_nocancel.S b/src/kernel/libsyscall/sys_x86-64/_____old_semwait_signal_nocancel.S
similarity index 73%
rename from src/kernel/libsyscall/sys_x86-64/____old_semwait_signal_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/_____old_semwait_signal_nocancel.S
index e3d341867..35e761dc2 100644
--- a/src/kernel/libsyscall/sys_x86-64/____old_semwait_signal_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/_____old_semwait_signal_nocancel.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(____old_semwait_signal_nocancel, __old_semwait_signal_nocancel, 5, cerror_nocancel)
+__SYSCALL2(_____old_semwait_signal_nocancel, __old_semwait_signal_nocancel, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/____sigwait_nocancel.S b/src/kernel/libsyscall/sys_x86-64/_____sigwait_nocancel.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/____sigwait_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/_____sigwait_nocancel.S
index 80f2ac595..7db68cc0c 100644
--- a/src/kernel/libsyscall/sys_x86-64/____sigwait_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/_____sigwait_nocancel.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(____sigwait_nocancel, __sigwait_nocancel, 2, cerror_nocancel)
+__SYSCALL2(_____sigwait_nocancel, __sigwait_nocancel, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__accept.S b/src/kernel/libsyscall/sys_x86-64/___accept.S
similarity index 75%
rename from src/kernel/libsyscall/sys_x86-64/__accept.S
rename to src/kernel/libsyscall/sys_x86-64/___accept.S
index 0234be213..b067802cb 100644
--- a/src/kernel/libsyscall/sys_x86-64/__accept.S
+++ b/src/kernel/libsyscall/sys_x86-64/___accept.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__accept, accept, 3, cerror)
+__SYSCALL2(___accept, accept, 3, cerror)
 #endif
 
 #if defined(__x86_64__)
-	.globl	accept
-		accept = __accept
+	.globl	_accept
+	.set	_accept, ___accept
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__accept_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___accept_nocancel.S
similarity index 66%
rename from src/kernel/libsyscall/sys_x86-64/__accept_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___accept_nocancel.S
index f9d964dc3..8b287705e 100644
--- a/src/kernel/libsyscall/sys_x86-64/__accept_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___accept_nocancel.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__accept_nocancel, accept_nocancel, 3, cerror_nocancel)
+__SYSCALL2(___accept_nocancel, accept_nocancel, 3, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	accept$NOCANCEL
-		accept$NOCANCEL = __accept_nocancel
+	.globl	_accept$NOCANCEL
+	.set	_accept$NOCANCEL, ___accept_nocancel
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__access_extended.S b/src/kernel/libsyscall/sys_x86-64/___access_extended.S
similarity index 68%
rename from src/kernel/libsyscall/sys_x86-64/__access_extended.S
rename to src/kernel/libsyscall/sys_x86-64/___access_extended.S
index 990e55175..9ed0215b0 100644
--- a/src/kernel/libsyscall/sys_x86-64/__access_extended.S
+++ b/src/kernel/libsyscall/sys_x86-64/___access_extended.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__access_extended, access_extended, 4, cerror_nocancel)
+__SYSCALL2(___access_extended, access_extended, 4, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	accessx_np
-		accessx_np = __access_extended
+	.globl	_accessx_np
+	.set	_accessx_np, ___access_extended
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__aio_suspend_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___aio_suspend_nocancel.S
similarity index 63%
rename from src/kernel/libsyscall/sys_x86-64/__aio_suspend_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___aio_suspend_nocancel.S
index 1cfd0c154..8af75b52c 100644
--- a/src/kernel/libsyscall/sys_x86-64/__aio_suspend_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___aio_suspend_nocancel.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__aio_suspend_nocancel, aio_suspend_nocancel, 3, cerror_nocancel)
+__SYSCALL2(___aio_suspend_nocancel, aio_suspend_nocancel, 3, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	aio_suspend$NOCANCEL
-		aio_suspend$NOCANCEL = __aio_suspend_nocancel
+	.globl	_aio_suspend$NOCANCEL
+	.set	_aio_suspend$NOCANCEL, ___aio_suspend_nocancel
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__bind.S b/src/kernel/libsyscall/sys_x86-64/___bind.S
similarity index 75%
rename from src/kernel/libsyscall/sys_x86-64/__bind.S
rename to src/kernel/libsyscall/sys_x86-64/___bind.S
index 78c2945d6..04aaf1e63 100644
--- a/src/kernel/libsyscall/sys_x86-64/__bind.S
+++ b/src/kernel/libsyscall/sys_x86-64/___bind.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__bind, bind, 3, cerror_nocancel)
+__SYSCALL2(___bind, bind, 3, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	bind
-		bind = __bind
+	.globl	_bind
+	.set	_bind, ___bind
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__bsdthread_create.S b/src/kernel/libsyscall/sys_x86-64/___bsdthread_create.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/__bsdthread_create.S
rename to src/kernel/libsyscall/sys_x86-64/___bsdthread_create.S
index 77b3fc4a9..81ab10c82 100644
--- a/src/kernel/libsyscall/sys_x86-64/__bsdthread_create.S
+++ b/src/kernel/libsyscall/sys_x86-64/___bsdthread_create.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__bsdthread_create, bsdthread_create, 5, cerror_nocancel)
+__SYSCALL2(___bsdthread_create, bsdthread_create, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__bsdthread_ctl.S b/src/kernel/libsyscall/sys_x86-64/___bsdthread_ctl.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__bsdthread_ctl.S
rename to src/kernel/libsyscall/sys_x86-64/___bsdthread_ctl.S
index 1d66af102..2301903eb 100644
--- a/src/kernel/libsyscall/sys_x86-64/__bsdthread_ctl.S
+++ b/src/kernel/libsyscall/sys_x86-64/___bsdthread_ctl.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__bsdthread_ctl, bsdthread_ctl, 4, cerror_nocancel)
+__SYSCALL2(___bsdthread_ctl, bsdthread_ctl, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__bsdthread_register.S b/src/kernel/libsyscall/sys_x86-64/___bsdthread_register.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/__bsdthread_register.S
rename to src/kernel/libsyscall/sys_x86-64/___bsdthread_register.S
index ef8f0717b..4f7a244c8 100644
--- a/src/kernel/libsyscall/sys_x86-64/__bsdthread_register.S
+++ b/src/kernel/libsyscall/sys_x86-64/___bsdthread_register.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__bsdthread_register, bsdthread_register, 7, cerror_nocancel)
+__SYSCALL2(___bsdthread_register, bsdthread_register, 7, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__bsdthread_terminate.S b/src/kernel/libsyscall/sys_x86-64/___bsdthread_terminate.S
similarity index 76%
rename from src/kernel/libsyscall/sys_x86-64/__bsdthread_terminate.S
rename to src/kernel/libsyscall/sys_x86-64/___bsdthread_terminate.S
index 300223c7a..7088590df 100644
--- a/src/kernel/libsyscall/sys_x86-64/__bsdthread_terminate.S
+++ b/src/kernel/libsyscall/sys_x86-64/___bsdthread_terminate.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__bsdthread_terminate, bsdthread_terminate, 4, cerror_nocancel)
+__SYSCALL2(___bsdthread_terminate, bsdthread_terminate, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__chmod.S b/src/kernel/libsyscall/sys_x86-64/___chmod.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/__chmod.S
rename to src/kernel/libsyscall/sys_x86-64/___chmod.S
index f67d89020..8224c55e4 100644
--- a/src/kernel/libsyscall/sys_x86-64/__chmod.S
+++ b/src/kernel/libsyscall/sys_x86-64/___chmod.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__chmod, chmod, 2, cerror_nocancel)
+__SYSCALL2(___chmod, chmod, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__chmod_extended.S b/src/kernel/libsyscall/sys_x86-64/___chmod_extended.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__chmod_extended.S
rename to src/kernel/libsyscall/sys_x86-64/___chmod_extended.S
index 0eda3ba3c..45d2ae2cb 100644
--- a/src/kernel/libsyscall/sys_x86-64/__chmod_extended.S
+++ b/src/kernel/libsyscall/sys_x86-64/___chmod_extended.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__chmod_extended, chmod_extended, 5, cerror_nocancel)
+__SYSCALL2(___chmod_extended, chmod_extended, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__chud.S b/src/kernel/libsyscall/sys_x86-64/___chud.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/__chud.S
rename to src/kernel/libsyscall/sys_x86-64/___chud.S
index 8f23809fb..47b7d266e 100644
--- a/src/kernel/libsyscall/sys_x86-64/__chud.S
+++ b/src/kernel/libsyscall/sys_x86-64/___chud.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__chud, chud, 6, cerror_nocancel)
+__SYSCALL2(___chud, chud, 6, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__close_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___close_nocancel.S
similarity index 67%
rename from src/kernel/libsyscall/sys_x86-64/__close_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___close_nocancel.S
index 8b99ff785..1f8bb8e2a 100644
--- a/src/kernel/libsyscall/sys_x86-64/__close_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___close_nocancel.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__close_nocancel, close_nocancel, 1, cerror_nocancel)
+__SYSCALL2(___close_nocancel, close_nocancel, 1, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	close$NOCANCEL
-		close$NOCANCEL = __close_nocancel
+	.globl	_close$NOCANCEL
+	.set	_close$NOCANCEL, ___close_nocancel
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__coalition.S b/src/kernel/libsyscall/sys_x86-64/___coalition.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/__coalition.S
rename to src/kernel/libsyscall/sys_x86-64/___coalition.S
index 0c4df942a..2ad2ac486 100644
--- a/src/kernel/libsyscall/sys_x86-64/__coalition.S
+++ b/src/kernel/libsyscall/sys_x86-64/___coalition.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__coalition, coalition, 3, cerror_nocancel)
+__SYSCALL2(___coalition, coalition, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__coalition_info.S b/src/kernel/libsyscall/sys_x86-64/___coalition_info.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__coalition_info.S
rename to src/kernel/libsyscall/sys_x86-64/___coalition_info.S
index e5159d1bf..f838d91bc 100644
--- a/src/kernel/libsyscall/sys_x86-64/__coalition_info.S
+++ b/src/kernel/libsyscall/sys_x86-64/___coalition_info.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__coalition_info, coalition_info, 4, cerror_nocancel)
+__SYSCALL2(___coalition_info, coalition_info, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__connect.S b/src/kernel/libsyscall/sys_x86-64/___connect.S
similarity index 74%
rename from src/kernel/libsyscall/sys_x86-64/__connect.S
rename to src/kernel/libsyscall/sys_x86-64/___connect.S
index 038f75c40..0a34cb9b0 100644
--- a/src/kernel/libsyscall/sys_x86-64/__connect.S
+++ b/src/kernel/libsyscall/sys_x86-64/___connect.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__connect, connect, 3, cerror)
+__SYSCALL2(___connect, connect, 3, cerror)
 #endif
 
 #if defined(__x86_64__)
-	.globl	connect
-		connect = __connect
+	.globl	_connect
+	.set	_connect, ___connect
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__connect_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___connect_nocancel.S
similarity index 66%
rename from src/kernel/libsyscall/sys_x86-64/__connect_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___connect_nocancel.S
index 1d13fa194..fbbc9f027 100644
--- a/src/kernel/libsyscall/sys_x86-64/__connect_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___connect_nocancel.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__connect_nocancel, connect_nocancel, 3, cerror_nocancel)
+__SYSCALL2(___connect_nocancel, connect_nocancel, 3, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	connect$NOCANCEL
-		connect$NOCANCEL = __connect_nocancel
+	.globl	_connect$NOCANCEL
+	.set	_connect$NOCANCEL, ___connect_nocancel
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__copyfile.S b/src/kernel/libsyscall/sys_x86-64/___copyfile.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/__copyfile.S
rename to src/kernel/libsyscall/sys_x86-64/___copyfile.S
index 235b7fa31..124a253e8 100644
--- a/src/kernel/libsyscall/sys_x86-64/__copyfile.S
+++ b/src/kernel/libsyscall/sys_x86-64/___copyfile.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__copyfile, copyfile, 4, cerror_nocancel)
+__SYSCALL2(___copyfile, copyfile, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__csrctl.S b/src/kernel/libsyscall/sys_x86-64/___csrctl.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/__csrctl.S
rename to src/kernel/libsyscall/sys_x86-64/___csrctl.S
index df3d7ea9d..13b0aaac2 100644
--- a/src/kernel/libsyscall/sys_x86-64/__csrctl.S
+++ b/src/kernel/libsyscall/sys_x86-64/___csrctl.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__csrctl, csrctl, 3, cerror_nocancel)
+__SYSCALL2(___csrctl, csrctl, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__delete.S b/src/kernel/libsyscall/sys_x86-64/___delete.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/__delete.S
rename to src/kernel/libsyscall/sys_x86-64/___delete.S
index 419ff6ed5..991912038 100644
--- a/src/kernel/libsyscall/sys_x86-64/__delete.S
+++ b/src/kernel/libsyscall/sys_x86-64/___delete.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__delete, delete, 1, cerror_nocancel)
+__SYSCALL2(___delete, delete, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__disable_threadsignal.S b/src/kernel/libsyscall/sys_x86-64/___disable_threadsignal.S
similarity index 76%
rename from src/kernel/libsyscall/sys_x86-64/__disable_threadsignal.S
rename to src/kernel/libsyscall/sys_x86-64/___disable_threadsignal.S
index 0bb5e2c95..a2a3a8d57 100644
--- a/src/kernel/libsyscall/sys_x86-64/__disable_threadsignal.S
+++ b/src/kernel/libsyscall/sys_x86-64/___disable_threadsignal.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__disable_threadsignal, __disable_threadsignal, 1, cerror_nocancel)
+__SYSCALL2(___disable_threadsignal, __disable_threadsignal, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__exit.S b/src/kernel/libsyscall/sys_x86-64/___exit.S
similarity index 75%
rename from src/kernel/libsyscall/sys_x86-64/__exit.S
rename to src/kernel/libsyscall/sys_x86-64/___exit.S
index 629f045cb..7c69cc6d1 100644
--- a/src/kernel/libsyscall/sys_x86-64/__exit.S
+++ b/src/kernel/libsyscall/sys_x86-64/___exit.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__exit, exit, 1, cerror_nocancel)
+__SYSCALL2(___exit, exit, 1, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	_exit
-		_exit = __exit
+	.globl	__exit
+	.set	__exit, ___exit
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__fchmod.S b/src/kernel/libsyscall/sys_x86-64/___fchmod.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/__fchmod.S
rename to src/kernel/libsyscall/sys_x86-64/___fchmod.S
index 33afa7624..4adfcb79c 100644
--- a/src/kernel/libsyscall/sys_x86-64/__fchmod.S
+++ b/src/kernel/libsyscall/sys_x86-64/___fchmod.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__fchmod, fchmod, 2, cerror_nocancel)
+__SYSCALL2(___fchmod, fchmod, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__fchmod_extended.S b/src/kernel/libsyscall/sys_x86-64/___fchmod_extended.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__fchmod_extended.S
rename to src/kernel/libsyscall/sys_x86-64/___fchmod_extended.S
index 7de15e59d..a3115a921 100644
--- a/src/kernel/libsyscall/sys_x86-64/__fchmod_extended.S
+++ b/src/kernel/libsyscall/sys_x86-64/___fchmod_extended.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__fchmod_extended, fchmod_extended, 5, cerror_nocancel)
+__SYSCALL2(___fchmod_extended, fchmod_extended, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__fcntl.S b/src/kernel/libsyscall/sys_x86-64/___fcntl.S
similarity index 85%
rename from src/kernel/libsyscall/sys_x86-64/__fcntl.S
rename to src/kernel/libsyscall/sys_x86-64/___fcntl.S
index 485cc8929..5f7df46e4 100644
--- a/src/kernel/libsyscall/sys_x86-64/__fcntl.S
+++ b/src/kernel/libsyscall/sys_x86-64/___fcntl.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__fcntl, fcntl, 3, cerror)
+__SYSCALL2(___fcntl, fcntl, 3, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__fcntl_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___fcntl_nocancel.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__fcntl_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___fcntl_nocancel.S
index 831f009ac..463f9724f 100644
--- a/src/kernel/libsyscall/sys_x86-64/__fcntl_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___fcntl_nocancel.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__fcntl_nocancel, fcntl_nocancel, 3, cerror_nocancel)
+__SYSCALL2(___fcntl_nocancel, fcntl_nocancel, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__fork.S b/src/kernel/libsyscall/sys_x86-64/___fork.S
similarity index 94%
rename from src/kernel/libsyscall/sys_x86-64/__fork.S
rename to src/kernel/libsyscall/sys_x86-64/___fork.S
index 977aa7608..4e26ec7c2 100644
--- a/src/kernel/libsyscall/sys_x86-64/__fork.S
+++ b/src/kernel/libsyscall/sys_x86-64/___fork.S
@@ -47,11 +47,6 @@
 
 #include "SYS.h"
 
-#ifdef DARLING
-#	define ___fork __fork
-#	define _cerror cerror
-#endif
-
 #if defined(__i386__)
 
 LEAF(___fork, 0)
@@ -88,12 +83,11 @@ LEAF(___fork, 0)
 	UNIX_SYSCALL_TRAP		// do the system call
 	jnc	L1			// jump if CF==0
 #else
-	movl	$ SYS_fork, %eax
-	call    __darling_bsd_syscall@PLT	
-	cmpq    $0, %rax 
+	movl    $ SYS_fork, %eax
+	call    __darling_bsd_syscall
+	cmpq    $0, %rax
 	jnb L1
 #endif
-
 	movq	%rax, %rdi
 	CALL_EXTERN(_cerror)
 	movq	$-1, %rax
@@ -105,10 +99,10 @@ L1:
 	orl	%edx,%edx	// CF=OF=0,  ZF set if zero result	
 	jz	L2		// parent, since r1 == 0 in parent, 1 in child
 #else
-	testl %eax,%eax
-	jnz L2
-#endif
-	
+	testl	%eax, %eax
+	jnz	L2
+#endif	
+
 	//child here...
 	xorq	%rax, %rax
 	PICIFY(__current_pid)
diff --git a/src/kernel/libsyscall/sys_x86-64/__fsgetpath.S b/src/kernel/libsyscall/sys_x86-64/___fsgetpath.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/__fsgetpath.S
rename to src/kernel/libsyscall/sys_x86-64/___fsgetpath.S
index 13eb18f46..41a694b5b 100644
--- a/src/kernel/libsyscall/sys_x86-64/__fsgetpath.S
+++ b/src/kernel/libsyscall/sys_x86-64/___fsgetpath.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__fsgetpath, fsgetpath, 4, cerror_nocancel)
+__SYSCALL2(___fsgetpath, fsgetpath, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__fstat64_extended.S b/src/kernel/libsyscall/sys_x86-64/___fstat64_extended.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/__fstat64_extended.S
rename to src/kernel/libsyscall/sys_x86-64/___fstat64_extended.S
index 37679eb16..3dbbc54ef 100644
--- a/src/kernel/libsyscall/sys_x86-64/__fstat64_extended.S
+++ b/src/kernel/libsyscall/sys_x86-64/___fstat64_extended.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__fstat64_extended, fstat64_extended, 4, cerror_nocancel)
+__SYSCALL2(___fstat64_extended, fstat64_extended, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__fstat_extended.S b/src/kernel/libsyscall/sys_x86-64/___fstat_extended.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__fstat_extended.S
rename to src/kernel/libsyscall/sys_x86-64/___fstat_extended.S
index 42284b904..b919b5c38 100644
--- a/src/kernel/libsyscall/sys_x86-64/__fstat_extended.S
+++ b/src/kernel/libsyscall/sys_x86-64/___fstat_extended.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__fstat_extended, fstat_extended, 4, cerror_nocancel)
+__SYSCALL2(___fstat_extended, fstat_extended, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__fsync_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___fsync_nocancel.S
similarity index 67%
rename from src/kernel/libsyscall/sys_x86-64/__fsync_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___fsync_nocancel.S
index 0fde09835..bdd8472c9 100644
--- a/src/kernel/libsyscall/sys_x86-64/__fsync_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___fsync_nocancel.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__fsync_nocancel, fsync_nocancel, 1, cerror_nocancel)
+__SYSCALL2(___fsync_nocancel, fsync_nocancel, 1, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	fsync$NOCANCEL
-		fsync$NOCANCEL = __fsync_nocancel
+	.globl	_fsync$NOCANCEL
+	.set	_fsync$NOCANCEL, ___fsync_nocancel
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__getattrlist.S b/src/kernel/libsyscall/sys_x86-64/___getattrlist.S
similarity index 69%
rename from src/kernel/libsyscall/sys_x86-64/__getattrlist.S
rename to src/kernel/libsyscall/sys_x86-64/___getattrlist.S
index 5757b4609..8374c43d3 100644
--- a/src/kernel/libsyscall/sys_x86-64/__getattrlist.S
+++ b/src/kernel/libsyscall/sys_x86-64/___getattrlist.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__getattrlist, getattrlist, 5, cerror_nocancel)
+__SYSCALL2(___getattrlist, getattrlist, 5, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	getattrlist
-		getattrlist = __getattrlist
+	.globl	_getattrlist
+	.set	_getattrlist, ___getattrlist
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__getdirentries64.S b/src/kernel/libsyscall/sys_x86-64/___getdirentries64.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__getdirentries64.S
rename to src/kernel/libsyscall/sys_x86-64/___getdirentries64.S
index 491322519..80d6a6ad8 100644
--- a/src/kernel/libsyscall/sys_x86-64/__getdirentries64.S
+++ b/src/kernel/libsyscall/sys_x86-64/___getdirentries64.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__getdirentries64, getdirentries64, 4, cerror_nocancel)
+__SYSCALL2(___getdirentries64, getdirentries64, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__gethostuuid.S b/src/kernel/libsyscall/sys_x86-64/___gethostuuid.S
similarity index 79%
rename from src/kernel/libsyscall/sys_x86-64/__gethostuuid.S
rename to src/kernel/libsyscall/sys_x86-64/___gethostuuid.S
index 624b688e1..eaa088294 100644
--- a/src/kernel/libsyscall/sys_x86-64/__gethostuuid.S
+++ b/src/kernel/libsyscall/sys_x86-64/___gethostuuid.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__gethostuuid, gethostuuid, 3, cerror_nocancel)
+__SYSCALL2(___gethostuuid, gethostuuid, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__getlogin.S b/src/kernel/libsyscall/sys_x86-64/___getlogin.S
similarity index 83%
rename from src/kernel/libsyscall/sys_x86-64/__getlogin.S
rename to src/kernel/libsyscall/sys_x86-64/___getlogin.S
index 65aa1e907..8c8c018e1 100644
--- a/src/kernel/libsyscall/sys_x86-64/__getlogin.S
+++ b/src/kernel/libsyscall/sys_x86-64/___getlogin.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__getlogin, getlogin, 2, cerror)
+__SYSCALL2(___getlogin, getlogin, 2, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__getpeername.S b/src/kernel/libsyscall/sys_x86-64/___getpeername.S
similarity index 69%
rename from src/kernel/libsyscall/sys_x86-64/__getpeername.S
rename to src/kernel/libsyscall/sys_x86-64/___getpeername.S
index fdfcb6600..dfc705359 100644
--- a/src/kernel/libsyscall/sys_x86-64/__getpeername.S
+++ b/src/kernel/libsyscall/sys_x86-64/___getpeername.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__getpeername, getpeername, 3, cerror_nocancel)
+__SYSCALL2(___getpeername, getpeername, 3, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	getpeername
-		getpeername = __getpeername
+	.globl	_getpeername
+	.set	_getpeername, ___getpeername
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__getpid.S b/src/kernel/libsyscall/sys_x86-64/___getpid.S
similarity index 95%
rename from src/kernel/libsyscall/sys_x86-64/__getpid.S
rename to src/kernel/libsyscall/sys_x86-64/___getpid.S
index e761eeab8..f3e75802b 100644
--- a/src/kernel/libsyscall/sys_x86-64/__getpid.S
+++ b/src/kernel/libsyscall/sys_x86-64/___getpid.S
@@ -29,15 +29,11 @@
 
 #include "SYS.h"
 
-#ifdef DARLING
-#	define ___getpid __getpid
-#endif
-
 #if defined(__i386__)
 
 	.data
 	.globl __current_pid
-	.hidden __current_pid
+	.private_extern __current_pid
 L__current_pid_addr:
  __current_pid:
 	.long 0
@@ -80,7 +76,7 @@ LEAF(___getpid, 0)
 
 	.data
 	.globl __current_pid
-	.hidden __current_pid
+	.private_extern __current_pid
 __current_pid:
 	.long 0
 
@@ -108,7 +104,7 @@ LEAF(___getpid, 0)
 #error Unsupported architecture
 #endif
 #if defined(__x86_64__)
-	.globl	getpid
-		getpid = __getpid
+	.globl	_getpid
+	.set	_getpid, ___getpid
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__getrlimit.S b/src/kernel/libsyscall/sys_x86-64/___getrlimit.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/__getrlimit.S
rename to src/kernel/libsyscall/sys_x86-64/___getrlimit.S
index aa76a7580..f19e881fd 100644
--- a/src/kernel/libsyscall/sys_x86-64/__getrlimit.S
+++ b/src/kernel/libsyscall/sys_x86-64/___getrlimit.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__getrlimit, getrlimit, 2, cerror_nocancel)
+__SYSCALL2(___getrlimit, getrlimit, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__getsgroups.S b/src/kernel/libsyscall/sys_x86-64/___getsgroups.S
similarity index 69%
rename from src/kernel/libsyscall/sys_x86-64/__getsgroups.S
rename to src/kernel/libsyscall/sys_x86-64/___getsgroups.S
index 2c1a0110b..d3a25d571 100644
--- a/src/kernel/libsyscall/sys_x86-64/__getsgroups.S
+++ b/src/kernel/libsyscall/sys_x86-64/___getsgroups.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__getsgroups, getsgroups, 2, cerror_nocancel)
+__SYSCALL2(___getsgroups, getsgroups, 2, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	getsgroups_np
-		getsgroups_np = __getsgroups
+	.globl	_getsgroups_np
+	.set	_getsgroups_np, ___getsgroups
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__getsockname.S b/src/kernel/libsyscall/sys_x86-64/___getsockname.S
similarity index 69%
rename from src/kernel/libsyscall/sys_x86-64/__getsockname.S
rename to src/kernel/libsyscall/sys_x86-64/___getsockname.S
index 9807001b0..8b98c8361 100644
--- a/src/kernel/libsyscall/sys_x86-64/__getsockname.S
+++ b/src/kernel/libsyscall/sys_x86-64/___getsockname.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__getsockname, getsockname, 3, cerror_nocancel)
+__SYSCALL2(___getsockname, getsockname, 3, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	getsockname
-		getsockname = __getsockname
+	.globl	_getsockname
+	.set	_getsockname, ___getsockname
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__gettid.S b/src/kernel/libsyscall/sys_x86-64/___gettid.S
similarity index 69%
rename from src/kernel/libsyscall/sys_x86-64/__gettid.S
rename to src/kernel/libsyscall/sys_x86-64/___gettid.S
index fb1164cb3..dc8394035 100644
--- a/src/kernel/libsyscall/sys_x86-64/__gettid.S
+++ b/src/kernel/libsyscall/sys_x86-64/___gettid.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__gettid, gettid, 2, cerror_nocancel)
+__SYSCALL2(___gettid, gettid, 2, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	pthread_getugid_np
-		pthread_getugid_np = __gettid
+	.globl	_pthread_getugid_np
+	.set	_pthread_getugid_np, ___gettid
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__gettimeofday.S b/src/kernel/libsyscall/sys_x86-64/___gettimeofday.S
similarity index 100%
rename from src/kernel/libsyscall/sys_x86-64/__gettimeofday.S
rename to src/kernel/libsyscall/sys_x86-64/___gettimeofday.S
diff --git a/src/kernel/libsyscall/sys_x86-64/__getwgroups.S b/src/kernel/libsyscall/sys_x86-64/___getwgroups.S
similarity index 69%
rename from src/kernel/libsyscall/sys_x86-64/__getwgroups.S
rename to src/kernel/libsyscall/sys_x86-64/___getwgroups.S
index f8e4c80bf..d93e7ed87 100644
--- a/src/kernel/libsyscall/sys_x86-64/__getwgroups.S
+++ b/src/kernel/libsyscall/sys_x86-64/___getwgroups.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__getwgroups, getwgroups, 2, cerror_nocancel)
+__SYSCALL2(___getwgroups, getwgroups, 2, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	getwgroups_np
-		getwgroups_np = __getwgroups
+	.globl	_getwgroups_np
+	.set	_getwgroups_np, ___getwgroups
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__guarded_open_dprotected_np.S b/src/kernel/libsyscall/sys_x86-64/___guarded_open_dprotected_np.S
similarity index 74%
rename from src/kernel/libsyscall/sys_x86-64/__guarded_open_dprotected_np.S
rename to src/kernel/libsyscall/sys_x86-64/___guarded_open_dprotected_np.S
index a090f8401..58df04b77 100644
--- a/src/kernel/libsyscall/sys_x86-64/__guarded_open_dprotected_np.S
+++ b/src/kernel/libsyscall/sys_x86-64/___guarded_open_dprotected_np.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__guarded_open_dprotected_np, guarded_open_dprotected_np, 7, cerror_nocancel)
+__SYSCALL2(___guarded_open_dprotected_np, guarded_open_dprotected_np, 7, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__guarded_open_np.S b/src/kernel/libsyscall/sys_x86-64/___guarded_open_np.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__guarded_open_np.S
rename to src/kernel/libsyscall/sys_x86-64/___guarded_open_np.S
index bb98e2b5c..fa0868336 100644
--- a/src/kernel/libsyscall/sys_x86-64/__guarded_open_np.S
+++ b/src/kernel/libsyscall/sys_x86-64/___guarded_open_np.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__guarded_open_np, guarded_open_np, 5, cerror_nocancel)
+__SYSCALL2(___guarded_open_np, guarded_open_np, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__identitysvc.S b/src/kernel/libsyscall/sys_x86-64/___identitysvc.S
similarity index 79%
rename from src/kernel/libsyscall/sys_x86-64/__identitysvc.S
rename to src/kernel/libsyscall/sys_x86-64/___identitysvc.S
index a320cd6af..fdbc8bfac 100644
--- a/src/kernel/libsyscall/sys_x86-64/__identitysvc.S
+++ b/src/kernel/libsyscall/sys_x86-64/___identitysvc.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__identitysvc, identitysvc, 2, cerror_nocancel)
+__SYSCALL2(___identitysvc, identitysvc, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__initgroups.S b/src/kernel/libsyscall/sys_x86-64/___initgroups.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/__initgroups.S
rename to src/kernel/libsyscall/sys_x86-64/___initgroups.S
index 6a5d48bd4..7ad04d07a 100644
--- a/src/kernel/libsyscall/sys_x86-64/__initgroups.S
+++ b/src/kernel/libsyscall/sys_x86-64/___initgroups.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__initgroups, initgroups, 3, cerror_nocancel)
+__SYSCALL2(___initgroups, initgroups, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__ioctl.S b/src/kernel/libsyscall/sys_x86-64/___ioctl.S
similarity index 85%
rename from src/kernel/libsyscall/sys_x86-64/__ioctl.S
rename to src/kernel/libsyscall/sys_x86-64/___ioctl.S
index 5249cdbd2..2c518a375 100644
--- a/src/kernel/libsyscall/sys_x86-64/__ioctl.S
+++ b/src/kernel/libsyscall/sys_x86-64/___ioctl.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__ioctl, ioctl, 3, cerror)
+__SYSCALL2(___ioctl, ioctl, 3, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__iopolicysys.S b/src/kernel/libsyscall/sys_x86-64/___iopolicysys.S
similarity index 79%
rename from src/kernel/libsyscall/sys_x86-64/__iopolicysys.S
rename to src/kernel/libsyscall/sys_x86-64/___iopolicysys.S
index 9d5633df4..1fe60fcd4 100644
--- a/src/kernel/libsyscall/sys_x86-64/__iopolicysys.S
+++ b/src/kernel/libsyscall/sys_x86-64/___iopolicysys.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__iopolicysys, iopolicysys, 2, cerror_nocancel)
+__SYSCALL2(___iopolicysys, iopolicysys, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__kdebug_trace.S b/src/kernel/libsyscall/sys_x86-64/___kdebug_trace.S
similarity index 66%
rename from src/kernel/libsyscall/sys_x86-64/__kdebug_trace.S
rename to src/kernel/libsyscall/sys_x86-64/___kdebug_trace.S
index b8a235cc5..f10a62d86 100644
--- a/src/kernel/libsyscall/sys_x86-64/__kdebug_trace.S
+++ b/src/kernel/libsyscall/sys_x86-64/___kdebug_trace.S
@@ -1,4 +1,4 @@
-#define __SYSCALL_32BIT_ARG_BYTES 24
+#define __SYSCALL_32BIT_ARG_BYTES 20
 #include "SYS.h"
 
 #ifndef SYS_kdebug_trace
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__kdebug_trace, kdebug_trace, 6, cerror_nocancel)
+__SYSCALL2(___kdebug_trace, kdebug_trace, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/___kdebug_trace64.S b/src/kernel/libsyscall/sys_x86-64/___kdebug_trace64.S
new file mode 100644
index 000000000..ffc23d7b9
--- /dev/null
+++ b/src/kernel/libsyscall/sys_x86-64/___kdebug_trace64.S
@@ -0,0 +1,11 @@
+#define __SYSCALL_32BIT_ARG_BYTES 36
+#include "SYS.h"
+
+#ifndef SYS_kdebug_trace64
+#error "SYS_kdebug_trace64 not defined. The header files libsyscall is building against do not match syscalls.master."
+#endif
+
+#if defined(__x86_64__)
+__SYSCALL2(___kdebug_trace64, kdebug_trace64, 5, cerror_nocancel)
+#endif
+
diff --git a/src/kernel/libsyscall/sys_x86-64/___kdebug_trace_string.S b/src/kernel/libsyscall/sys_x86-64/___kdebug_trace_string.S
new file mode 100644
index 000000000..4f4595d78
--- /dev/null
+++ b/src/kernel/libsyscall/sys_x86-64/___kdebug_trace_string.S
@@ -0,0 +1,11 @@
+#define __SYSCALL_32BIT_ARG_BYTES 16
+#include "SYS.h"
+
+#ifndef SYS_kdebug_trace_string
+#error "SYS_kdebug_trace_string not defined. The header files libsyscall is building against do not match syscalls.master."
+#endif
+
+#if defined(__x86_64__)
+__SYSCALL2(___kdebug_trace_string, kdebug_trace_string, 3, cerror_nocancel)
+#endif
+
diff --git a/src/kernel/libsyscall/sys_x86-64/__kill.S b/src/kernel/libsyscall/sys_x86-64/___kill.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/__kill.S
rename to src/kernel/libsyscall/sys_x86-64/___kill.S
index 2c4d9949a..2ba63bb86 100644
--- a/src/kernel/libsyscall/sys_x86-64/__kill.S
+++ b/src/kernel/libsyscall/sys_x86-64/___kill.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__kill, kill, 3, cerror_nocancel)
+__SYSCALL2(___kill, kill, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__lchown.S b/src/kernel/libsyscall/sys_x86-64/___lchown.S
similarity index 73%
rename from src/kernel/libsyscall/sys_x86-64/__lchown.S
rename to src/kernel/libsyscall/sys_x86-64/___lchown.S
index 8ef6f3b47..9e768e1b6 100644
--- a/src/kernel/libsyscall/sys_x86-64/__lchown.S
+++ b/src/kernel/libsyscall/sys_x86-64/___lchown.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__lchown, lchown, 3, cerror_nocancel)
+__SYSCALL2(___lchown, lchown, 3, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	lchown
-		lchown = __lchown
+	.globl	_lchown
+	.set	_lchown, ___lchown
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__listen.S b/src/kernel/libsyscall/sys_x86-64/___listen.S
similarity index 73%
rename from src/kernel/libsyscall/sys_x86-64/__listen.S
rename to src/kernel/libsyscall/sys_x86-64/___listen.S
index 49a01a672..d186717a5 100644
--- a/src/kernel/libsyscall/sys_x86-64/__listen.S
+++ b/src/kernel/libsyscall/sys_x86-64/___listen.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__listen, listen, 2, cerror_nocancel)
+__SYSCALL2(___listen, listen, 2, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	listen
-		listen = __listen
+	.globl	_listen
+	.set	_listen, ___listen
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__lseek.S b/src/kernel/libsyscall/sys_x86-64/___lseek.S
similarity index 95%
rename from src/kernel/libsyscall/sys_x86-64/__lseek.S
rename to src/kernel/libsyscall/sys_x86-64/___lseek.S
index 4b9e19b1b..fbaf70d08 100644
--- a/src/kernel/libsyscall/sys_x86-64/__lseek.S
+++ b/src/kernel/libsyscall/sys_x86-64/___lseek.S
@@ -29,10 +29,6 @@
 
 #include "SYS.h"
 
-#ifdef DARLING
-#	define ___lseek __lseek
-#endif
-
 #if defined(__x86_64__)
 
 __SYSCALL(___lseek, lseek, 3)
@@ -45,7 +41,7 @@ __SYSCALL_INT(___lseek, lseek, 3)
 #error Unsupported architecture
 #endif
 #if defined(__x86_64__)
-	.globl	lseek
-		lseek = __lseek
+	.globl	_lseek
+	.set	_lseek, ___lseek
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__lstat64_extended.S b/src/kernel/libsyscall/sys_x86-64/___lstat64_extended.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/__lstat64_extended.S
rename to src/kernel/libsyscall/sys_x86-64/___lstat64_extended.S
index 99c4a3ce0..5241a62d9 100644
--- a/src/kernel/libsyscall/sys_x86-64/__lstat64_extended.S
+++ b/src/kernel/libsyscall/sys_x86-64/___lstat64_extended.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__lstat64_extended, lstat64_extended, 4, cerror_nocancel)
+__SYSCALL2(___lstat64_extended, lstat64_extended, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__lstat_extended.S b/src/kernel/libsyscall/sys_x86-64/___lstat_extended.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__lstat_extended.S
rename to src/kernel/libsyscall/sys_x86-64/___lstat_extended.S
index 5c8c6a1a9..461103d96 100644
--- a/src/kernel/libsyscall/sys_x86-64/__lstat_extended.S
+++ b/src/kernel/libsyscall/sys_x86-64/___lstat_extended.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__lstat_extended, lstat_extended, 4, cerror_nocancel)
+__SYSCALL2(___lstat_extended, lstat_extended, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__mac_execve.S b/src/kernel/libsyscall/sys_x86-64/___mac_execve.S
similarity index 69%
rename from src/kernel/libsyscall/sys_x86-64/__mac_execve.S
rename to src/kernel/libsyscall/sys_x86-64/___mac_execve.S
index 5ab237486..770ce3110 100644
--- a/src/kernel/libsyscall/sys_x86-64/__mac_execve.S
+++ b/src/kernel/libsyscall/sys_x86-64/___mac_execve.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__mac_execve, __mac_execve, 4, cerror_nocancel)
+__SYSCALL2(___mac_execve, __mac_execve, 4, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	__sandbox_me
-		__sandbox_me = __mac_execve
+	.globl	___sandbox_me
+	.set	___sandbox_me, ___mac_execve
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__mac_get_fd.S b/src/kernel/libsyscall/sys_x86-64/___mac_get_fd.S
similarity index 79%
rename from src/kernel/libsyscall/sys_x86-64/__mac_get_fd.S
rename to src/kernel/libsyscall/sys_x86-64/___mac_get_fd.S
index 35e1222e8..d510ee38a 100644
--- a/src/kernel/libsyscall/sys_x86-64/__mac_get_fd.S
+++ b/src/kernel/libsyscall/sys_x86-64/___mac_get_fd.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__mac_get_fd, __mac_get_fd, 2, cerror_nocancel)
+__SYSCALL2(___mac_get_fd, __mac_get_fd, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__mac_get_file.S b/src/kernel/libsyscall/sys_x86-64/___mac_get_file.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__mac_get_file.S
rename to src/kernel/libsyscall/sys_x86-64/___mac_get_file.S
index 7fddffec9..a9f9bb53b 100644
--- a/src/kernel/libsyscall/sys_x86-64/__mac_get_file.S
+++ b/src/kernel/libsyscall/sys_x86-64/___mac_get_file.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__mac_get_file, __mac_get_file, 2, cerror_nocancel)
+__SYSCALL2(___mac_get_file, __mac_get_file, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__mac_get_link.S b/src/kernel/libsyscall/sys_x86-64/___mac_get_link.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__mac_get_link.S
rename to src/kernel/libsyscall/sys_x86-64/___mac_get_link.S
index a3ce92288..a66529475 100644
--- a/src/kernel/libsyscall/sys_x86-64/__mac_get_link.S
+++ b/src/kernel/libsyscall/sys_x86-64/___mac_get_link.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__mac_get_link, __mac_get_link, 2, cerror_nocancel)
+__SYSCALL2(___mac_get_link, __mac_get_link, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__mac_get_mount.S b/src/kernel/libsyscall/sys_x86-64/___mac_get_mount.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__mac_get_mount.S
rename to src/kernel/libsyscall/sys_x86-64/___mac_get_mount.S
index 1dc452bfd..5550ee9ea 100644
--- a/src/kernel/libsyscall/sys_x86-64/__mac_get_mount.S
+++ b/src/kernel/libsyscall/sys_x86-64/___mac_get_mount.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__mac_get_mount, __mac_get_mount, 2, cerror_nocancel)
+__SYSCALL2(___mac_get_mount, __mac_get_mount, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__mac_get_pid.S b/src/kernel/libsyscall/sys_x86-64/___mac_get_pid.S
similarity index 79%
rename from src/kernel/libsyscall/sys_x86-64/__mac_get_pid.S
rename to src/kernel/libsyscall/sys_x86-64/___mac_get_pid.S
index d8c85123f..2ef2d82a9 100644
--- a/src/kernel/libsyscall/sys_x86-64/__mac_get_pid.S
+++ b/src/kernel/libsyscall/sys_x86-64/___mac_get_pid.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__mac_get_pid, __mac_get_pid, 2, cerror_nocancel)
+__SYSCALL2(___mac_get_pid, __mac_get_pid, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__mac_get_proc.S b/src/kernel/libsyscall/sys_x86-64/___mac_get_proc.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__mac_get_proc.S
rename to src/kernel/libsyscall/sys_x86-64/___mac_get_proc.S
index 6072dbf7b..03e1a643b 100644
--- a/src/kernel/libsyscall/sys_x86-64/__mac_get_proc.S
+++ b/src/kernel/libsyscall/sys_x86-64/___mac_get_proc.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__mac_get_proc, __mac_get_proc, 1, cerror_nocancel)
+__SYSCALL2(___mac_get_proc, __mac_get_proc, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__mac_getfsstat.S b/src/kernel/libsyscall/sys_x86-64/___mac_getfsstat.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__mac_getfsstat.S
rename to src/kernel/libsyscall/sys_x86-64/___mac_getfsstat.S
index 2334811cf..bad0027d8 100644
--- a/src/kernel/libsyscall/sys_x86-64/__mac_getfsstat.S
+++ b/src/kernel/libsyscall/sys_x86-64/___mac_getfsstat.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__mac_getfsstat, __mac_getfsstat, 5, cerror_nocancel)
+__SYSCALL2(___mac_getfsstat, __mac_getfsstat, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__mac_mount.S b/src/kernel/libsyscall/sys_x86-64/___mac_mount.S
similarity index 70%
rename from src/kernel/libsyscall/sys_x86-64/__mac_mount.S
rename to src/kernel/libsyscall/sys_x86-64/___mac_mount.S
index 182ff825a..1bff23cb6 100644
--- a/src/kernel/libsyscall/sys_x86-64/__mac_mount.S
+++ b/src/kernel/libsyscall/sys_x86-64/___mac_mount.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__mac_mount, __mac_mount, 5, cerror_nocancel)
+__SYSCALL2(___mac_mount, __mac_mount, 5, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	__sandbox_mm
-		__sandbox_mm = __mac_mount
+	.globl	___sandbox_mm
+	.set	___sandbox_mm, ___mac_mount
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__mac_set_fd.S b/src/kernel/libsyscall/sys_x86-64/___mac_set_fd.S
similarity index 79%
rename from src/kernel/libsyscall/sys_x86-64/__mac_set_fd.S
rename to src/kernel/libsyscall/sys_x86-64/___mac_set_fd.S
index bf06d3d09..56746bad5 100644
--- a/src/kernel/libsyscall/sys_x86-64/__mac_set_fd.S
+++ b/src/kernel/libsyscall/sys_x86-64/___mac_set_fd.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__mac_set_fd, __mac_set_fd, 2, cerror_nocancel)
+__SYSCALL2(___mac_set_fd, __mac_set_fd, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__mac_set_file.S b/src/kernel/libsyscall/sys_x86-64/___mac_set_file.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__mac_set_file.S
rename to src/kernel/libsyscall/sys_x86-64/___mac_set_file.S
index 95a657ae0..f7a3cd231 100644
--- a/src/kernel/libsyscall/sys_x86-64/__mac_set_file.S
+++ b/src/kernel/libsyscall/sys_x86-64/___mac_set_file.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__mac_set_file, __mac_set_file, 2, cerror_nocancel)
+__SYSCALL2(___mac_set_file, __mac_set_file, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__mac_set_link.S b/src/kernel/libsyscall/sys_x86-64/___mac_set_link.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__mac_set_link.S
rename to src/kernel/libsyscall/sys_x86-64/___mac_set_link.S
index 80c37c5dd..3ff645a04 100644
--- a/src/kernel/libsyscall/sys_x86-64/__mac_set_link.S
+++ b/src/kernel/libsyscall/sys_x86-64/___mac_set_link.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__mac_set_link, __mac_set_link, 2, cerror_nocancel)
+__SYSCALL2(___mac_set_link, __mac_set_link, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__mac_set_proc.S b/src/kernel/libsyscall/sys_x86-64/___mac_set_proc.S
similarity index 68%
rename from src/kernel/libsyscall/sys_x86-64/__mac_set_proc.S
rename to src/kernel/libsyscall/sys_x86-64/___mac_set_proc.S
index 7d99b7027..6ad3bcc85 100644
--- a/src/kernel/libsyscall/sys_x86-64/__mac_set_proc.S
+++ b/src/kernel/libsyscall/sys_x86-64/___mac_set_proc.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__mac_set_proc, __mac_set_proc, 1, cerror_nocancel)
+__SYSCALL2(___mac_set_proc, __mac_set_proc, 1, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	__sandbox_msp
-		__sandbox_msp = __mac_set_proc
+	.globl	___sandbox_msp
+	.set	___sandbox_msp, ___mac_set_proc
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__mac_syscall.S b/src/kernel/libsyscall/sys_x86-64/___mac_syscall.S
similarity index 69%
rename from src/kernel/libsyscall/sys_x86-64/__mac_syscall.S
rename to src/kernel/libsyscall/sys_x86-64/___mac_syscall.S
index 94c636cca..755eb7323 100644
--- a/src/kernel/libsyscall/sys_x86-64/__mac_syscall.S
+++ b/src/kernel/libsyscall/sys_x86-64/___mac_syscall.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__mac_syscall, __mac_syscall, 3, cerror_nocancel)
+__SYSCALL2(___mac_syscall, __mac_syscall, 3, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	__sandbox_ms
-		__sandbox_ms = __mac_syscall
+	.globl	___sandbox_ms
+	.set	___sandbox_ms, ___mac_syscall
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/___microstackshot.S b/src/kernel/libsyscall/sys_x86-64/___microstackshot.S
new file mode 100644
index 000000000..cb7e944fc
--- /dev/null
+++ b/src/kernel/libsyscall/sys_x86-64/___microstackshot.S
@@ -0,0 +1,11 @@
+#define __SYSCALL_32BIT_ARG_BYTES 12
+#include "SYS.h"
+
+#ifndef SYS_microstackshot
+#error "SYS_microstackshot not defined. The header files libsyscall is building against do not match syscalls.master."
+#endif
+
+#if defined(__x86_64__)
+__SYSCALL2(___microstackshot, microstackshot, 3, cerror_nocancel)
+#endif
+
diff --git a/src/kernel/libsyscall/sys_x86-64/__mkdir_extended.S b/src/kernel/libsyscall/sys_x86-64/___mkdir_extended.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__mkdir_extended.S
rename to src/kernel/libsyscall/sys_x86-64/___mkdir_extended.S
index 80ab405b4..dfa126986 100644
--- a/src/kernel/libsyscall/sys_x86-64/__mkdir_extended.S
+++ b/src/kernel/libsyscall/sys_x86-64/___mkdir_extended.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__mkdir_extended, mkdir_extended, 5, cerror_nocancel)
+__SYSCALL2(___mkdir_extended, mkdir_extended, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__mkfifo_extended.S b/src/kernel/libsyscall/sys_x86-64/___mkfifo_extended.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__mkfifo_extended.S
rename to src/kernel/libsyscall/sys_x86-64/___mkfifo_extended.S
index 1fa7a6128..84a216cda 100644
--- a/src/kernel/libsyscall/sys_x86-64/__mkfifo_extended.S
+++ b/src/kernel/libsyscall/sys_x86-64/___mkfifo_extended.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__mkfifo_extended, mkfifo_extended, 5, cerror_nocancel)
+__SYSCALL2(___mkfifo_extended, mkfifo_extended, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__mmap.S b/src/kernel/libsyscall/sys_x86-64/___mmap.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/__mmap.S
rename to src/kernel/libsyscall/sys_x86-64/___mmap.S
index 03b8212a0..a3d159865 100644
--- a/src/kernel/libsyscall/sys_x86-64/__mmap.S
+++ b/src/kernel/libsyscall/sys_x86-64/___mmap.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__mmap, mmap, 6, cerror_nocancel)
+__SYSCALL2(___mmap, mmap, 6, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__mprotect.S b/src/kernel/libsyscall/sys_x86-64/___mprotect.S
similarity index 72%
rename from src/kernel/libsyscall/sys_x86-64/__mprotect.S
rename to src/kernel/libsyscall/sys_x86-64/___mprotect.S
index ad1495ea7..c79c77548 100644
--- a/src/kernel/libsyscall/sys_x86-64/__mprotect.S
+++ b/src/kernel/libsyscall/sys_x86-64/___mprotect.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__mprotect, mprotect, 3, cerror_nocancel)
+__SYSCALL2(___mprotect, mprotect, 3, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	mprotect
-		mprotect = __mprotect
+	.globl	_mprotect
+	.set	_mprotect, ___mprotect
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__msgctl.S b/src/kernel/libsyscall/sys_x86-64/___msgctl.S
similarity index 73%
rename from src/kernel/libsyscall/sys_x86-64/__msgctl.S
rename to src/kernel/libsyscall/sys_x86-64/___msgctl.S
index 89b8f6d2e..f24b1b8ed 100644
--- a/src/kernel/libsyscall/sys_x86-64/__msgctl.S
+++ b/src/kernel/libsyscall/sys_x86-64/___msgctl.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__msgctl, msgctl, 3, cerror_nocancel)
+__SYSCALL2(___msgctl, msgctl, 3, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	msgctl
-		msgctl = __msgctl
+	.globl	_msgctl
+	.set	_msgctl, ___msgctl
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__msgrcv_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___msgrcv_nocancel.S
similarity index 66%
rename from src/kernel/libsyscall/sys_x86-64/__msgrcv_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___msgrcv_nocancel.S
index 3dcbef01e..d0e6b2e08 100644
--- a/src/kernel/libsyscall/sys_x86-64/__msgrcv_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___msgrcv_nocancel.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__msgrcv_nocancel, msgrcv_nocancel, 5, cerror_nocancel)
+__SYSCALL2(___msgrcv_nocancel, msgrcv_nocancel, 5, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	msgrcv$NOCANCEL
-		msgrcv$NOCANCEL = __msgrcv_nocancel
+	.globl	_msgrcv$NOCANCEL
+	.set	_msgrcv$NOCANCEL, ___msgrcv_nocancel
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__msgsnd_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___msgsnd_nocancel.S
similarity index 66%
rename from src/kernel/libsyscall/sys_x86-64/__msgsnd_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___msgsnd_nocancel.S
index e2f1eb8d2..d124666d6 100644
--- a/src/kernel/libsyscall/sys_x86-64/__msgsnd_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___msgsnd_nocancel.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__msgsnd_nocancel, msgsnd_nocancel, 4, cerror_nocancel)
+__SYSCALL2(___msgsnd_nocancel, msgsnd_nocancel, 4, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	msgsnd$NOCANCEL
-		msgsnd$NOCANCEL = __msgsnd_nocancel
+	.globl	_msgsnd$NOCANCEL
+	.set	_msgsnd$NOCANCEL, ___msgsnd_nocancel
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__msgsys.S b/src/kernel/libsyscall/sys_x86-64/___msgsys.S
similarity index 73%
rename from src/kernel/libsyscall/sys_x86-64/__msgsys.S
rename to src/kernel/libsyscall/sys_x86-64/___msgsys.S
index 79d1f1222..486d5de88 100644
--- a/src/kernel/libsyscall/sys_x86-64/__msgsys.S
+++ b/src/kernel/libsyscall/sys_x86-64/___msgsys.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__msgsys, msgsys, 5, cerror_nocancel)
+__SYSCALL2(___msgsys, msgsys, 5, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	msgsys
-		msgsys = __msgsys
+	.globl	_msgsys
+	.set	_msgsys, ___msgsys
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__msync.S b/src/kernel/libsyscall/sys_x86-64/___msync.S
similarity index 76%
rename from src/kernel/libsyscall/sys_x86-64/__msync.S
rename to src/kernel/libsyscall/sys_x86-64/___msync.S
index 4b8083a41..629e1559c 100644
--- a/src/kernel/libsyscall/sys_x86-64/__msync.S
+++ b/src/kernel/libsyscall/sys_x86-64/___msync.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__msync, msync, 3, cerror)
+__SYSCALL2(___msync, msync, 3, cerror)
 #endif
 
 #if defined(__x86_64__)
-	.globl	msync
-		msync = __msync
+	.globl	_msync
+	.set	_msync, ___msync
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__msync_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___msync_nocancel.S
similarity index 67%
rename from src/kernel/libsyscall/sys_x86-64/__msync_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___msync_nocancel.S
index aaa03b8c0..550a7238b 100644
--- a/src/kernel/libsyscall/sys_x86-64/__msync_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___msync_nocancel.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__msync_nocancel, msync_nocancel, 3, cerror_nocancel)
+__SYSCALL2(___msync_nocancel, msync_nocancel, 3, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	msync$NOCANCEL
-		msync$NOCANCEL = __msync_nocancel
+	.globl	_msync$NOCANCEL
+	.set	_msync$NOCANCEL, ___msync_nocancel
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__munmap.S b/src/kernel/libsyscall/sys_x86-64/___munmap.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/__munmap.S
rename to src/kernel/libsyscall/sys_x86-64/___munmap.S
index 791daaf2a..f6d140a06 100644
--- a/src/kernel/libsyscall/sys_x86-64/__munmap.S
+++ b/src/kernel/libsyscall/sys_x86-64/___munmap.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__munmap, munmap, 2, cerror_nocancel)
+__SYSCALL2(___munmap, munmap, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__old_semwait_signal.S b/src/kernel/libsyscall/sys_x86-64/___old_semwait_signal.S
similarity index 76%
rename from src/kernel/libsyscall/sys_x86-64/__old_semwait_signal.S
rename to src/kernel/libsyscall/sys_x86-64/___old_semwait_signal.S
index 5c52211f7..847296124 100644
--- a/src/kernel/libsyscall/sys_x86-64/__old_semwait_signal.S
+++ b/src/kernel/libsyscall/sys_x86-64/___old_semwait_signal.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__old_semwait_signal, __old_semwait_signal, 5, cerror_nocancel)
+__SYSCALL2(___old_semwait_signal, __old_semwait_signal, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__open.S b/src/kernel/libsyscall/sys_x86-64/___open.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/__open.S
rename to src/kernel/libsyscall/sys_x86-64/___open.S
index 438ca7f3c..bddc6f30a 100644
--- a/src/kernel/libsyscall/sys_x86-64/__open.S
+++ b/src/kernel/libsyscall/sys_x86-64/___open.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__open, open, 3, cerror)
+__SYSCALL2(___open, open, 3, cerror)
 #endif
 
 #if defined(__x86_64__)
-	.globl	open
-		open = __open
+	.globl	_open
+	.set	_open, ___open
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__open_dprotected_np.S b/src/kernel/libsyscall/sys_x86-64/___open_dprotected_np.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/__open_dprotected_np.S
rename to src/kernel/libsyscall/sys_x86-64/___open_dprotected_np.S
index ae7d06416..df6ff9fcd 100644
--- a/src/kernel/libsyscall/sys_x86-64/__open_dprotected_np.S
+++ b/src/kernel/libsyscall/sys_x86-64/___open_dprotected_np.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__open_dprotected_np, open_dprotected_np, 5, cerror_nocancel)
+__SYSCALL2(___open_dprotected_np, open_dprotected_np, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__open_extended.S b/src/kernel/libsyscall/sys_x86-64/___open_extended.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__open_extended.S
rename to src/kernel/libsyscall/sys_x86-64/___open_extended.S
index 3f3e392fe..474369e09 100644
--- a/src/kernel/libsyscall/sys_x86-64/__open_extended.S
+++ b/src/kernel/libsyscall/sys_x86-64/___open_extended.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__open_extended, open_extended, 6, cerror_nocancel)
+__SYSCALL2(___open_extended, open_extended, 6, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__open_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___open_nocancel.S
similarity index 68%
rename from src/kernel/libsyscall/sys_x86-64/__open_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___open_nocancel.S
index 5be2ab78c..0aeab816a 100644
--- a/src/kernel/libsyscall/sys_x86-64/__open_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___open_nocancel.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__open_nocancel, open_nocancel, 3, cerror_nocancel)
+__SYSCALL2(___open_nocancel, open_nocancel, 3, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	open$NOCANCEL
-		open$NOCANCEL = __open_nocancel
+	.globl	_open$NOCANCEL
+	.set	_open$NOCANCEL, ___open_nocancel
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__openat.S b/src/kernel/libsyscall/sys_x86-64/___openat.S
similarity index 75%
rename from src/kernel/libsyscall/sys_x86-64/__openat.S
rename to src/kernel/libsyscall/sys_x86-64/___openat.S
index 2bd6c7347..b6d7a3272 100644
--- a/src/kernel/libsyscall/sys_x86-64/__openat.S
+++ b/src/kernel/libsyscall/sys_x86-64/___openat.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__openat, openat, 4, cerror)
+__SYSCALL2(___openat, openat, 4, cerror)
 #endif
 
 #if defined(__x86_64__)
-	.globl	openat
-		openat = __openat
+	.globl	_openat
+	.set	_openat, ___openat
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__openat_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___openat_nocancel.S
similarity index 66%
rename from src/kernel/libsyscall/sys_x86-64/__openat_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___openat_nocancel.S
index 5ebea3565..e5b8eaf65 100644
--- a/src/kernel/libsyscall/sys_x86-64/__openat_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___openat_nocancel.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__openat_nocancel, openat_nocancel, 4, cerror_nocancel)
+__SYSCALL2(___openat_nocancel, openat_nocancel, 4, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	openat$NOCANCEL
-		openat$NOCANCEL = __openat_nocancel
+	.globl	_openat$NOCANCEL
+	.set	_openat$NOCANCEL, ___openat_nocancel
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/___persona.S b/src/kernel/libsyscall/sys_x86-64/___persona.S
new file mode 100644
index 000000000..166a6d55d
--- /dev/null
+++ b/src/kernel/libsyscall/sys_x86-64/___persona.S
@@ -0,0 +1,11 @@
+#define __SYSCALL_32BIT_ARG_BYTES 20
+#include "SYS.h"
+
+#ifndef SYS_persona
+#error "SYS_persona not defined. The header files libsyscall is building against do not match syscalls.master."
+#endif
+
+#if defined(__x86_64__)
+__SYSCALL2(___persona, persona, 5, cerror_nocancel)
+#endif
+
diff --git a/src/kernel/libsyscall/sys_x86-64/__pipe.S b/src/kernel/libsyscall/sys_x86-64/___pipe.S
similarity index 86%
rename from src/kernel/libsyscall/sys_x86-64/__pipe.S
rename to src/kernel/libsyscall/sys_x86-64/___pipe.S
index f1c43db21..d97802407 100644
--- a/src/kernel/libsyscall/sys_x86-64/__pipe.S
+++ b/src/kernel/libsyscall/sys_x86-64/___pipe.S
@@ -30,23 +30,28 @@
 
 #include "SYS.h"
 
-#ifdef DARLING
-#	define ___pipe __pipe
-#endif
-
 #if defined(__i386__)
 
-__SYSCALL2(___pipe, pipe, 1, cerror)
+PSEUDO_INT(___pipe, pipe, 0)
+	movl	4(%esp),%ecx
+	movl	%eax,(%ecx)
+	movl	%edx,4(%ecx)
+	xorl	%eax,%eax
+	ret
 
 #elif defined(__x86_64__)
 
-__SYSCALL2(___pipe, pipe, 1, cerror)
+PSEUDO(___pipe, pipe, 0, cerror_nocancel)
+	movl	%eax, (%rdi)
+	movl	%edx, 4(%rdi)
+	xorl	%eax, %eax
+	ret
 
 #else
 #error Unsupported architecture
 #endif
 #if defined(__x86_64__)
-	.globl	pipe
-		pipe = __pipe
+	.globl	_pipe
+	.set	_pipe, ___pipe
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__poll_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___poll_nocancel.S
similarity index 68%
rename from src/kernel/libsyscall/sys_x86-64/__poll_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___poll_nocancel.S
index b696f1978..ebc2f55b4 100644
--- a/src/kernel/libsyscall/sys_x86-64/__poll_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___poll_nocancel.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__poll_nocancel, poll_nocancel, 3, cerror_nocancel)
+__SYSCALL2(___poll_nocancel, poll_nocancel, 3, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	poll$NOCANCEL
-		poll$NOCANCEL = __poll_nocancel
+	.globl	_poll$NOCANCEL
+	.set	_poll$NOCANCEL, ___poll_nocancel
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__posix_spawn.S b/src/kernel/libsyscall/sys_x86-64/___posix_spawn.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/__posix_spawn.S
rename to src/kernel/libsyscall/sys_x86-64/___posix_spawn.S
index eacf48f03..b44b0b78b 100644
--- a/src/kernel/libsyscall/sys_x86-64/__posix_spawn.S
+++ b/src/kernel/libsyscall/sys_x86-64/___posix_spawn.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__posix_spawn, posix_spawn, 5, cerror)
+__SYSCALL2(___posix_spawn, posix_spawn, 5, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__pread_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___pread_nocancel.S
similarity index 67%
rename from src/kernel/libsyscall/sys_x86-64/__pread_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___pread_nocancel.S
index 40adbd1bf..f0f7f2f1b 100644
--- a/src/kernel/libsyscall/sys_x86-64/__pread_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___pread_nocancel.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__pread_nocancel, pread_nocancel, 4, cerror_nocancel)
+__SYSCALL2(___pread_nocancel, pread_nocancel, 4, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	pread$NOCANCEL
-		pread$NOCANCEL = __pread_nocancel
+	.globl	_pread$NOCANCEL
+	.set	_pread$NOCANCEL, ___pread_nocancel
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__proc_info.S b/src/kernel/libsyscall/sys_x86-64/___proc_info.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/__proc_info.S
rename to src/kernel/libsyscall/sys_x86-64/___proc_info.S
index fcfdd5078..e22465c32 100644
--- a/src/kernel/libsyscall/sys_x86-64/__proc_info.S
+++ b/src/kernel/libsyscall/sys_x86-64/___proc_info.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__proc_info, proc_info, 6, cerror_nocancel)
+__SYSCALL2(___proc_info, proc_info, 6, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__process_policy.S b/src/kernel/libsyscall/sys_x86-64/___process_policy.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__process_policy.S
rename to src/kernel/libsyscall/sys_x86-64/___process_policy.S
index 523bfb584..5a9e11d1b 100644
--- a/src/kernel/libsyscall/sys_x86-64/__process_policy.S
+++ b/src/kernel/libsyscall/sys_x86-64/___process_policy.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__process_policy, process_policy, 7, cerror_nocancel)
+__SYSCALL2(___process_policy, process_policy, 7, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/___pselect.S b/src/kernel/libsyscall/sys_x86-64/___pselect.S
new file mode 100644
index 000000000..711cbbb26
--- /dev/null
+++ b/src/kernel/libsyscall/sys_x86-64/___pselect.S
@@ -0,0 +1,11 @@
+#define __SYSCALL_32BIT_ARG_BYTES 24
+#include "SYS.h"
+
+#ifndef SYS_pselect
+#error "SYS_pselect not defined. The header files libsyscall is building against do not match syscalls.master."
+#endif
+
+#if defined(__x86_64__)
+__SYSCALL2(___pselect, pselect, 6, cerror_nocancel)
+#endif
+
diff --git a/src/kernel/libsyscall/sys_x86-64/___pselect_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___pselect_nocancel.S
new file mode 100644
index 000000000..1d253f536
--- /dev/null
+++ b/src/kernel/libsyscall/sys_x86-64/___pselect_nocancel.S
@@ -0,0 +1,11 @@
+#define __SYSCALL_32BIT_ARG_BYTES 24
+#include "SYS.h"
+
+#ifndef SYS_pselect_nocancel
+#error "SYS_pselect_nocancel not defined. The header files libsyscall is building against do not match syscalls.master."
+#endif
+
+#if defined(__x86_64__)
+__SYSCALL2(___pselect_nocancel, pselect_nocancel, 6, cerror_nocancel)
+#endif
+
diff --git a/src/kernel/libsyscall/sys_x86-64/__psynch_cvbroad.S b/src/kernel/libsyscall/sys_x86-64/___psynch_cvbroad.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__psynch_cvbroad.S
rename to src/kernel/libsyscall/sys_x86-64/___psynch_cvbroad.S
index c52ab9c7d..782d8f265 100644
--- a/src/kernel/libsyscall/sys_x86-64/__psynch_cvbroad.S
+++ b/src/kernel/libsyscall/sys_x86-64/___psynch_cvbroad.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__psynch_cvbroad, psynch_cvbroad, 7, cerror_nocancel)
+__SYSCALL2(___psynch_cvbroad, psynch_cvbroad, 7, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__psynch_cvclrprepost.S b/src/kernel/libsyscall/sys_x86-64/___psynch_cvclrprepost.S
similarity index 76%
rename from src/kernel/libsyscall/sys_x86-64/__psynch_cvclrprepost.S
rename to src/kernel/libsyscall/sys_x86-64/___psynch_cvclrprepost.S
index 147e3b466..8313d3a15 100644
--- a/src/kernel/libsyscall/sys_x86-64/__psynch_cvclrprepost.S
+++ b/src/kernel/libsyscall/sys_x86-64/___psynch_cvclrprepost.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__psynch_cvclrprepost, psynch_cvclrprepost, 7, cerror_nocancel)
+__SYSCALL2(___psynch_cvclrprepost, psynch_cvclrprepost, 7, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__psynch_cvsignal.S b/src/kernel/libsyscall/sys_x86-64/___psynch_cvsignal.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__psynch_cvsignal.S
rename to src/kernel/libsyscall/sys_x86-64/___psynch_cvsignal.S
index ab42f49cf..1d7a6ee71 100644
--- a/src/kernel/libsyscall/sys_x86-64/__psynch_cvsignal.S
+++ b/src/kernel/libsyscall/sys_x86-64/___psynch_cvsignal.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__psynch_cvsignal, psynch_cvsignal, 8, cerror_nocancel)
+__SYSCALL2(___psynch_cvsignal, psynch_cvsignal, 8, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__psynch_cvwait.S b/src/kernel/libsyscall/sys_x86-64/___psynch_cvwait.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__psynch_cvwait.S
rename to src/kernel/libsyscall/sys_x86-64/___psynch_cvwait.S
index 2dd50e7a5..cab17a3de 100644
--- a/src/kernel/libsyscall/sys_x86-64/__psynch_cvwait.S
+++ b/src/kernel/libsyscall/sys_x86-64/___psynch_cvwait.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__psynch_cvwait, psynch_cvwait, 8, cerror_nocancel)
+__SYSCALL2(___psynch_cvwait, psynch_cvwait, 8, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__psynch_mutexdrop.S b/src/kernel/libsyscall/sys_x86-64/___psynch_mutexdrop.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/__psynch_mutexdrop.S
rename to src/kernel/libsyscall/sys_x86-64/___psynch_mutexdrop.S
index 343c4d806..0712412bf 100644
--- a/src/kernel/libsyscall/sys_x86-64/__psynch_mutexdrop.S
+++ b/src/kernel/libsyscall/sys_x86-64/___psynch_mutexdrop.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__psynch_mutexdrop, psynch_mutexdrop, 5, cerror_nocancel)
+__SYSCALL2(___psynch_mutexdrop, psynch_mutexdrop, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__psynch_mutexwait.S b/src/kernel/libsyscall/sys_x86-64/___psynch_mutexwait.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/__psynch_mutexwait.S
rename to src/kernel/libsyscall/sys_x86-64/___psynch_mutexwait.S
index 959a2ce8a..e6b6703ee 100644
--- a/src/kernel/libsyscall/sys_x86-64/__psynch_mutexwait.S
+++ b/src/kernel/libsyscall/sys_x86-64/___psynch_mutexwait.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__psynch_mutexwait, psynch_mutexwait, 5, cerror_nocancel)
+__SYSCALL2(___psynch_mutexwait, psynch_mutexwait, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__psynch_rw_downgrade.S b/src/kernel/libsyscall/sys_x86-64/___psynch_rw_downgrade.S
similarity index 76%
rename from src/kernel/libsyscall/sys_x86-64/__psynch_rw_downgrade.S
rename to src/kernel/libsyscall/sys_x86-64/___psynch_rw_downgrade.S
index 5e1a7b1bb..88183e6ca 100644
--- a/src/kernel/libsyscall/sys_x86-64/__psynch_rw_downgrade.S
+++ b/src/kernel/libsyscall/sys_x86-64/___psynch_rw_downgrade.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__psynch_rw_downgrade, psynch_rw_downgrade, 5, cerror_nocancel)
+__SYSCALL2(___psynch_rw_downgrade, psynch_rw_downgrade, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__psynch_rw_longrdlock.S b/src/kernel/libsyscall/sys_x86-64/___psynch_rw_longrdlock.S
similarity index 76%
rename from src/kernel/libsyscall/sys_x86-64/__psynch_rw_longrdlock.S
rename to src/kernel/libsyscall/sys_x86-64/___psynch_rw_longrdlock.S
index 9626da563..9c7a716c4 100644
--- a/src/kernel/libsyscall/sys_x86-64/__psynch_rw_longrdlock.S
+++ b/src/kernel/libsyscall/sys_x86-64/___psynch_rw_longrdlock.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__psynch_rw_longrdlock, psynch_rw_longrdlock, 5, cerror_nocancel)
+__SYSCALL2(___psynch_rw_longrdlock, psynch_rw_longrdlock, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__psynch_rw_rdlock.S b/src/kernel/libsyscall/sys_x86-64/___psynch_rw_rdlock.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/__psynch_rw_rdlock.S
rename to src/kernel/libsyscall/sys_x86-64/___psynch_rw_rdlock.S
index e6a8880df..966ed6309 100644
--- a/src/kernel/libsyscall/sys_x86-64/__psynch_rw_rdlock.S
+++ b/src/kernel/libsyscall/sys_x86-64/___psynch_rw_rdlock.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__psynch_rw_rdlock, psynch_rw_rdlock, 5, cerror_nocancel)
+__SYSCALL2(___psynch_rw_rdlock, psynch_rw_rdlock, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__psynch_rw_unlock.S b/src/kernel/libsyscall/sys_x86-64/___psynch_rw_unlock.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/__psynch_rw_unlock.S
rename to src/kernel/libsyscall/sys_x86-64/___psynch_rw_unlock.S
index f80cbc4eb..d3ecb5df2 100644
--- a/src/kernel/libsyscall/sys_x86-64/__psynch_rw_unlock.S
+++ b/src/kernel/libsyscall/sys_x86-64/___psynch_rw_unlock.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__psynch_rw_unlock, psynch_rw_unlock, 5, cerror_nocancel)
+__SYSCALL2(___psynch_rw_unlock, psynch_rw_unlock, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__psynch_rw_unlock2.S b/src/kernel/libsyscall/sys_x86-64/___psynch_rw_unlock2.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/__psynch_rw_unlock2.S
rename to src/kernel/libsyscall/sys_x86-64/___psynch_rw_unlock2.S
index fee75c4f6..3bd0e98ea 100644
--- a/src/kernel/libsyscall/sys_x86-64/__psynch_rw_unlock2.S
+++ b/src/kernel/libsyscall/sys_x86-64/___psynch_rw_unlock2.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__psynch_rw_unlock2, psynch_rw_unlock2, 5, cerror_nocancel)
+__SYSCALL2(___psynch_rw_unlock2, psynch_rw_unlock2, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__psynch_rw_upgrade.S b/src/kernel/libsyscall/sys_x86-64/___psynch_rw_upgrade.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/__psynch_rw_upgrade.S
rename to src/kernel/libsyscall/sys_x86-64/___psynch_rw_upgrade.S
index 8d6c5e17a..ee2d4362f 100644
--- a/src/kernel/libsyscall/sys_x86-64/__psynch_rw_upgrade.S
+++ b/src/kernel/libsyscall/sys_x86-64/___psynch_rw_upgrade.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__psynch_rw_upgrade, psynch_rw_upgrade, 5, cerror_nocancel)
+__SYSCALL2(___psynch_rw_upgrade, psynch_rw_upgrade, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__psynch_rw_wrlock.S b/src/kernel/libsyscall/sys_x86-64/___psynch_rw_wrlock.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/__psynch_rw_wrlock.S
rename to src/kernel/libsyscall/sys_x86-64/___psynch_rw_wrlock.S
index 45a93ec66..e55b535bd 100644
--- a/src/kernel/libsyscall/sys_x86-64/__psynch_rw_wrlock.S
+++ b/src/kernel/libsyscall/sys_x86-64/___psynch_rw_wrlock.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__psynch_rw_wrlock, psynch_rw_wrlock, 5, cerror_nocancel)
+__SYSCALL2(___psynch_rw_wrlock, psynch_rw_wrlock, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__psynch_rw_yieldwrlock.S b/src/kernel/libsyscall/sys_x86-64/___psynch_rw_yieldwrlock.S
similarity index 76%
rename from src/kernel/libsyscall/sys_x86-64/__psynch_rw_yieldwrlock.S
rename to src/kernel/libsyscall/sys_x86-64/___psynch_rw_yieldwrlock.S
index 0d881aa27..4f405af5f 100644
--- a/src/kernel/libsyscall/sys_x86-64/__psynch_rw_yieldwrlock.S
+++ b/src/kernel/libsyscall/sys_x86-64/___psynch_rw_yieldwrlock.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__psynch_rw_yieldwrlock, psynch_rw_yieldwrlock, 5, cerror_nocancel)
+__SYSCALL2(___psynch_rw_yieldwrlock, psynch_rw_yieldwrlock, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__pthread_canceled.S b/src/kernel/libsyscall/sys_x86-64/___pthread_canceled.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/__pthread_canceled.S
rename to src/kernel/libsyscall/sys_x86-64/___pthread_canceled.S
index f4fba760e..26f2daca3 100644
--- a/src/kernel/libsyscall/sys_x86-64/__pthread_canceled.S
+++ b/src/kernel/libsyscall/sys_x86-64/___pthread_canceled.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__pthread_canceled, __pthread_canceled, 1, cerror_nocancel)
+__SYSCALL2(___pthread_canceled, __pthread_canceled, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__pthread_chdir.S b/src/kernel/libsyscall/sys_x86-64/___pthread_chdir.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__pthread_chdir.S
rename to src/kernel/libsyscall/sys_x86-64/___pthread_chdir.S
index ea4bd81c5..73b4f56cc 100644
--- a/src/kernel/libsyscall/sys_x86-64/__pthread_chdir.S
+++ b/src/kernel/libsyscall/sys_x86-64/___pthread_chdir.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__pthread_chdir, __pthread_chdir, 1, cerror_nocancel)
+__SYSCALL2(___pthread_chdir, __pthread_chdir, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__pthread_fchdir.S b/src/kernel/libsyscall/sys_x86-64/___pthread_fchdir.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__pthread_fchdir.S
rename to src/kernel/libsyscall/sys_x86-64/___pthread_fchdir.S
index 7adb769c1..ae47d3ad2 100644
--- a/src/kernel/libsyscall/sys_x86-64/__pthread_fchdir.S
+++ b/src/kernel/libsyscall/sys_x86-64/___pthread_fchdir.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__pthread_fchdir, __pthread_fchdir, 1, cerror_nocancel)
+__SYSCALL2(___pthread_fchdir, __pthread_fchdir, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__pthread_kill.S b/src/kernel/libsyscall/sys_x86-64/___pthread_kill.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__pthread_kill.S
rename to src/kernel/libsyscall/sys_x86-64/___pthread_kill.S
index b2dd33d54..4fba578fe 100644
--- a/src/kernel/libsyscall/sys_x86-64/__pthread_kill.S
+++ b/src/kernel/libsyscall/sys_x86-64/___pthread_kill.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__pthread_kill, __pthread_kill, 2, cerror_nocancel)
+__SYSCALL2(___pthread_kill, __pthread_kill, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__pthread_markcancel.S b/src/kernel/libsyscall/sys_x86-64/___pthread_markcancel.S
similarity index 76%
rename from src/kernel/libsyscall/sys_x86-64/__pthread_markcancel.S
rename to src/kernel/libsyscall/sys_x86-64/___pthread_markcancel.S
index 4ea4d8263..70e236473 100644
--- a/src/kernel/libsyscall/sys_x86-64/__pthread_markcancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___pthread_markcancel.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__pthread_markcancel, __pthread_markcancel, 1, cerror_nocancel)
+__SYSCALL2(___pthread_markcancel, __pthread_markcancel, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__pthread_sigmask.S b/src/kernel/libsyscall/sys_x86-64/___pthread_sigmask.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/__pthread_sigmask.S
rename to src/kernel/libsyscall/sys_x86-64/___pthread_sigmask.S
index 2c397d3fa..0fabccb0e 100644
--- a/src/kernel/libsyscall/sys_x86-64/__pthread_sigmask.S
+++ b/src/kernel/libsyscall/sys_x86-64/___pthread_sigmask.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__pthread_sigmask, __pthread_sigmask, 3, cerror_nocancel)
+__SYSCALL2(___pthread_sigmask, __pthread_sigmask, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__ptrace.S b/src/kernel/libsyscall/sys_x86-64/___ptrace.S
similarity index 94%
rename from src/kernel/libsyscall/sys_x86-64/__ptrace.S
rename to src/kernel/libsyscall/sys_x86-64/___ptrace.S
index ed2790cad..69220b3a0 100644
--- a/src/kernel/libsyscall/sys_x86-64/__ptrace.S
+++ b/src/kernel/libsyscall/sys_x86-64/___ptrace.S
@@ -30,11 +30,6 @@
 
 #include "SYS.h"
 
-#ifdef DARLING
-#	define ___ptrace __ptrace
-#	define _errno darwin_errno
-#endif
-
 #if defined(__i386__)
 
 	.globl	_errno
@@ -60,7 +55,7 @@ LEAF(___ptrace, 0)
 #error Unsupported architecture
 #endif
 #if defined(__x86_64__)
-	.globl	ptrace
-		ptrace = __ptrace
+	.globl	_ptrace
+	.set	_ptrace, ___ptrace
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__pwrite_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___pwrite_nocancel.S
similarity index 66%
rename from src/kernel/libsyscall/sys_x86-64/__pwrite_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___pwrite_nocancel.S
index 120417d35..3c0161067 100644
--- a/src/kernel/libsyscall/sys_x86-64/__pwrite_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___pwrite_nocancel.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__pwrite_nocancel, pwrite_nocancel, 4, cerror_nocancel)
+__SYSCALL2(___pwrite_nocancel, pwrite_nocancel, 4, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	pwrite$NOCANCEL
-		pwrite$NOCANCEL = __pwrite_nocancel
+	.globl	_pwrite$NOCANCEL
+	.set	_pwrite$NOCANCEL, ___pwrite_nocancel
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__read_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___read_nocancel.S
similarity index 68%
rename from src/kernel/libsyscall/sys_x86-64/__read_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___read_nocancel.S
index f5589adb4..67243abb4 100644
--- a/src/kernel/libsyscall/sys_x86-64/__read_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___read_nocancel.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__read_nocancel, read_nocancel, 3, cerror_nocancel)
+__SYSCALL2(___read_nocancel, read_nocancel, 3, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	read$NOCANCEL
-		read$NOCANCEL = __read_nocancel
+	.globl	_read$NOCANCEL
+	.set	_read$NOCANCEL, ___read_nocancel
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__readv_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___readv_nocancel.S
similarity index 67%
rename from src/kernel/libsyscall/sys_x86-64/__readv_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___readv_nocancel.S
index 1108aad24..6fa04fa88 100644
--- a/src/kernel/libsyscall/sys_x86-64/__readv_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___readv_nocancel.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__readv_nocancel, readv_nocancel, 3, cerror_nocancel)
+__SYSCALL2(___readv_nocancel, readv_nocancel, 3, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	readv$NOCANCEL
-		readv$NOCANCEL = __readv_nocancel
+	.globl	_readv$NOCANCEL
+	.set	_readv$NOCANCEL, ___readv_nocancel
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__recvfrom.S b/src/kernel/libsyscall/sys_x86-64/___recvfrom.S
similarity index 73%
rename from src/kernel/libsyscall/sys_x86-64/__recvfrom.S
rename to src/kernel/libsyscall/sys_x86-64/___recvfrom.S
index e0cfdf869..52b3e8901 100644
--- a/src/kernel/libsyscall/sys_x86-64/__recvfrom.S
+++ b/src/kernel/libsyscall/sys_x86-64/___recvfrom.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__recvfrom, recvfrom, 6, cerror)
+__SYSCALL2(___recvfrom, recvfrom, 6, cerror)
 #endif
 
 #if defined(__x86_64__)
-	.globl	recvfrom
-		recvfrom = __recvfrom
+	.globl	_recvfrom
+	.set	_recvfrom, ___recvfrom
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__recvfrom_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___recvfrom_nocancel.S
similarity index 65%
rename from src/kernel/libsyscall/sys_x86-64/__recvfrom_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___recvfrom_nocancel.S
index 86336be30..49b0f2006 100644
--- a/src/kernel/libsyscall/sys_x86-64/__recvfrom_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___recvfrom_nocancel.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__recvfrom_nocancel, recvfrom_nocancel, 6, cerror_nocancel)
+__SYSCALL2(___recvfrom_nocancel, recvfrom_nocancel, 6, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	recvfrom$NOCANCEL
-		recvfrom$NOCANCEL = __recvfrom_nocancel
+	.globl	_recvfrom$NOCANCEL
+	.set	_recvfrom$NOCANCEL, ___recvfrom_nocancel
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__recvmsg.S b/src/kernel/libsyscall/sys_x86-64/___recvmsg.S
similarity index 74%
rename from src/kernel/libsyscall/sys_x86-64/__recvmsg.S
rename to src/kernel/libsyscall/sys_x86-64/___recvmsg.S
index 4348d2a18..c70a89908 100644
--- a/src/kernel/libsyscall/sys_x86-64/__recvmsg.S
+++ b/src/kernel/libsyscall/sys_x86-64/___recvmsg.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__recvmsg, recvmsg, 3, cerror)
+__SYSCALL2(___recvmsg, recvmsg, 3, cerror)
 #endif
 
 #if defined(__x86_64__)
-	.globl	recvmsg
-		recvmsg = __recvmsg
+	.globl	_recvmsg
+	.set	_recvmsg, ___recvmsg
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__recvmsg_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___recvmsg_nocancel.S
similarity index 66%
rename from src/kernel/libsyscall/sys_x86-64/__recvmsg_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___recvmsg_nocancel.S
index 6388bf16a..2c42cbafe 100644
--- a/src/kernel/libsyscall/sys_x86-64/__recvmsg_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___recvmsg_nocancel.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__recvmsg_nocancel, recvmsg_nocancel, 3, cerror_nocancel)
+__SYSCALL2(___recvmsg_nocancel, recvmsg_nocancel, 3, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	recvmsg$NOCANCEL
-		recvmsg$NOCANCEL = __recvmsg_nocancel
+	.globl	_recvmsg$NOCANCEL
+	.set	_recvmsg$NOCANCEL, ___recvmsg_nocancel
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__rename.S b/src/kernel/libsyscall/sys_x86-64/___rename.S
similarity index 84%
rename from src/kernel/libsyscall/sys_x86-64/__rename.S
rename to src/kernel/libsyscall/sys_x86-64/___rename.S
index ae06c3135..0293f7418 100644
--- a/src/kernel/libsyscall/sys_x86-64/__rename.S
+++ b/src/kernel/libsyscall/sys_x86-64/___rename.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__rename, rename, 2, cerror)
+__SYSCALL2(___rename, rename, 2, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__rename_ext.S b/src/kernel/libsyscall/sys_x86-64/___rename_ext.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/__rename_ext.S
rename to src/kernel/libsyscall/sys_x86-64/___rename_ext.S
index 606c78379..d929009e4 100644
--- a/src/kernel/libsyscall/sys_x86-64/__rename_ext.S
+++ b/src/kernel/libsyscall/sys_x86-64/___rename_ext.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__rename_ext, rename_ext, 3, cerror)
+__SYSCALL2(___rename_ext, rename_ext, 3, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__renameat.S b/src/kernel/libsyscall/sys_x86-64/___renameat.S
similarity index 83%
rename from src/kernel/libsyscall/sys_x86-64/__renameat.S
rename to src/kernel/libsyscall/sys_x86-64/___renameat.S
index 4b863adbc..589167607 100644
--- a/src/kernel/libsyscall/sys_x86-64/__renameat.S
+++ b/src/kernel/libsyscall/sys_x86-64/___renameat.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__renameat, renameat, 4, cerror)
+__SYSCALL2(___renameat, renameat, 4, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__rmdir.S b/src/kernel/libsyscall/sys_x86-64/___rmdir.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/__rmdir.S
rename to src/kernel/libsyscall/sys_x86-64/___rmdir.S
index 3f16c8346..37bef72f8 100644
--- a/src/kernel/libsyscall/sys_x86-64/__rmdir.S
+++ b/src/kernel/libsyscall/sys_x86-64/___rmdir.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__rmdir, rmdir, 1, cerror_nocancel)
+__SYSCALL2(___rmdir, rmdir, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__select.S b/src/kernel/libsyscall/sys_x86-64/___select.S
similarity index 70%
rename from src/kernel/libsyscall/sys_x86-64/__select.S
rename to src/kernel/libsyscall/sys_x86-64/___select.S
index b4ce6969c..1a255ba04 100644
--- a/src/kernel/libsyscall/sys_x86-64/__select.S
+++ b/src/kernel/libsyscall/sys_x86-64/___select.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__select, select, 5, cerror)
+__SYSCALL2(___select, select, 5, cerror)
 #endif
 
 #if defined(__x86_64__)
-	.globl	select$DARWIN_EXTSN
-		select$DARWIN_EXTSN = __select
+	.globl	_select$DARWIN_EXTSN
+	.set	_select$DARWIN_EXTSN, ___select
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__select_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___select_nocancel.S
similarity index 62%
rename from src/kernel/libsyscall/sys_x86-64/__select_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___select_nocancel.S
index 1b9525bba..76838bd90 100644
--- a/src/kernel/libsyscall/sys_x86-64/__select_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___select_nocancel.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__select_nocancel, select_nocancel, 5, cerror_nocancel)
+__SYSCALL2(___select_nocancel, select_nocancel, 5, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	select$DARWIN_EXTSN$NOCANCEL
-		select$DARWIN_EXTSN$NOCANCEL = __select_nocancel
+	.globl	_select$DARWIN_EXTSN$NOCANCEL
+	.set	_select$DARWIN_EXTSN$NOCANCEL, ___select_nocancel
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__sem_open.S b/src/kernel/libsyscall/sys_x86-64/___sem_open.S
similarity index 72%
rename from src/kernel/libsyscall/sys_x86-64/__sem_open.S
rename to src/kernel/libsyscall/sys_x86-64/___sem_open.S
index f0d08b9fe..fa891e3eb 100644
--- a/src/kernel/libsyscall/sys_x86-64/__sem_open.S
+++ b/src/kernel/libsyscall/sys_x86-64/___sem_open.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__sem_open, sem_open, 4, cerror_nocancel)
+__SYSCALL2(___sem_open, sem_open, 4, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	sem_open
-		sem_open = __sem_open
+	.globl	_sem_open
+	.set	_sem_open, ___sem_open
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__sem_wait_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___sem_wait_nocancel.S
similarity index 65%
rename from src/kernel/libsyscall/sys_x86-64/__sem_wait_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___sem_wait_nocancel.S
index 5f734cd73..f5cc61b1e 100644
--- a/src/kernel/libsyscall/sys_x86-64/__sem_wait_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___sem_wait_nocancel.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__sem_wait_nocancel, sem_wait_nocancel, 1, cerror_nocancel)
+__SYSCALL2(___sem_wait_nocancel, sem_wait_nocancel, 1, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	sem_wait$NOCANCEL
-		sem_wait$NOCANCEL = __sem_wait_nocancel
+	.globl	_sem_wait$NOCANCEL
+	.set	_sem_wait$NOCANCEL, ___sem_wait_nocancel
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__semctl.S b/src/kernel/libsyscall/sys_x86-64/___semctl.S
similarity index 73%
rename from src/kernel/libsyscall/sys_x86-64/__semctl.S
rename to src/kernel/libsyscall/sys_x86-64/___semctl.S
index 8affdd242..eb0570fd7 100644
--- a/src/kernel/libsyscall/sys_x86-64/__semctl.S
+++ b/src/kernel/libsyscall/sys_x86-64/___semctl.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__semctl, semctl, 4, cerror_nocancel)
+__SYSCALL2(___semctl, semctl, 4, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	semctl
-		semctl = __semctl
+	.globl	_semctl
+	.set	_semctl, ___semctl
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__semsys.S b/src/kernel/libsyscall/sys_x86-64/___semsys.S
similarity index 73%
rename from src/kernel/libsyscall/sys_x86-64/__semsys.S
rename to src/kernel/libsyscall/sys_x86-64/___semsys.S
index cfb9db8e4..83bac2282 100644
--- a/src/kernel/libsyscall/sys_x86-64/__semsys.S
+++ b/src/kernel/libsyscall/sys_x86-64/___semsys.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__semsys, semsys, 5, cerror_nocancel)
+__SYSCALL2(___semsys, semsys, 5, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	semsys
-		semsys = __semsys
+	.globl	_semsys
+	.set	_semsys, ___semsys
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__semwait_signal.S b/src/kernel/libsyscall/sys_x86-64/___semwait_signal.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/__semwait_signal.S
rename to src/kernel/libsyscall/sys_x86-64/___semwait_signal.S
index d0ace89c3..fc691c81e 100644
--- a/src/kernel/libsyscall/sys_x86-64/__semwait_signal.S
+++ b/src/kernel/libsyscall/sys_x86-64/___semwait_signal.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__semwait_signal, __semwait_signal, 6, cerror)
+__SYSCALL2(___semwait_signal, __semwait_signal, 6, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__semwait_signal_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___semwait_signal_nocancel.S
similarity index 75%
rename from src/kernel/libsyscall/sys_x86-64/__semwait_signal_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___semwait_signal_nocancel.S
index d0fa66d5d..59340e27e 100644
--- a/src/kernel/libsyscall/sys_x86-64/__semwait_signal_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___semwait_signal_nocancel.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__semwait_signal_nocancel, __semwait_signal_nocancel, 6, cerror_nocancel)
+__SYSCALL2(___semwait_signal_nocancel, __semwait_signal_nocancel, 6, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__sendmsg.S b/src/kernel/libsyscall/sys_x86-64/___sendmsg.S
similarity index 74%
rename from src/kernel/libsyscall/sys_x86-64/__sendmsg.S
rename to src/kernel/libsyscall/sys_x86-64/___sendmsg.S
index fb90be255..ab1d5edee 100644
--- a/src/kernel/libsyscall/sys_x86-64/__sendmsg.S
+++ b/src/kernel/libsyscall/sys_x86-64/___sendmsg.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__sendmsg, sendmsg, 3, cerror)
+__SYSCALL2(___sendmsg, sendmsg, 3, cerror)
 #endif
 
 #if defined(__x86_64__)
-	.globl	sendmsg
-		sendmsg = __sendmsg
+	.globl	_sendmsg
+	.set	_sendmsg, ___sendmsg
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__sendmsg_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___sendmsg_nocancel.S
similarity index 66%
rename from src/kernel/libsyscall/sys_x86-64/__sendmsg_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___sendmsg_nocancel.S
index 07e9b0209..5866455b0 100644
--- a/src/kernel/libsyscall/sys_x86-64/__sendmsg_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___sendmsg_nocancel.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__sendmsg_nocancel, sendmsg_nocancel, 3, cerror_nocancel)
+__SYSCALL2(___sendmsg_nocancel, sendmsg_nocancel, 3, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	sendmsg$NOCANCEL
-		sendmsg$NOCANCEL = __sendmsg_nocancel
+	.globl	_sendmsg$NOCANCEL
+	.set	_sendmsg$NOCANCEL, ___sendmsg_nocancel
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__sendto.S b/src/kernel/libsyscall/sys_x86-64/___sendto.S
similarity index 75%
rename from src/kernel/libsyscall/sys_x86-64/__sendto.S
rename to src/kernel/libsyscall/sys_x86-64/___sendto.S
index 0a02ef367..e6fbdf600 100644
--- a/src/kernel/libsyscall/sys_x86-64/__sendto.S
+++ b/src/kernel/libsyscall/sys_x86-64/___sendto.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__sendto, sendto, 6, cerror)
+__SYSCALL2(___sendto, sendto, 6, cerror)
 #endif
 
 #if defined(__x86_64__)
-	.globl	sendto
-		sendto = __sendto
+	.globl	_sendto
+	.set	_sendto, ___sendto
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__sendto_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___sendto_nocancel.S
similarity index 66%
rename from src/kernel/libsyscall/sys_x86-64/__sendto_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___sendto_nocancel.S
index 125fde1e2..9408dff1e 100644
--- a/src/kernel/libsyscall/sys_x86-64/__sendto_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___sendto_nocancel.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__sendto_nocancel, sendto_nocancel, 6, cerror_nocancel)
+__SYSCALL2(___sendto_nocancel, sendto_nocancel, 6, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	sendto$NOCANCEL
-		sendto$NOCANCEL = __sendto_nocancel
+	.globl	_sendto$NOCANCEL
+	.set	_sendto$NOCANCEL, ___sendto_nocancel
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__setattrlist.S b/src/kernel/libsyscall/sys_x86-64/___setattrlist.S
similarity index 69%
rename from src/kernel/libsyscall/sys_x86-64/__setattrlist.S
rename to src/kernel/libsyscall/sys_x86-64/___setattrlist.S
index 2faedfb95..d5a97ffae 100644
--- a/src/kernel/libsyscall/sys_x86-64/__setattrlist.S
+++ b/src/kernel/libsyscall/sys_x86-64/___setattrlist.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__setattrlist, setattrlist, 5, cerror_nocancel)
+__SYSCALL2(___setattrlist, setattrlist, 5, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	setattrlist
-		setattrlist = __setattrlist
+	.globl	_setattrlist
+	.set	_setattrlist, ___setattrlist
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__setlogin.S b/src/kernel/libsyscall/sys_x86-64/___setlogin.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/__setlogin.S
rename to src/kernel/libsyscall/sys_x86-64/___setlogin.S
index 408a5f8d4..bded93611 100644
--- a/src/kernel/libsyscall/sys_x86-64/__setlogin.S
+++ b/src/kernel/libsyscall/sys_x86-64/___setlogin.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__setlogin, setlogin, 1, cerror_nocancel)
+__SYSCALL2(___setlogin, setlogin, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__setpriority.S b/src/kernel/libsyscall/sys_x86-64/___setpriority.S
similarity index 79%
rename from src/kernel/libsyscall/sys_x86-64/__setpriority.S
rename to src/kernel/libsyscall/sys_x86-64/___setpriority.S
index cd99c57b1..f8c8062d2 100644
--- a/src/kernel/libsyscall/sys_x86-64/__setpriority.S
+++ b/src/kernel/libsyscall/sys_x86-64/___setpriority.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__setpriority, setpriority, 3, cerror_nocancel)
+__SYSCALL2(___setpriority, setpriority, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__setregid.S b/src/kernel/libsyscall/sys_x86-64/___setregid.S
similarity index 72%
rename from src/kernel/libsyscall/sys_x86-64/__setregid.S
rename to src/kernel/libsyscall/sys_x86-64/___setregid.S
index 5e2c08d47..a4757cd2c 100644
--- a/src/kernel/libsyscall/sys_x86-64/__setregid.S
+++ b/src/kernel/libsyscall/sys_x86-64/___setregid.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__setregid, setregid, 2, cerror_nocancel)
+__SYSCALL2(___setregid, setregid, 2, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	setregid
-		setregid = __setregid
+	.globl	_setregid
+	.set	_setregid, ___setregid
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__setreuid.S b/src/kernel/libsyscall/sys_x86-64/___setreuid.S
similarity index 72%
rename from src/kernel/libsyscall/sys_x86-64/__setreuid.S
rename to src/kernel/libsyscall/sys_x86-64/___setreuid.S
index e159b7dd1..5acf97e4e 100644
--- a/src/kernel/libsyscall/sys_x86-64/__setreuid.S
+++ b/src/kernel/libsyscall/sys_x86-64/___setreuid.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__setreuid, setreuid, 2, cerror_nocancel)
+__SYSCALL2(___setreuid, setreuid, 2, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	setreuid
-		setreuid = __setreuid
+	.globl	_setreuid
+	.set	_setreuid, ___setreuid
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__setrlimit.S b/src/kernel/libsyscall/sys_x86-64/___setrlimit.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/__setrlimit.S
rename to src/kernel/libsyscall/sys_x86-64/___setrlimit.S
index 3a6bd71e2..67acf1544 100644
--- a/src/kernel/libsyscall/sys_x86-64/__setrlimit.S
+++ b/src/kernel/libsyscall/sys_x86-64/___setrlimit.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__setrlimit, setrlimit, 2, cerror_nocancel)
+__SYSCALL2(___setrlimit, setrlimit, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__setsgroups.S b/src/kernel/libsyscall/sys_x86-64/___setsgroups.S
similarity index 69%
rename from src/kernel/libsyscall/sys_x86-64/__setsgroups.S
rename to src/kernel/libsyscall/sys_x86-64/___setsgroups.S
index 76f1f1e29..6ca1bb779 100644
--- a/src/kernel/libsyscall/sys_x86-64/__setsgroups.S
+++ b/src/kernel/libsyscall/sys_x86-64/___setsgroups.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__setsgroups, setsgroups, 2, cerror_nocancel)
+__SYSCALL2(___setsgroups, setsgroups, 2, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	setsgroups_np
-		setsgroups_np = __setsgroups
+	.globl	_setsgroups_np
+	.set	_setsgroups_np, ___setsgroups
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__settid.S b/src/kernel/libsyscall/sys_x86-64/___settid.S
similarity index 69%
rename from src/kernel/libsyscall/sys_x86-64/__settid.S
rename to src/kernel/libsyscall/sys_x86-64/___settid.S
index 7b2a6c3a7..3be52108f 100644
--- a/src/kernel/libsyscall/sys_x86-64/__settid.S
+++ b/src/kernel/libsyscall/sys_x86-64/___settid.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__settid, settid, 2, cerror_nocancel)
+__SYSCALL2(___settid, settid, 2, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	pthread_setugid_np
-		pthread_setugid_np = __settid
+	.globl	_pthread_setugid_np
+	.set	_pthread_setugid_np, ___settid
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__settid_with_pid.S b/src/kernel/libsyscall/sys_x86-64/___settid_with_pid.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__settid_with_pid.S
rename to src/kernel/libsyscall/sys_x86-64/___settid_with_pid.S
index a168fad26..1cab72d8b 100644
--- a/src/kernel/libsyscall/sys_x86-64/__settid_with_pid.S
+++ b/src/kernel/libsyscall/sys_x86-64/___settid_with_pid.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__settid_with_pid, settid_with_pid, 2, cerror_nocancel)
+__SYSCALL2(___settid_with_pid, settid_with_pid, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__settimeofday.S b/src/kernel/libsyscall/sys_x86-64/___settimeofday.S
similarity index 79%
rename from src/kernel/libsyscall/sys_x86-64/__settimeofday.S
rename to src/kernel/libsyscall/sys_x86-64/___settimeofday.S
index 40de9a33c..84dc1f537 100644
--- a/src/kernel/libsyscall/sys_x86-64/__settimeofday.S
+++ b/src/kernel/libsyscall/sys_x86-64/___settimeofday.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__settimeofday, settimeofday, 2, cerror_nocancel)
+__SYSCALL2(___settimeofday, settimeofday, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__setwgroups.S b/src/kernel/libsyscall/sys_x86-64/___setwgroups.S
similarity index 69%
rename from src/kernel/libsyscall/sys_x86-64/__setwgroups.S
rename to src/kernel/libsyscall/sys_x86-64/___setwgroups.S
index bfef45461..f55bf5355 100644
--- a/src/kernel/libsyscall/sys_x86-64/__setwgroups.S
+++ b/src/kernel/libsyscall/sys_x86-64/___setwgroups.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__setwgroups, setwgroups, 2, cerror_nocancel)
+__SYSCALL2(___setwgroups, setwgroups, 2, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	setwgroups_np
-		setwgroups_np = __setwgroups
+	.globl	_setwgroups_np
+	.set	_setwgroups_np, ___setwgroups
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__sfi_ctl.S b/src/kernel/libsyscall/sys_x86-64/___sfi_ctl.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/__sfi_ctl.S
rename to src/kernel/libsyscall/sys_x86-64/___sfi_ctl.S
index ad1bb7eb9..85e90768e 100644
--- a/src/kernel/libsyscall/sys_x86-64/__sfi_ctl.S
+++ b/src/kernel/libsyscall/sys_x86-64/___sfi_ctl.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__sfi_ctl, sfi_ctl, 4, cerror_nocancel)
+__SYSCALL2(___sfi_ctl, sfi_ctl, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__sfi_pidctl.S b/src/kernel/libsyscall/sys_x86-64/___sfi_pidctl.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/__sfi_pidctl.S
rename to src/kernel/libsyscall/sys_x86-64/___sfi_pidctl.S
index 08c5c5cc8..ce338d9b2 100644
--- a/src/kernel/libsyscall/sys_x86-64/__sfi_pidctl.S
+++ b/src/kernel/libsyscall/sys_x86-64/___sfi_pidctl.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__sfi_pidctl, sfi_pidctl, 4, cerror_nocancel)
+__SYSCALL2(___sfi_pidctl, sfi_pidctl, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__shared_region_check_np.S b/src/kernel/libsyscall/sys_x86-64/___shared_region_check_np.S
similarity index 75%
rename from src/kernel/libsyscall/sys_x86-64/__shared_region_check_np.S
rename to src/kernel/libsyscall/sys_x86-64/___shared_region_check_np.S
index 8bedc42bd..1c4978c99 100644
--- a/src/kernel/libsyscall/sys_x86-64/__shared_region_check_np.S
+++ b/src/kernel/libsyscall/sys_x86-64/___shared_region_check_np.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__shared_region_check_np, shared_region_check_np, 1, cerror_nocancel)
+__SYSCALL2(___shared_region_check_np, shared_region_check_np, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__shared_region_map_and_slide_np.S b/src/kernel/libsyscall/sys_x86-64/___shared_region_map_and_slide_np.S
similarity index 73%
rename from src/kernel/libsyscall/sys_x86-64/__shared_region_map_and_slide_np.S
rename to src/kernel/libsyscall/sys_x86-64/___shared_region_map_and_slide_np.S
index 119713a7a..a4b9df074 100644
--- a/src/kernel/libsyscall/sys_x86-64/__shared_region_map_and_slide_np.S
+++ b/src/kernel/libsyscall/sys_x86-64/___shared_region_map_and_slide_np.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__shared_region_map_and_slide_np, shared_region_map_and_slide_np, 6, cerror_nocancel)
+__SYSCALL2(___shared_region_map_and_slide_np, shared_region_map_and_slide_np, 6, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__shm_open.S b/src/kernel/libsyscall/sys_x86-64/___shm_open.S
similarity index 72%
rename from src/kernel/libsyscall/sys_x86-64/__shm_open.S
rename to src/kernel/libsyscall/sys_x86-64/___shm_open.S
index 3e6208319..895cdeecd 100644
--- a/src/kernel/libsyscall/sys_x86-64/__shm_open.S
+++ b/src/kernel/libsyscall/sys_x86-64/___shm_open.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__shm_open, shm_open, 3, cerror_nocancel)
+__SYSCALL2(___shm_open, shm_open, 3, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	shm_open
-		shm_open = __shm_open
+	.globl	_shm_open
+	.set	_shm_open, ___shm_open
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__shmctl.S b/src/kernel/libsyscall/sys_x86-64/___shmctl.S
similarity index 73%
rename from src/kernel/libsyscall/sys_x86-64/__shmctl.S
rename to src/kernel/libsyscall/sys_x86-64/___shmctl.S
index c25f69255..978a5a9a9 100644
--- a/src/kernel/libsyscall/sys_x86-64/__shmctl.S
+++ b/src/kernel/libsyscall/sys_x86-64/___shmctl.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__shmctl, shmctl, 3, cerror_nocancel)
+__SYSCALL2(___shmctl, shmctl, 3, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	shmctl
-		shmctl = __shmctl
+	.globl	_shmctl
+	.set	_shmctl, ___shmctl
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__shmsys.S b/src/kernel/libsyscall/sys_x86-64/___shmsys.S
similarity index 73%
rename from src/kernel/libsyscall/sys_x86-64/__shmsys.S
rename to src/kernel/libsyscall/sys_x86-64/___shmsys.S
index 3c9abe406..5608e2a02 100644
--- a/src/kernel/libsyscall/sys_x86-64/__shmsys.S
+++ b/src/kernel/libsyscall/sys_x86-64/___shmsys.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__shmsys, shmsys, 4, cerror_nocancel)
+__SYSCALL2(___shmsys, shmsys, 4, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	shmsys
-		shmsys = __shmsys
+	.globl	_shmsys
+	.set	_shmsys, ___shmsys
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__sigaction.S b/src/kernel/libsyscall/sys_x86-64/___sigaction.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/__sigaction.S
rename to src/kernel/libsyscall/sys_x86-64/___sigaction.S
index 56357088c..a42c13cf1 100644
--- a/src/kernel/libsyscall/sys_x86-64/__sigaction.S
+++ b/src/kernel/libsyscall/sys_x86-64/___sigaction.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__sigaction, sigaction, 3, cerror_nocancel)
+__SYSCALL2(___sigaction, sigaction, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__sigaltstack.S b/src/kernel/libsyscall/sys_x86-64/___sigaltstack.S
similarity index 96%
rename from src/kernel/libsyscall/sys_x86-64/__sigaltstack.S
rename to src/kernel/libsyscall/sys_x86-64/___sigaltstack.S
index 5749d39dc..a8edf9110 100644
--- a/src/kernel/libsyscall/sys_x86-64/__sigaltstack.S
+++ b/src/kernel/libsyscall/sys_x86-64/___sigaltstack.S
@@ -29,10 +29,6 @@
 
 #include "SYS.h"
 
-#ifdef DARLING
-#	define ___sigaltstack __sigaltstack
-#endif
-
 #if defined(__x86_64__)
 
 __SYSCALL(___sigaltstack, sigaltstack, 3)
diff --git a/src/kernel/libsyscall/sys_x86-64/__sigreturn.S b/src/kernel/libsyscall/sys_x86-64/___sigreturn.S
similarity index 96%
rename from src/kernel/libsyscall/sys_x86-64/__sigreturn.S
rename to src/kernel/libsyscall/sys_x86-64/___sigreturn.S
index cedffff38..635660e97 100644
--- a/src/kernel/libsyscall/sys_x86-64/__sigreturn.S
+++ b/src/kernel/libsyscall/sys_x86-64/___sigreturn.S
@@ -29,10 +29,6 @@
 
 #include "SYS.h"
 
-#ifdef DARLING
-#	define ___sigreturn __sigreturn
-#endif
-
 #if defined(__x86_64__)
 
 __SYSCALL(___sigreturn, sigreturn, 2)
diff --git a/src/kernel/libsyscall/sys_x86-64/__sigsuspend.S b/src/kernel/libsyscall/sys_x86-64/___sigsuspend.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/__sigsuspend.S
rename to src/kernel/libsyscall/sys_x86-64/___sigsuspend.S
index 5622273d2..ae50456a9 100644
--- a/src/kernel/libsyscall/sys_x86-64/__sigsuspend.S
+++ b/src/kernel/libsyscall/sys_x86-64/___sigsuspend.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__sigsuspend, sigsuspend, 1, cerror)
+__SYSCALL2(___sigsuspend, sigsuspend, 1, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__sigsuspend_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___sigsuspend_nocancel.S
similarity index 76%
rename from src/kernel/libsyscall/sys_x86-64/__sigsuspend_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___sigsuspend_nocancel.S
index fd97bf83a..ea56ae30f 100644
--- a/src/kernel/libsyscall/sys_x86-64/__sigsuspend_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___sigsuspend_nocancel.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__sigsuspend_nocancel, sigsuspend_nocancel, 1, cerror_nocancel)
+__SYSCALL2(___sigsuspend_nocancel, sigsuspend_nocancel, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__sigwait.S b/src/kernel/libsyscall/sys_x86-64/___sigwait.S
similarity index 83%
rename from src/kernel/libsyscall/sys_x86-64/__sigwait.S
rename to src/kernel/libsyscall/sys_x86-64/___sigwait.S
index b795b0491..a118dd619 100644
--- a/src/kernel/libsyscall/sys_x86-64/__sigwait.S
+++ b/src/kernel/libsyscall/sys_x86-64/___sigwait.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__sigwait, __sigwait, 2, cerror)
+__SYSCALL2(___sigwait, __sigwait, 2, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__socketpair.S b/src/kernel/libsyscall/sys_x86-64/___socketpair.S
similarity index 70%
rename from src/kernel/libsyscall/sys_x86-64/__socketpair.S
rename to src/kernel/libsyscall/sys_x86-64/___socketpair.S
index 362339378..95d6120f9 100644
--- a/src/kernel/libsyscall/sys_x86-64/__socketpair.S
+++ b/src/kernel/libsyscall/sys_x86-64/___socketpair.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__socketpair, socketpair, 4, cerror_nocancel)
+__SYSCALL2(___socketpair, socketpair, 4, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	socketpair
-		socketpair = __socketpair
+	.globl	_socketpair
+	.set	_socketpair, ___socketpair
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__stack_snapshot.S b/src/kernel/libsyscall/sys_x86-64/___stack_snapshot.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__stack_snapshot.S
rename to src/kernel/libsyscall/sys_x86-64/___stack_snapshot.S
index 8609e9afd..fa5d5082c 100644
--- a/src/kernel/libsyscall/sys_x86-64/__stack_snapshot.S
+++ b/src/kernel/libsyscall/sys_x86-64/___stack_snapshot.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__stack_snapshot, stack_snapshot, 5, cerror_nocancel)
+__SYSCALL2(___stack_snapshot, stack_snapshot, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/___stack_snapshot_with_config.S b/src/kernel/libsyscall/sys_x86-64/___stack_snapshot_with_config.S
new file mode 100644
index 000000000..97f01f8d3
--- /dev/null
+++ b/src/kernel/libsyscall/sys_x86-64/___stack_snapshot_with_config.S
@@ -0,0 +1,11 @@
+#define __SYSCALL_32BIT_ARG_BYTES 12
+#include "SYS.h"
+
+#ifndef SYS_stack_snapshot_with_config
+#error "SYS_stack_snapshot_with_config not defined. The header files libsyscall is building against do not match syscalls.master."
+#endif
+
+#if defined(__x86_64__)
+__SYSCALL2(___stack_snapshot_with_config, stack_snapshot_with_config, 3, cerror_nocancel)
+#endif
+
diff --git a/src/kernel/libsyscall/sys_x86-64/__stat64_extended.S b/src/kernel/libsyscall/sys_x86-64/___stat64_extended.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__stat64_extended.S
rename to src/kernel/libsyscall/sys_x86-64/___stat64_extended.S
index da5414a6f..7e56090ea 100644
--- a/src/kernel/libsyscall/sys_x86-64/__stat64_extended.S
+++ b/src/kernel/libsyscall/sys_x86-64/___stat64_extended.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__stat64_extended, stat64_extended, 4, cerror_nocancel)
+__SYSCALL2(___stat64_extended, stat64_extended, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__stat_extended.S b/src/kernel/libsyscall/sys_x86-64/___stat_extended.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__stat_extended.S
rename to src/kernel/libsyscall/sys_x86-64/___stat_extended.S
index 9aa1153ae..8b1530e71 100644
--- a/src/kernel/libsyscall/sys_x86-64/__stat_extended.S
+++ b/src/kernel/libsyscall/sys_x86-64/___stat_extended.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__stat_extended, stat_extended, 4, cerror_nocancel)
+__SYSCALL2(___stat_extended, stat_extended, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__syscall.S b/src/kernel/libsyscall/sys_x86-64/___syscall.S
similarity index 95%
rename from src/kernel/libsyscall/sys_x86-64/__syscall.S
rename to src/kernel/libsyscall/sys_x86-64/___syscall.S
index 11f3065ac..2b08a01f3 100644
--- a/src/kernel/libsyscall/sys_x86-64/__syscall.S
+++ b/src/kernel/libsyscall/sys_x86-64/___syscall.S
@@ -30,10 +30,6 @@
 
 #include "SYS.h"
 
-#ifdef DARLING
-#	define ___syscall __syscall
-#endif
-
 #if defined(__i386__)
 
 LEAF(___syscall, 0)
@@ -59,7 +55,7 @@ __SYSCALL(___syscall, syscall, 0);
 #error Unsupported architecture
 #endif
 #if defined(__x86_64__)
-	.globl	syscall
-		syscall = __syscall
+	.globl	_syscall
+	.set	_syscall, ___syscall
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__sysctl.S b/src/kernel/libsyscall/sys_x86-64/___sysctl.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/__sysctl.S
rename to src/kernel/libsyscall/sys_x86-64/___sysctl.S
index f613b521c..ba6b32d8e 100644
--- a/src/kernel/libsyscall/sys_x86-64/__sysctl.S
+++ b/src/kernel/libsyscall/sys_x86-64/___sysctl.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__sysctl, sysctl, 6, cerror_nocancel)
+__SYSCALL2(___sysctl, sysctl, 6, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__sysctlbyname.S b/src/kernel/libsyscall/sys_x86-64/___sysctlbyname.S
similarity index 79%
rename from src/kernel/libsyscall/sys_x86-64/__sysctlbyname.S
rename to src/kernel/libsyscall/sys_x86-64/___sysctlbyname.S
index b38713a05..a4a3b6627 100644
--- a/src/kernel/libsyscall/sys_x86-64/__sysctlbyname.S
+++ b/src/kernel/libsyscall/sys_x86-64/___sysctlbyname.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__sysctlbyname, sysctlbyname, 6, cerror_nocancel)
+__SYSCALL2(___sysctlbyname, sysctlbyname, 6, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__telemetry.S b/src/kernel/libsyscall/sys_x86-64/___telemetry.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/__telemetry.S
rename to src/kernel/libsyscall/sys_x86-64/___telemetry.S
index 250f678d1..6aef7cc4f 100644
--- a/src/kernel/libsyscall/sys_x86-64/__telemetry.S
+++ b/src/kernel/libsyscall/sys_x86-64/___telemetry.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__telemetry, telemetry, 6, cerror_nocancel)
+__SYSCALL2(___telemetry, telemetry, 6, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__thread_selfid.S b/src/kernel/libsyscall/sys_x86-64/___thread_selfid.S
similarity index 95%
rename from src/kernel/libsyscall/sys_x86-64/__thread_selfid.S
rename to src/kernel/libsyscall/sys_x86-64/___thread_selfid.S
index ec9256ba8..2ae1e6ff4 100644
--- a/src/kernel/libsyscall/sys_x86-64/__thread_selfid.S
+++ b/src/kernel/libsyscall/sys_x86-64/___thread_selfid.S
@@ -29,10 +29,6 @@
 
 #include "SYS.h"
 
-#ifdef DARLING
-#	define ___thread_selfid __thread_selfid
-#endif
-
 #if defined(__x86_64__)
 
 __SYSCALL(___thread_selfid, thread_selfid, 0)
diff --git a/src/kernel/libsyscall/sys_x86-64/__thread_selfusage.S b/src/kernel/libsyscall/sys_x86-64/___thread_selfusage.S
similarity index 95%
rename from src/kernel/libsyscall/sys_x86-64/__thread_selfusage.S
rename to src/kernel/libsyscall/sys_x86-64/___thread_selfusage.S
index a4ed8e68d..838b0f3e1 100644
--- a/src/kernel/libsyscall/sys_x86-64/__thread_selfusage.S
+++ b/src/kernel/libsyscall/sys_x86-64/___thread_selfusage.S
@@ -29,10 +29,6 @@
 
 #include "SYS.h"
 
-#ifdef DARLING
-#	define ___thread_selfusage __thread_selfusage
-#endif
-
 #if defined(__x86_64__)
 
 __SYSCALL(___thread_selfusage, thread_selfusage, 0)
diff --git a/src/kernel/libsyscall/sys_x86-64/__umask_extended.S b/src/kernel/libsyscall/sys_x86-64/___umask_extended.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/__umask_extended.S
rename to src/kernel/libsyscall/sys_x86-64/___umask_extended.S
index 1e0944888..09e2b6434 100644
--- a/src/kernel/libsyscall/sys_x86-64/__umask_extended.S
+++ b/src/kernel/libsyscall/sys_x86-64/___umask_extended.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__umask_extended, umask_extended, 2, cerror_nocancel)
+__SYSCALL2(___umask_extended, umask_extended, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__unlink.S b/src/kernel/libsyscall/sys_x86-64/___unlink.S
similarity index 84%
rename from src/kernel/libsyscall/sys_x86-64/__unlink.S
rename to src/kernel/libsyscall/sys_x86-64/___unlink.S
index 805255f0c..bc5537611 100644
--- a/src/kernel/libsyscall/sys_x86-64/__unlink.S
+++ b/src/kernel/libsyscall/sys_x86-64/___unlink.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__unlink, unlink, 1, cerror)
+__SYSCALL2(___unlink, unlink, 1, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__unlinkat.S b/src/kernel/libsyscall/sys_x86-64/___unlinkat.S
similarity index 83%
rename from src/kernel/libsyscall/sys_x86-64/__unlinkat.S
rename to src/kernel/libsyscall/sys_x86-64/___unlinkat.S
index 149c2ac6d..0bc52bf63 100644
--- a/src/kernel/libsyscall/sys_x86-64/__unlinkat.S
+++ b/src/kernel/libsyscall/sys_x86-64/___unlinkat.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__unlinkat, unlinkat, 3, cerror)
+__SYSCALL2(___unlinkat, unlinkat, 3, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__vfork.S b/src/kernel/libsyscall/sys_x86-64/___vfork.S
similarity index 92%
rename from src/kernel/libsyscall/sys_x86-64/__vfork.S
rename to src/kernel/libsyscall/sys_x86-64/___vfork.S
index f72663b8c..a63e8a568 100644
--- a/src/kernel/libsyscall/sys_x86-64/__vfork.S
+++ b/src/kernel/libsyscall/sys_x86-64/___vfork.S
@@ -38,11 +38,6 @@
 
 #include "SYS.h"
 
-#ifdef DARLING
-#define ___vfork __vfork
-#define _cerror cerror
-#endif
-
 #if defined(__i386__)
 
 #if defined(__DYNAMIC__)
@@ -116,13 +111,13 @@ LEAF(___vfork, 0)
 	movq		$ SYSCALL_CONSTRUCT_UNIX(SYS_vfork), %rax	// code for vfork -> rax
 	UNIX_SYSCALL_TRAP			// do the system call
 	jnb		L1			// jump if CF==0
+	pushq		%rdi			// put return address back on stack for cerror
 #else
-	movl	$ SYS_vfork, %eax
-	call    __darling_bsd_syscall@PLT	
-	cmpq    $0, %rax 
+	movl    $ SYS_vfork, %eax
+	call    __darling_bsd_syscall
+	cmpq    $0, %rax
 	jnb L1
 #endif
-	//pushq		%rdi			// put return address back on stack for cerror
 	movq		__current_pid@GOTPCREL(%rip), %rcx
 	lock
 	addq		$1, (%rcx)
@@ -138,8 +133,7 @@ L1:
 	jnz		L2
 #endif
 	xorq		%rax, %rax		// zero rax
-	//jmp		*%rdi
-	ret
+	jmp		*%rdi
 
 L2:
 	movq		__current_pid@GOTPCREL(%rip), %rdx
@@ -152,8 +146,7 @@ L2:
 #error Unsupported architecture
 #endif
 #if defined(__x86_64__)
-	.type vfork, @function
-	.globl	vfork
-		vfork = __vfork
+	.globl	_vfork
+	.set	_vfork, ___vfork
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__wait4.S b/src/kernel/libsyscall/sys_x86-64/___wait4.S
similarity index 85%
rename from src/kernel/libsyscall/sys_x86-64/__wait4.S
rename to src/kernel/libsyscall/sys_x86-64/___wait4.S
index 1d77b06b7..0cc7f53f1 100644
--- a/src/kernel/libsyscall/sys_x86-64/__wait4.S
+++ b/src/kernel/libsyscall/sys_x86-64/___wait4.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__wait4, wait4, 4, cerror)
+__SYSCALL2(___wait4, wait4, 4, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__wait4_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___wait4_nocancel.S
similarity index 70%
rename from src/kernel/libsyscall/sys_x86-64/__wait4_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___wait4_nocancel.S
index 790403f8c..8ec333c5e 100644
--- a/src/kernel/libsyscall/sys_x86-64/__wait4_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___wait4_nocancel.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__wait4_nocancel, wait4_nocancel, 4, cerror_nocancel)
+__SYSCALL2(___wait4_nocancel, wait4_nocancel, 4, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	wait4
-		wait4 = __wait4_nocancel
+	.globl	_wait4
+	.set	_wait4, ___wait4_nocancel
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__waitid_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___waitid_nocancel.S
similarity index 66%
rename from src/kernel/libsyscall/sys_x86-64/__waitid_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___waitid_nocancel.S
index adafb318b..914c4b048 100644
--- a/src/kernel/libsyscall/sys_x86-64/__waitid_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___waitid_nocancel.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__waitid_nocancel, waitid_nocancel, 4, cerror_nocancel)
+__SYSCALL2(___waitid_nocancel, waitid_nocancel, 4, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	waitid$NOCANCEL
-		waitid$NOCANCEL = __waitid_nocancel
+	.globl	_waitid$NOCANCEL
+	.set	_waitid$NOCANCEL, ___waitid_nocancel
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/___work_interval_ctl.S b/src/kernel/libsyscall/sys_x86-64/___work_interval_ctl.S
new file mode 100644
index 000000000..7aeec9eb1
--- /dev/null
+++ b/src/kernel/libsyscall/sys_x86-64/___work_interval_ctl.S
@@ -0,0 +1,11 @@
+#define __SYSCALL_32BIT_ARG_BYTES 20
+#include "SYS.h"
+
+#ifndef SYS_work_interval_ctl
+#error "SYS_work_interval_ctl not defined. The header files libsyscall is building against do not match syscalls.master."
+#endif
+
+#if defined(__x86_64__)
+__SYSCALL2(___work_interval_ctl, work_interval_ctl, 4, cerror_nocancel)
+#endif
+
diff --git a/src/kernel/libsyscall/sys_x86-64/__workq_kernreturn.S b/src/kernel/libsyscall/sys_x86-64/___workq_kernreturn.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/__workq_kernreturn.S
rename to src/kernel/libsyscall/sys_x86-64/___workq_kernreturn.S
index 57f6c3c9f..5cd827fce 100644
--- a/src/kernel/libsyscall/sys_x86-64/__workq_kernreturn.S
+++ b/src/kernel/libsyscall/sys_x86-64/___workq_kernreturn.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__workq_kernreturn, workq_kernreturn, 4, cerror_nocancel)
+__SYSCALL2(___workq_kernreturn, workq_kernreturn, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__workq_open.S b/src/kernel/libsyscall/sys_x86-64/___workq_open.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/__workq_open.S
rename to src/kernel/libsyscall/sys_x86-64/___workq_open.S
index b4e93b91f..3bae9c38c 100644
--- a/src/kernel/libsyscall/sys_x86-64/__workq_open.S
+++ b/src/kernel/libsyscall/sys_x86-64/___workq_open.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__workq_open, workq_open, 0, cerror_nocancel)
+__SYSCALL2(___workq_open, workq_open, 0, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__write_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___write_nocancel.S
similarity index 67%
rename from src/kernel/libsyscall/sys_x86-64/__write_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___write_nocancel.S
index d2cec0e22..b48b40065 100644
--- a/src/kernel/libsyscall/sys_x86-64/__write_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___write_nocancel.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__write_nocancel, write_nocancel, 3, cerror_nocancel)
+__SYSCALL2(___write_nocancel, write_nocancel, 3, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	write$NOCANCEL
-		write$NOCANCEL = __write_nocancel
+	.globl	_write$NOCANCEL
+	.set	_write$NOCANCEL, ___write_nocancel
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__writev_nocancel.S b/src/kernel/libsyscall/sys_x86-64/___writev_nocancel.S
similarity index 66%
rename from src/kernel/libsyscall/sys_x86-64/__writev_nocancel.S
rename to src/kernel/libsyscall/sys_x86-64/___writev_nocancel.S
index bf82cb317..e41588851 100644
--- a/src/kernel/libsyscall/sys_x86-64/__writev_nocancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/___writev_nocancel.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(__writev_nocancel, writev_nocancel, 3, cerror_nocancel)
+__SYSCALL2(___writev_nocancel, writev_nocancel, 3, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	writev$NOCANCEL
-		writev$NOCANCEL = __writev_nocancel
+	.globl	_writev$NOCANCEL
+	.set	_writev$NOCANCEL, ___writev_nocancel
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/__getlcid.S b/src/kernel/libsyscall/sys_x86-64/__getlcid.S
deleted file mode 100644
index 2d8bbf492..000000000
--- a/src/kernel/libsyscall/sys_x86-64/__getlcid.S
+++ /dev/null
@@ -1,11 +0,0 @@
-#define __SYSCALL_32BIT_ARG_BYTES 4
-#include "SYS.h"
-
-#ifndef SYS_getlcid
-#error "SYS_getlcid not defined. The header files libsyscall is building against do not match syscalls.master."
-#endif
-
-#if defined(__x86_64__)
-__SYSCALL2(__getlcid, getlcid, 1, cerror_nocancel)
-#endif
-
diff --git a/src/kernel/libsyscall/sys_x86-64/__mac_get_lcid.S b/src/kernel/libsyscall/sys_x86-64/__mac_get_lcid.S
deleted file mode 100644
index efe1ebcbc..000000000
--- a/src/kernel/libsyscall/sys_x86-64/__mac_get_lcid.S
+++ /dev/null
@@ -1,11 +0,0 @@
-#define __SYSCALL_32BIT_ARG_BYTES 8
-#include "SYS.h"
-
-#ifndef SYS___mac_get_lcid
-#error "SYS___mac_get_lcid not defined. The header files libsyscall is building against do not match syscalls.master."
-#endif
-
-#if defined(__x86_64__)
-__SYSCALL2(__mac_get_lcid, __mac_get_lcid, 2, cerror_nocancel)
-#endif
-
diff --git a/src/kernel/libsyscall/sys_x86-64/__mac_get_lctx.S b/src/kernel/libsyscall/sys_x86-64/__mac_get_lctx.S
deleted file mode 100644
index 8a5e4682f..000000000
--- a/src/kernel/libsyscall/sys_x86-64/__mac_get_lctx.S
+++ /dev/null
@@ -1,11 +0,0 @@
-#define __SYSCALL_32BIT_ARG_BYTES 4
-#include "SYS.h"
-
-#ifndef SYS___mac_get_lctx
-#error "SYS___mac_get_lctx not defined. The header files libsyscall is building against do not match syscalls.master."
-#endif
-
-#if defined(__x86_64__)
-__SYSCALL2(__mac_get_lctx, __mac_get_lctx, 1, cerror_nocancel)
-#endif
-
diff --git a/src/kernel/libsyscall/sys_x86-64/__mac_set_lctx.S b/src/kernel/libsyscall/sys_x86-64/__mac_set_lctx.S
deleted file mode 100644
index adab63a6c..000000000
--- a/src/kernel/libsyscall/sys_x86-64/__mac_set_lctx.S
+++ /dev/null
@@ -1,11 +0,0 @@
-#define __SYSCALL_32BIT_ARG_BYTES 4
-#include "SYS.h"
-
-#ifndef SYS___mac_set_lctx
-#error "SYS___mac_set_lctx not defined. The header files libsyscall is building against do not match syscalls.master."
-#endif
-
-#if defined(__x86_64__)
-__SYSCALL2(__mac_set_lctx, __mac_set_lctx, 1, cerror_nocancel)
-#endif
-
diff --git a/src/kernel/libsyscall/sys_x86-64/__setlcid.S b/src/kernel/libsyscall/sys_x86-64/__setlcid.S
deleted file mode 100644
index 0c496a749..000000000
--- a/src/kernel/libsyscall/sys_x86-64/__setlcid.S
+++ /dev/null
@@ -1,11 +0,0 @@
-#define __SYSCALL_32BIT_ARG_BYTES 8
-#include "SYS.h"
-
-#ifndef SYS_setlcid
-#error "SYS_setlcid not defined. The header files libsyscall is building against do not match syscalls.master."
-#endif
-
-#if defined(__x86_64__)
-__SYSCALL2(__setlcid, setlcid, 2, cerror_nocancel)
-#endif
-
diff --git a/src/kernel/libsyscall/sys_x86-64/access.S b/src/kernel/libsyscall/sys_x86-64/_access.S
similarity index 85%
rename from src/kernel/libsyscall/sys_x86-64/access.S
rename to src/kernel/libsyscall/sys_x86-64/_access.S
index 0c328f1b3..95d299741 100644
--- a/src/kernel/libsyscall/sys_x86-64/access.S
+++ b/src/kernel/libsyscall/sys_x86-64/_access.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(access, access, 2, cerror)
+__SYSCALL2(_access, access, 2, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/acct.S b/src/kernel/libsyscall/sys_x86-64/_acct.S
similarity index 83%
rename from src/kernel/libsyscall/sys_x86-64/acct.S
rename to src/kernel/libsyscall/sys_x86-64/_acct.S
index b59145590..3cf44b5aa 100644
--- a/src/kernel/libsyscall/sys_x86-64/acct.S
+++ b/src/kernel/libsyscall/sys_x86-64/_acct.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(acct, acct, 1, cerror_nocancel)
+__SYSCALL2(_acct, acct, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/adjtime.S b/src/kernel/libsyscall/sys_x86-64/_adjtime.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/adjtime.S
rename to src/kernel/libsyscall/sys_x86-64/_adjtime.S
index 9fc972e6c..d51a4a04f 100644
--- a/src/kernel/libsyscall/sys_x86-64/adjtime.S
+++ b/src/kernel/libsyscall/sys_x86-64/_adjtime.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(adjtime, adjtime, 2, cerror_nocancel)
+__SYSCALL2(_adjtime, adjtime, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/aio_cancel.S b/src/kernel/libsyscall/sys_x86-64/_aio_cancel.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/aio_cancel.S
rename to src/kernel/libsyscall/sys_x86-64/_aio_cancel.S
index b4f72687e..fd8056623 100644
--- a/src/kernel/libsyscall/sys_x86-64/aio_cancel.S
+++ b/src/kernel/libsyscall/sys_x86-64/_aio_cancel.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(aio_cancel, aio_cancel, 2, cerror_nocancel)
+__SYSCALL2(_aio_cancel, aio_cancel, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/aio_error.S b/src/kernel/libsyscall/sys_x86-64/_aio_error.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/aio_error.S
rename to src/kernel/libsyscall/sys_x86-64/_aio_error.S
index 6f94088d8..750989925 100644
--- a/src/kernel/libsyscall/sys_x86-64/aio_error.S
+++ b/src/kernel/libsyscall/sys_x86-64/_aio_error.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(aio_error, aio_error, 1, cerror_nocancel)
+__SYSCALL2(_aio_error, aio_error, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/aio_fsync.S b/src/kernel/libsyscall/sys_x86-64/_aio_fsync.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/aio_fsync.S
rename to src/kernel/libsyscall/sys_x86-64/_aio_fsync.S
index 0f0f3a6ac..33e5ab215 100644
--- a/src/kernel/libsyscall/sys_x86-64/aio_fsync.S
+++ b/src/kernel/libsyscall/sys_x86-64/_aio_fsync.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(aio_fsync, aio_fsync, 2, cerror_nocancel)
+__SYSCALL2(_aio_fsync, aio_fsync, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/aio_read.S b/src/kernel/libsyscall/sys_x86-64/_aio_read.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/aio_read.S
rename to src/kernel/libsyscall/sys_x86-64/_aio_read.S
index b702e992a..3a0d58a01 100644
--- a/src/kernel/libsyscall/sys_x86-64/aio_read.S
+++ b/src/kernel/libsyscall/sys_x86-64/_aio_read.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(aio_read, aio_read, 1, cerror_nocancel)
+__SYSCALL2(_aio_read, aio_read, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/aio_return.S b/src/kernel/libsyscall/sys_x86-64/_aio_return.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/aio_return.S
rename to src/kernel/libsyscall/sys_x86-64/_aio_return.S
index 8fe218852..b6f7b5503 100644
--- a/src/kernel/libsyscall/sys_x86-64/aio_return.S
+++ b/src/kernel/libsyscall/sys_x86-64/_aio_return.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(aio_return, aio_return, 1, cerror_nocancel)
+__SYSCALL2(_aio_return, aio_return, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/aio_suspend.S b/src/kernel/libsyscall/sys_x86-64/_aio_suspend.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/aio_suspend.S
rename to src/kernel/libsyscall/sys_x86-64/_aio_suspend.S
index 4b0fa083e..a296fbbd0 100644
--- a/src/kernel/libsyscall/sys_x86-64/aio_suspend.S
+++ b/src/kernel/libsyscall/sys_x86-64/_aio_suspend.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(aio_suspend, aio_suspend, 3, cerror)
+__SYSCALL2(_aio_suspend, aio_suspend, 3, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/aio_write.S b/src/kernel/libsyscall/sys_x86-64/_aio_write.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/aio_write.S
rename to src/kernel/libsyscall/sys_x86-64/_aio_write.S
index 6622d2222..23ceb8cef 100644
--- a/src/kernel/libsyscall/sys_x86-64/aio_write.S
+++ b/src/kernel/libsyscall/sys_x86-64/_aio_write.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(aio_write, aio_write, 1, cerror_nocancel)
+__SYSCALL2(_aio_write, aio_write, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/audit.S b/src/kernel/libsyscall/sys_x86-64/_audit.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/audit.S
rename to src/kernel/libsyscall/sys_x86-64/_audit.S
index 692e0d19e..3fd1f1de5 100644
--- a/src/kernel/libsyscall/sys_x86-64/audit.S
+++ b/src/kernel/libsyscall/sys_x86-64/_audit.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(audit, audit, 2, cerror_nocancel)
+__SYSCALL2(_audit, audit, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/audit_session_join.S b/src/kernel/libsyscall/sys_x86-64/_audit_session_join.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/audit_session_join.S
rename to src/kernel/libsyscall/sys_x86-64/_audit_session_join.S
index 64c138d9e..50abb9836 100644
--- a/src/kernel/libsyscall/sys_x86-64/audit_session_join.S
+++ b/src/kernel/libsyscall/sys_x86-64/_audit_session_join.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(audit_session_join, audit_session_join, 1, cerror_nocancel)
+__SYSCALL2(_audit_session_join, audit_session_join, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/audit_session_port.S b/src/kernel/libsyscall/sys_x86-64/_audit_session_port.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/audit_session_port.S
rename to src/kernel/libsyscall/sys_x86-64/_audit_session_port.S
index c5a3e8d32..a9f2186b7 100644
--- a/src/kernel/libsyscall/sys_x86-64/audit_session_port.S
+++ b/src/kernel/libsyscall/sys_x86-64/_audit_session_port.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(audit_session_port, audit_session_port, 2, cerror_nocancel)
+__SYSCALL2(_audit_session_port, audit_session_port, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/audit_session_self.S b/src/kernel/libsyscall/sys_x86-64/_audit_session_self.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/audit_session_self.S
rename to src/kernel/libsyscall/sys_x86-64/_audit_session_self.S
index 1cd5554d0..98374af2f 100644
--- a/src/kernel/libsyscall/sys_x86-64/audit_session_self.S
+++ b/src/kernel/libsyscall/sys_x86-64/_audit_session_self.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(audit_session_self, audit_session_self, 0, cerror_nocancel)
+__SYSCALL2(_audit_session_self, audit_session_self, 0, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/auditctl.S b/src/kernel/libsyscall/sys_x86-64/_auditctl.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/auditctl.S
rename to src/kernel/libsyscall/sys_x86-64/_auditctl.S
index fa0a1075d..9a5563abf 100644
--- a/src/kernel/libsyscall/sys_x86-64/auditctl.S
+++ b/src/kernel/libsyscall/sys_x86-64/_auditctl.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(auditctl, auditctl, 1, cerror_nocancel)
+__SYSCALL2(_auditctl, auditctl, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/auditon.S b/src/kernel/libsyscall/sys_x86-64/_auditon.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/auditon.S
rename to src/kernel/libsyscall/sys_x86-64/_auditon.S
index 8ac633831..6df4030e1 100644
--- a/src/kernel/libsyscall/sys_x86-64/auditon.S
+++ b/src/kernel/libsyscall/sys_x86-64/_auditon.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(auditon, auditon, 3, cerror_nocancel)
+__SYSCALL2(_auditon, auditon, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/change_fdguard_np.S b/src/kernel/libsyscall/sys_x86-64/_change_fdguard_np.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/change_fdguard_np.S
rename to src/kernel/libsyscall/sys_x86-64/_change_fdguard_np.S
index c1ce47965..4b7f6d9c0 100644
--- a/src/kernel/libsyscall/sys_x86-64/change_fdguard_np.S
+++ b/src/kernel/libsyscall/sys_x86-64/_change_fdguard_np.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(change_fdguard_np, change_fdguard_np, 6, cerror_nocancel)
+__SYSCALL2(_change_fdguard_np, change_fdguard_np, 6, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/chdir.S b/src/kernel/libsyscall/sys_x86-64/_chdir.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/chdir.S
rename to src/kernel/libsyscall/sys_x86-64/_chdir.S
index d97fadc1e..7ffd228fa 100644
--- a/src/kernel/libsyscall/sys_x86-64/chdir.S
+++ b/src/kernel/libsyscall/sys_x86-64/_chdir.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(chdir, chdir, 1, cerror_nocancel)
+__SYSCALL2(_chdir, chdir, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/chflags.S b/src/kernel/libsyscall/sys_x86-64/_chflags.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/chflags.S
rename to src/kernel/libsyscall/sys_x86-64/_chflags.S
index 9e1c1c016..bb7503d0f 100644
--- a/src/kernel/libsyscall/sys_x86-64/chflags.S
+++ b/src/kernel/libsyscall/sys_x86-64/_chflags.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(chflags, chflags, 2, cerror_nocancel)
+__SYSCALL2(_chflags, chflags, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/chown.S b/src/kernel/libsyscall/sys_x86-64/_chown.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/chown.S
rename to src/kernel/libsyscall/sys_x86-64/_chown.S
index 3c7add921..f1366a173 100644
--- a/src/kernel/libsyscall/sys_x86-64/chown.S
+++ b/src/kernel/libsyscall/sys_x86-64/_chown.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(chown, chown, 3, cerror_nocancel)
+__SYSCALL2(_chown, chown, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/chroot.S b/src/kernel/libsyscall/sys_x86-64/_chroot.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/chroot.S
rename to src/kernel/libsyscall/sys_x86-64/_chroot.S
index 70449d6cc..e58809271 100644
--- a/src/kernel/libsyscall/sys_x86-64/chroot.S
+++ b/src/kernel/libsyscall/sys_x86-64/_chroot.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(chroot, chroot, 1, cerror_nocancel)
+__SYSCALL2(_chroot, chroot, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/close.S b/src/kernel/libsyscall/sys_x86-64/_close.S
similarity index 85%
rename from src/kernel/libsyscall/sys_x86-64/close.S
rename to src/kernel/libsyscall/sys_x86-64/_close.S
index b8a771213..ef0ca830f 100644
--- a/src/kernel/libsyscall/sys_x86-64/close.S
+++ b/src/kernel/libsyscall/sys_x86-64/_close.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(close, close, 1, cerror)
+__SYSCALL2(_close, close, 1, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/connectx.S b/src/kernel/libsyscall/sys_x86-64/_connectx.S
similarity index 84%
rename from src/kernel/libsyscall/sys_x86-64/connectx.S
rename to src/kernel/libsyscall/sys_x86-64/_connectx.S
index 9ea45dfb4..e65b4e182 100644
--- a/src/kernel/libsyscall/sys_x86-64/connectx.S
+++ b/src/kernel/libsyscall/sys_x86-64/_connectx.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(connectx, connectx, 8, cerror)
+__SYSCALL2(_connectx, connectx, 8, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/csops.S b/src/kernel/libsyscall/sys_x86-64/_csops.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/csops.S
rename to src/kernel/libsyscall/sys_x86-64/_csops.S
index 2c714e12b..7daa0905f 100644
--- a/src/kernel/libsyscall/sys_x86-64/csops.S
+++ b/src/kernel/libsyscall/sys_x86-64/_csops.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(csops, csops, 4, cerror_nocancel)
+__SYSCALL2(_csops, csops, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/csops_audittoken.S b/src/kernel/libsyscall/sys_x86-64/_csops_audittoken.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/csops_audittoken.S
rename to src/kernel/libsyscall/sys_x86-64/_csops_audittoken.S
index 59a1eaac5..34f7798fa 100644
--- a/src/kernel/libsyscall/sys_x86-64/csops_audittoken.S
+++ b/src/kernel/libsyscall/sys_x86-64/_csops_audittoken.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(csops_audittoken, csops_audittoken, 5, cerror_nocancel)
+__SYSCALL2(_csops_audittoken, csops_audittoken, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/disconnectx.S b/src/kernel/libsyscall/sys_x86-64/_disconnectx.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/disconnectx.S
rename to src/kernel/libsyscall/sys_x86-64/_disconnectx.S
index 2d7845e62..addad8acc 100644
--- a/src/kernel/libsyscall/sys_x86-64/disconnectx.S
+++ b/src/kernel/libsyscall/sys_x86-64/_disconnectx.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(disconnectx, disconnectx, 3, cerror)
+__SYSCALL2(_disconnectx, disconnectx, 3, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/dup.S b/src/kernel/libsyscall/sys_x86-64/_dup.S
similarity index 83%
rename from src/kernel/libsyscall/sys_x86-64/dup.S
rename to src/kernel/libsyscall/sys_x86-64/_dup.S
index bc34b4faf..2779515cb 100644
--- a/src/kernel/libsyscall/sys_x86-64/dup.S
+++ b/src/kernel/libsyscall/sys_x86-64/_dup.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(dup, dup, 1, cerror_nocancel)
+__SYSCALL2(_dup, dup, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/dup2.S b/src/kernel/libsyscall/sys_x86-64/_dup2.S
similarity index 83%
rename from src/kernel/libsyscall/sys_x86-64/dup2.S
rename to src/kernel/libsyscall/sys_x86-64/_dup2.S
index 449952231..8e08ac0c3 100644
--- a/src/kernel/libsyscall/sys_x86-64/dup2.S
+++ b/src/kernel/libsyscall/sys_x86-64/_dup2.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(dup2, dup2, 2, cerror_nocancel)
+__SYSCALL2(_dup2, dup2, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/exchangedata.S b/src/kernel/libsyscall/sys_x86-64/_exchangedata.S
similarity index 79%
rename from src/kernel/libsyscall/sys_x86-64/exchangedata.S
rename to src/kernel/libsyscall/sys_x86-64/_exchangedata.S
index 60be398ee..b4809ebe3 100644
--- a/src/kernel/libsyscall/sys_x86-64/exchangedata.S
+++ b/src/kernel/libsyscall/sys_x86-64/_exchangedata.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(exchangedata, exchangedata, 3, cerror_nocancel)
+__SYSCALL2(_exchangedata, exchangedata, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/execve.S b/src/kernel/libsyscall/sys_x86-64/_execve.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/execve.S
rename to src/kernel/libsyscall/sys_x86-64/_execve.S
index 32aec1b35..8bf57bc45 100644
--- a/src/kernel/libsyscall/sys_x86-64/execve.S
+++ b/src/kernel/libsyscall/sys_x86-64/_execve.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(execve, execve, 3, cerror_nocancel)
+__SYSCALL2(_execve, execve, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/faccessat.S b/src/kernel/libsyscall/sys_x86-64/_faccessat.S
similarity index 83%
rename from src/kernel/libsyscall/sys_x86-64/faccessat.S
rename to src/kernel/libsyscall/sys_x86-64/_faccessat.S
index e920f2141..176823fe9 100644
--- a/src/kernel/libsyscall/sys_x86-64/faccessat.S
+++ b/src/kernel/libsyscall/sys_x86-64/_faccessat.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(faccessat, faccessat, 4, cerror)
+__SYSCALL2(_faccessat, faccessat, 4, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/fchdir.S b/src/kernel/libsyscall/sys_x86-64/_fchdir.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/fchdir.S
rename to src/kernel/libsyscall/sys_x86-64/_fchdir.S
index aa52539b9..4f601ba8f 100644
--- a/src/kernel/libsyscall/sys_x86-64/fchdir.S
+++ b/src/kernel/libsyscall/sys_x86-64/_fchdir.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(fchdir, fchdir, 1, cerror_nocancel)
+__SYSCALL2(_fchdir, fchdir, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/fchflags.S b/src/kernel/libsyscall/sys_x86-64/_fchflags.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/fchflags.S
rename to src/kernel/libsyscall/sys_x86-64/_fchflags.S
index 06d06adfa..3b70a1098 100644
--- a/src/kernel/libsyscall/sys_x86-64/fchflags.S
+++ b/src/kernel/libsyscall/sys_x86-64/_fchflags.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(fchflags, fchflags, 2, cerror_nocancel)
+__SYSCALL2(_fchflags, fchflags, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/fchmodat.S b/src/kernel/libsyscall/sys_x86-64/_fchmodat.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/fchmodat.S
rename to src/kernel/libsyscall/sys_x86-64/_fchmodat.S
index 4f0adf4d2..3cb0a8568 100644
--- a/src/kernel/libsyscall/sys_x86-64/fchmodat.S
+++ b/src/kernel/libsyscall/sys_x86-64/_fchmodat.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(fchmodat, fchmodat, 4, cerror_nocancel)
+__SYSCALL2(_fchmodat, fchmodat, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/fchown.S b/src/kernel/libsyscall/sys_x86-64/_fchown.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/fchown.S
rename to src/kernel/libsyscall/sys_x86-64/_fchown.S
index c4f1f32e6..823211d4f 100644
--- a/src/kernel/libsyscall/sys_x86-64/fchown.S
+++ b/src/kernel/libsyscall/sys_x86-64/_fchown.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(fchown, fchown, 3, cerror_nocancel)
+__SYSCALL2(_fchown, fchown, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/fchownat.S b/src/kernel/libsyscall/sys_x86-64/_fchownat.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/fchownat.S
rename to src/kernel/libsyscall/sys_x86-64/_fchownat.S
index 0cedcda9c..73603e971 100644
--- a/src/kernel/libsyscall/sys_x86-64/fchownat.S
+++ b/src/kernel/libsyscall/sys_x86-64/_fchownat.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(fchownat, fchownat, 5, cerror_nocancel)
+__SYSCALL2(_fchownat, fchownat, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/fdatasync.S b/src/kernel/libsyscall/sys_x86-64/_fdatasync.S
similarity index 83%
rename from src/kernel/libsyscall/sys_x86-64/fdatasync.S
rename to src/kernel/libsyscall/sys_x86-64/_fdatasync.S
index ea3d85b03..7c0e412c9 100644
--- a/src/kernel/libsyscall/sys_x86-64/fdatasync.S
+++ b/src/kernel/libsyscall/sys_x86-64/_fdatasync.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(fdatasync, fdatasync, 1, cerror)
+__SYSCALL2(_fdatasync, fdatasync, 1, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/ffsctl.S b/src/kernel/libsyscall/sys_x86-64/_ffsctl.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/ffsctl.S
rename to src/kernel/libsyscall/sys_x86-64/_ffsctl.S
index 586aac459..df5e3a1dd 100644
--- a/src/kernel/libsyscall/sys_x86-64/ffsctl.S
+++ b/src/kernel/libsyscall/sys_x86-64/_ffsctl.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(ffsctl, ffsctl, 4, cerror_nocancel)
+__SYSCALL2(_ffsctl, ffsctl, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/fgetattrlist.S b/src/kernel/libsyscall/sys_x86-64/_fgetattrlist.S
similarity index 79%
rename from src/kernel/libsyscall/sys_x86-64/fgetattrlist.S
rename to src/kernel/libsyscall/sys_x86-64/_fgetattrlist.S
index 33f6900ed..43f56d270 100644
--- a/src/kernel/libsyscall/sys_x86-64/fgetattrlist.S
+++ b/src/kernel/libsyscall/sys_x86-64/_fgetattrlist.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(fgetattrlist, fgetattrlist, 5, cerror_nocancel)
+__SYSCALL2(_fgetattrlist, fgetattrlist, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/fgetxattr.S b/src/kernel/libsyscall/sys_x86-64/_fgetxattr.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/fgetxattr.S
rename to src/kernel/libsyscall/sys_x86-64/_fgetxattr.S
index 8f2601c27..ee87a7367 100644
--- a/src/kernel/libsyscall/sys_x86-64/fgetxattr.S
+++ b/src/kernel/libsyscall/sys_x86-64/_fgetxattr.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(fgetxattr, fgetxattr, 6, cerror_nocancel)
+__SYSCALL2(_fgetxattr, fgetxattr, 6, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/fhopen.S b/src/kernel/libsyscall/sys_x86-64/_fhopen.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/fhopen.S
rename to src/kernel/libsyscall/sys_x86-64/_fhopen.S
index 7fb0f62d2..7c6eb63e7 100644
--- a/src/kernel/libsyscall/sys_x86-64/fhopen.S
+++ b/src/kernel/libsyscall/sys_x86-64/_fhopen.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(fhopen, fhopen, 2, cerror_nocancel)
+__SYSCALL2(_fhopen, fhopen, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/fileport_makefd.S b/src/kernel/libsyscall/sys_x86-64/_fileport_makefd.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/fileport_makefd.S
rename to src/kernel/libsyscall/sys_x86-64/_fileport_makefd.S
index 2c10923df..cc91a3db2 100644
--- a/src/kernel/libsyscall/sys_x86-64/fileport_makefd.S
+++ b/src/kernel/libsyscall/sys_x86-64/_fileport_makefd.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(fileport_makefd, fileport_makefd, 1, cerror_nocancel)
+__SYSCALL2(_fileport_makefd, fileport_makefd, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/fileport_makeport.S b/src/kernel/libsyscall/sys_x86-64/_fileport_makeport.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/fileport_makeport.S
rename to src/kernel/libsyscall/sys_x86-64/_fileport_makeport.S
index 82c8bb9f7..652cecf8d 100644
--- a/src/kernel/libsyscall/sys_x86-64/fileport_makeport.S
+++ b/src/kernel/libsyscall/sys_x86-64/_fileport_makeport.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(fileport_makeport, fileport_makeport, 2, cerror_nocancel)
+__SYSCALL2(_fileport_makeport, fileport_makeport, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/flistxattr.S b/src/kernel/libsyscall/sys_x86-64/_flistxattr.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/flistxattr.S
rename to src/kernel/libsyscall/sys_x86-64/_flistxattr.S
index 36dbe2f61..13251bae5 100644
--- a/src/kernel/libsyscall/sys_x86-64/flistxattr.S
+++ b/src/kernel/libsyscall/sys_x86-64/_flistxattr.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(flistxattr, flistxattr, 4, cerror_nocancel)
+__SYSCALL2(_flistxattr, flistxattr, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/flock.S b/src/kernel/libsyscall/sys_x86-64/_flock.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/flock.S
rename to src/kernel/libsyscall/sys_x86-64/_flock.S
index 7b25a15b7..b67565b14 100644
--- a/src/kernel/libsyscall/sys_x86-64/flock.S
+++ b/src/kernel/libsyscall/sys_x86-64/_flock.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(flock, flock, 2, cerror_nocancel)
+__SYSCALL2(_flock, flock, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/fpathconf.S b/src/kernel/libsyscall/sys_x86-64/_fpathconf.S
similarity index 83%
rename from src/kernel/libsyscall/sys_x86-64/fpathconf.S
rename to src/kernel/libsyscall/sys_x86-64/_fpathconf.S
index c00caeb53..b70a6d4d8 100644
--- a/src/kernel/libsyscall/sys_x86-64/fpathconf.S
+++ b/src/kernel/libsyscall/sys_x86-64/_fpathconf.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(fpathconf, fpathconf, 2, cerror)
+__SYSCALL2(_fpathconf, fpathconf, 2, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/fremovexattr.S b/src/kernel/libsyscall/sys_x86-64/_fremovexattr.S
similarity index 79%
rename from src/kernel/libsyscall/sys_x86-64/fremovexattr.S
rename to src/kernel/libsyscall/sys_x86-64/_fremovexattr.S
index 25586bed4..38aac00ed 100644
--- a/src/kernel/libsyscall/sys_x86-64/fremovexattr.S
+++ b/src/kernel/libsyscall/sys_x86-64/_fremovexattr.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(fremovexattr, fremovexattr, 3, cerror_nocancel)
+__SYSCALL2(_fremovexattr, fremovexattr, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/fsctl.S b/src/kernel/libsyscall/sys_x86-64/_fsctl.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/fsctl.S
rename to src/kernel/libsyscall/sys_x86-64/_fsctl.S
index 5427d0689..94c672493 100644
--- a/src/kernel/libsyscall/sys_x86-64/fsctl.S
+++ b/src/kernel/libsyscall/sys_x86-64/_fsctl.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(fsctl, fsctl, 4, cerror_nocancel)
+__SYSCALL2(_fsctl, fsctl, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/fsetattrlist.S b/src/kernel/libsyscall/sys_x86-64/_fsetattrlist.S
similarity index 79%
rename from src/kernel/libsyscall/sys_x86-64/fsetattrlist.S
rename to src/kernel/libsyscall/sys_x86-64/_fsetattrlist.S
index 63c32f730..0487d52d9 100644
--- a/src/kernel/libsyscall/sys_x86-64/fsetattrlist.S
+++ b/src/kernel/libsyscall/sys_x86-64/_fsetattrlist.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(fsetattrlist, fsetattrlist, 5, cerror_nocancel)
+__SYSCALL2(_fsetattrlist, fsetattrlist, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/fsetxattr.S b/src/kernel/libsyscall/sys_x86-64/_fsetxattr.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/fsetxattr.S
rename to src/kernel/libsyscall/sys_x86-64/_fsetxattr.S
index 5a26e5e4d..2bb8fc132 100644
--- a/src/kernel/libsyscall/sys_x86-64/fsetxattr.S
+++ b/src/kernel/libsyscall/sys_x86-64/_fsetxattr.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(fsetxattr, fsetxattr, 6, cerror_nocancel)
+__SYSCALL2(_fsetxattr, fsetxattr, 6, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/fstat.S b/src/kernel/libsyscall/sys_x86-64/_fstat.S
similarity index 85%
rename from src/kernel/libsyscall/sys_x86-64/fstat.S
rename to src/kernel/libsyscall/sys_x86-64/_fstat.S
index 6fc5b4c9a..0a0db5528 100644
--- a/src/kernel/libsyscall/sys_x86-64/fstat.S
+++ b/src/kernel/libsyscall/sys_x86-64/_fstat.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(fstat, fstat, 2, cerror)
+__SYSCALL2(_fstat, fstat, 2, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/fstat64.S b/src/kernel/libsyscall/sys_x86-64/_fstat64.S
similarity index 71%
rename from src/kernel/libsyscall/sys_x86-64/fstat64.S
rename to src/kernel/libsyscall/sys_x86-64/_fstat64.S
index e3e2ed302..9e21432be 100644
--- a/src/kernel/libsyscall/sys_x86-64/fstat64.S
+++ b/src/kernel/libsyscall/sys_x86-64/_fstat64.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(fstat64, fstat64, 2, cerror_nocancel)
+__SYSCALL2(_fstat64, fstat64, 2, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	fstat$INODE64
-		fstat$INODE64 = fstat64
+	.globl	_fstat$INODE64
+	.set	_fstat$INODE64, _fstat64
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/fstatat.S b/src/kernel/libsyscall/sys_x86-64/_fstatat.S
similarity index 84%
rename from src/kernel/libsyscall/sys_x86-64/fstatat.S
rename to src/kernel/libsyscall/sys_x86-64/_fstatat.S
index 23d3ef247..1885f0105 100644
--- a/src/kernel/libsyscall/sys_x86-64/fstatat.S
+++ b/src/kernel/libsyscall/sys_x86-64/_fstatat.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(fstatat, fstatat, 4, cerror)
+__SYSCALL2(_fstatat, fstatat, 4, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/fstatat64.S b/src/kernel/libsyscall/sys_x86-64/_fstatat64.S
similarity index 69%
rename from src/kernel/libsyscall/sys_x86-64/fstatat64.S
rename to src/kernel/libsyscall/sys_x86-64/_fstatat64.S
index 64247305f..0245117f2 100644
--- a/src/kernel/libsyscall/sys_x86-64/fstatat64.S
+++ b/src/kernel/libsyscall/sys_x86-64/_fstatat64.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(fstatat64, fstatat64, 4, cerror_nocancel)
+__SYSCALL2(_fstatat64, fstatat64, 4, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	fstatat$INODE64
-		fstatat$INODE64 = fstatat64
+	.globl	_fstatat$INODE64
+	.set	_fstatat$INODE64, _fstatat64
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/fstatfs.S b/src/kernel/libsyscall/sys_x86-64/_fstatfs.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/fstatfs.S
rename to src/kernel/libsyscall/sys_x86-64/_fstatfs.S
index e90165532..48cd391cc 100644
--- a/src/kernel/libsyscall/sys_x86-64/fstatfs.S
+++ b/src/kernel/libsyscall/sys_x86-64/_fstatfs.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(fstatfs, fstatfs, 2, cerror_nocancel)
+__SYSCALL2(_fstatfs, fstatfs, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/fstatfs64.S b/src/kernel/libsyscall/sys_x86-64/_fstatfs64.S
similarity index 69%
rename from src/kernel/libsyscall/sys_x86-64/fstatfs64.S
rename to src/kernel/libsyscall/sys_x86-64/_fstatfs64.S
index 5e673056a..4b5fcfce8 100644
--- a/src/kernel/libsyscall/sys_x86-64/fstatfs64.S
+++ b/src/kernel/libsyscall/sys_x86-64/_fstatfs64.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(fstatfs64, fstatfs64, 2, cerror_nocancel)
+__SYSCALL2(_fstatfs64, fstatfs64, 2, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	fstatfs$INODE64
-		fstatfs$INODE64 = fstatfs64
+	.globl	_fstatfs$INODE64
+	.set	_fstatfs$INODE64, _fstatfs64
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/fsync.S b/src/kernel/libsyscall/sys_x86-64/_fsync.S
similarity index 85%
rename from src/kernel/libsyscall/sys_x86-64/fsync.S
rename to src/kernel/libsyscall/sys_x86-64/_fsync.S
index ac6de88e9..f03c5db19 100644
--- a/src/kernel/libsyscall/sys_x86-64/fsync.S
+++ b/src/kernel/libsyscall/sys_x86-64/_fsync.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(fsync, fsync, 1, cerror)
+__SYSCALL2(_fsync, fsync, 1, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/ftruncate.S b/src/kernel/libsyscall/sys_x86-64/_ftruncate.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/ftruncate.S
rename to src/kernel/libsyscall/sys_x86-64/_ftruncate.S
index 160320897..960cc1960 100644
--- a/src/kernel/libsyscall/sys_x86-64/ftruncate.S
+++ b/src/kernel/libsyscall/sys_x86-64/_ftruncate.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(ftruncate, ftruncate, 2, cerror_nocancel)
+__SYSCALL2(_ftruncate, ftruncate, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/futimes.S b/src/kernel/libsyscall/sys_x86-64/_futimes.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/futimes.S
rename to src/kernel/libsyscall/sys_x86-64/_futimes.S
index 834b6d0db..67dab3413 100644
--- a/src/kernel/libsyscall/sys_x86-64/futimes.S
+++ b/src/kernel/libsyscall/sys_x86-64/_futimes.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(futimes, futimes, 2, cerror_nocancel)
+__SYSCALL2(_futimes, futimes, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/getattrlistat.S b/src/kernel/libsyscall/sys_x86-64/_getattrlistat.S
similarity index 79%
rename from src/kernel/libsyscall/sys_x86-64/getattrlistat.S
rename to src/kernel/libsyscall/sys_x86-64/_getattrlistat.S
index 16314a60d..ac6fedeca 100644
--- a/src/kernel/libsyscall/sys_x86-64/getattrlistat.S
+++ b/src/kernel/libsyscall/sys_x86-64/_getattrlistat.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(getattrlistat, getattrlistat, 6, cerror_nocancel)
+__SYSCALL2(_getattrlistat, getattrlistat, 6, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/getattrlistbulk.S b/src/kernel/libsyscall/sys_x86-64/_getattrlistbulk.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/getattrlistbulk.S
rename to src/kernel/libsyscall/sys_x86-64/_getattrlistbulk.S
index 2a2cb50ce..035b2dee3 100644
--- a/src/kernel/libsyscall/sys_x86-64/getattrlistbulk.S
+++ b/src/kernel/libsyscall/sys_x86-64/_getattrlistbulk.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(getattrlistbulk, getattrlistbulk, 5, cerror_nocancel)
+__SYSCALL2(_getattrlistbulk, getattrlistbulk, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/getaudit_addr.S b/src/kernel/libsyscall/sys_x86-64/_getaudit_addr.S
similarity index 79%
rename from src/kernel/libsyscall/sys_x86-64/getaudit_addr.S
rename to src/kernel/libsyscall/sys_x86-64/_getaudit_addr.S
index cc89e8593..9e000352b 100644
--- a/src/kernel/libsyscall/sys_x86-64/getaudit_addr.S
+++ b/src/kernel/libsyscall/sys_x86-64/_getaudit_addr.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(getaudit_addr, getaudit_addr, 2, cerror_nocancel)
+__SYSCALL2(_getaudit_addr, getaudit_addr, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/getauid.S b/src/kernel/libsyscall/sys_x86-64/_getauid.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/getauid.S
rename to src/kernel/libsyscall/sys_x86-64/_getauid.S
index 8dd7f3203..cbb631a8a 100644
--- a/src/kernel/libsyscall/sys_x86-64/getauid.S
+++ b/src/kernel/libsyscall/sys_x86-64/_getauid.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(getauid, getauid, 1, cerror_nocancel)
+__SYSCALL2(_getauid, getauid, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/getdirentries.S b/src/kernel/libsyscall/sys_x86-64/_getdirentries.S
similarity index 79%
rename from src/kernel/libsyscall/sys_x86-64/getdirentries.S
rename to src/kernel/libsyscall/sys_x86-64/_getdirentries.S
index 771e103dd..50f132ac0 100644
--- a/src/kernel/libsyscall/sys_x86-64/getdirentries.S
+++ b/src/kernel/libsyscall/sys_x86-64/_getdirentries.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(getdirentries, getdirentries, 4, cerror_nocancel)
+__SYSCALL2(_getdirentries, getdirentries, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/getdirentriesattr.S b/src/kernel/libsyscall/sys_x86-64/_getdirentriesattr.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/getdirentriesattr.S
rename to src/kernel/libsyscall/sys_x86-64/_getdirentriesattr.S
index 19d871466..0d4fd5da4 100644
--- a/src/kernel/libsyscall/sys_x86-64/getdirentriesattr.S
+++ b/src/kernel/libsyscall/sys_x86-64/_getdirentriesattr.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(getdirentriesattr, getdirentriesattr, 8, cerror_nocancel)
+__SYSCALL2(_getdirentriesattr, getdirentriesattr, 8, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/getdtablesize.S b/src/kernel/libsyscall/sys_x86-64/_getdtablesize.S
similarity index 79%
rename from src/kernel/libsyscall/sys_x86-64/getdtablesize.S
rename to src/kernel/libsyscall/sys_x86-64/_getdtablesize.S
index fbacedb0a..c8b5049a4 100644
--- a/src/kernel/libsyscall/sys_x86-64/getdtablesize.S
+++ b/src/kernel/libsyscall/sys_x86-64/_getdtablesize.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(getdtablesize, getdtablesize, 0, cerror_nocancel)
+__SYSCALL2(_getdtablesize, getdtablesize, 0, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/getegid.S b/src/kernel/libsyscall/sys_x86-64/_getegid.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/getegid.S
rename to src/kernel/libsyscall/sys_x86-64/_getegid.S
index 902552fd9..de85526bf 100644
--- a/src/kernel/libsyscall/sys_x86-64/getegid.S
+++ b/src/kernel/libsyscall/sys_x86-64/_getegid.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(getegid, getegid, 0, cerror_nocancel)
+__SYSCALL2(_getegid, getegid, 0, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/geteuid.S b/src/kernel/libsyscall/sys_x86-64/_geteuid.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/geteuid.S
rename to src/kernel/libsyscall/sys_x86-64/_geteuid.S
index 6805c2cf5..ff2759203 100644
--- a/src/kernel/libsyscall/sys_x86-64/geteuid.S
+++ b/src/kernel/libsyscall/sys_x86-64/_geteuid.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(geteuid, geteuid, 0, cerror_nocancel)
+__SYSCALL2(_geteuid, geteuid, 0, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/getfh.S b/src/kernel/libsyscall/sys_x86-64/_getfh.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/getfh.S
rename to src/kernel/libsyscall/sys_x86-64/_getfh.S
index 9dd3c5fbc..8996f8792 100644
--- a/src/kernel/libsyscall/sys_x86-64/getfh.S
+++ b/src/kernel/libsyscall/sys_x86-64/_getfh.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(getfh, getfh, 2, cerror_nocancel)
+__SYSCALL2(_getfh, getfh, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/getfsstat.S b/src/kernel/libsyscall/sys_x86-64/_getfsstat.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/getfsstat.S
rename to src/kernel/libsyscall/sys_x86-64/_getfsstat.S
index 5179ce3ac..fb1f4e23b 100644
--- a/src/kernel/libsyscall/sys_x86-64/getfsstat.S
+++ b/src/kernel/libsyscall/sys_x86-64/_getfsstat.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(getfsstat, getfsstat, 3, cerror_nocancel)
+__SYSCALL2(_getfsstat, getfsstat, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/getfsstat64.S b/src/kernel/libsyscall/sys_x86-64/_getfsstat64.S
similarity index 68%
rename from src/kernel/libsyscall/sys_x86-64/getfsstat64.S
rename to src/kernel/libsyscall/sys_x86-64/_getfsstat64.S
index c5d94c2e4..c9ba9540b 100644
--- a/src/kernel/libsyscall/sys_x86-64/getfsstat64.S
+++ b/src/kernel/libsyscall/sys_x86-64/_getfsstat64.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(getfsstat64, getfsstat64, 3, cerror_nocancel)
+__SYSCALL2(_getfsstat64, getfsstat64, 3, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	getfsstat$INODE64
-		getfsstat$INODE64 = getfsstat64
+	.globl	_getfsstat$INODE64
+	.set	_getfsstat$INODE64, _getfsstat64
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/getgid.S b/src/kernel/libsyscall/sys_x86-64/_getgid.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/getgid.S
rename to src/kernel/libsyscall/sys_x86-64/_getgid.S
index ff40b8b70..11bb8879e 100644
--- a/src/kernel/libsyscall/sys_x86-64/getgid.S
+++ b/src/kernel/libsyscall/sys_x86-64/_getgid.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(getgid, getgid, 0, cerror_nocancel)
+__SYSCALL2(_getgid, getgid, 0, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/getgroups.S b/src/kernel/libsyscall/sys_x86-64/_getgroups.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/getgroups.S
rename to src/kernel/libsyscall/sys_x86-64/_getgroups.S
index 4f4ff0060..ec643cb86 100644
--- a/src/kernel/libsyscall/sys_x86-64/getgroups.S
+++ b/src/kernel/libsyscall/sys_x86-64/_getgroups.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(getgroups, getgroups, 2, cerror_nocancel)
+__SYSCALL2(_getgroups, getgroups, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/getitimer.S b/src/kernel/libsyscall/sys_x86-64/_getitimer.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/getitimer.S
rename to src/kernel/libsyscall/sys_x86-64/_getitimer.S
index 38cb69879..8a1fc064c 100644
--- a/src/kernel/libsyscall/sys_x86-64/getitimer.S
+++ b/src/kernel/libsyscall/sys_x86-64/_getitimer.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(getitimer, getitimer, 2, cerror_nocancel)
+__SYSCALL2(_getitimer, getitimer, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/getpgid.S b/src/kernel/libsyscall/sys_x86-64/_getpgid.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/getpgid.S
rename to src/kernel/libsyscall/sys_x86-64/_getpgid.S
index f93d7aff7..8aab8067f 100644
--- a/src/kernel/libsyscall/sys_x86-64/getpgid.S
+++ b/src/kernel/libsyscall/sys_x86-64/_getpgid.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(getpgid, getpgid, 1, cerror_nocancel)
+__SYSCALL2(_getpgid, getpgid, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/getpgrp.S b/src/kernel/libsyscall/sys_x86-64/_getpgrp.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/getpgrp.S
rename to src/kernel/libsyscall/sys_x86-64/_getpgrp.S
index 4c87e0ef1..064e4012f 100644
--- a/src/kernel/libsyscall/sys_x86-64/getpgrp.S
+++ b/src/kernel/libsyscall/sys_x86-64/_getpgrp.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(getpgrp, getpgrp, 0, cerror_nocancel)
+__SYSCALL2(_getpgrp, getpgrp, 0, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/getppid.S b/src/kernel/libsyscall/sys_x86-64/_getppid.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/getppid.S
rename to src/kernel/libsyscall/sys_x86-64/_getppid.S
index f4d3655eb..f46524d20 100644
--- a/src/kernel/libsyscall/sys_x86-64/getppid.S
+++ b/src/kernel/libsyscall/sys_x86-64/_getppid.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(getppid, getppid, 0, cerror_nocancel)
+__SYSCALL2(_getppid, getppid, 0, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/getpriority.S b/src/kernel/libsyscall/sys_x86-64/_getpriority.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/getpriority.S
rename to src/kernel/libsyscall/sys_x86-64/_getpriority.S
index 165ba544a..90f521214 100644
--- a/src/kernel/libsyscall/sys_x86-64/getpriority.S
+++ b/src/kernel/libsyscall/sys_x86-64/_getpriority.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(getpriority, getpriority, 2, cerror_nocancel)
+__SYSCALL2(_getpriority, getpriority, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/getrusage.S b/src/kernel/libsyscall/sys_x86-64/_getrusage.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/getrusage.S
rename to src/kernel/libsyscall/sys_x86-64/_getrusage.S
index 6d120d8f9..d662b3c35 100644
--- a/src/kernel/libsyscall/sys_x86-64/getrusage.S
+++ b/src/kernel/libsyscall/sys_x86-64/_getrusage.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(getrusage, getrusage, 2, cerror_nocancel)
+__SYSCALL2(_getrusage, getrusage, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/getsid.S b/src/kernel/libsyscall/sys_x86-64/_getsid.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/getsid.S
rename to src/kernel/libsyscall/sys_x86-64/_getsid.S
index 33b23a553..8c521830a 100644
--- a/src/kernel/libsyscall/sys_x86-64/getsid.S
+++ b/src/kernel/libsyscall/sys_x86-64/_getsid.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(getsid, getsid, 1, cerror_nocancel)
+__SYSCALL2(_getsid, getsid, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/getsockopt.S b/src/kernel/libsyscall/sys_x86-64/_getsockopt.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/getsockopt.S
rename to src/kernel/libsyscall/sys_x86-64/_getsockopt.S
index 64d4ef636..4d7caf70e 100644
--- a/src/kernel/libsyscall/sys_x86-64/getsockopt.S
+++ b/src/kernel/libsyscall/sys_x86-64/_getsockopt.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(getsockopt, getsockopt, 5, cerror_nocancel)
+__SYSCALL2(_getsockopt, getsockopt, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/getuid.S b/src/kernel/libsyscall/sys_x86-64/_getuid.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/getuid.S
rename to src/kernel/libsyscall/sys_x86-64/_getuid.S
index 92bd349a3..a9ba97b92 100644
--- a/src/kernel/libsyscall/sys_x86-64/getuid.S
+++ b/src/kernel/libsyscall/sys_x86-64/_getuid.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(getuid, getuid, 0, cerror_nocancel)
+__SYSCALL2(_getuid, getuid, 0, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/getxattr.S b/src/kernel/libsyscall/sys_x86-64/_getxattr.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/getxattr.S
rename to src/kernel/libsyscall/sys_x86-64/_getxattr.S
index 5054eaa3c..549b1abf8 100644
--- a/src/kernel/libsyscall/sys_x86-64/getxattr.S
+++ b/src/kernel/libsyscall/sys_x86-64/_getxattr.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(getxattr, getxattr, 6, cerror_nocancel)
+__SYSCALL2(_getxattr, getxattr, 6, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/_grab_pgo_data.S b/src/kernel/libsyscall/sys_x86-64/_grab_pgo_data.S
new file mode 100644
index 000000000..ecf5c5e4f
--- /dev/null
+++ b/src/kernel/libsyscall/sys_x86-64/_grab_pgo_data.S
@@ -0,0 +1,11 @@
+#define __SYSCALL_32BIT_ARG_BYTES 16
+#include "SYS.h"
+
+#ifndef SYS_grab_pgo_data
+#error "SYS_grab_pgo_data not defined. The header files libsyscall is building against do not match syscalls.master."
+#endif
+
+#if defined(__x86_64__)
+__SYSCALL2(_grab_pgo_data, grab_pgo_data, 4, cerror_nocancel)
+#endif
+
diff --git a/src/kernel/libsyscall/sys_x86-64/guarded_close_np.S b/src/kernel/libsyscall/sys_x86-64/_guarded_close_np.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/guarded_close_np.S
rename to src/kernel/libsyscall/sys_x86-64/_guarded_close_np.S
index 7845a822b..5a9f64e0a 100644
--- a/src/kernel/libsyscall/sys_x86-64/guarded_close_np.S
+++ b/src/kernel/libsyscall/sys_x86-64/_guarded_close_np.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(guarded_close_np, guarded_close_np, 2, cerror_nocancel)
+__SYSCALL2(_guarded_close_np, guarded_close_np, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/guarded_kqueue_np.S b/src/kernel/libsyscall/sys_x86-64/_guarded_kqueue_np.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/guarded_kqueue_np.S
rename to src/kernel/libsyscall/sys_x86-64/_guarded_kqueue_np.S
index e39793107..1b1a08a73 100644
--- a/src/kernel/libsyscall/sys_x86-64/guarded_kqueue_np.S
+++ b/src/kernel/libsyscall/sys_x86-64/_guarded_kqueue_np.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(guarded_kqueue_np, guarded_kqueue_np, 2, cerror_nocancel)
+__SYSCALL2(_guarded_kqueue_np, guarded_kqueue_np, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/guarded_pwrite_np.S b/src/kernel/libsyscall/sys_x86-64/_guarded_pwrite_np.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/guarded_pwrite_np.S
rename to src/kernel/libsyscall/sys_x86-64/_guarded_pwrite_np.S
index 442250f36..79f1dfabd 100644
--- a/src/kernel/libsyscall/sys_x86-64/guarded_pwrite_np.S
+++ b/src/kernel/libsyscall/sys_x86-64/_guarded_pwrite_np.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(guarded_pwrite_np, guarded_pwrite_np, 5, cerror_nocancel)
+__SYSCALL2(_guarded_pwrite_np, guarded_pwrite_np, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/guarded_write_np.S b/src/kernel/libsyscall/sys_x86-64/_guarded_write_np.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/guarded_write_np.S
rename to src/kernel/libsyscall/sys_x86-64/_guarded_write_np.S
index a3a4eb672..885bf189e 100644
--- a/src/kernel/libsyscall/sys_x86-64/guarded_write_np.S
+++ b/src/kernel/libsyscall/sys_x86-64/_guarded_write_np.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(guarded_write_np, guarded_write_np, 4, cerror_nocancel)
+__SYSCALL2(_guarded_write_np, guarded_write_np, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/guarded_writev_np.S b/src/kernel/libsyscall/sys_x86-64/_guarded_writev_np.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/guarded_writev_np.S
rename to src/kernel/libsyscall/sys_x86-64/_guarded_writev_np.S
index 04f167d0d..bb0fb6ba5 100644
--- a/src/kernel/libsyscall/sys_x86-64/guarded_writev_np.S
+++ b/src/kernel/libsyscall/sys_x86-64/_guarded_writev_np.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(guarded_writev_np, guarded_writev_np, 4, cerror_nocancel)
+__SYSCALL2(_guarded_writev_np, guarded_writev_np, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/issetugid.S b/src/kernel/libsyscall/sys_x86-64/_issetugid.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/issetugid.S
rename to src/kernel/libsyscall/sys_x86-64/_issetugid.S
index 60c907853..4b5e59c51 100644
--- a/src/kernel/libsyscall/sys_x86-64/issetugid.S
+++ b/src/kernel/libsyscall/sys_x86-64/_issetugid.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(issetugid, issetugid, 0, cerror_nocancel)
+__SYSCALL2(_issetugid, issetugid, 0, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/kas_info.S b/src/kernel/libsyscall/sys_x86-64/_kas_info.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/kas_info.S
rename to src/kernel/libsyscall/sys_x86-64/_kas_info.S
index fa6ca6a8d..8b1c6a2f9 100644
--- a/src/kernel/libsyscall/sys_x86-64/kas_info.S
+++ b/src/kernel/libsyscall/sys_x86-64/_kas_info.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(kas_info, kas_info, 3, cerror_nocancel)
+__SYSCALL2(_kas_info, kas_info, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/kevent.S b/src/kernel/libsyscall/sys_x86-64/_kevent.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/kevent.S
rename to src/kernel/libsyscall/sys_x86-64/_kevent.S
index 549f17f9a..be9233895 100644
--- a/src/kernel/libsyscall/sys_x86-64/kevent.S
+++ b/src/kernel/libsyscall/sys_x86-64/_kevent.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(kevent, kevent, 6, cerror_nocancel)
+__SYSCALL2(_kevent, kevent, 6, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/kevent64.S b/src/kernel/libsyscall/sys_x86-64/_kevent64.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/kevent64.S
rename to src/kernel/libsyscall/sys_x86-64/_kevent64.S
index 1cd1a1577..754114e99 100644
--- a/src/kernel/libsyscall/sys_x86-64/kevent64.S
+++ b/src/kernel/libsyscall/sys_x86-64/_kevent64.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(kevent64, kevent64, 7, cerror_nocancel)
+__SYSCALL2(_kevent64, kevent64, 7, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/_kevent_qos.S b/src/kernel/libsyscall/sys_x86-64/_kevent_qos.S
new file mode 100644
index 000000000..6a5a2c9fa
--- /dev/null
+++ b/src/kernel/libsyscall/sys_x86-64/_kevent_qos.S
@@ -0,0 +1,11 @@
+#define __SYSCALL_32BIT_ARG_BYTES 32
+#include "SYS.h"
+
+#ifndef SYS_kevent_qos
+#error "SYS_kevent_qos not defined. The header files libsyscall is building against do not match syscalls.master."
+#endif
+
+#if defined(__x86_64__)
+__SYSCALL2(_kevent_qos, kevent_qos, 8, cerror_nocancel)
+#endif
+
diff --git a/src/kernel/libsyscall/sys_x86-64/kqueue.S b/src/kernel/libsyscall/sys_x86-64/_kqueue.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/kqueue.S
rename to src/kernel/libsyscall/sys_x86-64/_kqueue.S
index 1798f099c..789e84dda 100644
--- a/src/kernel/libsyscall/sys_x86-64/kqueue.S
+++ b/src/kernel/libsyscall/sys_x86-64/_kqueue.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(kqueue, kqueue, 0, cerror_nocancel)
+__SYSCALL2(_kqueue, kqueue, 0, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/ledger.S b/src/kernel/libsyscall/sys_x86-64/_ledger.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/ledger.S
rename to src/kernel/libsyscall/sys_x86-64/_ledger.S
index 486023a0f..e3f8ba5f1 100644
--- a/src/kernel/libsyscall/sys_x86-64/ledger.S
+++ b/src/kernel/libsyscall/sys_x86-64/_ledger.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(ledger, ledger, 4, cerror_nocancel)
+__SYSCALL2(_ledger, ledger, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/link.S b/src/kernel/libsyscall/sys_x86-64/_link.S
similarity index 86%
rename from src/kernel/libsyscall/sys_x86-64/link.S
rename to src/kernel/libsyscall/sys_x86-64/_link.S
index fcf0448ab..2eae426f9 100644
--- a/src/kernel/libsyscall/sys_x86-64/link.S
+++ b/src/kernel/libsyscall/sys_x86-64/_link.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(link, link, 2, cerror)
+__SYSCALL2(_link, link, 2, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/linkat.S b/src/kernel/libsyscall/sys_x86-64/_linkat.S
similarity index 85%
rename from src/kernel/libsyscall/sys_x86-64/linkat.S
rename to src/kernel/libsyscall/sys_x86-64/_linkat.S
index 879bceba5..53ee2f9ba 100644
--- a/src/kernel/libsyscall/sys_x86-64/linkat.S
+++ b/src/kernel/libsyscall/sys_x86-64/_linkat.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(linkat, linkat, 5, cerror)
+__SYSCALL2(_linkat, linkat, 5, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/lio_listio.S b/src/kernel/libsyscall/sys_x86-64/_lio_listio.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/lio_listio.S
rename to src/kernel/libsyscall/sys_x86-64/_lio_listio.S
index 1e82ba329..87431af0d 100644
--- a/src/kernel/libsyscall/sys_x86-64/lio_listio.S
+++ b/src/kernel/libsyscall/sys_x86-64/_lio_listio.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(lio_listio, lio_listio, 4, cerror_nocancel)
+__SYSCALL2(_lio_listio, lio_listio, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/listxattr.S b/src/kernel/libsyscall/sys_x86-64/_listxattr.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/listxattr.S
rename to src/kernel/libsyscall/sys_x86-64/_listxattr.S
index a272f772f..63781b9f0 100644
--- a/src/kernel/libsyscall/sys_x86-64/listxattr.S
+++ b/src/kernel/libsyscall/sys_x86-64/_listxattr.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(listxattr, listxattr, 4, cerror_nocancel)
+__SYSCALL2(_listxattr, listxattr, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/lstat.S b/src/kernel/libsyscall/sys_x86-64/_lstat.S
similarity index 85%
rename from src/kernel/libsyscall/sys_x86-64/lstat.S
rename to src/kernel/libsyscall/sys_x86-64/_lstat.S
index d372a6cbd..9ff7145be 100644
--- a/src/kernel/libsyscall/sys_x86-64/lstat.S
+++ b/src/kernel/libsyscall/sys_x86-64/_lstat.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(lstat, lstat, 2, cerror)
+__SYSCALL2(_lstat, lstat, 2, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/lstat64.S b/src/kernel/libsyscall/sys_x86-64/_lstat64.S
similarity index 71%
rename from src/kernel/libsyscall/sys_x86-64/lstat64.S
rename to src/kernel/libsyscall/sys_x86-64/_lstat64.S
index 97c640b07..23b8c8c1f 100644
--- a/src/kernel/libsyscall/sys_x86-64/lstat64.S
+++ b/src/kernel/libsyscall/sys_x86-64/_lstat64.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(lstat64, lstat64, 2, cerror_nocancel)
+__SYSCALL2(_lstat64, lstat64, 2, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	lstat$INODE64
-		lstat$INODE64 = lstat64
+	.globl	_lstat$INODE64
+	.set	_lstat$INODE64, _lstat64
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/madvise.S b/src/kernel/libsyscall/sys_x86-64/_madvise.S
similarity index 71%
rename from src/kernel/libsyscall/sys_x86-64/madvise.S
rename to src/kernel/libsyscall/sys_x86-64/_madvise.S
index ec5e49c10..fbeacd6dd 100644
--- a/src/kernel/libsyscall/sys_x86-64/madvise.S
+++ b/src/kernel/libsyscall/sys_x86-64/_madvise.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(madvise, madvise, 3, cerror_nocancel)
+__SYSCALL2(_madvise, madvise, 3, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	posix_madvise
-		posix_madvise = madvise
+	.globl	_posix_madvise
+	.set	_posix_madvise, _madvise
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/memorystatus_control.S b/src/kernel/libsyscall/sys_x86-64/_memorystatus_control.S
similarity index 76%
rename from src/kernel/libsyscall/sys_x86-64/memorystatus_control.S
rename to src/kernel/libsyscall/sys_x86-64/_memorystatus_control.S
index 89c267e53..dd1fe72bd 100644
--- a/src/kernel/libsyscall/sys_x86-64/memorystatus_control.S
+++ b/src/kernel/libsyscall/sys_x86-64/_memorystatus_control.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(memorystatus_control, memorystatus_control, 5, cerror_nocancel)
+__SYSCALL2(_memorystatus_control, memorystatus_control, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/memorystatus_get_level.S b/src/kernel/libsyscall/sys_x86-64/_memorystatus_get_level.S
similarity index 76%
rename from src/kernel/libsyscall/sys_x86-64/memorystatus_get_level.S
rename to src/kernel/libsyscall/sys_x86-64/_memorystatus_get_level.S
index 85829483a..5ee7eda62 100644
--- a/src/kernel/libsyscall/sys_x86-64/memorystatus_get_level.S
+++ b/src/kernel/libsyscall/sys_x86-64/_memorystatus_get_level.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(memorystatus_get_level, memorystatus_get_level, 1, cerror_nocancel)
+__SYSCALL2(_memorystatus_get_level, memorystatus_get_level, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/mincore.S b/src/kernel/libsyscall/sys_x86-64/_mincore.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/mincore.S
rename to src/kernel/libsyscall/sys_x86-64/_mincore.S
index 620a9d0dd..bbd08adc9 100644
--- a/src/kernel/libsyscall/sys_x86-64/mincore.S
+++ b/src/kernel/libsyscall/sys_x86-64/_mincore.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(mincore, mincore, 3, cerror_nocancel)
+__SYSCALL2(_mincore, mincore, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/minherit.S b/src/kernel/libsyscall/sys_x86-64/_minherit.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/minherit.S
rename to src/kernel/libsyscall/sys_x86-64/_minherit.S
index 3f51a5c41..e8a1b2234 100644
--- a/src/kernel/libsyscall/sys_x86-64/minherit.S
+++ b/src/kernel/libsyscall/sys_x86-64/_minherit.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(minherit, minherit, 3, cerror_nocancel)
+__SYSCALL2(_minherit, minherit, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/mkdir.S b/src/kernel/libsyscall/sys_x86-64/_mkdir.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/mkdir.S
rename to src/kernel/libsyscall/sys_x86-64/_mkdir.S
index 6da46bfa1..1b5bd423c 100644
--- a/src/kernel/libsyscall/sys_x86-64/mkdir.S
+++ b/src/kernel/libsyscall/sys_x86-64/_mkdir.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(mkdir, mkdir, 2, cerror_nocancel)
+__SYSCALL2(_mkdir, mkdir, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/mkdirat.S b/src/kernel/libsyscall/sys_x86-64/_mkdirat.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/mkdirat.S
rename to src/kernel/libsyscall/sys_x86-64/_mkdirat.S
index 0fdf6a119..27cf8cc47 100644
--- a/src/kernel/libsyscall/sys_x86-64/mkdirat.S
+++ b/src/kernel/libsyscall/sys_x86-64/_mkdirat.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(mkdirat, mkdirat, 3, cerror_nocancel)
+__SYSCALL2(_mkdirat, mkdirat, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/mkfifo.S b/src/kernel/libsyscall/sys_x86-64/_mkfifo.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/mkfifo.S
rename to src/kernel/libsyscall/sys_x86-64/_mkfifo.S
index ddc247ad5..bcad8b2b7 100644
--- a/src/kernel/libsyscall/sys_x86-64/mkfifo.S
+++ b/src/kernel/libsyscall/sys_x86-64/_mkfifo.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(mkfifo, mkfifo, 2, cerror_nocancel)
+__SYSCALL2(_mkfifo, mkfifo, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/mknod.S b/src/kernel/libsyscall/sys_x86-64/_mknod.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/mknod.S
rename to src/kernel/libsyscall/sys_x86-64/_mknod.S
index 4b925d73c..0008f14b4 100644
--- a/src/kernel/libsyscall/sys_x86-64/mknod.S
+++ b/src/kernel/libsyscall/sys_x86-64/_mknod.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(mknod, mknod, 3, cerror_nocancel)
+__SYSCALL2(_mknod, mknod, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/mlock.S b/src/kernel/libsyscall/sys_x86-64/_mlock.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/mlock.S
rename to src/kernel/libsyscall/sys_x86-64/_mlock.S
index 878c16e59..cef4cd1be 100644
--- a/src/kernel/libsyscall/sys_x86-64/mlock.S
+++ b/src/kernel/libsyscall/sys_x86-64/_mlock.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(mlock, mlock, 2, cerror_nocancel)
+__SYSCALL2(_mlock, mlock, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/mlockall.S b/src/kernel/libsyscall/sys_x86-64/_mlockall.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/mlockall.S
rename to src/kernel/libsyscall/sys_x86-64/_mlockall.S
index 053410dbd..39578920b 100644
--- a/src/kernel/libsyscall/sys_x86-64/mlockall.S
+++ b/src/kernel/libsyscall/sys_x86-64/_mlockall.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(mlockall, mlockall, 1, cerror_nocancel)
+__SYSCALL2(_mlockall, mlockall, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/modwatch.S b/src/kernel/libsyscall/sys_x86-64/_modwatch.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/modwatch.S
rename to src/kernel/libsyscall/sys_x86-64/_modwatch.S
index 4ff7c2a33..f8e944844 100644
--- a/src/kernel/libsyscall/sys_x86-64/modwatch.S
+++ b/src/kernel/libsyscall/sys_x86-64/_modwatch.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(modwatch, modwatch, 2, cerror_nocancel)
+__SYSCALL2(_modwatch, modwatch, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/mount.S b/src/kernel/libsyscall/sys_x86-64/_mount.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/mount.S
rename to src/kernel/libsyscall/sys_x86-64/_mount.S
index de2df5b4d..8e8c8e25d 100644
--- a/src/kernel/libsyscall/sys_x86-64/mount.S
+++ b/src/kernel/libsyscall/sys_x86-64/_mount.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(mount, mount, 4, cerror_nocancel)
+__SYSCALL2(_mount, mount, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/mremap_encrypted.S b/src/kernel/libsyscall/sys_x86-64/_mremap_encrypted.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/mremap_encrypted.S
rename to src/kernel/libsyscall/sys_x86-64/_mremap_encrypted.S
index 3721261d2..0988c8d42 100644
--- a/src/kernel/libsyscall/sys_x86-64/mremap_encrypted.S
+++ b/src/kernel/libsyscall/sys_x86-64/_mremap_encrypted.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(mremap_encrypted, mremap_encrypted, 5, cerror_nocancel)
+__SYSCALL2(_mremap_encrypted, mremap_encrypted, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/msgget.S b/src/kernel/libsyscall/sys_x86-64/_msgget.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/msgget.S
rename to src/kernel/libsyscall/sys_x86-64/_msgget.S
index 90dd98608..69939f607 100644
--- a/src/kernel/libsyscall/sys_x86-64/msgget.S
+++ b/src/kernel/libsyscall/sys_x86-64/_msgget.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(msgget, msgget, 2, cerror_nocancel)
+__SYSCALL2(_msgget, msgget, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/msgrcv.S b/src/kernel/libsyscall/sys_x86-64/_msgrcv.S
similarity index 85%
rename from src/kernel/libsyscall/sys_x86-64/msgrcv.S
rename to src/kernel/libsyscall/sys_x86-64/_msgrcv.S
index c8e873510..25d4049bb 100644
--- a/src/kernel/libsyscall/sys_x86-64/msgrcv.S
+++ b/src/kernel/libsyscall/sys_x86-64/_msgrcv.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(msgrcv, msgrcv, 5, cerror)
+__SYSCALL2(_msgrcv, msgrcv, 5, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/msgsnd.S b/src/kernel/libsyscall/sys_x86-64/_msgsnd.S
similarity index 85%
rename from src/kernel/libsyscall/sys_x86-64/msgsnd.S
rename to src/kernel/libsyscall/sys_x86-64/_msgsnd.S
index 76ba0734d..1bac99ab5 100644
--- a/src/kernel/libsyscall/sys_x86-64/msgsnd.S
+++ b/src/kernel/libsyscall/sys_x86-64/_msgsnd.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(msgsnd, msgsnd, 4, cerror)
+__SYSCALL2(_msgsnd, msgsnd, 4, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/munlock.S b/src/kernel/libsyscall/sys_x86-64/_munlock.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/munlock.S
rename to src/kernel/libsyscall/sys_x86-64/_munlock.S
index c1cb133bb..61e0830ee 100644
--- a/src/kernel/libsyscall/sys_x86-64/munlock.S
+++ b/src/kernel/libsyscall/sys_x86-64/_munlock.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(munlock, munlock, 2, cerror_nocancel)
+__SYSCALL2(_munlock, munlock, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/munlockall.S b/src/kernel/libsyscall/sys_x86-64/_munlockall.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/munlockall.S
rename to src/kernel/libsyscall/sys_x86-64/_munlockall.S
index d6465d4c1..d925dbfed 100644
--- a/src/kernel/libsyscall/sys_x86-64/munlockall.S
+++ b/src/kernel/libsyscall/sys_x86-64/_munlockall.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(munlockall, munlockall, 1, cerror_nocancel)
+__SYSCALL2(_munlockall, munlockall, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/necp_match_policy.S b/src/kernel/libsyscall/sys_x86-64/_necp_match_policy.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/necp_match_policy.S
rename to src/kernel/libsyscall/sys_x86-64/_necp_match_policy.S
index f5b4ff312..8a2e3a4bc 100644
--- a/src/kernel/libsyscall/sys_x86-64/necp_match_policy.S
+++ b/src/kernel/libsyscall/sys_x86-64/_necp_match_policy.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(necp_match_policy, necp_match_policy, 3, cerror_nocancel)
+__SYSCALL2(_necp_match_policy, necp_match_policy, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/_netagent_trigger.S b/src/kernel/libsyscall/sys_x86-64/_netagent_trigger.S
new file mode 100644
index 000000000..220ce72a1
--- /dev/null
+++ b/src/kernel/libsyscall/sys_x86-64/_netagent_trigger.S
@@ -0,0 +1,11 @@
+#define __SYSCALL_32BIT_ARG_BYTES 8
+#include "SYS.h"
+
+#ifndef SYS_netagent_trigger
+#error "SYS_netagent_trigger not defined. The header files libsyscall is building against do not match syscalls.master."
+#endif
+
+#if defined(__x86_64__)
+__SYSCALL2(_netagent_trigger, netagent_trigger, 2, cerror_nocancel)
+#endif
+
diff --git a/src/kernel/libsyscall/sys_x86-64/nfsclnt.S b/src/kernel/libsyscall/sys_x86-64/_nfsclnt.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/nfsclnt.S
rename to src/kernel/libsyscall/sys_x86-64/_nfsclnt.S
index bf1fc4f60..20055c0cf 100644
--- a/src/kernel/libsyscall/sys_x86-64/nfsclnt.S
+++ b/src/kernel/libsyscall/sys_x86-64/_nfsclnt.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(nfsclnt, nfsclnt, 2, cerror_nocancel)
+__SYSCALL2(_nfsclnt, nfsclnt, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/nfssvc.S b/src/kernel/libsyscall/sys_x86-64/_nfssvc.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/nfssvc.S
rename to src/kernel/libsyscall/sys_x86-64/_nfssvc.S
index 25eeeb430..db5ebf6b7 100644
--- a/src/kernel/libsyscall/sys_x86-64/nfssvc.S
+++ b/src/kernel/libsyscall/sys_x86-64/_nfssvc.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(nfssvc, nfssvc, 2, cerror_nocancel)
+__SYSCALL2(_nfssvc, nfssvc, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/openbyid_np.S b/src/kernel/libsyscall/sys_x86-64/_openbyid_np.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/openbyid_np.S
rename to src/kernel/libsyscall/sys_x86-64/_openbyid_np.S
index 1ad52a244..f063cf143 100644
--- a/src/kernel/libsyscall/sys_x86-64/openbyid_np.S
+++ b/src/kernel/libsyscall/sys_x86-64/_openbyid_np.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(openbyid_np, openbyid_np, 3, cerror_nocancel)
+__SYSCALL2(_openbyid_np, openbyid_np, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/pathconf.S b/src/kernel/libsyscall/sys_x86-64/_pathconf.S
similarity index 84%
rename from src/kernel/libsyscall/sys_x86-64/pathconf.S
rename to src/kernel/libsyscall/sys_x86-64/_pathconf.S
index fb8f72dc9..8623a7124 100644
--- a/src/kernel/libsyscall/sys_x86-64/pathconf.S
+++ b/src/kernel/libsyscall/sys_x86-64/_pathconf.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(pathconf, pathconf, 2, cerror)
+__SYSCALL2(_pathconf, pathconf, 2, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/peeloff.S b/src/kernel/libsyscall/sys_x86-64/_peeloff.S
similarity index 84%
rename from src/kernel/libsyscall/sys_x86-64/peeloff.S
rename to src/kernel/libsyscall/sys_x86-64/_peeloff.S
index 9d7663fc6..6356c93d0 100644
--- a/src/kernel/libsyscall/sys_x86-64/peeloff.S
+++ b/src/kernel/libsyscall/sys_x86-64/_peeloff.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(peeloff, peeloff, 2, cerror)
+__SYSCALL2(_peeloff, peeloff, 2, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/pid_resume.S b/src/kernel/libsyscall/sys_x86-64/_pid_resume.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/pid_resume.S
rename to src/kernel/libsyscall/sys_x86-64/_pid_resume.S
index cff6e6919..207fa339a 100644
--- a/src/kernel/libsyscall/sys_x86-64/pid_resume.S
+++ b/src/kernel/libsyscall/sys_x86-64/_pid_resume.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(pid_resume, pid_resume, 1, cerror_nocancel)
+__SYSCALL2(_pid_resume, pid_resume, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/pid_suspend.S b/src/kernel/libsyscall/sys_x86-64/_pid_suspend.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/pid_suspend.S
rename to src/kernel/libsyscall/sys_x86-64/_pid_suspend.S
index b14bf2320..b16a896be 100644
--- a/src/kernel/libsyscall/sys_x86-64/pid_suspend.S
+++ b/src/kernel/libsyscall/sys_x86-64/_pid_suspend.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(pid_suspend, pid_suspend, 1, cerror_nocancel)
+__SYSCALL2(_pid_suspend, pid_suspend, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/poll.S b/src/kernel/libsyscall/sys_x86-64/_poll.S
similarity index 86%
rename from src/kernel/libsyscall/sys_x86-64/poll.S
rename to src/kernel/libsyscall/sys_x86-64/_poll.S
index 897186469..2bb93afb4 100644
--- a/src/kernel/libsyscall/sys_x86-64/poll.S
+++ b/src/kernel/libsyscall/sys_x86-64/_poll.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(poll, poll, 3, cerror)
+__SYSCALL2(_poll, poll, 3, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/pread.S b/src/kernel/libsyscall/sys_x86-64/_pread.S
similarity index 85%
rename from src/kernel/libsyscall/sys_x86-64/pread.S
rename to src/kernel/libsyscall/sys_x86-64/_pread.S
index a5e36ca16..c27cabe16 100644
--- a/src/kernel/libsyscall/sys_x86-64/pread.S
+++ b/src/kernel/libsyscall/sys_x86-64/_pread.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(pread, pread, 4, cerror)
+__SYSCALL2(_pread, pread, 4, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/proc_rlimit_control.S b/src/kernel/libsyscall/sys_x86-64/_proc_rlimit_control.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/proc_rlimit_control.S
rename to src/kernel/libsyscall/sys_x86-64/_proc_rlimit_control.S
index e7fd69162..e0da064bf 100644
--- a/src/kernel/libsyscall/sys_x86-64/proc_rlimit_control.S
+++ b/src/kernel/libsyscall/sys_x86-64/_proc_rlimit_control.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(proc_rlimit_control, proc_rlimit_control, 3, cerror_nocancel)
+__SYSCALL2(_proc_rlimit_control, proc_rlimit_control, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/proc_trace_log.S b/src/kernel/libsyscall/sys_x86-64/_proc_trace_log.S
similarity index 79%
rename from src/kernel/libsyscall/sys_x86-64/proc_trace_log.S
rename to src/kernel/libsyscall/sys_x86-64/_proc_trace_log.S
index 2d6edaa7e..9bc495714 100644
--- a/src/kernel/libsyscall/sys_x86-64/proc_trace_log.S
+++ b/src/kernel/libsyscall/sys_x86-64/_proc_trace_log.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(proc_trace_log, proc_trace_log, 2, cerror_nocancel)
+__SYSCALL2(_proc_trace_log, proc_trace_log, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/proc_uuid_policy.S b/src/kernel/libsyscall/sys_x86-64/_proc_uuid_policy.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/proc_uuid_policy.S
rename to src/kernel/libsyscall/sys_x86-64/_proc_uuid_policy.S
index 953138272..63b68b900 100644
--- a/src/kernel/libsyscall/sys_x86-64/proc_uuid_policy.S
+++ b/src/kernel/libsyscall/sys_x86-64/_proc_uuid_policy.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(proc_uuid_policy, proc_uuid_policy, 4, cerror_nocancel)
+__SYSCALL2(_proc_uuid_policy, proc_uuid_policy, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/pwrite.S b/src/kernel/libsyscall/sys_x86-64/_pwrite.S
similarity index 85%
rename from src/kernel/libsyscall/sys_x86-64/pwrite.S
rename to src/kernel/libsyscall/sys_x86-64/_pwrite.S
index f94d9444a..4b1ae8ae2 100644
--- a/src/kernel/libsyscall/sys_x86-64/pwrite.S
+++ b/src/kernel/libsyscall/sys_x86-64/_pwrite.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(pwrite, pwrite, 4, cerror)
+__SYSCALL2(_pwrite, pwrite, 4, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/quota.S b/src/kernel/libsyscall/sys_x86-64/_quota.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/quota.S
rename to src/kernel/libsyscall/sys_x86-64/_quota.S
index cab3b4549..f6f44bb7c 100644
--- a/src/kernel/libsyscall/sys_x86-64/quota.S
+++ b/src/kernel/libsyscall/sys_x86-64/_quota.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(quota, quota, 4, cerror_nocancel)
+__SYSCALL2(_quota, quota, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/quotactl.S b/src/kernel/libsyscall/sys_x86-64/_quotactl.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/quotactl.S
rename to src/kernel/libsyscall/sys_x86-64/_quotactl.S
index 1bbcaf546..900b10195 100644
--- a/src/kernel/libsyscall/sys_x86-64/quotactl.S
+++ b/src/kernel/libsyscall/sys_x86-64/_quotactl.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(quotactl, quotactl, 4, cerror_nocancel)
+__SYSCALL2(_quotactl, quotactl, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/read.S b/src/kernel/libsyscall/sys_x86-64/_read.S
similarity index 86%
rename from src/kernel/libsyscall/sys_x86-64/read.S
rename to src/kernel/libsyscall/sys_x86-64/_read.S
index 34a79da0e..cef425a2a 100644
--- a/src/kernel/libsyscall/sys_x86-64/read.S
+++ b/src/kernel/libsyscall/sys_x86-64/_read.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(read, read, 3, cerror)
+__SYSCALL2(_read, read, 3, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/readlink.S b/src/kernel/libsyscall/sys_x86-64/_readlink.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/readlink.S
rename to src/kernel/libsyscall/sys_x86-64/_readlink.S
index 211174b3f..a22f12f2f 100644
--- a/src/kernel/libsyscall/sys_x86-64/readlink.S
+++ b/src/kernel/libsyscall/sys_x86-64/_readlink.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(readlink, readlink, 3, cerror_nocancel)
+__SYSCALL2(_readlink, readlink, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/readlinkat.S b/src/kernel/libsyscall/sys_x86-64/_readlinkat.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/readlinkat.S
rename to src/kernel/libsyscall/sys_x86-64/_readlinkat.S
index d3f6a2949..897337d5a 100644
--- a/src/kernel/libsyscall/sys_x86-64/readlinkat.S
+++ b/src/kernel/libsyscall/sys_x86-64/_readlinkat.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(readlinkat, readlinkat, 4, cerror_nocancel)
+__SYSCALL2(_readlinkat, readlinkat, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/readv.S b/src/kernel/libsyscall/sys_x86-64/_readv.S
similarity index 85%
rename from src/kernel/libsyscall/sys_x86-64/readv.S
rename to src/kernel/libsyscall/sys_x86-64/_readv.S
index 3586fabf5..c4b82656f 100644
--- a/src/kernel/libsyscall/sys_x86-64/readv.S
+++ b/src/kernel/libsyscall/sys_x86-64/_readv.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(readv, readv, 3, cerror)
+__SYSCALL2(_readv, readv, 3, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/reboot.S b/src/kernel/libsyscall/sys_x86-64/_reboot.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/reboot.S
rename to src/kernel/libsyscall/sys_x86-64/_reboot.S
index 1c2b0b648..ec8179b07 100644
--- a/src/kernel/libsyscall/sys_x86-64/reboot.S
+++ b/src/kernel/libsyscall/sys_x86-64/_reboot.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(reboot, reboot, 2, cerror_nocancel)
+__SYSCALL2(_reboot, reboot, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/recvmsg_x.S b/src/kernel/libsyscall/sys_x86-64/_recvmsg_x.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/recvmsg_x.S
rename to src/kernel/libsyscall/sys_x86-64/_recvmsg_x.S
index d78d641cf..31f378051 100644
--- a/src/kernel/libsyscall/sys_x86-64/recvmsg_x.S
+++ b/src/kernel/libsyscall/sys_x86-64/_recvmsg_x.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(recvmsg_x, recvmsg_x, 4, cerror_nocancel)
+__SYSCALL2(_recvmsg_x, recvmsg_x, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/removexattr.S b/src/kernel/libsyscall/sys_x86-64/_removexattr.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/removexattr.S
rename to src/kernel/libsyscall/sys_x86-64/_removexattr.S
index 5f09c3c39..fad8f2660 100644
--- a/src/kernel/libsyscall/sys_x86-64/removexattr.S
+++ b/src/kernel/libsyscall/sys_x86-64/_removexattr.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(removexattr, removexattr, 3, cerror_nocancel)
+__SYSCALL2(_removexattr, removexattr, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/revoke.S b/src/kernel/libsyscall/sys_x86-64/_revoke.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/revoke.S
rename to src/kernel/libsyscall/sys_x86-64/_revoke.S
index 29068a431..fe2b22edc 100644
--- a/src/kernel/libsyscall/sys_x86-64/revoke.S
+++ b/src/kernel/libsyscall/sys_x86-64/_revoke.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(revoke, revoke, 1, cerror_nocancel)
+__SYSCALL2(_revoke, revoke, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/searchfs.S b/src/kernel/libsyscall/sys_x86-64/_searchfs.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/searchfs.S
rename to src/kernel/libsyscall/sys_x86-64/_searchfs.S
index 34a85f1cf..823beb79c 100644
--- a/src/kernel/libsyscall/sys_x86-64/searchfs.S
+++ b/src/kernel/libsyscall/sys_x86-64/_searchfs.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(searchfs, searchfs, 6, cerror_nocancel)
+__SYSCALL2(_searchfs, searchfs, 6, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/sem_close.S b/src/kernel/libsyscall/sys_x86-64/_sem_close.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/sem_close.S
rename to src/kernel/libsyscall/sys_x86-64/_sem_close.S
index cee560c37..1b337949a 100644
--- a/src/kernel/libsyscall/sys_x86-64/sem_close.S
+++ b/src/kernel/libsyscall/sys_x86-64/_sem_close.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(sem_close, sem_close, 1, cerror_nocancel)
+__SYSCALL2(_sem_close, sem_close, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/sem_post.S b/src/kernel/libsyscall/sys_x86-64/_sem_post.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/sem_post.S
rename to src/kernel/libsyscall/sys_x86-64/_sem_post.S
index b934d50ad..b87edcfb9 100644
--- a/src/kernel/libsyscall/sys_x86-64/sem_post.S
+++ b/src/kernel/libsyscall/sys_x86-64/_sem_post.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(sem_post, sem_post, 1, cerror_nocancel)
+__SYSCALL2(_sem_post, sem_post, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/sem_trywait.S b/src/kernel/libsyscall/sys_x86-64/_sem_trywait.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/sem_trywait.S
rename to src/kernel/libsyscall/sys_x86-64/_sem_trywait.S
index 6a9c1a013..4c2fad7b3 100644
--- a/src/kernel/libsyscall/sys_x86-64/sem_trywait.S
+++ b/src/kernel/libsyscall/sys_x86-64/_sem_trywait.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(sem_trywait, sem_trywait, 1, cerror_nocancel)
+__SYSCALL2(_sem_trywait, sem_trywait, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/sem_unlink.S b/src/kernel/libsyscall/sys_x86-64/_sem_unlink.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/sem_unlink.S
rename to src/kernel/libsyscall/sys_x86-64/_sem_unlink.S
index 5aae3d52c..617dae966 100644
--- a/src/kernel/libsyscall/sys_x86-64/sem_unlink.S
+++ b/src/kernel/libsyscall/sys_x86-64/_sem_unlink.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(sem_unlink, sem_unlink, 1, cerror_nocancel)
+__SYSCALL2(_sem_unlink, sem_unlink, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/sem_wait.S b/src/kernel/libsyscall/sys_x86-64/_sem_wait.S
similarity index 84%
rename from src/kernel/libsyscall/sys_x86-64/sem_wait.S
rename to src/kernel/libsyscall/sys_x86-64/_sem_wait.S
index aac4feacd..ada7dad57 100644
--- a/src/kernel/libsyscall/sys_x86-64/sem_wait.S
+++ b/src/kernel/libsyscall/sys_x86-64/_sem_wait.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(sem_wait, sem_wait, 1, cerror)
+__SYSCALL2(_sem_wait, sem_wait, 1, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/semget.S b/src/kernel/libsyscall/sys_x86-64/_semget.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/semget.S
rename to src/kernel/libsyscall/sys_x86-64/_semget.S
index ad1a97018..e9eaf1d60 100644
--- a/src/kernel/libsyscall/sys_x86-64/semget.S
+++ b/src/kernel/libsyscall/sys_x86-64/_semget.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(semget, semget, 3, cerror_nocancel)
+__SYSCALL2(_semget, semget, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/semop.S b/src/kernel/libsyscall/sys_x86-64/_semop.S
similarity index 85%
rename from src/kernel/libsyscall/sys_x86-64/semop.S
rename to src/kernel/libsyscall/sys_x86-64/_semop.S
index aae5f3487..283f5384d 100644
--- a/src/kernel/libsyscall/sys_x86-64/semop.S
+++ b/src/kernel/libsyscall/sys_x86-64/_semop.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(semop, semop, 3, cerror)
+__SYSCALL2(_semop, semop, 3, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/sendfile.S b/src/kernel/libsyscall/sys_x86-64/_sendfile.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/sendfile.S
rename to src/kernel/libsyscall/sys_x86-64/_sendfile.S
index 79e4f2fed..4d2279924 100644
--- a/src/kernel/libsyscall/sys_x86-64/sendfile.S
+++ b/src/kernel/libsyscall/sys_x86-64/_sendfile.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(sendfile, sendfile, 6, cerror_nocancel)
+__SYSCALL2(_sendfile, sendfile, 6, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/sendmsg_x.S b/src/kernel/libsyscall/sys_x86-64/_sendmsg_x.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/sendmsg_x.S
rename to src/kernel/libsyscall/sys_x86-64/_sendmsg_x.S
index afd91af8e..81d83e2e5 100644
--- a/src/kernel/libsyscall/sys_x86-64/sendmsg_x.S
+++ b/src/kernel/libsyscall/sys_x86-64/_sendmsg_x.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(sendmsg_x, sendmsg_x, 4, cerror_nocancel)
+__SYSCALL2(_sendmsg_x, sendmsg_x, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/setaudit_addr.S b/src/kernel/libsyscall/sys_x86-64/_setaudit_addr.S
similarity index 79%
rename from src/kernel/libsyscall/sys_x86-64/setaudit_addr.S
rename to src/kernel/libsyscall/sys_x86-64/_setaudit_addr.S
index d4f5c0efc..9c10eafec 100644
--- a/src/kernel/libsyscall/sys_x86-64/setaudit_addr.S
+++ b/src/kernel/libsyscall/sys_x86-64/_setaudit_addr.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(setaudit_addr, setaudit_addr, 2, cerror_nocancel)
+__SYSCALL2(_setaudit_addr, setaudit_addr, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/setauid.S b/src/kernel/libsyscall/sys_x86-64/_setauid.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/setauid.S
rename to src/kernel/libsyscall/sys_x86-64/_setauid.S
index a1abc2627..91fe07da8 100644
--- a/src/kernel/libsyscall/sys_x86-64/setauid.S
+++ b/src/kernel/libsyscall/sys_x86-64/_setauid.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(setauid, setauid, 1, cerror_nocancel)
+__SYSCALL2(_setauid, setauid, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/setegid.S b/src/kernel/libsyscall/sys_x86-64/_setegid.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/setegid.S
rename to src/kernel/libsyscall/sys_x86-64/_setegid.S
index a32028093..6d220e5ea 100644
--- a/src/kernel/libsyscall/sys_x86-64/setegid.S
+++ b/src/kernel/libsyscall/sys_x86-64/_setegid.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(setegid, setegid, 1, cerror_nocancel)
+__SYSCALL2(_setegid, setegid, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/seteuid.S b/src/kernel/libsyscall/sys_x86-64/_seteuid.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/seteuid.S
rename to src/kernel/libsyscall/sys_x86-64/_seteuid.S
index 0cf00b318..e512e235c 100644
--- a/src/kernel/libsyscall/sys_x86-64/seteuid.S
+++ b/src/kernel/libsyscall/sys_x86-64/_seteuid.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(seteuid, seteuid, 1, cerror_nocancel)
+__SYSCALL2(_seteuid, seteuid, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/setgid.S b/src/kernel/libsyscall/sys_x86-64/_setgid.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/setgid.S
rename to src/kernel/libsyscall/sys_x86-64/_setgid.S
index 1ad1e9f20..260c20453 100644
--- a/src/kernel/libsyscall/sys_x86-64/setgid.S
+++ b/src/kernel/libsyscall/sys_x86-64/_setgid.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(setgid, setgid, 1, cerror_nocancel)
+__SYSCALL2(_setgid, setgid, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/setgroups.S b/src/kernel/libsyscall/sys_x86-64/_setgroups.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/setgroups.S
rename to src/kernel/libsyscall/sys_x86-64/_setgroups.S
index 7162e30a6..959d02aa1 100644
--- a/src/kernel/libsyscall/sys_x86-64/setgroups.S
+++ b/src/kernel/libsyscall/sys_x86-64/_setgroups.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(setgroups, setgroups, 2, cerror_nocancel)
+__SYSCALL2(_setgroups, setgroups, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/setitimer.S b/src/kernel/libsyscall/sys_x86-64/_setitimer.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/setitimer.S
rename to src/kernel/libsyscall/sys_x86-64/_setitimer.S
index 3b1543942..01cd5b14e 100644
--- a/src/kernel/libsyscall/sys_x86-64/setitimer.S
+++ b/src/kernel/libsyscall/sys_x86-64/_setitimer.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(setitimer, setitimer, 3, cerror_nocancel)
+__SYSCALL2(_setitimer, setitimer, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/setpgid.S b/src/kernel/libsyscall/sys_x86-64/_setpgid.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/setpgid.S
rename to src/kernel/libsyscall/sys_x86-64/_setpgid.S
index 1e7ff3647..e25c6974e 100644
--- a/src/kernel/libsyscall/sys_x86-64/setpgid.S
+++ b/src/kernel/libsyscall/sys_x86-64/_setpgid.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(setpgid, setpgid, 2, cerror_nocancel)
+__SYSCALL2(_setpgid, setpgid, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/setprivexec.S b/src/kernel/libsyscall/sys_x86-64/_setprivexec.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/setprivexec.S
rename to src/kernel/libsyscall/sys_x86-64/_setprivexec.S
index 53f0edeb4..03fb1d90d 100644
--- a/src/kernel/libsyscall/sys_x86-64/setprivexec.S
+++ b/src/kernel/libsyscall/sys_x86-64/_setprivexec.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(setprivexec, setprivexec, 1, cerror_nocancel)
+__SYSCALL2(_setprivexec, setprivexec, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/setquota.S b/src/kernel/libsyscall/sys_x86-64/_setquota.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/setquota.S
rename to src/kernel/libsyscall/sys_x86-64/_setquota.S
index a99a9be8a..334c6cd5e 100644
--- a/src/kernel/libsyscall/sys_x86-64/setquota.S
+++ b/src/kernel/libsyscall/sys_x86-64/_setquota.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(setquota, setquota, 2, cerror_nocancel)
+__SYSCALL2(_setquota, setquota, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/setsid.S b/src/kernel/libsyscall/sys_x86-64/_setsid.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/setsid.S
rename to src/kernel/libsyscall/sys_x86-64/_setsid.S
index 7f2dd36bc..a362e16d1 100644
--- a/src/kernel/libsyscall/sys_x86-64/setsid.S
+++ b/src/kernel/libsyscall/sys_x86-64/_setsid.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(setsid, setsid, 0, cerror_nocancel)
+__SYSCALL2(_setsid, setsid, 0, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/setsockopt.S b/src/kernel/libsyscall/sys_x86-64/_setsockopt.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/setsockopt.S
rename to src/kernel/libsyscall/sys_x86-64/_setsockopt.S
index eb90f38f2..27b5c76bb 100644
--- a/src/kernel/libsyscall/sys_x86-64/setsockopt.S
+++ b/src/kernel/libsyscall/sys_x86-64/_setsockopt.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(setsockopt, setsockopt, 5, cerror_nocancel)
+__SYSCALL2(_setsockopt, setsockopt, 5, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/setuid.S b/src/kernel/libsyscall/sys_x86-64/_setuid.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/setuid.S
rename to src/kernel/libsyscall/sys_x86-64/_setuid.S
index f1d90b597..ae9e09023 100644
--- a/src/kernel/libsyscall/sys_x86-64/setuid.S
+++ b/src/kernel/libsyscall/sys_x86-64/_setuid.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(setuid, setuid, 1, cerror_nocancel)
+__SYSCALL2(_setuid, setuid, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/setxattr.S b/src/kernel/libsyscall/sys_x86-64/_setxattr.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/setxattr.S
rename to src/kernel/libsyscall/sys_x86-64/_setxattr.S
index a8bbf2780..b2050791d 100644
--- a/src/kernel/libsyscall/sys_x86-64/setxattr.S
+++ b/src/kernel/libsyscall/sys_x86-64/_setxattr.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(setxattr, setxattr, 6, cerror_nocancel)
+__SYSCALL2(_setxattr, setxattr, 6, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/shm_unlink.S b/src/kernel/libsyscall/sys_x86-64/_shm_unlink.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/shm_unlink.S
rename to src/kernel/libsyscall/sys_x86-64/_shm_unlink.S
index a0834e1fc..77142b6d9 100644
--- a/src/kernel/libsyscall/sys_x86-64/shm_unlink.S
+++ b/src/kernel/libsyscall/sys_x86-64/_shm_unlink.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(shm_unlink, shm_unlink, 1, cerror_nocancel)
+__SYSCALL2(_shm_unlink, shm_unlink, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/shmat.S b/src/kernel/libsyscall/sys_x86-64/_shmat.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/shmat.S
rename to src/kernel/libsyscall/sys_x86-64/_shmat.S
index a35f7e044..1259b0397 100644
--- a/src/kernel/libsyscall/sys_x86-64/shmat.S
+++ b/src/kernel/libsyscall/sys_x86-64/_shmat.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(shmat, shmat, 3, cerror_nocancel)
+__SYSCALL2(_shmat, shmat, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/shmdt.S b/src/kernel/libsyscall/sys_x86-64/_shmdt.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/shmdt.S
rename to src/kernel/libsyscall/sys_x86-64/_shmdt.S
index 51a5b0fea..bbf6b65db 100644
--- a/src/kernel/libsyscall/sys_x86-64/shmdt.S
+++ b/src/kernel/libsyscall/sys_x86-64/_shmdt.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(shmdt, shmdt, 1, cerror_nocancel)
+__SYSCALL2(_shmdt, shmdt, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/shmget.S b/src/kernel/libsyscall/sys_x86-64/_shmget.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/shmget.S
rename to src/kernel/libsyscall/sys_x86-64/_shmget.S
index b3333770a..2c1c26b37 100644
--- a/src/kernel/libsyscall/sys_x86-64/shmget.S
+++ b/src/kernel/libsyscall/sys_x86-64/_shmget.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(shmget, shmget, 3, cerror_nocancel)
+__SYSCALL2(_shmget, shmget, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/shutdown.S b/src/kernel/libsyscall/sys_x86-64/_shutdown.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/shutdown.S
rename to src/kernel/libsyscall/sys_x86-64/_shutdown.S
index 728755c7b..7ae075c30 100644
--- a/src/kernel/libsyscall/sys_x86-64/shutdown.S
+++ b/src/kernel/libsyscall/sys_x86-64/_shutdown.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(shutdown, shutdown, 2, cerror_nocancel)
+__SYSCALL2(_shutdown, shutdown, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/sigpending.S b/src/kernel/libsyscall/sys_x86-64/_sigpending.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/sigpending.S
rename to src/kernel/libsyscall/sys_x86-64/_sigpending.S
index 7fbbd7446..02d597aef 100644
--- a/src/kernel/libsyscall/sys_x86-64/sigpending.S
+++ b/src/kernel/libsyscall/sys_x86-64/_sigpending.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(sigpending, sigpending, 1, cerror_nocancel)
+__SYSCALL2(_sigpending, sigpending, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/sigprocmask.S b/src/kernel/libsyscall/sys_x86-64/_sigprocmask.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/sigprocmask.S
rename to src/kernel/libsyscall/sys_x86-64/_sigprocmask.S
index 0f047721b..2508f29e3 100644
--- a/src/kernel/libsyscall/sys_x86-64/sigprocmask.S
+++ b/src/kernel/libsyscall/sys_x86-64/_sigprocmask.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(sigprocmask, sigprocmask, 3, cerror_nocancel)
+__SYSCALL2(_sigprocmask, sigprocmask, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/socket.S b/src/kernel/libsyscall/sys_x86-64/_socket.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/socket.S
rename to src/kernel/libsyscall/sys_x86-64/_socket.S
index 1a20bc14f..1ac5a79c5 100644
--- a/src/kernel/libsyscall/sys_x86-64/socket.S
+++ b/src/kernel/libsyscall/sys_x86-64/_socket.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(socket, socket, 3, cerror_nocancel)
+__SYSCALL2(_socket, socket, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/socket_delegate.S b/src/kernel/libsyscall/sys_x86-64/_socket_delegate.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/socket_delegate.S
rename to src/kernel/libsyscall/sys_x86-64/_socket_delegate.S
index 76d058018..93cac6314 100644
--- a/src/kernel/libsyscall/sys_x86-64/socket_delegate.S
+++ b/src/kernel/libsyscall/sys_x86-64/_socket_delegate.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(socket_delegate, socket_delegate, 4, cerror_nocancel)
+__SYSCALL2(_socket_delegate, socket_delegate, 4, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/stat.S b/src/kernel/libsyscall/sys_x86-64/_stat.S
similarity index 86%
rename from src/kernel/libsyscall/sys_x86-64/stat.S
rename to src/kernel/libsyscall/sys_x86-64/_stat.S
index 27ca73827..45df7f88f 100644
--- a/src/kernel/libsyscall/sys_x86-64/stat.S
+++ b/src/kernel/libsyscall/sys_x86-64/_stat.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(stat, stat, 2, cerror)
+__SYSCALL2(_stat, stat, 2, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/stat64.S b/src/kernel/libsyscall/sys_x86-64/_stat64.S
similarity index 72%
rename from src/kernel/libsyscall/sys_x86-64/stat64.S
rename to src/kernel/libsyscall/sys_x86-64/_stat64.S
index 3430efb16..7306503d5 100644
--- a/src/kernel/libsyscall/sys_x86-64/stat64.S
+++ b/src/kernel/libsyscall/sys_x86-64/_stat64.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(stat64, stat64, 2, cerror_nocancel)
+__SYSCALL2(_stat64, stat64, 2, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	stat$INODE64
-		stat$INODE64 = stat64
+	.globl	_stat$INODE64
+	.set	_stat$INODE64, _stat64
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/statfs.S b/src/kernel/libsyscall/sys_x86-64/_statfs.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/statfs.S
rename to src/kernel/libsyscall/sys_x86-64/_statfs.S
index 4fcd17137..780b8bc41 100644
--- a/src/kernel/libsyscall/sys_x86-64/statfs.S
+++ b/src/kernel/libsyscall/sys_x86-64/_statfs.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(statfs, statfs, 2, cerror_nocancel)
+__SYSCALL2(_statfs, statfs, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/statfs64.S b/src/kernel/libsyscall/sys_x86-64/_statfs64.S
similarity index 70%
rename from src/kernel/libsyscall/sys_x86-64/statfs64.S
rename to src/kernel/libsyscall/sys_x86-64/_statfs64.S
index 30447e4d7..bc566f3a7 100644
--- a/src/kernel/libsyscall/sys_x86-64/statfs64.S
+++ b/src/kernel/libsyscall/sys_x86-64/_statfs64.S
@@ -6,11 +6,11 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(statfs64, statfs64, 2, cerror_nocancel)
+__SYSCALL2(_statfs64, statfs64, 2, cerror_nocancel)
 #endif
 
 #if defined(__x86_64__)
-	.globl	statfs$INODE64
-		statfs$INODE64 = statfs64
+	.globl	_statfs$INODE64
+	.set	_statfs$INODE64, _statfs64
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/swapon.S b/src/kernel/libsyscall/sys_x86-64/_swapon.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/swapon.S
rename to src/kernel/libsyscall/sys_x86-64/_swapon.S
index c58b0a02e..861f63c05 100644
--- a/src/kernel/libsyscall/sys_x86-64/swapon.S
+++ b/src/kernel/libsyscall/sys_x86-64/_swapon.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(swapon, swapon, 0, cerror_nocancel)
+__SYSCALL2(_swapon, swapon, 0, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/symlink.S b/src/kernel/libsyscall/sys_x86-64/_symlink.S
similarity index 84%
rename from src/kernel/libsyscall/sys_x86-64/symlink.S
rename to src/kernel/libsyscall/sys_x86-64/_symlink.S
index 478a44f6a..5c7cc7dd8 100644
--- a/src/kernel/libsyscall/sys_x86-64/symlink.S
+++ b/src/kernel/libsyscall/sys_x86-64/_symlink.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(symlink, symlink, 2, cerror)
+__SYSCALL2(_symlink, symlink, 2, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/symlinkat.S b/src/kernel/libsyscall/sys_x86-64/_symlinkat.S
similarity index 83%
rename from src/kernel/libsyscall/sys_x86-64/symlinkat.S
rename to src/kernel/libsyscall/sys_x86-64/_symlinkat.S
index 0ed8c89f7..44f7e50de 100644
--- a/src/kernel/libsyscall/sys_x86-64/symlinkat.S
+++ b/src/kernel/libsyscall/sys_x86-64/_symlinkat.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(symlinkat, symlinkat, 3, cerror)
+__SYSCALL2(_symlinkat, symlinkat, 3, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/sync.S b/src/kernel/libsyscall/sys_x86-64/_sync.S
similarity index 86%
rename from src/kernel/libsyscall/sys_x86-64/sync.S
rename to src/kernel/libsyscall/sys_x86-64/_sync.S
index d6da90e33..cb8346157 100644
--- a/src/kernel/libsyscall/sys_x86-64/sync.S
+++ b/src/kernel/libsyscall/sys_x86-64/_sync.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(sync, sync, 0, cerror)
+__SYSCALL2(_sync, sync, 0, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/system_override.S b/src/kernel/libsyscall/sys_x86-64/_system_override.S
similarity index 78%
rename from src/kernel/libsyscall/sys_x86-64/system_override.S
rename to src/kernel/libsyscall/sys_x86-64/_system_override.S
index 8bcfd0b40..c9d1aefe8 100644
--- a/src/kernel/libsyscall/sys_x86-64/system_override.S
+++ b/src/kernel/libsyscall/sys_x86-64/_system_override.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(system_override, system_override, 2, cerror_nocancel)
+__SYSCALL2(_system_override, system_override, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/truncate.S b/src/kernel/libsyscall/sys_x86-64/_truncate.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/truncate.S
rename to src/kernel/libsyscall/sys_x86-64/_truncate.S
index 49e5795bd..b45aac823 100644
--- a/src/kernel/libsyscall/sys_x86-64/truncate.S
+++ b/src/kernel/libsyscall/sys_x86-64/_truncate.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(truncate, truncate, 2, cerror_nocancel)
+__SYSCALL2(_truncate, truncate, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/umask.S b/src/kernel/libsyscall/sys_x86-64/_umask.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/umask.S
rename to src/kernel/libsyscall/sys_x86-64/_umask.S
index afa057831..2d3a506e9 100644
--- a/src/kernel/libsyscall/sys_x86-64/umask.S
+++ b/src/kernel/libsyscall/sys_x86-64/_umask.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(umask, umask, 1, cerror_nocancel)
+__SYSCALL2(_umask, umask, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/undelete.S b/src/kernel/libsyscall/sys_x86-64/_undelete.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/undelete.S
rename to src/kernel/libsyscall/sys_x86-64/_undelete.S
index c263b58eb..c824e5ad1 100644
--- a/src/kernel/libsyscall/sys_x86-64/undelete.S
+++ b/src/kernel/libsyscall/sys_x86-64/_undelete.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(undelete, undelete, 1, cerror_nocancel)
+__SYSCALL2(_undelete, undelete, 1, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/unmount.S b/src/kernel/libsyscall/sys_x86-64/_unmount.S
similarity index 81%
rename from src/kernel/libsyscall/sys_x86-64/unmount.S
rename to src/kernel/libsyscall/sys_x86-64/_unmount.S
index 0731ce3d9..20b77e53f 100644
--- a/src/kernel/libsyscall/sys_x86-64/unmount.S
+++ b/src/kernel/libsyscall/sys_x86-64/_unmount.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(unmount, unmount, 2, cerror_nocancel)
+__SYSCALL2(_unmount, unmount, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/_usrctl.S b/src/kernel/libsyscall/sys_x86-64/_usrctl.S
new file mode 100644
index 000000000..fe440acf0
--- /dev/null
+++ b/src/kernel/libsyscall/sys_x86-64/_usrctl.S
@@ -0,0 +1,11 @@
+#define __SYSCALL_32BIT_ARG_BYTES 4
+#include "SYS.h"
+
+#ifndef SYS_usrctl
+#error "SYS_usrctl not defined. The header files libsyscall is building against do not match syscalls.master."
+#endif
+
+#if defined(__x86_64__)
+__SYSCALL2(_usrctl, usrctl, 1, cerror_nocancel)
+#endif
+
diff --git a/src/kernel/libsyscall/sys_x86-64/utimes.S b/src/kernel/libsyscall/sys_x86-64/_utimes.S
similarity index 82%
rename from src/kernel/libsyscall/sys_x86-64/utimes.S
rename to src/kernel/libsyscall/sys_x86-64/_utimes.S
index d80d87c60..e7c0ab72d 100644
--- a/src/kernel/libsyscall/sys_x86-64/utimes.S
+++ b/src/kernel/libsyscall/sys_x86-64/_utimes.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(utimes, utimes, 2, cerror_nocancel)
+__SYSCALL2(_utimes, utimes, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/vfs_purge.S b/src/kernel/libsyscall/sys_x86-64/_vfs_purge.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/vfs_purge.S
rename to src/kernel/libsyscall/sys_x86-64/_vfs_purge.S
index 6ffb7b46b..302cb6767 100644
--- a/src/kernel/libsyscall/sys_x86-64/vfs_purge.S
+++ b/src/kernel/libsyscall/sys_x86-64/_vfs_purge.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(vfs_purge, vfs_purge, 0, cerror_nocancel)
+__SYSCALL2(_vfs_purge, vfs_purge, 0, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/vm_pressure_monitor.S b/src/kernel/libsyscall/sys_x86-64/_vm_pressure_monitor.S
similarity index 77%
rename from src/kernel/libsyscall/sys_x86-64/vm_pressure_monitor.S
rename to src/kernel/libsyscall/sys_x86-64/_vm_pressure_monitor.S
index 51006e73e..787bc3bc0 100644
--- a/src/kernel/libsyscall/sys_x86-64/vm_pressure_monitor.S
+++ b/src/kernel/libsyscall/sys_x86-64/_vm_pressure_monitor.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(vm_pressure_monitor, vm_pressure_monitor, 3, cerror_nocancel)
+__SYSCALL2(_vm_pressure_monitor, vm_pressure_monitor, 3, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/waitevent.S b/src/kernel/libsyscall/sys_x86-64/_waitevent.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/waitevent.S
rename to src/kernel/libsyscall/sys_x86-64/_waitevent.S
index 975800a53..ebe03fb1a 100644
--- a/src/kernel/libsyscall/sys_x86-64/waitevent.S
+++ b/src/kernel/libsyscall/sys_x86-64/_waitevent.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(waitevent, waitevent, 2, cerror_nocancel)
+__SYSCALL2(_waitevent, waitevent, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/waitid.S b/src/kernel/libsyscall/sys_x86-64/_waitid.S
similarity index 85%
rename from src/kernel/libsyscall/sys_x86-64/waitid.S
rename to src/kernel/libsyscall/sys_x86-64/_waitid.S
index 60e1c7b0c..53d27b80f 100644
--- a/src/kernel/libsyscall/sys_x86-64/waitid.S
+++ b/src/kernel/libsyscall/sys_x86-64/_waitid.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(waitid, waitid, 4, cerror)
+__SYSCALL2(_waitid, waitid, 4, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/watchevent.S b/src/kernel/libsyscall/sys_x86-64/_watchevent.S
similarity index 80%
rename from src/kernel/libsyscall/sys_x86-64/watchevent.S
rename to src/kernel/libsyscall/sys_x86-64/_watchevent.S
index 87324752c..cb0f103da 100644
--- a/src/kernel/libsyscall/sys_x86-64/watchevent.S
+++ b/src/kernel/libsyscall/sys_x86-64/_watchevent.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(watchevent, watchevent, 2, cerror_nocancel)
+__SYSCALL2(_watchevent, watchevent, 2, cerror_nocancel)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/write.S b/src/kernel/libsyscall/sys_x86-64/_write.S
similarity index 85%
rename from src/kernel/libsyscall/sys_x86-64/write.S
rename to src/kernel/libsyscall/sys_x86-64/_write.S
index e5ebdb6c3..c2ab9cf48 100644
--- a/src/kernel/libsyscall/sys_x86-64/write.S
+++ b/src/kernel/libsyscall/sys_x86-64/_write.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(write, write, 3, cerror)
+__SYSCALL2(_write, write, 3, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/writev.S b/src/kernel/libsyscall/sys_x86-64/_writev.S
similarity index 85%
rename from src/kernel/libsyscall/sys_x86-64/writev.S
rename to src/kernel/libsyscall/sys_x86-64/_writev.S
index 579315ca1..b8a878dac 100644
--- a/src/kernel/libsyscall/sys_x86-64/writev.S
+++ b/src/kernel/libsyscall/sys_x86-64/_writev.S
@@ -6,6 +6,6 @@
 #endif
 
 #if defined(__x86_64__)
-__SYSCALL2(writev, writev, 3, cerror)
+__SYSCALL2(_writev, writev, 3, cerror)
 #endif
 
diff --git a/src/kernel/libsyscall/sys_x86-64/custom.S b/src/kernel/libsyscall/sys_x86-64/custom.S
index 0c2bfe50f..7c0004688 100644
--- a/src/kernel/libsyscall/sys_x86-64/custom.S
+++ b/src/kernel/libsyscall/sys_x86-64/custom.S
@@ -44,7 +44,7 @@ LABEL(tramp_cerror)
 	subl	$16, %esp
 	movl	%edx, 4(%esp)
 	movl	%eax, (%esp)
-	CALL_EXTERN(cerror)
+	CALL_EXTERN(_cerror)
 	movl	4(%esp), %esp
 	ret
 
@@ -54,7 +54,7 @@ LABEL(tramp_cerror_nocancel)
 	subl	$16, %esp
 	movl	%edx, 4(%esp)
 	movl	%eax, (%esp)
-	CALL_EXTERN(cerror_nocancel)
+	CALL_EXTERN(_cerror_nocancel)
 	movl	4(%esp), %esp
 	ret
 
@@ -69,7 +69,7 @@ _i386_get_ldt:
 	movl    $6,%eax
 	MACHDEP_SYSCALL_TRAP
 	jnb		2f
-	jmp		tramp_cerror@PLT
+	jmp		_tramp_cerror
 2:	ret
 
 
@@ -79,7 +79,7 @@ _i386_set_ldt:
 	movl    $5,%eax
 	MACHDEP_SYSCALL_TRAP
 	jnb		2f
-	jmp		tramp_cerror@PLT
+	jmp		_tramp_cerror
 2:	ret
 
 #elif defined(__x86_64__)
@@ -91,7 +91,7 @@ _i386_get_ldt:
 	MACHDEP_SYSCALL_TRAP
 	jnb		2f
 	movq	%rax, %rdi
-	jmp		cerror@PLT
+	jmp		_cerror
 2:	ret
 
 
@@ -102,7 +102,7 @@ _i386_set_ldt:
 	MACHDEP_SYSCALL_TRAP
 	jnb		2f
 	movq	%rax, %rdi
-	jmp		cerror@PLT
+	jmp		_cerror
 2:	ret
 
 #endif
diff --git a/src/kernel/libsyscall/sys_x86-64/stubs.list b/src/kernel/libsyscall/sys_x86-64/stubs.list
index 897eef5a4..60bcd7800 100644
--- a/src/kernel/libsyscall/sys_x86-64/stubs.list
+++ b/src/kernel/libsyscall/sys_x86-64/stubs.list
@@ -1,388 +1,395 @@
-sys/____old_semwait_signal_nocancel.s
-sys/____sigwait_nocancel.s
-sys/__accept.s
-sys/__accept_nocancel.s
-sys/__access_extended.s
-sys/__aio_suspend_nocancel.s
-sys/__bind.s
-sys/__bsdthread_create.s
-sys/__bsdthread_ctl.s
-sys/__bsdthread_register.s
-sys/__bsdthread_terminate.s
-sys/__chmod.s
-sys/__chmod_extended.s
-sys/__chud.s
-sys/__close_nocancel.s
-sys/__coalition.s
-sys/__coalition_info.s
-sys/__connect.s
-sys/__connect_nocancel.s
-sys/__copyfile.s
-sys/__csrctl.s
-sys/__delete.s
-sys/__disable_threadsignal.s
-sys/__exit.s
-sys/__fchmod.s
-sys/__fchmod_extended.s
-sys/__fcntl.s
-sys/__fcntl_nocancel.s
-sys/__fork.s
-sys/__fsgetpath.s
-sys/__fstat64_extended.s
-sys/__fstat_extended.s
-sys/__fsync_nocancel.s
-sys/__getattrlist.s
-sys/__getdirentries64.s
-sys/__gethostuuid.s
-sys/__getlcid.s
-sys/__getlogin.s
-sys/__getpeername.s
-sys/__getpid.s
-sys/__getrlimit.s
-sys/__getsgroups.s
-sys/__getsockname.s
-sys/__gettid.s
-sys/__gettimeofday.s
-sys/__getwgroups.s
-sys/__guarded_open_dprotected_np.s
-sys/__guarded_open_np.s
-sys/__identitysvc.s
-sys/__initgroups.s
-sys/__ioctl.s
-sys/__iopolicysys.s
-sys/__kdebug_trace.s
-sys/__kill.s
-sys/__lchown.s
-sys/__listen.s
-sys/__lseek.s
-sys/__lstat64_extended.s
-sys/__lstat_extended.s
-sys/__mac_execve.s
-sys/__mac_get_fd.s
-sys/__mac_get_file.s
-sys/__mac_get_lcid.s
-sys/__mac_get_lctx.s
-sys/__mac_get_link.s
-sys/__mac_get_mount.s
-sys/__mac_get_pid.s
-sys/__mac_get_proc.s
-sys/__mac_getfsstat.s
-sys/__mac_mount.s
-sys/__mac_set_fd.s
-sys/__mac_set_file.s
-sys/__mac_set_lctx.s
-sys/__mac_set_link.s
-sys/__mac_set_proc.s
-sys/__mac_syscall.s
-sys/__mkdir_extended.s
-sys/__mkfifo_extended.s
-sys/__mmap.s
-sys/__mprotect.s
-sys/__msgctl.s
-sys/__msgrcv_nocancel.s
-sys/__msgsnd_nocancel.s
-sys/__msgsys.s
-sys/__msync.s
-sys/__msync_nocancel.s
-sys/__munmap.s
-sys/__old_semwait_signal.s
-sys/__open.s
-sys/__open_dprotected_np.s
-sys/__open_extended.s
-sys/__open_nocancel.s
-sys/__openat.s
-sys/__openat_nocancel.s
-sys/__pipe.s
-sys/__poll_nocancel.s
-sys/__posix_spawn.s
-sys/__pread_nocancel.s
-sys/__proc_info.s
-sys/__process_policy.s
-sys/__psynch_cvbroad.s
-sys/__psynch_cvclrprepost.s
-sys/__psynch_cvsignal.s
-sys/__psynch_cvwait.s
-sys/__psynch_mutexdrop.s
-sys/__psynch_mutexwait.s
-sys/__psynch_rw_downgrade.s
-sys/__psynch_rw_longrdlock.s
-sys/__psynch_rw_rdlock.s
-sys/__psynch_rw_unlock.s
-sys/__psynch_rw_unlock2.s
-sys/__psynch_rw_upgrade.s
-sys/__psynch_rw_wrlock.s
-sys/__psynch_rw_yieldwrlock.s
-sys/__pthread_canceled.s
-sys/__pthread_chdir.s
-sys/__pthread_fchdir.s
-sys/__pthread_kill.s
-sys/__pthread_markcancel.s
-sys/__pthread_sigmask.s
-sys/__ptrace.s
-sys/__pwrite_nocancel.s
-sys/__read_nocancel.s
-sys/__readv_nocancel.s
-sys/__recvfrom.s
-sys/__recvfrom_nocancel.s
-sys/__recvmsg.s
-sys/__recvmsg_nocancel.s
-sys/__rename.s
-sys/__rename_ext.s
-sys/__renameat.s
-sys/__rmdir.s
-sys/__select.s
-sys/__select_nocancel.s
-sys/__sem_open.s
-sys/__sem_wait_nocancel.s
-sys/__semctl.s
-sys/__semsys.s
-sys/__semwait_signal.s
-sys/__semwait_signal_nocancel.s
-sys/__sendmsg.s
-sys/__sendmsg_nocancel.s
-sys/__sendto.s
-sys/__sendto_nocancel.s
-sys/__setattrlist.s
-sys/__setlcid.s
-sys/__setlogin.s
-sys/__setpriority.s
-sys/__setregid.s
-sys/__setreuid.s
-sys/__setrlimit.s
-sys/__setsgroups.s
-sys/__settid.s
-sys/__settid_with_pid.s
-sys/__settimeofday.s
-sys/__setwgroups.s
-sys/__sfi_ctl.s
-sys/__sfi_pidctl.s
-sys/__shared_region_check_np.s
-sys/__shared_region_map_and_slide_np.s
-sys/__shm_open.s
-sys/__shmctl.s
-sys/__shmsys.s
-sys/__sigaction.s
-sys/__sigaltstack.s
-sys/__sigreturn.s
-sys/__sigsuspend.s
-sys/__sigsuspend_nocancel.s
-sys/__sigwait.s
-sys/__socketpair.s
-sys/__stack_snapshot.s
-sys/__stat64_extended.s
-sys/__stat_extended.s
-sys/__syscall.s
-sys/__sysctl.s
-sys/__sysctlbyname.s
-sys/__telemetry.s
-sys/__thread_selfid.s
-sys/__thread_selfusage.s
-sys/__umask_extended.s
-sys/__unlink.s
-sys/__unlinkat.s
-sys/__vfork.s
-sys/__wait4.s
-sys/__wait4_nocancel.s
-sys/__waitid_nocancel.s
-sys/__workq_kernreturn.s
-sys/__workq_open.s
-sys/__write_nocancel.s
-sys/__writev_nocancel.s
-sys/access.s
-sys/acct.s
-sys/adjtime.s
-sys/aio_cancel.s
-sys/aio_error.s
-sys/aio_fsync.s
-sys/aio_read.s
-sys/aio_return.s
-sys/aio_suspend.s
-sys/aio_write.s
-sys/audit.s
-sys/audit_session_join.s
-sys/audit_session_port.s
-sys/audit_session_self.s
-sys/auditctl.s
-sys/auditon.s
-sys/change_fdguard_np.s
-sys/chdir.s
-sys/chflags.s
-sys/chown.s
-sys/chroot.s
-sys/close.s
-sys/connectx.s
-sys/csops.s
-sys/csops_audittoken.s
-sys/custom.s
-sys/disconnectx.s
-sys/dup.s
-sys/dup2.s
-sys/exchangedata.s
-sys/execve.s
-sys/faccessat.s
-sys/fchdir.s
-sys/fchflags.s
-sys/fchmodat.s
-sys/fchown.s
-sys/fchownat.s
-sys/fdatasync.s
-sys/ffsctl.s
-sys/fgetattrlist.s
-sys/fgetxattr.s
-sys/fhopen.s
-sys/fileport_makefd.s
-sys/fileport_makeport.s
-sys/flistxattr.s
-sys/flock.s
-sys/fpathconf.s
-sys/fremovexattr.s
-sys/fsctl.s
-sys/fsetattrlist.s
-sys/fsetxattr.s
-sys/fstat.s
-sys/fstat64.s
-sys/fstatat.s
-sys/fstatat64.s
-sys/fstatfs.s
-sys/fstatfs64.s
-sys/fsync.s
-sys/ftruncate.s
-sys/futimes.s
-sys/getattrlistat.s
-sys/getattrlistbulk.s
-sys/getaudit_addr.s
-sys/getauid.s
-sys/getdirentries.s
-sys/getdirentriesattr.s
-sys/getdtablesize.s
-sys/getegid.s
-sys/geteuid.s
-sys/getfh.s
-sys/getfsstat.s
-sys/getfsstat64.s
-sys/getgid.s
-sys/getgroups.s
-sys/getitimer.s
-sys/getpgid.s
-sys/getpgrp.s
-sys/getppid.s
-sys/getpriority.s
-sys/getrusage.s
-sys/getsid.s
-sys/getsockopt.s
-sys/getuid.s
-sys/getxattr.s
-sys/guarded_close_np.s
-sys/guarded_kqueue_np.s
-sys/guarded_pwrite_np.s
-sys/guarded_write_np.s
-sys/guarded_writev_np.s
-sys/issetugid.s
-sys/kas_info.s
-sys/kevent.s
-sys/kevent64.s
-sys/kqueue.s
-sys/ledger.s
-sys/link.s
-sys/linkat.s
-sys/lio_listio.s
-sys/listxattr.s
-sys/lstat.s
-sys/lstat64.s
-sys/madvise.s
-sys/memorystatus_control.s
-sys/memorystatus_get_level.s
-sys/mincore.s
-sys/minherit.s
-sys/mkdir.s
-sys/mkdirat.s
-sys/mkfifo.s
-sys/mknod.s
-sys/mlock.s
-sys/mlockall.s
-sys/modwatch.s
-sys/mount.s
-sys/mremap_encrypted.s
-sys/msgget.s
-sys/msgrcv.s
-sys/msgsnd.s
-sys/munlock.s
-sys/munlockall.s
-sys/necp_match_policy.s
-sys/nfsclnt.s
-sys/nfssvc.s
-sys/openbyid_np.s
-sys/pathconf.s
-sys/peeloff.s
-sys/pid_resume.s
-sys/pid_suspend.s
-sys/poll.s
-sys/pread.s
-sys/proc_rlimit_control.s
-sys/proc_trace_log.s
-sys/proc_uuid_policy.s
-sys/pwrite.s
-sys/quota.s
-sys/quotactl.s
-sys/read.s
-sys/readlink.s
-sys/readlinkat.s
-sys/readv.s
-sys/reboot.s
-sys/recvmsg_x.s
-sys/removexattr.s
-sys/revoke.s
-sys/searchfs.s
-sys/sem_close.s
-sys/sem_post.s
-sys/sem_trywait.s
-sys/sem_unlink.s
-sys/sem_wait.s
-sys/semget.s
-sys/semop.s
-sys/sendfile.s
-sys/sendmsg_x.s
-sys/setaudit_addr.s
-sys/setauid.s
-sys/setegid.s
-sys/seteuid.s
-sys/setgid.s
-sys/setgroups.s
-sys/setitimer.s
-sys/setpgid.s
-sys/setprivexec.s
-sys/setquota.s
-sys/setsid.s
-sys/setsockopt.s
-sys/setuid.s
-sys/setxattr.s
-sys/shm_unlink.s
-sys/shmat.s
-sys/shmdt.s
-sys/shmget.s
-sys/shutdown.s
-sys/sigpending.s
-sys/sigprocmask.s
-sys/socket.s
-sys/socket_delegate.s
-sys/stat.s
-sys/stat64.s
-sys/statfs.s
-sys/statfs64.s
-sys/swapon.s
-sys/symlink.s
-sys/symlinkat.s
-sys/sync.s
-sys/system_override.s
-sys/truncate.s
-sys/umask.s
-sys/undelete.s
-sys/unmount.s
-sys/utimes.s
-sys/vfs_purge.s
-sys/vm_pressure_monitor.s
-sys/waitevent.s
-sys/waitid.s
-sys/watchevent.s
-sys/write.s
-sys/writev.s
+sys_x86-64/_____old_semwait_signal_nocancel.s
+sys_x86-64/_____sigwait_nocancel.s
+sys_x86-64/___accept.s
+sys_x86-64/___accept_nocancel.s
+sys_x86-64/___access_extended.s
+sys_x86-64/___aio_suspend_nocancel.s
+sys_x86-64/___bind.s
+sys_x86-64/___bsdthread_create.s
+sys_x86-64/___bsdthread_ctl.s
+sys_x86-64/___bsdthread_register.s
+sys_x86-64/___bsdthread_terminate.s
+sys_x86-64/___chmod.s
+sys_x86-64/___chmod_extended.s
+sys_x86-64/___chud.s
+sys_x86-64/___close_nocancel.s
+sys_x86-64/___coalition.s
+sys_x86-64/___coalition_info.s
+sys_x86-64/___connect.s
+sys_x86-64/___connect_nocancel.s
+sys_x86-64/___copyfile.s
+sys_x86-64/___csrctl.s
+sys_x86-64/___delete.s
+sys_x86-64/___disable_threadsignal.s
+sys_x86-64/___exit.s
+sys_x86-64/___fchmod.s
+sys_x86-64/___fchmod_extended.s
+sys_x86-64/___fcntl.s
+sys_x86-64/___fcntl_nocancel.s
+sys_x86-64/___fork.s
+sys_x86-64/___fsgetpath.s
+sys_x86-64/___fstat64_extended.s
+sys_x86-64/___fstat_extended.s
+sys_x86-64/___fsync_nocancel.s
+sys_x86-64/___getattrlist.s
+sys_x86-64/___getdirentries64.s
+sys_x86-64/___gethostuuid.s
+sys_x86-64/___getlogin.s
+sys_x86-64/___getpeername.s
+sys_x86-64/___getpid.s
+sys_x86-64/___getrlimit.s
+sys_x86-64/___getsgroups.s
+sys_x86-64/___getsockname.s
+sys_x86-64/___gettid.s
+sys_x86-64/___gettimeofday.s
+sys_x86-64/___getwgroups.s
+sys_x86-64/___guarded_open_dprotected_np.s
+sys_x86-64/___guarded_open_np.s
+sys_x86-64/___identitysvc.s
+sys_x86-64/___initgroups.s
+sys_x86-64/___ioctl.s
+sys_x86-64/___iopolicysys.s
+sys_x86-64/___kdebug_trace.s
+sys_x86-64/___kdebug_trace64.s
+sys_x86-64/___kdebug_trace_string.s
+sys_x86-64/___kill.s
+sys_x86-64/___lchown.s
+sys_x86-64/___listen.s
+sys_x86-64/___lseek.s
+sys_x86-64/___lstat64_extended.s
+sys_x86-64/___lstat_extended.s
+sys_x86-64/___mac_execve.s
+sys_x86-64/___mac_get_fd.s
+sys_x86-64/___mac_get_file.s
+sys_x86-64/___mac_get_link.s
+sys_x86-64/___mac_get_mount.s
+sys_x86-64/___mac_get_pid.s
+sys_x86-64/___mac_get_proc.s
+sys_x86-64/___mac_getfsstat.s
+sys_x86-64/___mac_mount.s
+sys_x86-64/___mac_set_fd.s
+sys_x86-64/___mac_set_file.s
+sys_x86-64/___mac_set_link.s
+sys_x86-64/___mac_set_proc.s
+sys_x86-64/___mac_syscall.s
+sys_x86-64/___microstackshot.s
+sys_x86-64/___mkdir_extended.s
+sys_x86-64/___mkfifo_extended.s
+sys_x86-64/___mmap.s
+sys_x86-64/___mprotect.s
+sys_x86-64/___msgctl.s
+sys_x86-64/___msgrcv_nocancel.s
+sys_x86-64/___msgsnd_nocancel.s
+sys_x86-64/___msgsys.s
+sys_x86-64/___msync.s
+sys_x86-64/___msync_nocancel.s
+sys_x86-64/___munmap.s
+sys_x86-64/___old_semwait_signal.s
+sys_x86-64/___open.s
+sys_x86-64/___open_dprotected_np.s
+sys_x86-64/___open_extended.s
+sys_x86-64/___open_nocancel.s
+sys_x86-64/___openat.s
+sys_x86-64/___openat_nocancel.s
+sys_x86-64/___persona.s
+sys_x86-64/___pipe.s
+sys_x86-64/___poll_nocancel.s
+sys_x86-64/___posix_spawn.s
+sys_x86-64/___pread_nocancel.s
+sys_x86-64/___proc_info.s
+sys_x86-64/___process_policy.s
+sys_x86-64/___pselect.s
+sys_x86-64/___pselect_nocancel.s
+sys_x86-64/___psynch_cvbroad.s
+sys_x86-64/___psynch_cvclrprepost.s
+sys_x86-64/___psynch_cvsignal.s
+sys_x86-64/___psynch_cvwait.s
+sys_x86-64/___psynch_mutexdrop.s
+sys_x86-64/___psynch_mutexwait.s
+sys_x86-64/___psynch_rw_downgrade.s
+sys_x86-64/___psynch_rw_longrdlock.s
+sys_x86-64/___psynch_rw_rdlock.s
+sys_x86-64/___psynch_rw_unlock.s
+sys_x86-64/___psynch_rw_unlock2.s
+sys_x86-64/___psynch_rw_upgrade.s
+sys_x86-64/___psynch_rw_wrlock.s
+sys_x86-64/___psynch_rw_yieldwrlock.s
+sys_x86-64/___pthread_canceled.s
+sys_x86-64/___pthread_chdir.s
+sys_x86-64/___pthread_fchdir.s
+sys_x86-64/___pthread_kill.s
+sys_x86-64/___pthread_markcancel.s
+sys_x86-64/___pthread_sigmask.s
+sys_x86-64/___ptrace.s
+sys_x86-64/___pwrite_nocancel.s
+sys_x86-64/___read_nocancel.s
+sys_x86-64/___readv_nocancel.s
+sys_x86-64/___recvfrom.s
+sys_x86-64/___recvfrom_nocancel.s
+sys_x86-64/___recvmsg.s
+sys_x86-64/___recvmsg_nocancel.s
+sys_x86-64/___rename.s
+sys_x86-64/___rename_ext.s
+sys_x86-64/___renameat.s
+sys_x86-64/___rmdir.s
+sys_x86-64/___select.s
+sys_x86-64/___select_nocancel.s
+sys_x86-64/___sem_open.s
+sys_x86-64/___sem_wait_nocancel.s
+sys_x86-64/___semctl.s
+sys_x86-64/___semsys.s
+sys_x86-64/___semwait_signal.s
+sys_x86-64/___semwait_signal_nocancel.s
+sys_x86-64/___sendmsg.s
+sys_x86-64/___sendmsg_nocancel.s
+sys_x86-64/___sendto.s
+sys_x86-64/___sendto_nocancel.s
+sys_x86-64/___setattrlist.s
+sys_x86-64/___setlogin.s
+sys_x86-64/___setpriority.s
+sys_x86-64/___setregid.s
+sys_x86-64/___setreuid.s
+sys_x86-64/___setrlimit.s
+sys_x86-64/___setsgroups.s
+sys_x86-64/___settid.s
+sys_x86-64/___settid_with_pid.s
+sys_x86-64/___settimeofday.s
+sys_x86-64/___setwgroups.s
+sys_x86-64/___sfi_ctl.s
+sys_x86-64/___sfi_pidctl.s
+sys_x86-64/___shared_region_check_np.s
+sys_x86-64/___shared_region_map_and_slide_np.s
+sys_x86-64/___shm_open.s
+sys_x86-64/___shmctl.s
+sys_x86-64/___shmsys.s
+sys_x86-64/___sigaction.s
+sys_x86-64/___sigaltstack.s
+sys_x86-64/___sigreturn.s
+sys_x86-64/___sigsuspend.s
+sys_x86-64/___sigsuspend_nocancel.s
+sys_x86-64/___sigwait.s
+sys_x86-64/___socketpair.s
+sys_x86-64/___stack_snapshot.s
+sys_x86-64/___stack_snapshot_with_config.s
+sys_x86-64/___stat64_extended.s
+sys_x86-64/___stat_extended.s
+sys_x86-64/___syscall.s
+sys_x86-64/___sysctl.s
+sys_x86-64/___sysctlbyname.s
+sys_x86-64/___telemetry.s
+sys_x86-64/___thread_selfid.s
+sys_x86-64/___thread_selfusage.s
+sys_x86-64/___umask_extended.s
+sys_x86-64/___unlink.s
+sys_x86-64/___unlinkat.s
+sys_x86-64/___vfork.s
+sys_x86-64/___wait4.s
+sys_x86-64/___wait4_nocancel.s
+sys_x86-64/___waitid_nocancel.s
+sys_x86-64/___work_interval_ctl.s
+sys_x86-64/___workq_kernreturn.s
+sys_x86-64/___workq_open.s
+sys_x86-64/___write_nocancel.s
+sys_x86-64/___writev_nocancel.s
+sys_x86-64/_access.s
+sys_x86-64/_acct.s
+sys_x86-64/_adjtime.s
+sys_x86-64/_aio_cancel.s
+sys_x86-64/_aio_error.s
+sys_x86-64/_aio_fsync.s
+sys_x86-64/_aio_read.s
+sys_x86-64/_aio_return.s
+sys_x86-64/_aio_suspend.s
+sys_x86-64/_aio_write.s
+sys_x86-64/_audit.s
+sys_x86-64/_audit_session_join.s
+sys_x86-64/_audit_session_port.s
+sys_x86-64/_audit_session_self.s
+sys_x86-64/_auditctl.s
+sys_x86-64/_auditon.s
+sys_x86-64/_change_fdguard_np.s
+sys_x86-64/_chdir.s
+sys_x86-64/_chflags.s
+sys_x86-64/_chown.s
+sys_x86-64/_chroot.s
+sys_x86-64/_close.s
+sys_x86-64/_connectx.s
+sys_x86-64/_csops.s
+sys_x86-64/_csops_audittoken.s
+sys_x86-64/_disconnectx.s
+sys_x86-64/_dup.s
+sys_x86-64/_dup2.s
+sys_x86-64/_exchangedata.s
+sys_x86-64/_execve.s
+sys_x86-64/_faccessat.s
+sys_x86-64/_fchdir.s
+sys_x86-64/_fchflags.s
+sys_x86-64/_fchmodat.s
+sys_x86-64/_fchown.s
+sys_x86-64/_fchownat.s
+sys_x86-64/_fdatasync.s
+sys_x86-64/_ffsctl.s
+sys_x86-64/_fgetattrlist.s
+sys_x86-64/_fgetxattr.s
+sys_x86-64/_fhopen.s
+sys_x86-64/_fileport_makefd.s
+sys_x86-64/_fileport_makeport.s
+sys_x86-64/_flistxattr.s
+sys_x86-64/_flock.s
+sys_x86-64/_fpathconf.s
+sys_x86-64/_fremovexattr.s
+sys_x86-64/_fsctl.s
+sys_x86-64/_fsetattrlist.s
+sys_x86-64/_fsetxattr.s
+sys_x86-64/_fstat.s
+sys_x86-64/_fstat64.s
+sys_x86-64/_fstatat.s
+sys_x86-64/_fstatat64.s
+sys_x86-64/_fstatfs.s
+sys_x86-64/_fstatfs64.s
+sys_x86-64/_fsync.s
+sys_x86-64/_ftruncate.s
+sys_x86-64/_futimes.s
+sys_x86-64/_getattrlistat.s
+sys_x86-64/_getattrlistbulk.s
+sys_x86-64/_getaudit_addr.s
+sys_x86-64/_getauid.s
+sys_x86-64/_getdirentries.s
+sys_x86-64/_getdirentriesattr.s
+sys_x86-64/_getdtablesize.s
+sys_x86-64/_getegid.s
+sys_x86-64/_geteuid.s
+sys_x86-64/_getfh.s
+sys_x86-64/_getfsstat.s
+sys_x86-64/_getfsstat64.s
+sys_x86-64/_getgid.s
+sys_x86-64/_getgroups.s
+sys_x86-64/_getitimer.s
+sys_x86-64/_getpgid.s
+sys_x86-64/_getpgrp.s
+sys_x86-64/_getppid.s
+sys_x86-64/_getpriority.s
+sys_x86-64/_getrusage.s
+sys_x86-64/_getsid.s
+sys_x86-64/_getsockopt.s
+sys_x86-64/_getuid.s
+sys_x86-64/_getxattr.s
+sys_x86-64/_grab_pgo_data.s
+sys_x86-64/_guarded_close_np.s
+sys_x86-64/_guarded_kqueue_np.s
+sys_x86-64/_guarded_pwrite_np.s
+sys_x86-64/_guarded_write_np.s
+sys_x86-64/_guarded_writev_np.s
+sys_x86-64/_issetugid.s
+sys_x86-64/_kas_info.s
+sys_x86-64/_kevent.s
+sys_x86-64/_kevent64.s
+sys_x86-64/_kevent_qos.s
+sys_x86-64/_kqueue.s
+sys_x86-64/_ledger.s
+sys_x86-64/_link.s
+sys_x86-64/_linkat.s
+sys_x86-64/_lio_listio.s
+sys_x86-64/_listxattr.s
+sys_x86-64/_lstat.s
+sys_x86-64/_lstat64.s
+sys_x86-64/_madvise.s
+sys_x86-64/_memorystatus_control.s
+sys_x86-64/_memorystatus_get_level.s
+sys_x86-64/_mincore.s
+sys_x86-64/_minherit.s
+sys_x86-64/_mkdir.s
+sys_x86-64/_mkdirat.s
+sys_x86-64/_mkfifo.s
+sys_x86-64/_mknod.s
+sys_x86-64/_mlock.s
+sys_x86-64/_mlockall.s
+sys_x86-64/_modwatch.s
+sys_x86-64/_mount.s
+sys_x86-64/_mremap_encrypted.s
+sys_x86-64/_msgget.s
+sys_x86-64/_msgrcv.s
+sys_x86-64/_msgsnd.s
+sys_x86-64/_munlock.s
+sys_x86-64/_munlockall.s
+sys_x86-64/_necp_match_policy.s
+sys_x86-64/_netagent_trigger.s
+sys_x86-64/_nfsclnt.s
+sys_x86-64/_nfssvc.s
+sys_x86-64/_openbyid_np.s
+sys_x86-64/_pathconf.s
+sys_x86-64/_peeloff.s
+sys_x86-64/_pid_resume.s
+sys_x86-64/_pid_suspend.s
+sys_x86-64/_poll.s
+sys_x86-64/_pread.s
+sys_x86-64/_proc_rlimit_control.s
+sys_x86-64/_proc_trace_log.s
+sys_x86-64/_proc_uuid_policy.s
+sys_x86-64/_pwrite.s
+sys_x86-64/_quota.s
+sys_x86-64/_quotactl.s
+sys_x86-64/_read.s
+sys_x86-64/_readlink.s
+sys_x86-64/_readlinkat.s
+sys_x86-64/_readv.s
+sys_x86-64/_reboot.s
+sys_x86-64/_recvmsg_x.s
+sys_x86-64/_removexattr.s
+sys_x86-64/_revoke.s
+sys_x86-64/_searchfs.s
+sys_x86-64/_sem_close.s
+sys_x86-64/_sem_post.s
+sys_x86-64/_sem_trywait.s
+sys_x86-64/_sem_unlink.s
+sys_x86-64/_sem_wait.s
+sys_x86-64/_semget.s
+sys_x86-64/_semop.s
+sys_x86-64/_sendfile.s
+sys_x86-64/_sendmsg_x.s
+sys_x86-64/_setaudit_addr.s
+sys_x86-64/_setauid.s
+sys_x86-64/_setegid.s
+sys_x86-64/_seteuid.s
+sys_x86-64/_setgid.s
+sys_x86-64/_setgroups.s
+sys_x86-64/_setitimer.s
+sys_x86-64/_setpgid.s
+sys_x86-64/_setprivexec.s
+sys_x86-64/_setquota.s
+sys_x86-64/_setsid.s
+sys_x86-64/_setsockopt.s
+sys_x86-64/_setuid.s
+sys_x86-64/_setxattr.s
+sys_x86-64/_shm_unlink.s
+sys_x86-64/_shmat.s
+sys_x86-64/_shmdt.s
+sys_x86-64/_shmget.s
+sys_x86-64/_shutdown.s
+sys_x86-64/_sigpending.s
+sys_x86-64/_sigprocmask.s
+sys_x86-64/_socket.s
+sys_x86-64/_socket_delegate.s
+sys_x86-64/_stat.s
+sys_x86-64/_stat64.s
+sys_x86-64/_statfs.s
+sys_x86-64/_statfs64.s
+sys_x86-64/_swapon.s
+sys_x86-64/_symlink.s
+sys_x86-64/_symlinkat.s
+sys_x86-64/_sync.s
+sys_x86-64/_system_override.s
+sys_x86-64/_truncate.s
+sys_x86-64/_umask.s
+sys_x86-64/_undelete.s
+sys_x86-64/_unmount.s
+sys_x86-64/_usrctl.s
+sys_x86-64/_utimes.s
+sys_x86-64/_vfs_purge.s
+sys_x86-64/_vm_pressure_monitor.s
+sys_x86-64/_waitevent.s
+sys_x86-64/_waitid.s
+sys_x86-64/_watchevent.s
+sys_x86-64/_write.s
+sys_x86-64/_writev.s
+sys_x86-64/custom.s
diff --git a/src/kernel/libsyscall/sys_x86-64/truncate.o b/src/kernel/libsyscall/sys_x86-64/truncate.o
deleted file mode 100644
index fade632d9d2a0b52afc0ac5ee66ae5c14fc6fd5c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1048
zcmb<-^>JfjWMpQ50!9Wq21Y0wnVNvaaR9R&7&sVM8FrjtU|@Iw5-8^I=sf-s#5xQj
z^omk*67@<_D@qvjl8TEN^olczONvSolNj{ibY(7>pORRT2+~3g%*Ma~c0Y(lHV@)v
z1_n`NK?Vi}7BoJ{@91J6B`=^MWB}qYFff432dU+N@+F|OHq?Hoa;PW+Lj;_K%0Rb^
zhk=0sWG1=#1sNC^(Dj0BgxPNh;viv=ACR~V$_xw)OvnOI_5`Tl2PmH%8U`S@f`nlH
zm&Rd#1JqGzAjL=+-F_q~6s8rJ_whfNLLwmgF~vbjn87Il#6rc)SVIUDZs@VWz~Iin
zz#xFdoB*&ms<|MZ2o7;A9O4W<@$q@7#U-gJ@oA-b$t9Wjc?|LKDTzfnnR)5)NyRDg
z#g)a$i8(n8$*Dy}`9<-0`N@fS$*DOYjcG-Rxv9mORjCXmMWuPki6yBF@$NqUPL4kD
p{%&r;t|9Ruj!r(V@zA&exew$+P@Mhw4*>!oL1>(FGB7Z}!~yOcSsVZW

diff --git a/src/kernel/libsyscall/xcodescripts/create-syscalls.pl b/src/kernel/libsyscall/xcodescripts/create-syscalls.pl
index 4a8c5acf5..9c587b536 100755
--- a/src/kernel/libsyscall/xcodescripts/create-syscalls.pl
+++ b/src/kernel/libsyscall/xcodescripts/create-syscalls.pl
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# Modified by Lubos Dolezel for Darling (remove 1 underscore from symbols)
 #
 # Copyright (c) 2006-2014 Apple Inc. All rights reserved.
 #
@@ -62,9 +61,9 @@ my $OutDir;
 # size in bytes of known types (only used for i386)
 my %TypeBytes = (
     'au_asid_t'		=> 4,
-    'associd_t'		=> 4,
+    'sae_associd_t'	=> 4,
     'caddr_t'		=> 4,
-    'connid_t'		=> 4,
+    'sae_connid_t'	=> 4,
     'gid_t'		=> 4,
     'id_t'		=> 4,
     'idtype_t'		=> 4,
@@ -101,7 +100,7 @@ my %Symbols = (
     "quota" => {
         c_sym => "quota",
         syscall => "quota",
-        asm_sym => "quota",
+        asm_sym => "_quota",
         is_private => undef,
         is_custom => undef,
         nargs => 4,
@@ -111,7 +110,7 @@ my %Symbols = (
     "setquota" => {
         c_sym => "setquota",
         syscall => "setquota",
-        asm_sym => "setquota",
+        asm_sym => "_setquota",
         is_private => undef,
         is_custom => undef,
         nargs => 2,
@@ -121,7 +120,7 @@ my %Symbols = (
     "syscall" => {
         c_sym => "syscall",
         syscall => "syscall",
-        asm_sym => "syscall",
+        asm_sym => "_syscall",
         is_private => undef,
         is_custom => undef,
         nargs => 0,
@@ -218,7 +217,7 @@ sub readMaster {
         $Symbols{$name} = {
             c_sym => $name,
             syscall => $name,
-            asm_sym => $no_syscall_stub ? "__$name" : "$name",
+            asm_sym => $no_syscall_stub ? "___$name" : "_$name",
             is_private => $no_syscall_stub,
             is_custom => undef,
             nargs => $nargs,
@@ -331,7 +330,6 @@ sub writeStubForSymbol {
     
     print $f "#define __SYSCALL_32BIT_ARG_BYTES $$symbol{bytes}\n";
     print $f "#include \"SYS.h\"\n\n";
-    
     if (scalar(@conditions)) {
         printf $f "#ifndef SYS_%s\n", $$symbol{syscall};
         printf $f "#error \"SYS_%s not defined. The header files libsyscall is building against do not match syscalls.master.\"\n", $$symbol{syscall};
@@ -364,7 +362,7 @@ sub writeAliasesForSymbol {
             my $sym = (grep { $_ eq $arch } @{$$symbol{except}}) ? "__".$$symbol{asm_sym} : $$symbol{asm_sym};
 					
 						printf $f "\t.globl\t$alias_sym\n";
-						printf $f "\t\t$alias_sym = $sym\n";
+						printf $f "\t.set\t$alias_sym, $sym\n";
         }
 				printf $f "#endif\n\n";
     }
diff --git a/src/kernel/libsyscall/xcodescripts/syscalls.master b/src/kernel/libsyscall/xcodescripts/syscalls.master
index d19267e84..faf5af9d4 100644
--- a/src/kernel/libsyscall/xcodescripts/syscalls.master
+++ b/src/kernel/libsyscall/xcodescripts/syscalls.master
@@ -266,9 +266,9 @@
 175	AUE_NULL	ALL	{ int nosys(void); }   { old gc_control }
 176	AUE_NULL	ALL	{ int nosys(void); }   { old add_profil }
 177	AUE_NULL	ALL	{ int nosys(void); } 
-178	AUE_NULL	ALL	{ int nosys(void); } 
-179	AUE_NULL	ALL	{ int nosys(void); } 
-180	AUE_KDEBUGTRACE	ALL 	{ int kdebug_trace(int code, int arg1, int arg2, int arg3, int arg4, int arg5) NO_SYSCALL_STUB; } 
+178	AUE_KDEBUGTRACE	ALL 	{ uint64_t kdebug_trace_string(uint32_t debugid, uint64_t str_id, const char *str) NO_SYSCALL_STUB; }
+179	AUE_KDEBUGTRACE	ALL 	{ int kdebug_trace64(uint32_t code, uint64_t arg1, uint64_t arg2, uint64_t arg3, uint64_t arg4) NO_SYSCALL_STUB; } 
+180	AUE_KDEBUGTRACE	ALL 	{ int kdebug_trace(uint32_t code, u_long arg1, u_long arg2, u_long arg3, u_long arg4) NO_SYSCALL_STUB; } 
 181	AUE_SETGID	ALL	{ int setgid(gid_t gid); } 
 182	AUE_SETEGID	ALL	{ int setegid(gid_t egid); } 
 183	AUE_SETEUID	ALL	{ int seteuid(uid_t euid); } 
@@ -567,7 +567,7 @@
 #endif
 372	AUE_NULL	ALL	{ uint64_t thread_selfid (void) NO_SYSCALL_STUB; } 
 373	AUE_LEDGER	ALL	{ int ledger(int cmd, caddr_t arg1, caddr_t arg2, caddr_t arg3); } 
-374	AUE_NULL	ALL	{ int nosys(void); } 
+374	AUE_NULL	ALL	{ int kevent_qos(int fd, const struct kevent_qos_s *changelist, int nchanges, struct kevent_qos_s *eventlist, int nevents, void *data_out, size_t *data_available, unsigned int flags); } 
 375	AUE_NULL	ALL	{ int nosys(void); } 
 376	AUE_NULL	ALL	{ int nosys(void); } 
 377	AUE_NULL	ALL	{ int nosys(void); } 
@@ -585,9 +585,6 @@
 388	AUE_MAC_GET_FD	ALL	{ int __mac_get_fd(int fd, struct mac *mac_p); } 
 389	AUE_MAC_SET_FD	ALL	{ int __mac_set_fd(int fd, struct mac *mac_p); } 
 390	AUE_MAC_GET_PID	ALL	{ int __mac_get_pid(pid_t pid, struct mac *mac_p); } 
-391	AUE_MAC_GET_LCID	ALL	{ int __mac_get_lcid(pid_t lcid, struct mac *mac_p); }
-392	AUE_MAC_GET_LCTX	ALL	{ int __mac_get_lctx(struct mac *mac_p); }
-393	AUE_MAC_SET_LCTX	ALL	{ int __mac_set_lctx(struct mac *mac_p); }
 #else
 381     AUE_MAC_SYSCALL ALL     { int enosys(void); }
 382     AUE_MAC_GET_FILE        ALL     { int nosys(void); }
@@ -599,12 +596,12 @@
 388     AUE_MAC_GET_FD  ALL     { int nosys(void); }
 389     AUE_MAC_SET_FD  ALL     { int nosys(void); }
 390     AUE_MAC_GET_PID ALL     { int nosys(void); }
-391     AUE_MAC_GET_LCID        ALL     { int nosys(void); }
-392     AUE_MAC_GET_LCTX        ALL     { int nosys(void); }
-393     AUE_MAC_SET_LCTX        ALL     { int nosys(void); }
 #endif
-394	AUE_SETLCID	ALL	{ int setlcid(pid_t pid, pid_t lcid) NO_SYSCALL_STUB; }
-395	AUE_GETLCID	ALL	{ int getlcid(pid_t pid) NO_SYSCALL_STUB; }
+391	AUE_NULL	ALL	{ int enosys(void); }
+392	AUE_NULL	ALL	{ int enosys(void); }
+393	AUE_NULL	ALL	{ int enosys(void); }
+394	AUE_SELECT	ALL	{ int pselect(int nd, u_int32_t *in, u_int32_t *ou, u_int32_t *ex, const struct timespec *ts, const struct sigset_t *mask) NO_SYSCALL_STUB; }
+395	AUE_SELECT	ALL	{ int pselect_nocancel(int nd, u_int32_t *in, u_int32_t *ou, u_int32_t *ex, const struct timespec *ts, const struct sigset_t *mask) NO_SYSCALL_STUB; }
 396	AUE_NULL	ALL	{ user_ssize_t read_nocancel(int fd, user_addr_t cbuf, user_size_t nbyte) NO_SYSCALL_STUB; } 
 397	AUE_NULL	ALL	{ user_ssize_t write_nocancel(int fd, user_addr_t cbuf, user_size_t nbyte) NO_SYSCALL_STUB; } 
 398	AUE_OPEN_RWTC	ALL	{ int open_nocancel(user_addr_t path, int flags, int mode) NO_SYSCALL_STUB; } 
@@ -686,12 +683,12 @@
 442	AUE_CLOSE	ALL	{ int guarded_close_np(int fd, const guardid_t *guard); }
 443	AUE_KQUEUE	ALL	{ int guarded_kqueue_np(const guardid_t *guard, u_int guardflags); }
 444	AUE_NULL	ALL	{ int change_fdguard_np(int fd, const guardid_t *guard, u_int guardflags, const guardid_t *nguard, u_int nguardflags, int *fdflagsp); }
-445	AUE_NULL	ALL	{ int nosys(void); } { old __proc_suppress } 
+445	AUE_USRCTL	ALL	{ int usrctl(uint32_t flags); }
 446	AUE_NULL	ALL	{ int proc_rlimit_control(pid_t pid, int flavor, void *arg); }
 #if SOCKETS
-447	AUE_CONNECT	ALL	{ int connectx(int s, struct sockaddr *src, socklen_t srclen, struct sockaddr *dsts, socklen_t dstlen, uint32_t ifscope, associd_t aid, connid_t *cid); } 
-448	AUE_NULL	ALL	{ int disconnectx(int s, associd_t aid, connid_t cid); } 
-449	AUE_NULL	ALL	{ int peeloff(int s, associd_t aid); } 
+447	AUE_CONNECT	ALL	{ int connectx(int socket, const sa_endpoints_t *endpoints, sae_associd_t associd, unsigned int flags, const struct iovec *iov, unsigned int iovcnt, size_t *len, sae_connid_t *connid); }
+448	AUE_NULL	ALL	{ int disconnectx(int s, sae_associd_t aid, sae_connid_t cid); }
+449	AUE_NULL	ALL	{ int peeloff(int s, sae_associd_t aid); }
 450	AUE_SOCKET	ALL	{ int socket_delegate(int domain, int type, int protocol, pid_t epid); } 
 #else
 447	AUE_NULL	ALL	{ int nosys(void); }
@@ -761,7 +758,7 @@
 484	AUE_NULL	ALL	{ int guarded_open_dprotected_np(const char *path, const guardid_t *guard, u_int guardflags, int flags, int dpclass, int dpflags, int mode) NO_SYSCALL_STUB; }
 485	AUE_NULL	ALL	{ user_ssize_t guarded_write_np(int fd, const guardid_t *guard, user_addr_t cbuf, user_size_t nbyte); }
 486	AUE_PWRITE	ALL	{ user_ssize_t guarded_pwrite_np(int fd, const guardid_t *guard, user_addr_t buf, user_size_t nbyte, off_t offset); }
-487	AUE_WRITEV	ALL	{ user_ssize_t guarded_writev_np(int fd, const guardid_t *guard, struct iovec *iovp, u_int iovcnt); }
+487	AUE_WRITEV	ALL	{ user_ssize_t guarded_writev_np(int fd, const guardid_t *guard, struct iovec *iovp, int iovcnt); }
 #if CONFIG_SECLUDED_RENAME
 488	AUE_RENAME	ALL	{ int rename_ext(char *from, char *to, u_int flags) NO_SYSCALL_STUB; }
 #else
@@ -772,3 +769,25 @@
 #else
 489	AUE_NULL	ALL	{ int enosys(void); }
 #endif
+#if NETWORKING
+490	AUE_NULL	ALL	{ int netagent_trigger(uuid_t agent_uuid, size_t agent_uuidlen); }
+#else
+490	AUE_NULL	ALL	{ int nosys(void); }
+#endif /* NETWORKING */
+491	AUE_STACKSNAPSHOT ALL	{ int stack_snapshot_with_config(int stackshot_config_version, user_addr_t stackshot_config, size_t stackshot_config_size) NO_SYSCALL_STUB; }
+#if CONFIG_TELEMETRY
+492	AUE_STACKSNAPSHOT ALL	{ int microstackshot(user_addr_t tracebuf, uint32_t tracebuf_size, uint32_t flags) NO_SYSCALL_STUB; }
+#else
+492	AUE_NULL	ALL { int enosys(void); }
+#endif /* CONFIG_TELEMETRY */
+493 	AUE_NULL	ALL	{ user_ssize_t grab_pgo_data (user_addr_t uuid, int flags, user_addr_t buffer, user_ssize_t size); }
+#if CONFIG_PERSONAS
+494	AUE_PERSONA	ALL	{ int persona(uint32_t operation, uint32_t flags, struct kpersona_info *info, uid_t *id, size_t *idlen) NO_SYSCALL_STUB; }
+#else
+494	AUE_NULL	ALL	{ int enosys(void); }
+#endif
+495	AUE_NULL	ALL	{ int enosys(void); }
+496	AUE_NULL	ALL	{ int enosys(void); }
+497 	AUE_NULL	ALL	{ int enosys(void); }
+498	AUE_NULL	ALL	{ int enosys(void); }
+499	AUE_NULL	ALL	{ int work_interval_ctl(uint32_t operation, uint64_t work_interval_id, void *arg, size_t len) NO_SYSCALL_STUB; }
diff --git a/src/libc/CMakeLists.txt b/src/libc/CMakeLists.txt
index 055e5aad3..685306cf8 100644
--- a/src/libc/CMakeLists.txt
+++ b/src/libc/CMakeLists.txt
@@ -104,7 +104,7 @@ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
-add_library(system_c SHARED
+add_darling_library(system_c SHARED
 	$<TARGET_OBJECTS:libc-db>
 	$<TARGET_OBJECTS:libc-compat>
 	$<TARGET_OBJECTS:libc-compat_cancelable>
diff --git a/src/libc/include/sys/cdefs.h b/src/libc/include/sys/cdefs.h
index c3e1c6eae..50e370c19 100644
--- a/src/libc/include/sys/cdefs.h
+++ b/src/libc/include/sys/cdefs.h
@@ -89,7 +89,7 @@
 /*
  * symbol versioning macros
  */
-#ifndef DARLING
+#ifndef DARLING__DISABLED
 #define LIBC_ALIAS(sym)		__asm("_" __STRING(sym) LIBC_SUF_UNIX03)
 #define LIBC_ALIAS_C(sym)	__asm("_" __STRING(sym) LIBC_SUF_NON_CANCELABLE LIBC_SUF_UNIX03)
 #define LIBC_ALIAS_I(sym)	__asm("_" __STRING(sym) LIBC_SUF_64_BIT_INO_T LIBC_SUF_UNIX03)