e288c6015e
It doesn't seem reasonable to have these files as our API part. Just inlining them in the source. Change-Id: Iff970bb25e72e49e7ac21990824dbf4ef8bfd2e2