Modified references to header files.