Revert "[Patch] Move defines that are not required by litevirt"

This reverts commit f125616d1006d19dd7fdbbc3fdea8877c8efb027.