Revert "Remove x_gc.h."

This reverts commit eaf8a14b68c6475f119b7dc284995a654c743c77.
Minor refactor.