If we already have such an include dir, let's have all headers there.

Change-Id: I2100b5308e7fdad9d98cfde76434ff485aca20c7