standalone: Use more variables, preparing to include these files from main