Remove support for __members__ and __methods__.  There still might be
some cleanup to do on this.  Particularly in Python/traceback.c with
getting rid of the getattr if possible and Demo/*metaclasses/Enum.py.
diff --git a/PC/_winreg.c b/PC/_winreg.c
index c294653..135be32 100644
--- a/PC/_winreg.c
+++ b/PC/_winreg.c
@@ -473,8 +473,8 @@
 
 #define OFF(e) offsetof(PyHKEYObject, e)
 
-static struct memberlist PyHKEY_memberlist[] = {
-	{"handle",      T_INT,      OFF(hkey)},
+static PyMemberDef PyHKEY_memberlist[] = {
+	{"handle",      T_INT,      OFF(hkey), READONLY},
 	{NULL}    /* Sentinel */
 };
 
@@ -523,7 +523,10 @@
 	PyErr_Clear();
 	if (strcmp(name, "handle") == 0)
 		return PyLong_FromVoidPtr(((PyHKEYObject *)self)->hkey);
-	return PyMember_Get((char *)self, PyHKEY_memberlist, name);
+	PyErr_Format(PyExc_AttributeError,
+                     "'%.50s' object has no attribute '%.400s'",
+                     Py_Type(self)->tp_name, name);
+	return NULL;
 }
 
 /************************************************************************
diff --git a/PC/os2emx/python25.def b/PC/os2emx/python25.def
index ef6bd13..6aa2e62 100644
--- a/PC/os2emx/python25.def
+++ b/PC/os2emx/python25.def
@@ -1091,10 +1091,8 @@
   "_Py_QnewFlag"
 
 ; From python25_s.lib(structmember)
-  "PyMember_Get"
   "PyMember_GetOne"
   "PyMember_SetOne"
-  "PyMember_Set"
 
 ; From python25_s.lib(symtable)
   "PySymtable_Build"
diff --git a/PC/os2vacpp/python.def b/PC/os2vacpp/python.def
index b336445..55a17d7 100644
--- a/PC/os2vacpp/python.def
+++ b/PC/os2vacpp/python.def
@@ -244,8 +244,6 @@
                PyMem_Free
                PyMem_Malloc
                PyMem_Realloc
-               PyMember_Get
-               PyMember_Set
                PyMethod_Class
                PyMethod_Fini
                PyMethod_Function