I dropped some header file changes in the last commit.