fix includes to match renamed files