Changing some include names and headers