Fix out-of-order requires