diff --git a/Lib/gettext.py b/Lib/gettext.py
index 7ef425935d8..638d4ae7a31 100644
--- a/Lib/gettext.py
+++ b/Lib/gettext.py
@@ -48,6 +48,9 @@ import sys
 import struct
 from errno import ENOENT
 
+__all__ = ["bindtextdomain","textdomain","gettext","dgettext",
+           "find","translation","install","Catalog"]
+
 _default_localedir = os.path.join(sys.prefix, 'share', 'locale')
 
 
diff --git a/Lib/gopherlib.py b/Lib/gopherlib.py
index 6965fbdb8a9..9514832acf2 100644
--- a/Lib/gopherlib.py
+++ b/Lib/gopherlib.py
@@ -2,6 +2,8 @@
 
 import string
 
+__all__ = ["send_selector","send_query"]
+
 # Default selector, host and port
 DEF_SELECTOR = '1/'
 DEF_HOST     = 'gopher.micro.umn.edu'
diff --git a/Lib/gzip.py b/Lib/gzip.py
index 2ed3d9c71e6..53e6e9c3c7c 100644
--- a/Lib/gzip.py
+++ b/Lib/gzip.py
@@ -9,6 +9,8 @@ import string, struct, sys, time
 import zlib
 import __builtin__
 
+__all__ = ["GzipFile","open"]
+
 FTEXT, FHCRC, FEXTRA, FNAME, FCOMMENT = 1, 2, 4, 8, 16
 
 READ, WRITE = 1, 2
diff --git a/Lib/htmlentitydefs.py b/Lib/htmlentitydefs.py
index b20a07c7011..dfbf55e0099 100644
--- a/Lib/htmlentitydefs.py
+++ b/Lib/htmlentitydefs.py
@@ -1,5 +1,7 @@
 """HTML character entity references."""
 
+__all__ = ["entitydefs"]
+
 entitydefs = {
     'AElig':    '\306',         # latin capital letter AE = latin capital ligature AE, U+00C6 ISOlat1
     'Aacute':   '\301',         # latin capital letter A with acute, U+00C1 ISOlat1
diff --git a/Lib/htmllib.py b/Lib/htmllib.py
index cae9ae5eaf7..d3e8f88fecb 100644
--- a/Lib/htmllib.py
+++ b/Lib/htmllib.py
@@ -9,6 +9,7 @@ import string
 from sgmllib import SGMLParser
 from formatter import AS_IS
 
+__all__ = ["HTMLParser"]
 
 class HTMLParser(SGMLParser):
 
diff --git a/Lib/httplib.py b/Lib/httplib.py
index 27a9e0110c6..47506851986 100644
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -74,6 +74,8 @@ try:
 except ImportError:
     from StringIO import StringIO
 
+__all__ = ["HTTP"]
+
 HTTP_PORT = 80
 HTTPS_PORT = 443
 
diff --git a/Lib/ihooks.py b/Lib/ihooks.py
index 62760cbbe49..9e1e8842a35 100644
--- a/Lib/ihooks.py
+++ b/Lib/ihooks.py
@@ -42,7 +42,7 @@ instantiated).
 The classes defined here should be used as base classes for extended
 functionality along those lines.
 
-If a module mporter class supports dotted names, its import_module()
+If a module importer class supports dotted names, its import_module()
 must return a different value depending on whether it is called on
 behalf of a "from ... import ..." statement or not.  (This is caused
 by the way the __import__ hook is used by the Python interpreter.)  It
@@ -57,6 +57,8 @@ import os
 import sys
 import string
 
+__all__ = ["BasicModuleLoader","Hooks","ModuleLoader","FancyModuleLoader",
+           "BasicModuleImporter","ModuleImporter","install","uninstall"]
 
 VERBOSE = 0
 
diff --git a/Lib/imaplib.py b/Lib/imaplib.py
index 954ecf65d10..229e5c6edcd 100644
--- a/Lib/imaplib.py
+++ b/Lib/imaplib.py
@@ -18,6 +18,9 @@ __version__ = "2.39"
 
 import binascii, re, socket, string, time, random, sys
 
+__all__ = ["IMAP4","error","abort","readonly","Internaldate2tuple",
+           "Int2AP","ParseFlags","Time2InternalDate"]
+
 #       Globals
 
 CRLF = '\r\n'
diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py
index 0b684ec46ae..0027b02e671 100644
--- a/Lib/test/test___all__.py
+++ b/Lib/test/test___all__.py
@@ -67,5 +67,13 @@ check_all("fpformat")
 check_all("ftplib")
 check_all("getopt")
 check_all("getpass")
+check_all("gettext")
 check_all("glob")
+check_all("gopher")
+check_all("gzip")
+check_all("htmlentitydefs")
+check_all("htmllib")
+check_all("httplib")
+check_all("ihooks")
+check_all("imaplib")
 check_all("robotparser")