Cleanup some includes

Just a try ;)