All files in the /src/gfx folder have been scanned for multi-line macros without do{}while(0) wrappers and fixed. About 1/3 of the files have also been const-corrected (adding const to functions that don't change the class state (usually those that return a value)). Run-time problems remain, however.