Further changes to properly include different header files under GCC.
Correct to mutex to support.  Somehow a pthread_ routine snuck in, which would
draw in PTHREADS.