--- ../dictobject.c	2007-10-02 16:06:08.000000000 +0200
+++ ./dictobject.c	2007-10-05 09:19:33.000000000 +0200
@@ -168,7 +168,7 @@
    There are two ways to create a dict:  PyDict_New() is the main C API
    function, and the tp_new slot maps to dict_new().  In the latter case we
    can save a little time over what PyDict_New does because it's guaranteed
-   that the PyDictObject struct is already zeroed out.
+   that the dictobject struct is already zeroed out.
    Everyone except dict_new() should use EMPTY_TO_MINSIZE (unless they have
    an excellent reason not to).
 */
@@ -186,7 +186,7 @@
 
 /* Dictionary reuse scheme to save calls to malloc, free, and memset */
 #define MAXFREEDICTS 80
-static PyDictObject *free_dicts[MAXFREEDICTS];
+static dictobject *free_dicts[MAXFREEDICTS];
 static int num_free_dicts = 0;
 
 PyObject *
@@ -397,7 +397,7 @@
 {
 	PyObject *old_value;
 	register dictentry *ep;
-	typedef PyDictEntry *(*lookupfunc)(PyDictObject *, PyObject *, long);
+	typedef dictentry *(*lookupfunc)(dictobject *, PyObject *, long);
 
 	assert(mp->ma_lookup != NULL);
 	ep = mp->ma_lookup(mp, key, hash);
@@ -1338,7 +1338,7 @@
 int
 PyDict_Merge(PyObject *a, PyObject *b, int override)
 {
-	register PyDictObject *mp, *other;
+	register dictobject *mp, *other;
 	register Py_ssize_t i;
 	dictentry *entry;
 
@@ -2066,7 +2066,7 @@
 	assert(type != NULL && type->tp_alloc != NULL);
 	self = type->tp_alloc(type, 0);
 	if (self != NULL) {
-		PyDictObject *d = (PyDictObject *)self;
+		dictobject *d = (dictobject *)self;
 		/* It's guaranteed that tp->alloc zeroed out the struct. */
 		assert(d->ma_table == NULL && d->ma_fill == 0 && d->ma_used == 0);
 		INIT_NONZERO_DICT_SLOTS(d);