Fix compile errors created by bundling queue.h