MASTER: Caught a missing a header class for the last commit.