[DF-4267] Removed #include overhead