Move around inc/ files to be top-level.