KN-6330 Include files are refactored