diff --git a/slixmpp/plugins/__init__.py b/slixmpp/plugins/__init__.py
index be01b06e..95a8582f 100644
--- a/slixmpp/plugins/__init__.py
+++ b/slixmpp/plugins/__init__.py
@@ -114,4 +114,6 @@ __all__ = [
     'xep_0441',  # Message Archive Management Preferences
     'xep_0444',  # Message Reactions
     'xep_0461',  # Message Replies
+    # Meant to be imported by plugins
+    'BasePlugin'
 ]
diff --git a/slixmpp/types.py b/slixmpp/types.py
index 336ab7d8..99492062 100644
--- a/slixmpp/types.py
+++ b/slixmpp/types.py
@@ -84,7 +84,7 @@ MAMDefault = Literal['always', 'never', 'roster']
 FilterString = Literal['in', 'out', 'out_sync']
 
 __all__ = [
-    'Protocol', 'TypedDict', 'Literal', 'OptJid', 'JidStr', 'MAMDefault',
+    'Protocol', 'TypedDict', 'Literal', 'OptJid', 'OptJidStr', 'JidStr', 'MAMDefault',
     'PresenceTypes', 'PresenceShows', 'MessageTypes', 'IqTypes', 'MucRole',
     'MucAffiliation', 'FilterString',
 ]