diff --git a/sys/compat/cloudabi/cloudabi_thread.c b/sys/compat/cloudabi/cloudabi_thread.c
index e70549b6e332..f920b8b41ee8 100644
--- a/sys/compat/cloudabi/cloudabi_thread.c
+++ b/sys/compat/cloudabi/cloudabi_thread.c
@@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/sched.h>
 #include <sys/syscallsubr.h>
-#include <sys/umtx.h>
 
 #include <contrib/cloudabi/cloudabi_types_common.h>
 
@@ -45,8 +44,6 @@ cloudabi_sys_thread_exit(struct thread *td,
 		.scope = uap->scope,
 	};
 
-	umtx_thread_exit(td);
-
         /* Wake up joining thread. */
 	cloudabi_sys_lock_unlock(td, &cloudabi_sys_lock_unlock_args);
 
diff --git a/sys/compat/linux/linux_fork.c b/sys/compat/linux/linux_fork.c
index ed4adcf8a175..8230d5b4108b 100644
--- a/sys/compat/linux/linux_fork.c
+++ b/sys/compat/linux/linux_fork.c
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/sched.h>
 #include <sys/syscallsubr.h>
 #include <sys/sx.h>
-#include <sys/umtx.h>
 #include <sys/unistd.h>
 #include <sys/wait.h>
 
@@ -376,8 +375,6 @@ linux_exit(struct thread *td, struct linux_exit_args *args)
 
 	LINUX_CTR2(exit, "thread(%d) (%d)", em->em_tid, args->rval);
 
-	umtx_thread_exit(td);
-
 	linux_thread_detach(td);
 
 	/*