Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Move variables that are compiled but may not be used due to macros into the scope of the macros.
- Move variables that are compiled but may not be used due to macros into the scope of the macros.