game: warning fix refs 193 - merge of latest code from omnibot google
project (some includes are adjusted)