diff --git a/.flake8 b/.flake8
index e6dbe70f2..95a7b6411 100644
--- a/.flake8
+++ b/.flake8
@@ -12,8 +12,6 @@ per-file-ignores =
     manifest_xml.py: IMR241,
     subcmds/gc.py: IMR241,
     subcmds/rebase.py: IMR241,
-    subcmds/selfupdate.py: IMR241,
-    subcmds/smartsync.py: IMR241,
     subcmds/sync.py: IMR241,
     subcmds/upload.py: IMR241,
     subcmds/wipe.py: IMR241,
diff --git a/subcmds/selfupdate.py b/subcmds/selfupdate.py
index 5c819c529..c5845170a 100644
--- a/subcmds/selfupdate.py
+++ b/subcmds/selfupdate.py
@@ -17,8 +17,7 @@ import optparse
 import command
 import error
 import repo_logging
-from subcmds.sync import _PostRepoFetch
-from subcmds.sync import _PostRepoUpgrade
+from subcmds import sync
 
 
 logger = repo_logging.RepoLogger(__file__)
@@ -62,7 +61,7 @@ need to be performed by an end-user.
         rp.PreSync()
 
         if opt.repo_upgraded:
-            _PostRepoUpgrade(self.manifest)
+            sync._PostRepoUpgrade(self.manifest)
 
         else:
             result = rp.Sync_NetworkHalf()
@@ -71,4 +70,4 @@ need to be performed by an end-user.
                 raise SelfupdateError(aggregate_errors=[result.error])
 
             rp.bare_git.gc("--auto")
-            _PostRepoFetch(rp, repo_verify=opt.repo_verify, verbose=True)
+            sync._PostRepoFetch(rp, repo_verify=opt.repo_verify, verbose=True)
diff --git a/subcmds/smartsync.py b/subcmds/smartsync.py
index 49d099727..e920ac78b 100644
--- a/subcmds/smartsync.py
+++ b/subcmds/smartsync.py
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from subcmds.sync import Sync
+from subcmds import sync
 
 
-class Smartsync(Sync):
+class Smartsync(sync.Sync):
     COMMON = True
     helpSummary = "Update working tree to the latest known good revision"
     helpUsage = """
@@ -26,8 +26,8 @@ The '%prog' command is a shortcut for sync -s.
 """
 
     def _Options(self, p):
-        Sync._Options(self, p, show_smart=False)
+        sync.Sync._Options(self, p, show_smart=False)
 
     def Execute(self, opt, args):
         opt.smart_sync = True
-        Sync.Execute(self, opt, args)
+        sync.Sync.Execute(self, opt, args)
diff --git a/subcmds/upload.py b/subcmds/upload.py
index 8b9adb68c..0c8a14236 100644
--- a/subcmds/upload.py
+++ b/subcmds/upload.py
@@ -27,7 +27,7 @@ import git_superproject
 import hooks
 from project import ReviewableBranch
 import repo_logging
-from subcmds.sync import LocalSyncState
+from subcmds import sync
 
 
 _DEFAULT_UNUSUAL_COMMIT_THRESHOLD = 5
@@ -836,7 +836,7 @@ Gerrit Code Review:  https://www.gerritcodereview.com/
             if not hook.Run(
                 project_list=pending_proj_names, worktree_list=pending_worktrees
             ):
-                if LocalSyncState(manifest).IsPartiallySynced():
+                if sync.LocalSyncState(manifest).IsPartiallySynced():
                     logger.info(
                         "Tip: A partially synced tree was detected. "
                         "If this failure involves cross-project dependencies, "