Fix external release builds.

Due to a complicated set of circumstances, this was the problem that
caused console key input eating on Gehn. Always remember kids, ifdef
include hackery is teh ebils.
Merge remote-tracking branch 'huru/master'