Forgot header files from previous commit