Move #defines out of structs
Merge pull request #1996 from yebblies/evictdefine

[DDMD] Move #defines out of structs