diff --git a/include/libc.h b/include/libc.h
index 1f86742..10000b5 100644
--- a/include/libc.h
+++ b/include/libc.h
@@ -904,17 +904,6 @@
 #	endif
 #endif
 
-/* this really shouldn't be here */
-#if defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(sched_yield))
-#define sched_yield() \
-	do { \
-		struct timespec ts; \
-		ts.tv_sec = 0; \
-		ts.tv_nsec = 10; \
-		nanosleep(&ts, NULL); \
-	} while(0)
-#endif
-
 /* command line */
 extern char	*argv0;
 extern void __fixargv0(void);
diff --git a/include/u.h b/include/u.h
index c3f0081..466f3ea 100644
--- a/include/u.h
+++ b/include/u.h
@@ -154,6 +154,7 @@
  * Gcc is too smart for its own good.
  */
 #if defined(__GNUC__)
+#	undef strcmp	/* causes way too many warnings */
 #	if __GNUC__ >= 4 || (__GNUC__==3 && !defined(__APPLE_CC__))
 #		undef AUTOLIB
 #		define AUTOLIB(x) int __p9l_autolib_ ## x __attribute__ ((weak));
diff --git a/src/lib9/sleep.c b/src/lib9/sleep.c
index 5da602e..7a5c79f 100644
--- a/src/lib9/sleep.c
+++ b/src/lib9/sleep.c
@@ -1,9 +1,19 @@
 #include <u.h>
 #define NOPLAN9DEFINES
+#include <sys/param.h>
 #include <sys/time.h>
 #include <sched.h>
 #include <libc.h>
 
+#if defined(__NetBSD__) || (defined(__OpenBSD__) && OpenBSD <= 200511)
+#	define sched_yield() \
+#		do{ struct timespec ts; \
+#			ts.tv_sec = 0; \
+#			ts.tv_nsec = 10; \
+#			nanosleep(&ts, 0); \
+#		}while(0)
+#endif
+
 int
 p9sleep(long milli)
 {
diff --git a/src/libthread/386-ucontext.h b/src/libthread/386-ucontext.h
index 57fd1bd..00af62a 100644
--- a/src/libthread/386-ucontext.h
+++ b/src/libthread/386-ucontext.h
@@ -5,6 +5,8 @@
 
 extern	int		swapcontext(ucontext_t*, ucontext_t*);
 extern	void		makecontext(ucontext_t*, void(*)(), int, ...);
+extern	int		getmcontext(mcontext_t*);
+extern	void		setmcontext(mcontetx_t*);
 
 /*-
  * Copyright (c) 1999 Marcel Moolenaar
diff --git a/src/libthread/BSD.c b/src/libthread/BSD.c
index fdbc712..b9e8888 100644
--- a/src/libthread/BSD.c
+++ b/src/libthread/BSD.c
@@ -33,7 +33,7 @@
 	for(i=0; i<1000; i++){
 		if(!_tas(&l->held))
 			return 1;
-		sched_yield();
+		sleep(0);
 	}
 	/* increasingly slow */
 	for(i=0; i<10; i++){
diff --git a/src/libthread/OpenBSD-386-asm.s b/src/libthread/OpenBSD-386-asm.s
index 7ffb413..1a59436 100644
--- a/src/libthread/OpenBSD-386-asm.s
+++ b/src/libthread/OpenBSD-386-asm.s
@@ -96,4 +96,5 @@
 	movl    %ebp, %esp
 	popl    %ebp
 	PIC_PROLOGUE
-	jmp     PIC_PLT(_C_LABEL(__cerror))
\ No newline at end of file
+	jmp     PIC_PLT(_C_LABEL(__cerror))
+