Fix include loop and remove macro