Fix includes for test thread