Tweak Makefile and sources to compile in gcc 4.6.2 / Linux.