Fix setjmp header file
Merge branch 'fixHeaders'