Merged the code used to update the cursor and the light on screen.

It permitted to drop some dead code along the way.

As a good side-effect, the cursor and the light are displayed right
from the start, and not when you click the first time on the map.

I also removed a few uneeded headers while seeing it.