More build fixes for non-USE_GRAPHICS