Fixed typos in include scripts, and moved libs.