stop the circular includes

Change-Id: Ifc21bcec37b64dfe6762a30774ff12d937a89aee