Move headers that are private to toolkit there, then

Change-Id: I12df9dc88960a6f78e85ab2f604782d1a4f9faf6