Code cleanup.
Switch to top-level glib headers. Thanks to DimStar for patch
optimized includes
moving trunk for module inkscape