Fix require/provide-related problems
Merge pull request #1 from YoungFrog/master

Fix require/provide order.