rename some include files