export more headers

Change-Id: I9c721161dfc890d01e0184d7e2598ad0f0adb3a3