more post-reorganization include and project changes