Fix header guards and includes for new location of gfx module.