(GX) Use the inlined functions in the headers