Fix inc/ dir inclusion and copy