Merge pull request #429 from mhaskel/remove_include_update