Improve set cpp include files