[cvs-nhc98] Fix dependencies amongst .h files.