Refactored gfx-types.h