[mkgmap-dev] Commit r4244: Reduce number of includes in default style