diff --git a/Xlib/__init__.py b/Xlib/__init__.py
index 28a0e01..090eb3f 100644
--- a/Xlib/__init__.py
+++ b/Xlib/__init__.py
@@ -19,6 +19,8 @@
 #    Suite 330,
 #    Boston, MA 02111-1307 USA
 
+from . import XK, X, Xatom, Xcursorfont, Xutil, display, error, rdb
+
 __version__ = (0, 33)
 
 __version_extra__ = ''
diff --git a/Xlib/display.py b/Xlib/display.py
index 87b9aa6..ce6fe81 100644
--- a/Xlib/display.py
+++ b/Xlib/display.py
@@ -26,7 +26,6 @@
 from six import create_unbound_method
 
 # Xlib modules
-from . import error
 from . import ext
 from . import X
 
@@ -949,3 +948,6 @@ def no_operation(self, onerror = None):
         """Do nothing but send a request to the server."""
         request.NoOperation(display = self.display,
                             onerror = onerror)
+
+# Late import because of circular dependency
+from . import error
diff --git a/Xlib/ext/__init__.py b/Xlib/ext/__init__.py
index 37229ba..f1f49d6 100644
--- a/Xlib/ext/__init__.py
+++ b/Xlib/ext/__init__.py
@@ -23,6 +23,9 @@
 # extname is the name of the extension according to the X
 # protocol.  extmod is the name of the module in this package.
 
+from . import (composite, damage, dpms, ge, nvcontrol, randr, record, res, screensaver, security, shape, xfixes,
+               xinerama, xinput, xtest)
+
 __extensions__ = [
     # We load this first so other extensions can register generic event data
     # structures.
@@ -43,4 +46,6 @@
     ('MIT-SCREEN-SAVER', 'screensaver'),
     ]
 
-__all__ = map(lambda x: x[1], __extensions__)
+
+__all__ = ['ge', 'xtest', 'shape', 'xinerama', 'record', 'composite', 'randr',
+           'xfixes', 'security', 'xinput', 'nvcontrol', 'damage', 'dpms', 'res', 'screensaver']
diff --git a/Xlib/keysymdef/__init__.py b/Xlib/keysymdef/__init__.py
index 4ff1441..ef5e1ee 100644
--- a/Xlib/keysymdef/__init__.py
+++ b/Xlib/keysymdef/__init__.py
@@ -19,6 +19,9 @@
 #    Suite 330,
 #    Boston, MA 02111-1307 USA
 
+from . import (apl, arabic, cyrillic, greek, hebrew, katakana, korean, latin1, latin2, latin3, latin4,  miscellany,
+               publishing, special, technical, thai, xf86, xk3270, xkb)
+
 __all__ = [
     'apl',
     'arabic',
diff --git a/Xlib/protocol/__init__.py b/Xlib/protocol/__init__.py
index 4e2840a..342446c 100644
--- a/Xlib/protocol/__init__.py
+++ b/Xlib/protocol/__init__.py
@@ -19,6 +19,8 @@
 #    Suite 330,
 #    Boston, MA 02111-1307 USA
 
+from . import display, event, request, rq, structs
+
 __all__ = [
     'display',
     'event',
diff --git a/Xlib/support/__init__.py b/Xlib/support/__init__.py
index 4c0d622..74174cf 100644
--- a/Xlib/support/__init__.py
+++ b/Xlib/support/__init__.py
@@ -19,6 +19,8 @@
 #    Suite 330,
 #    Boston, MA 02111-1307 USA
 
+from . import connect, lock
+
 __all__ = [
     'lock',
     'connect'
diff --git a/Xlib/xobject/__init__.py b/Xlib/xobject/__init__.py
index 67d3254..570365e 100644
--- a/Xlib/xobject/__init__.py
+++ b/Xlib/xobject/__init__.py
@@ -19,6 +19,8 @@
 #    Suite 330,
 #    Boston, MA 02111-1307 USA
 
+from . import colormap, cursor, drawable, fontable, icccm, resource
+
 __all__ = [
     'colormap',
     'cursor',