Fix dependency require order