Various API and header updates.