diff --git a/Python/getmtime.c b/Python/getmtime.c
index a54d3b4..793c663 100644
--- a/Python/getmtime.c
+++ b/Python/getmtime.c
@@ -37,10 +37,9 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "rename2.h"
 
 long
-getmtime(path)
+PyOS_GetLastModificationTime(path)
 	char *path;
 {
 	struct stat st;
diff --git a/Python/graminit.c b/Python/graminit.c
index 7b31a31..ca08e00 100644
--- a/Python/graminit.c
+++ b/Python/graminit.c
@@ -1445,7 +1445,7 @@
 	{1, "class"},
 	{312, 0},
 };
-grammar gram = {
+grammar _PyParser_Grammar = {
 	57,
 	dfas,
 	{124, labels},
diff --git a/Python/mystrtoul.c b/Python/mystrtoul.c
index ed0e526..6f8e9bd 100644
--- a/Python/mystrtoul.c
+++ b/Python/mystrtoul.c
@@ -39,8 +39,6 @@
 #define Py_CHARMASK(c)		((c) & 0xff)
 #endif
 
-#include "rename2.h"
-
 /* strtol and strtoul, renamed to avoid conflicts */
 
 /*
@@ -61,7 +59,7 @@
 #include <errno.h>
 
 unsigned long
-mystrtoul(str, ptr, base)
+PyOS_strtoul(str, ptr, base)
 register char *	str;
 char **		ptr;
 int		base;
@@ -148,7 +146,7 @@
 }
 
 long
-mystrtol(str, ptr, base)
+PyOS_strtol(str, ptr, base)
 char *	str;
 char ** ptr;
 int	base;
@@ -163,7 +161,7 @@
 	if (sign == '+' || sign == '-')
 		str++;
 	
-	result = (long) mystrtoul(str, ptr, base);
+	result = (long) PyOS_strtoul(str, ptr, base);
 	
 	/* Signal overflow if the result appears negative,
 	   except for the largest negative integer */