Change local includes to global includes