Index: coregrind/m_sigframe/sigframe-x86-darwin.c
===================================================================
--- coregrind/m_sigframe/sigframe-x86-darwin.c	(revision 11689)
+++ coregrind/m_sigframe/sigframe-x86-darwin.c	(revision 11690)
@@ -34,6 +34,7 @@
 #include "pub_core_basics.h"
 #include "pub_core_vki.h"
 #include "pub_core_vkiscnums.h"
+#include "pub_core_libcsetjmp.h"    // to keep _threadstate.h happy
 #include "pub_core_threadstate.h"
 #include "pub_core_aspacemgr.h"
 #include "pub_core_libcbase.h"
Index: coregrind/m_sigframe/sigframe-amd64-darwin.c
===================================================================
--- coregrind/m_sigframe/sigframe-amd64-darwin.c	(revision 11689)
+++ coregrind/m_sigframe/sigframe-amd64-darwin.c	(revision 11690)
@@ -34,6 +34,7 @@
 #include "pub_core_basics.h"
 #include "pub_core_vki.h"
 #include "pub_core_vkiscnums.h"
+#include "pub_core_libcsetjmp.h"    // to keep _threadstate.h happy
 #include "pub_core_threadstate.h"
 #include "pub_core_aspacemgr.h"
 #include "pub_core_libcbase.h"
Index: coregrind/m_syswrap/syswrap-x86-darwin.c
===================================================================
--- coregrind/m_syswrap/syswrap-x86-darwin.c	(revision 11689)
+++ coregrind/m_syswrap/syswrap-x86-darwin.c	(revision 11690)
@@ -32,6 +32,7 @@
 
 #include "pub_core_basics.h"
 #include "pub_core_vki.h"
+#include "pub_core_libcsetjmp.h"   // to keep _threadstate.h happy
 #include "pub_core_threadstate.h"
 #include "pub_core_aspacemgr.h"
 #include "pub_core_xarray.h"
Index: coregrind/m_syswrap/syswrap-amd64-darwin.c
===================================================================
--- coregrind/m_syswrap/syswrap-amd64-darwin.c	(revision 11689)
+++ coregrind/m_syswrap/syswrap-amd64-darwin.c	(revision 11690)
@@ -32,6 +32,7 @@
 
 #include "pub_core_basics.h"
 #include "pub_core_vki.h"
+#include "pub_core_libcsetjmp.h"   // to keep _threadstate.h happy
 #include "pub_core_threadstate.h"
 #include "pub_core_aspacemgr.h"
 #include "pub_core_xarray.h"
Index: coregrind/m_syswrap/syswrap-main.c
===================================================================
--- coregrind/m_syswrap/syswrap-main.c	(revision 11689)
+++ coregrind/m_syswrap/syswrap-main.c	(revision 11690)
@@ -2267,7 +2267,7 @@
    sci->status.what = SsIdle;
 
    vg_assert(tst->sched_jmpbuf_valid);
-   VG_MINIMAL_LONGJMP(tst->sched_jmpbuf, True);
+   VG_MINIMAL_LONGJMP(tst->sched_jmpbuf);
 
    /* NOTREACHED */
    vg_assert(0);
Index: coregrind/m_syswrap/syswrap-darwin.c
===================================================================
--- coregrind/m_syswrap/syswrap-darwin.c	(revision 11689)
+++ coregrind/m_syswrap/syswrap-darwin.c	(revision 11690)
@@ -33,6 +33,7 @@
 #include "pub_core_basics.h"
 #include "pub_core_vki.h"
 #include "pub_core_vkiscnums.h"
+#include "pub_core_libcsetjmp.h"   // to keep _threadstate.h happy
 #include "pub_core_threadstate.h"
 #include "pub_core_aspacemgr.h"
 #include "pub_core_xarray.h"
Index: coregrind/m_initimg/initimg-darwin.c
===================================================================
--- coregrind/m_initimg/initimg-darwin.c	(revision 11689)
+++ coregrind/m_initimg/initimg-darwin.c	(revision 11690)
@@ -47,6 +47,7 @@
 #include "pub_core_ume.h"
 #include "pub_core_options.h"
 #include "pub_core_tooliface.h"       /* VG_TRACK */
+#include "pub_core_libcsetjmp.h"      // to keep _threadstate.h happy
 #include "pub_core_threadstate.h"     /* ThreadArchState */
 #include "priv_initimg_pathscan.h"
 #include "pub_core_initimg.h"         /* self */
Index: coregrind/m_coredump/coredump-macho.c
===================================================================
--- coregrind/m_coredump/coredump-macho.c	(revision 11689)
+++ coregrind/m_coredump/coredump-macho.c	(revision 11690)
@@ -33,6 +33,7 @@
 #include "pub_core_basics.h"
 #include "pub_core_vki.h"
 #include "pub_core_coredump.h"
+#include "pub_core_libcsetjmp.h"   // to keep _threadstate.h happy
 #include "pub_core_threadstate.h"
 
 void VG_(make_coredump)(ThreadId tid, const vki_siginfo_t *si, UInt max_size)