Generator: Add explicit require to fix load-order problems