Update include logic

Change-Id: I4835d3bcc0f337bb6fd8028a5147860c6f28f5e8