clean up includes
handle multiple threads on 1.9