Move some includes to cpp