Changes to be able to compile F-Spot

Changes to be able to compile F-Spot —and run it, but with lots of errors yet.