Fix buildinfo generation dependencies after code re-reorg