Let's create missing header files and move stuff around to have a clear view of who implements what. Change-Id: Ib32091d716b33bca58e2d3acf8840b52824c0bd3