Cleanup includes

Some includes use relative paths, while some use global includes.

As apparently the preferred style is to use global includes, change leftover relative includes to global ones.