Clean up in include directories in blocking_queue.h and merge_sorter.h