Revert "Use full import path for glib.h"

This reverts commit 17001db65b843492e4740702e1a165c506543cf6.
Merge branch 'fix-build'