Move some includes where required