applied header location changes of up-to-date svn