diff --git a/dtool/src/interrogate/interfaceMakerPythonNative.cxx b/dtool/src/interrogate/interfaceMakerPythonNative.cxx
index bf9b13431b..95d646ec18 100755
--- a/dtool/src/interrogate/interfaceMakerPythonNative.cxx
+++ b/dtool/src/interrogate/interfaceMakerPythonNative.cxx
@@ -1228,7 +1228,7 @@ void InterfaceMakerPythonNative::write_module_class(ostream &out,  Object *obj)
                 out << "//  A LocalHash(GetKey) Function for this type";
                 out << "//     " <<ClassName << "\n";
                 out << "//////////////////\n";
-                out << "extern \"C\" static long  DTool_HashKey_"<<ClassName << "(PyObject * self)\n";
+                out << "static long  DTool_HashKey_"<<ClassName << "(PyObject * self)\n";
                 out << "{\n";
                 out << "    "<<cClassName  << " * local_this = NULL;\n";
                 out << "    DTOOL_Call_ExtractThisPointerForType(self,&Dtool_"<<  ClassName<<",(void **)&local_this);\n";
@@ -1248,7 +1248,7 @@ void InterfaceMakerPythonNative::write_module_class(ostream &out,  Object *obj)
                     out << "//  A LocalHash(This Pointer) Function for this type";
                     out << "//     " <<ClassName << "\n";
                     out << "//////////////////\n";
-                    out << "extern \"C\" static long  DTool_HashKey_"<<ClassName << "(PyObject * self)\n";
+                    out << "static long  DTool_HashKey_"<<ClassName << "(PyObject * self)\n";
                     out << "{\n";
                     out << "    "<<cClassName  << " * local_this = NULL;\n";
                     out << "    DTOOL_Call_ExtractThisPointerForType(self,&Dtool_"<<  ClassName<<",(void **)&local_this);\n";
@@ -1268,7 +1268,7 @@ void InterfaceMakerPythonNative::write_module_class(ostream &out,  Object *obj)
                 out << "//  A __repr__ Function\n";
                 out << "//     " <<ClassName << "\n";
                 out << "//////////////////\n";
-                out << "extern \"C\" static PyObject *  Dtool_Repr_"<<ClassName << "(PyObject * self)\n";
+                out << "static PyObject *  Dtool_Repr_"<<ClassName << "(PyObject * self)\n";
                 out << "{\n";
                 out << "    "<<cClassName  << " * local_this = NULL;\n";
                 out << "    DTOOL_Call_ExtractThisPointerForType(self,&Dtool_"<<  ClassName<<",(void **)&local_this);\n";
@@ -1289,7 +1289,7 @@ void InterfaceMakerPythonNative::write_module_class(ostream &out,  Object *obj)
                 out << "//  A __str__ Function\n";
                 out << "//     " <<ClassName << "\n";
                 out << "//////////////////\n";
-                out << "extern \"C\" static PyObject *  Dtool_Str_"<<ClassName << "(PyObject * self)\n";
+                out << "static PyObject *  Dtool_Str_"<<ClassName << "(PyObject * self)\n";
                 out << "{\n";
                 out << "    "<<cClassName  << " * local_this = NULL;\n";
                 out << "    DTOOL_Call_ExtractThisPointerForType(self,&Dtool_"<<  ClassName<<",(void **)&local_this);\n";
diff --git a/dtool/src/interrogatedb/py_panda.h b/dtool/src/interrogatedb/py_panda.h
index 7d2bdb11c8..5650a5d64f 100755
--- a/dtool/src/interrogatedb/py_panda.h
+++ b/dtool/src/interrogatedb/py_panda.h
@@ -446,6 +446,8 @@ DTOOL_C_LINKAGE void  * Dtool_DowncastInterface_##CLASS_NAME(void *self,Dtool_Py
 DTOOL_C_LINKAGE void    Dtool_FreeInstance_##CLASS_NAME(PyObject *self);\
 DTOOL_C_LINKAGEvoid    Dtool_PyModuleClassInit_##CLASS_NAME(PyObject *module);\
 */
+//extern void        Dtool_FreeInstance_##CLASS_NAME(PyObject *self);\
+
 
 ///////////////////////////////////////////////////////////////////////////////
 #define Define_Module_Class_Internal(MODULE_NAME,CLASS_NAME,CNAME)\
@@ -455,8 +457,7 @@ extern int         Dtool_Init_##CLASS_NAME(PyObject *self, PyObject *args, PyObj
 extern PyObject *  Dtool_new_##CLASS_NAME(PyTypeObject *type, PyObject *args, PyObject *kwds);\
 extern void  *     Dtool_UpcastInterface_##CLASS_NAME(PyObject *self, Dtool_PyTypedObject *requested_type);\
 extern void  *     Dtool_DowncastInterface_##CLASS_NAME(void *self, Dtool_PyTypedObject *requested_type);\
-extern void        Dtool_FreeInstance_##CLASS_NAME(PyObject *self);\
-extern void        Dtool_PyModuleClassInit_##CLASS_NAME(PyObject *module);\
+extern void        Dtool_PyModuleClassInit_##CLASS_NAME(PyObject *module);
 
 ///////////////////////////////////////////////////////////////////////////////
 #define Define_Module_Class(MODULE_NAME,CLASS_NAME,CNAME,PUBLIC_NAME)\