stop the circular includes

Change-Id: I7166c186dbfb9c08913df1cbf117f774b04f14bb