Revert RR 903

Also make sure that internal.h is included before glib so that
GLIB_VERSION_MIN_REQUIRED will actually work.

Testing Done:
Compiled and verified the deprecation warnings didn't show up.

Reviewed at https://reviews.imfreedom.org/r/909/