Merge "Add missing includes for threads.h"