merged src/inc dirs