Some changes in include structure