Changed some include files