improve some includes