Fixed manually errors in build. Problems with includes folder