Also changed the Make/options file to reflect changes to #includes