Revert "Fix includes for other media variants"

This reverts commit 65f3de2e0e85dfcd033f8a77ee6bc067acb48607.