To make them thread-safe.

This makes computations somewhat slower,
on my 4-core machine the test suite needs 105.8 s instead of 99.0 s.

using new text-processing sript ls-includes