Minor changes to include files