diff --git a/src/command_system/implementation/custom.py b/src/command_system/implementation/custom.py
index 3fa00d083..38cd2e2c3 100644
--- a/src/command_system/implementation/custom.py
+++ b/src/command_system/implementation/custom.py
@@ -35,7 +35,7 @@ detected.
 """
 
 from ..framework import CommandContainer, command, doc
-from .hosts import *
+from .hosts import ChatCommands, PrivateChatCommands, GroupChatCommands
 
 class CustomCommonCommands(CommandContainer):
     """
diff --git a/src/command_system/implementation/execute.py b/src/command_system/implementation/execute.py
index ab14f4ea1..767e761a5 100644
--- a/src/command_system/implementation/execute.py
+++ b/src/command_system/implementation/execute.py
@@ -38,7 +38,7 @@ from os.path import expanduser
 from gi.repository import GLib
 
 from ..framework import CommandContainer, command, doc
-from .hosts import *
+from .hosts import ChatCommands, PrivateChatCommands, GroupChatCommands
 
 class Execute(CommandContainer):
     AUTOMATIC = True
diff --git a/src/command_system/implementation/standard.py b/src/command_system/implementation/standard.py
index 8cdfa3516..bd263b669 100644
--- a/src/command_system/implementation/standard.py
+++ b/src/command_system/implementation/standard.py
@@ -30,7 +30,7 @@ from ..errors import CommandError
 from ..framework import CommandContainer, command, doc
 from ..mapping import generate_usage
 
-from .hosts import *
+from .hosts import ChatCommands, PrivateChatCommands, GroupChatCommands
 from . import execute
 
 # This holds constants fron the logger, which we'll be using in some of our