Thread Safety Analysis: now with less includes. No functional changes.