Include some headers in new multi-thread test