Add missing header files from previous commit