Fix header includes for polygon and rectangle