diff --git a/_pytest/main.py b/_pytest/main.py
index 3d7b456d2..da4ae8e41 100644
--- a/_pytest/main.py
+++ b/_pytest/main.py
@@ -77,11 +77,6 @@ def pytest_addoption(parser):
                help="base temporary directory for this test run.")
 
 
-def pytest_namespace():
-    collect = dict(Item=Item, Collector=Collector, File=File, Session=Session)
-    return dict(collect=collect)
-
-
 def pytest_configure(config):
     pytest.config = config # compatibility
 
diff --git a/pytest.py b/pytest.py
index bac816b11..a072b49ae 100644
--- a/pytest.py
+++ b/pytest.py
@@ -23,6 +23,14 @@ __all__ = [
     'exit',
     'mark',
 
+    '_fillfuncargs',
+
+    'Item',
+    'File',
+    'Collector',
+    'Session',
+
+
 ]
 
 if __name__ == '__main__': # if run as a script or by 'python -m pytest'
@@ -45,7 +53,10 @@ from _pytest.recwarn import warns, deprecated_call
 from _pytest.runner import fail, skip, importorskip, exit
 from _pytest.mark import MARK_GEN as mark
 from _pytest.skipping import xfail
+from _pytest.main import Item, Collector, File, Session
 from _pytest.fixtures import fillfixtures as _fillfuncargs
+
+
 set_trace = __pytestPDB.set_trace