[cvs-nhc98] patch applied (hat): Fix dependencies amongst .h files.