diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -11,17 +11,11 @@
 import os
 import copy
 
-from mercurial import hg, commands, util, cmdutil, match as match_, node, \
-        archival, error, merge
+from mercurial import hg, commands, util, cmdutil, scmutil, match as match_, \
+    node, archival, error, merge
 from mercurial.i18n import _
 from mercurial.node import hex
 from hgext import rebase
-import lfutil
-
-try:
-    from mercurial import scmutil
-except ImportError:
-    pass
 
 import lfutil
 import lfcommands
diff --git a/hgext/largefiles/reposetup.py b/hgext/largefiles/reposetup.py
--- a/hgext/largefiles/reposetup.py
+++ b/hgext/largefiles/reposetup.py
@@ -12,8 +12,7 @@ import types
 import os
 import re
 
-from mercurial import context, error, manifest, match as match_, \
-        node, util
+from mercurial import context, error, manifest, match as match_, node, util
 from mercurial.i18n import _
 
 import lfcommands