Some changes to include files