minor suggestions

On second thought maybe the headers should be included from the header in order to remain compatible with pthreads.