Fix sys-queue.h conflict for good