Some changes to #includes