diff --git a/eventlet/api.py b/eventlet/api.py
index d511a5f..1779f42 100644
--- a/eventlet/api.py
+++ b/eventlet/api.py
@@ -17,6 +17,9 @@ __all__ = [
     'ssl_listener', 'tcp_listener', 'trampoline',
     'unspew', 'use_hub', 'with_timeout', 'timeout']
 
+warnings.warn("eventlet.api is deprecated!  Nearly everything in it has moved "
+    "to the eventlet module.", DeprecationWarning, stacklevel=2)
+
 def get_hub(*a, **kw):
     warnings.warn("eventlet.api.get_hub has moved to eventlet.hubs.get_hub",
         DeprecationWarning, stacklevel=2)
diff --git a/eventlet/corolocal.py b/eventlet/corolocal.py
index 1ed1193..990069f 100644
--- a/eventlet/corolocal.py
+++ b/eventlet/corolocal.py
@@ -1,8 +1,8 @@
-from eventlet import api
+from eventlet import greenthread
 
 def get_ident():
     """ Returns ``id()`` of current greenlet.  Useful for debugging."""
-    return id(api.getcurrent())
+    return id(greenthread.getcurrent())
 
 # TODO: The base threadlocal class wants to call __init__ on itself for every new thread that associates with it; our corolocal doesn't do this, but should for 100% compatibility.  The implementation in _threading_local.py is so janky....
 class local(object):
diff --git a/eventlet/green/select.py b/eventlet/green/select.py
index 29e2bdd..6bd7e41 100644
--- a/eventlet/green/select.py
+++ b/eventlet/green/select.py
@@ -1,8 +1,6 @@
-
-
 __select = __import__('select')
 error = __select.error
-from eventlet.api import getcurrent
+from eventlet.greenthread import getcurrent
 from eventlet.hubs import get_hub
 
 __patched__ = ['select']
diff --git a/eventlet/green/time.py b/eventlet/green/time.py
index 35c110c..86d1dff 100644
--- a/eventlet/green/time.py
+++ b/eventlet/green/time.py
@@ -2,4 +2,4 @@ __time = __import__('time')
 for var in dir(__time):
     exec "%s = __time.%s" % (var, var)
 __patched__ = ['sleep']
-from eventlet.api import sleep
+from eventlet.greenthread import sleep
diff --git a/eventlet/pools.py b/eventlet/pools.py
index 0889fde..d79f7f3 100644
--- a/eventlet/pools.py
+++ b/eventlet/pools.py
@@ -1,6 +1,5 @@
 import collections
 
-from eventlet import api
 from eventlet import queue
 
 __all__ = ['Pool', 'TokenPool']