diff --git a/Modules/fcntlmodule.c b/Modules/fcntlmodule.c
index e951bc40952..8f7407f52ab 100644
--- a/Modules/fcntlmodule.c
+++ b/Modules/fcntlmodule.c
@@ -279,6 +279,7 @@ all_ins(d)
         if (ins(d, "LOCK_EX", (long)LOCK_EX)) return -1;
         if (ins(d, "LOCK_NB", (long)LOCK_NB)) return -1;
         if (ins(d, "LOCK_UN", (long)LOCK_UN)) return -1;
+	return 0;
 }
 
 void
diff --git a/Modules/python.c b/Modules/python.c
index 8a638c7b78d..83e7b07ecdb 100644
--- a/Modules/python.c
+++ b/Modules/python.c
@@ -2,6 +2,7 @@
 
 extern int Py_Main();
 
+int
 main(argc, argv)
 	int argc;
 	char **argv;
diff --git a/Modules/reopmodule.c b/Modules/reopmodule.c
index f36647e177d..13ef95e2d85 100644
--- a/Modules/reopmodule.c
+++ b/Modules/reopmodule.c
@@ -62,8 +62,6 @@ static PyObject *ReopError;	/* Exception */
 #define BEGINNING_OF_BUFFER	7
 #define END_OF_BUFFER		8
 
-static unsigned char *reop_casefold;
-
 static PyObject *
 makeresult(regs, num_regs)
 	struct re_registers *regs;
diff --git a/Python/frozenmain.c b/Python/frozenmain.c
index d5a398b0759..755033c9ba5 100644
--- a/Python/frozenmain.c
+++ b/Python/frozenmain.c
@@ -77,6 +77,6 @@ Py_FrozenMain(argc, argv)
 	if (inspect && isatty((int)fileno(stdin)))
 		sts = PyRun_AnyFile(stdin, "<stdin>") != 0;
 
-	Py_Exit(sts);
-	/*NOTREACHED*/
+	Py_Finalize();
+	return sts;
 }
diff --git a/Python/import.c b/Python/import.c
index 2368143c637..fe24b2816f3 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -692,7 +692,6 @@ static int
 init_builtin(name)
 	char *name;
 {
-	PyInterpreterState *interp = PyThreadState_Get()->interp;
 	struct _inittab *p;
 	PyObject *mod;