[cvs-nhc98] patch applied (hat): * Move the header to include from OPTIONS to the foreign imports