fix more includes