Unify GL inclusion better