[DF-291] Fix problem in headers