Index: sys/amd64/linux/syscalls.master
===================================================================
--- sys/amd64/linux/syscalls.master
+++ sys/amd64/linux/syscalls.master
@@ -423,8 +423,8 @@
 		int linux_clone(
 		    l_ulong flags,
 		    void *stack,
-		    void *parent_tidptr,
-		    void *child_tidptr,
+		    l_pid_t *parent_tidptr,
+		    l_pid_t *child_tidptr,
 		    void *tls
 		);
 	}
@@ -1295,7 +1295,7 @@
 222	AUE_NULL	STD {
 		int linux_timer_create(
 		    clockid_t clock_id,
-		    struct sigevent *evp,
+		    struct l_sigevent *evp,
 		    l_timer_t *timerid
 		);
 	}
@@ -1303,14 +1303,14 @@
 		int linux_timer_settime(
 		    l_timer_t timerid,
 		    l_int flags,
-		    const struct itimerspec *new,
-		    struct itimerspec *old
+		    const struct l_itimerspec *new,
+		    struct l_itimerspec *old
 		);
 	}
 224	AUE_NULL	STD {
 		int linux_timer_gettime(
 		    l_timer_t timerid,
-		    struct itimerspec *setting
+		    struct l_itimerspec *setting
 		);
 	}
 225	AUE_NULL	STD {
Index: sys/amd64/linux32/syscalls.master
===================================================================
--- sys/amd64/linux32/syscalls.master
+++ sys/amd64/linux32/syscalls.master
@@ -644,9 +644,9 @@
 		int linux_clone(
 		    l_int flags,
 		    void *stack,
-		    void *parent_tidptr,
+		    l_pid_t *parent_tidptr,
 		    void *tls,
-		    void *child_tidptr
+		    l_pid_t *child_tidptr
 		);
 	}
 121	AUE_SYSCTL	STD {
@@ -1405,7 +1405,7 @@
 259	AUE_NULL	STD {
 		int linux_timer_create(
 		    clockid_t clock_id,
-		    struct sigevent *evp,
+		    struct l_sigevent *evp,
 		    l_timer_t *timerid
 		);
 	}
@@ -1413,14 +1413,14 @@
 		int linux_timer_settime(
 		    l_timer_t timerid,
 		    l_int flags,
-		    const struct itimerspec *new,
-		    struct itimerspec *old
+		    const struct l_itimerspec *new,
+		    struct l_itimerspec *old
 		);
 	}
 261	AUE_NULL	STD {
 		int linux_timer_gettime(
 		    l_timer_t timerid,
-		    struct itimerspec *setting
+		    struct l_itimerspec *setting
 		);
 	}
 262	AUE_NULL	STD {
Index: sys/arm/linux/syscalls.master
===================================================================
--- sys/arm/linux/syscalls.master
+++ sys/arm/linux/syscalls.master
@@ -510,9 +510,9 @@
 		int linux_clone(
 		    l_int flags,
 		    void *stack,
-		    void *parent_tidptr,
+		    l_pid_t *parent_tidptr,
 		    void *tls,
-		    void * child_tidptr
+		    l_pid_t * child_tidptr
 		);
 	}
 121	AUE_SYSCTL	STD	{
@@ -1174,20 +1174,20 @@
 257	AUE_NULL	STD	{
 		int linux_timer_create(
 		    clockid_t clock_id,
-		    struct sigevent *evp,
+		    struct l_sigevent *evp,
 		    l_timer_t *timerid);
 	}
 258	AUE_NULL	STD	{
 		int linux_timer_settime(
 		    l_timer_t timerid,
 		    l_int flags,
-		    const struct itimerspec *new,
-		    struct itimerspec *old);
+		    const struct l_itimerspec *new,
+		    struct l_itimerspec *old);
 	}
 259	AUE_NULL	STD	{
 		int linux_timer_gettime(
 		    l_timer_t timerid,
-		    struct itimerspec *setting
+		    struct l_itimerspec *setting
 		);
 	}
 260	AUE_NULL	STD	{
Index: sys/arm64/linux/syscalls.master
===================================================================
--- sys/arm64/linux/syscalls.master
+++ sys/arm64/linux/syscalls.master
@@ -648,13 +648,13 @@
 107	AUE_NULL	STD	{
 		int linux_timer_create(
 		    clockid_t clock_id,
-		    struct sigevent *evp,
+		    struct l_sigevent *evp,
 		    l_timer_t *timerid);
 	}
 108	AUE_NULL	STD	{
 		int linux_timer_gettime(
 		    l_timer_t timerid,
-		    struct itimerspec *setting
+		    struct l_itimerspec *setting
 		);
 	}
 109	AUE_NULL	STD	{
@@ -665,8 +665,8 @@
 		int linux_timer_settime(
 		    l_timer_t timerid,
 		    l_int flags,
-		    const struct itimerspec *new,
-		    struct itimerspec *old);
+		    const struct l_itimerspec *new,
+		    struct l_itimerspec *old);
 	}
 111	AUE_NULL	STD	{
 		int linux_timer_delete(
@@ -1318,9 +1318,9 @@
 		int linux_clone(
 		    l_ulong flags,
 		    void *stack,
-		    void *parent_tidptr,
+		    l_pid_t *parent_tidptr,
 		    void *tls,
-		    void *child_tidptr
+		    l_pid_t *child_tidptr
 		);
 	}
 221	AUE_EXECVE	STD	{
Index: sys/i386/linux/syscalls.master
===================================================================
--- sys/i386/linux/syscalls.master
+++ sys/i386/linux/syscalls.master
@@ -661,9 +661,9 @@
 		int linux_clone(
 		    l_int flags,
 		    void *stack,
-		    void *parent_tidptr,
+		    l_pid_t *parent_tidptr,
 		    void *tls,
-		    void *child_tidptr
+		    l_pid_t *child_tidptr
 		);
 	}
 121	AUE_SYSCTL	STD {
@@ -1429,7 +1429,7 @@
 259	AUE_NULL	STD {
 		int linux_timer_create(
 		    clockid_t clock_id,
-		    struct sigevent *evp,
+		    struct l_sigevent *evp,
 		    l_timer_t *timerid
 		);
 	}
@@ -1437,14 +1437,14 @@
 		int linux_timer_settime(
 		    l_timer_t timerid,
 		    l_int flags,
-		    const struct itimerspec *new,
-		    struct itimerspec *old
+		    const struct l_itimerspec *new,
+		    struct l_itimerspec *old
 		);
 	}
 261	AUE_NULL	STD {
 		int linux_timer_gettime(
 		    l_timer_t timerid,
-		    struct itimerspec *setting
+		    struct l_itimerspec *setting
 		);
 	}
 262	AUE_NULL	STD {