Minor reorganization of early #defines/#includes