diff --git a/_pytest/genscript.py b/_pytest/genscript.py
index 927a31e88..f41230b8a 100755
--- a/_pytest/genscript.py
+++ b/_pytest/genscript.py
@@ -99,16 +99,6 @@ def freeze_includes():
     """
     result = list(_iter_all_modules(py))
     result += list(_iter_all_modules(_pytest))
-
-    # builtin files imported by pytest using py.std implicit mechanism;
-    # should be removed if https://bitbucket.org/hpk42/pytest/pull-request/185
-    # gets merged
-    result += [
-        'argparse',
-        'shlex',
-        'warnings',
-        'types',
-    ]
     return result
 
 
diff --git a/doc/en/example/simple.txt b/doc/en/example/simple.txt
index 1f353d2c6..380f6139f 100644
--- a/doc/en/example/simple.txt
+++ b/doc/en/example/simple.txt
@@ -684,7 +684,7 @@ invaluable to obtain more information about a hard to reproduce bug.
 
 Unfortunately ``cx_freeze`` can't discover them
 automatically because of ``pytest``'s use of dynamic module loading, so you
-must declare them explicitly by using ``pytest.cx_freeze_support.includes()``::
+must declare them explicitly by using ``pytest.freeze_includes()``::
 
     # contents of setup.py
     from cx_Freeze import setup, Executable
@@ -695,7 +695,7 @@ must declare them explicitly by using ``pytest.cx_freeze_support.includes()``::
         executables=[Executable("app_main.py")],
         options={"build_exe":
             {
-            'includes': pytest.cx_freeze_support.includes()}
+            'includes': pytest.freeze_includes()}
             },
         # ... other options
     )
@@ -718,5 +718,4 @@ over to ``pytest`` instead. For example::
 This makes it convenient to execute your tests from within your frozen
 application, using standard ``py.test`` command-line options::
 
-    $ ./app_main --pytest --verbose --tb=long --junit-xml=results.xml test-suite/    /bin/sh: 1: ./app_main: not found
-    /bin/sh: 1: ./app_main: not found
+    $ ./app_main --pytest --verbose --tb=long --junit-xml=results.xml test-suite/