Restore conditionals from master
Make more like master
Fixed whitespace to be same as master in conditionals
Restore GLIB_INC1 and GLIB_INC2