Commit r368867 "Fix a layering violation in mutex"
moved "thread_id" from <thread> to <threading_support>.
Along the way the conditions for its presence changed.
Before it only required that threading was supported.
Now it needs that and you not to be using an external
This change restores the old behaviour by putting it
in a separate block with the correct condition.