Add header files, credit to Derek Molloy