LPS-33132 Refactor wrong caused _includes not being used