changed .i-files according to previous changes in hpp-files