Adapted to use Util class. Added header safe preprocs into Tile.h and Item.h.