Update includes to new filenames