* fix more includes + use an unordered_set instead of a set in compute_base