Sync some headers with ltp project, missed on initial checkin