Reorganize some requires