Fix for Only bootstrap Buildyard if required..., Note: changed include logics!