USB: regroup all depends on USB within an if USB block