various header fixes to include what is actually used and better future-proof compile for mapnik refactoring upstream
fixes for compiling against Mapnik 2.0.0