Non-X11 compile fix for generated code.

15 files changed