diff --git a/ansible_mitogen/connection.py b/ansible_mitogen/connection.py
index 5053a5f5b..e903e49d0 100644
--- a/ansible_mitogen/connection.py
+++ b/ansible_mitogen/connection.py
@@ -43,11 +43,11 @@
 import ansible.plugins.connection
 
 import mitogen.core
+import mitogen.parent
+import mitogen.service
 
 import ansible_mitogen.mixins
-import ansible_mitogen.parsing
 import ansible_mitogen.process
-import ansible_mitogen.services
 import ansible_mitogen.target
 import ansible_mitogen.transport_config
 import ansible_mitogen.utils.unsafe
diff --git a/ansible_mitogen/logging.py b/ansible_mitogen/logging.py
index 4d5647a45..70a8f15f4 100644
--- a/ansible_mitogen/logging.py
+++ b/ansible_mitogen/logging.py
@@ -34,7 +34,6 @@
 
 import ansible.utils.display
 
-import mitogen.core
 import mitogen.utils
 
 
diff --git a/ansible_mitogen/planner.py b/ansible_mitogen/planner.py
index 2915f4b78..35b51e7e2 100644
--- a/ansible_mitogen/planner.py
+++ b/ansible_mitogen/planner.py
@@ -50,6 +50,7 @@
 
 import mitogen.core
 import mitogen.select
+import mitogen.service
 
 import ansible_mitogen.loaders
 import ansible_mitogen.parsing
diff --git a/ansible_mitogen/strategy.py b/ansible_mitogen/strategy.py
index 9408ca636..c0b2ef87d 100644
--- a/ansible_mitogen/strategy.py
+++ b/ansible_mitogen/strategy.py
@@ -41,6 +41,7 @@
 import mitogen.core
 import ansible_mitogen.affinity
 import ansible_mitogen.loaders
+import ansible_mitogen.logging
 import ansible_mitogen.mixins
 import ansible_mitogen.process
 
diff --git a/mitogen/__init__.py b/mitogen/__init__.py
index 87e7572a7..a1117040f 100644
--- a/mitogen/__init__.py
+++ b/mitogen/__init__.py
@@ -106,7 +106,8 @@ def main(router):
     def wrapper(func):
         if func.__module__ != '__main__':
             return func
-        import mitogen.parent
+        import mitogen.core
+        import mitogen.master
         import mitogen.utils
         if profiling:
             mitogen.core.enable_profiling()
diff --git a/mitogen/os_fork.py b/mitogen/os_fork.py
index 9c649d07f..57f884600 100644
--- a/mitogen/os_fork.py
+++ b/mitogen/os_fork.py
@@ -38,6 +38,7 @@
 import weakref
 
 import mitogen.core
+import mitogen.parent
 
 
 # List of weakrefs. On Python 2.4, mitogen.core registers its Broker on this
diff --git a/mitogen/ssh.py b/mitogen/ssh.py
index f32d2cabb..c43d00da8 100644
--- a/mitogen/ssh.py
+++ b/mitogen/ssh.py
@@ -40,6 +40,7 @@
 except ImportError:
     from pipes import quote as shlex_quote
 
+import mitogen.core
 import mitogen.parent
 from mitogen.core import b
 
diff --git a/mitogen/unix.py b/mitogen/unix.py
index b241a4037..59bf5d9fb 100644
--- a/mitogen/unix.py
+++ b/mitogen/unix.py
@@ -44,6 +44,7 @@
 import tempfile
 
 import mitogen.core
+import mitogen.parent
 import mitogen.master