3 files changed, 13 insertions, 2 deletions
diff --git a/discord/ext/commands/__init__.py b/discord/ext/commands/__init__.py
index bfb0814a..cb866e9f 100644
--- a/discord/ext/commands/__init__.py
+++ b/discord/ext/commands/__init__.py
@@ -8,8 +8,8 @@ An extension module to facilitate creation of bot commands.
 :license: MIT, see LICENSE for more details.
 """
 
-from .bot import Bot, AutoShardedBot, when_mentioned, when_mentioned_or
-from .context import Context
+from .bot import *
+from .context import *
 from .core import *
 from .errors import *
 from .help import *
diff --git a/discord/ext/commands/bot.py b/discord/ext/commands/bot.py
index 503aa266..e421f8d9 100644
--- a/discord/ext/commands/bot.py
+++ b/discord/ext/commands/bot.py
@@ -39,6 +39,13 @@ from . import errors
 from .help import HelpCommand, DefaultHelpCommand
 from .cog import Cog
 
+__all__ = (
+    'when_mentioned',
+    'when_mentioned_or',
+    'Bot',
+    'AutoShardedBot',
+)
+
 def when_mentioned(bot, msg):
     """A callable that implements a command prefix equivalent to being mentioned.
 
diff --git a/discord/ext/commands/context.py b/discord/ext/commands/context.py
index 5e83b1ab..cbd28597 100644
--- a/discord/ext/commands/context.py
+++ b/discord/ext/commands/context.py
@@ -25,6 +25,10 @@ DEALINGS IN THE SOFTWARE.
 import discord.abc
 import discord.utils
 
+__all__ = (
+    'Context',
+)
+
 class Context(discord.abc.Messageable):
     r"""Represents the context in which a command is being invoked under.