Change all includes to point at files in the folder explicitly