Fixed include errors after file renames