Index: setup.py
--- setup.py.orig
+++ setup.py
@@ -1151,6 +1151,8 @@ class PyBuildExt(build_ext):
                                                      'termcap'):
                 readline_libs.append('termcap')
             self.add(Extension('readline', ['readline.c'],
+			       extra_compile_args=['-nostdinc'],
+			       include_dirs=['/usr/include'],
                                library_dirs=['/usr/lib/termcap'],
                                extra_link_args=readline_extra_link_args,
                                libraries=readline_libs))
@@ -1870,7 +1872,7 @@ class PyBuildExt(build_ext):
         uuid_h = sysconfig.get_config_var("HAVE_UUID_H")
         uuid_uuid_h = sysconfig.get_config_var("HAVE_UUID_UUID_H")
         if uuid_h or uuid_uuid_h:
-            if sysconfig.get_config_var("HAVE_LIBUUID"):
+            if sysconfig.get_config_var("HAVE_LIBUUID") and not HOST_PLATFORM.startswith('openbsd'):
                 uuid_libs = ["uuid"]
             else:
                 uuid_libs = []
@@ -2116,8 +2118,7 @@ class PyBuildExt(build_ext):
         # The versions with dots are used on Unix, and the versions without
         # dots on Windows, for detection by cygwin.
         tcllib = tklib = tcl_includes = tk_includes = None
-        for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83',
-                        '8.2', '82', '8.1', '81', '8.0', '80']:
+        for version in ['85']:
             tklib = self.compiler.find_library_file(self.lib_dirs,
                                                         'tk' + version)
             tcllib = self.compiler.find_library_file(self.lib_dirs,