Follow-up r93258, r93266, r93266: Move the defines to Defines.php