Makefile dependency fix
Make include guards consistent
Add Tile and Map