Public headers are long moved from here

Change-Id: I672f0348167a6347a609ad9f56b99ed056f7b4b1