Fix Makefiles.
Revive poll.