Later we would want to move headers if they are not used outside.

Change-Id: I863f6f00254b335af563598a195aea01595f6c99