I would have done this upstream in the server but we are in code freeze. The following files should be removed from the forked driver sources because they are unused:

synchronization.cpp and synchronization.h
thread_pool.cpp and thread_pool.h
intrusive_counter.cpp intrusive_counter.h

We probably should just exclude them from the extraction script, and then patch up SConscript.client after the fork.