[DF-185] Include fixes