Clean up the hacks to use Marble

[Thiago Macieira]

Let people with a custom, non-system-wide install of Marble also find
it. And clean up the hack to find the missing header.