diff --git a/PC/os2vacpp/python.def b/PC/os2vacpp/python.def
index bf443b69020..b671d837597 100644
--- a/PC/os2vacpp/python.def
+++ b/PC/os2vacpp/python.def
@@ -4,372 +4,369 @@ PROTMODE
 DATA           MULTIPLE NONSHARED
 
 EXPORTS
-               _Py_ZeroStruct
-            	_Py_NoneStruct
-            	_Py_TrueStruct
-            	Py_DebugFlag
-            	Py_NoSiteFlag
-            	Py_UseClassExceptionsFlag
-            	_PyParser_Grammar
-            	_PyThread_Started
-            	_PyParser_TokenNames
-            	Py_VerboseFlag
-            	PyExc_Exception
-            	PyExc_StandardError
-            	PyExc_ArithmeticError
-            	PyExc_LookupError
-            	PyExc_AttributeError
-            	PyExc_EOFError
-            	PyExc_FloatingPointError
-            	PyExc_IOError
-            	PyExc_ImportError
-            	PyExc_IndexError
-            	PyExc_KeyError
-            	PyExc_MemoryError
-            	PyExc_NameError
-            	PyExc_OverflowError
-            	PyExc_RuntimeError
-            	PyExc_SyntaxError
-            	PyExc_SystemError
-            	PyExc_TypeError
-            	PyExc_ValueError
-            	PyExc_ZeroDivisionError
-            	PyExc_KeyboardInterrupt
-            	PyExc_SystemExit
-            	PyFloat_Type
-            	PyInt_Type
-            	PyLong_Type
-            	PyString_Type
-            	PyType_Type
-            	PyList_Type
-            	PyDict_Type
-            	PyTuple_Type
-            	PyFile_Type
-            	PyClass_Type
-            	PyFunction_Type
-            	PyMethod_Type
-            	PyInstance_Type
-            	PyCFunction_Type
-            	PyModule_Type
-            	PyCode_Type
-            	PyFrame_Type
-            	PyRange_Type
-            	PyComplex_Type
-            	_Py_EllipsisObject
-            	PySlice_Type
-            	Py_InteractiveFlag
-            	PyCObject_Type
-            	PyOS_InputHook
-            	PyOS_ReadlineFunctionPointer
+                ; Data
+                PyCFunction_Type
+                PyCObject_Type
+                PyClass_Type
+                PyCode_Type
+                PyComplex_Type
+                PyDict_Type
+                PyExc_ArithmeticError
+                PyExc_AttributeError
+                PyExc_EOFError
+                PyExc_Exception
+                PyExc_FloatingPointError
+                PyExc_IOError
+                PyExc_ImportError
+                PyExc_IndexError
+                PyExc_KeyError
+                PyExc_KeyboardInterrupt
+                PyExc_LookupError
+                PyExc_MemoryError
+                PyExc_NameError
+                PyExc_OverflowError
+                PyExc_RuntimeError
+                PyExc_StandardError
+                PyExc_SyntaxError
+                PyExc_SystemError
+                PyExc_SystemExit
+                PyExc_TypeError
+                PyExc_ValueError
+                PyExc_ZeroDivisionError
+                PyFile_Type
+                PyFloat_Type
+                PyFrame_Type
+                PyFunction_Type
+                PyInstance_Type
+                PyInt_Type
+                PyList_Type
+                PyLong_Type
+                PyMethod_Type
+                PyModule_Type
+                PyOS_InputHook
+                PyOS_ReadlineFunctionPointer
+                PyRange_Type
+                PySlice_Type
+                PyString_Type
+                PyTuple_Type
+                PyType_Type
+                Py_DebugFlag
+                Py_InteractiveFlag
+                Py_NoSiteFlag
+                Py_UseClassExceptionsFlag
+                Py_VerboseFlag
+                _PyParser_Grammar
+                _PyParser_TokenNames
+                _PyThread_Started
+                _Py_EllipsisObject
+                _Py_NoneStruct
+                _Py_TrueStruct
+                _Py_ZeroStruct
 
-            	_PyObject_New
-            	_PyObject_NewVar
-            	PyObject_Compare
-            	PyObject_GetAttrString
-            	PyObject_GetAttr
-            	PyObject_HasAttrString
-            	PyObject_Hash
-            	PyObject_Print
-            	PyObject_Repr
-            	PyObject_Str
-            	PyObject_SetAttrString
-            	PyObject_SetAttr
-            	PyObject_IsTrue
-            	PyFloat_AsString
-            	PyFloat_AsDouble
-            	PyFloat_FromDouble
-            	PyInt_AsLong
-            	PyInt_GetMax
-            	PyInt_FromLong
-            	PyLong_AsDouble
-            	PyLong_FromDouble
-            	PyLong_AsLong
-            	PyLong_AsUnsignedLong
-            	PyLong_FromString
-            	PyLong_FromLong
-            	PyLong_FromUnsignedLong
-            	PyString_Format
-            	PyString_Size
-            	PyString_AsString
-            	PyString_Concat
-            	PyString_ConcatAndDel
-            	PyString_FromStringAndSize
-            	PyString_FromString
-            	_PyString_Resize
-
-            	PyList_Append
-            	PyList_GetItem
-            	PyList_Size
-            	PyList_GetSlice
-            	PyList_Insert
-            	PyList_New
-            	PyList_SetItem
-            	PyList_SetSlice
-            	PyList_Sort
-            	PyList_Reverse
-            	PyList_AsTuple
-            	PyDict_SetItemString
-            	PyDict_GetItemString
-            	PyDict_DelItemString
-            	PyDict_Items
-            	PyDict_Keys
-            	PyDict_Values
-            	PyDict_Size
-            	PyDict_Clear
-            	PyDict_Next
-            	PyDict_SetItem
-            	PyDict_GetItem
-            	PyDict_DelItem
-            	PyDict_New
-            	PyTuple_GetItem
-            	PyTuple_Size
-            	PyTuple_GetSlice
-            	PyTuple_New
-            	PyTuple_SetItem
-            	PyFile_GetLine
-            	PyFile_AsFile
-            	PyFile_Name
-            	PyFile_SetBufSize
-            	PyFile_FromString
-            	PyFile_FromFile
-            	PyFile_SoftSpace
-            	PyFile_WriteObject
-            	PyFile_WriteString
-            	PyMethod_Class
-            	PyMethod_Function
-            	PyMethod_Self
-            	PyClass_IsSubclass
-            	PyClass_New
-            	PyMethod_New
-            	PyInstance_New
-            	PyInstance_DoBinOp
-            	PyFrame_New
-            	PyFrame_BlockPop
-            	PyFrame_BlockSetup
-            	PyFrame_FastToLocals
-            	PyFrame_LocalsToFast
-            	PyFunction_GetCode
-            	PyFunction_GetGlobals
-            	PyOS_strtol
-            	PyOS_strtoul
-            	PyFunction_New
-            	PyRange_New
-            	Py_FindMethod
-            	Py_FindMethodInChain
-            	PyCFunction_GetFunction
-            	PyCFunction_GetSelf
-            	PyCFunction_New
-            	PyModule_GetDict
-            	PyModule_GetName
-            	PyModule_New
-            	PyGrammar_AddAccelerators
-            	PyGrammar_FindDFA
-            	PyGrammar_LabelRepr
-            	PyNode_AddChild
-            	PyNode_Free
-            	PyNode_New
-            	PyParser_AddToken
-            	PyParser_Delete
-            	PyParser_New
-            	PyParser_ParseFile
-            	PyParser_ParseString
-            	PyToken_OneChar
-            	PyToken_TwoChars
-            	PyTokenizer_Free
-            	PyTokenizer_Get
-            	PyTokenizer_FromFile
-            	PyTokenizer_FromString
-            	PyNode_Compile
-            	PyCode_New
-            	PyEval_CallObject
-            	PyEval_CallObjectWithKeywords
-            	PyEval_EvalCode
-            	Py_FlushLine
-            	PyEval_GetBuiltins
-            	PyEval_GetGlobals
-            	PyEval_GetLocals
-            	PyEval_GetFrame
-            	PyEval_GetRestricted
-            	PyEval_InitThreads
-            	PyEval_AcquireThread
-            	PyEval_ReleaseThread
-            	PyEval_RestoreThread
-            	PyEval_SaveThread
-            	PyEval_AcquireLock
-            	PyEval_ReleaseLock
-            	PyTraceBack_Here
-            	PyTraceBack_Print
-            	PyImport_AddModule
-            	PyImport_Cleanup
-            	PyImport_GetModuleDict
-            	PyImport_GetMagicNumber
-            	PyImport_ImportModule
-            	PyImport_ImportModuleEx
-            	PyImport_Import
-            	PyImport_ImportFrozenModule
-            	PyImport_ReloadModule
-            	PyNumber_Coerce
-            	PyMarshal_Init
-            	Py_InitModule4
-            	PySys_SetArgv
-            	PySys_SetPath
-            	PySys_GetObject
-            	PySys_GetFile
-            	PySys_SetObject
-            	Py_CompileString
-            	Py_FatalError
-            	Py_Exit
-            	Py_Initialize
-            	Py_Finalize
-            	Py_IsInitialized
-            	PyErr_Print
-            	PyParser_SimpleParseFile
-            	PyParser_SimpleParseString
-            	PyRun_AnyFile
-            	PyRun_SimpleFile
-            	PyRun_SimpleString
-            	PyRun_File
-            	PyRun_String
-            	PyRun_InteractiveOne
-            	PyRun_InteractiveLoop
-            	PyMember_Get
-            	PyMember_Set
-            	Py_BuildValue
-            	Py_VaBuildValue
-            	PyArg_Parse
-            	PyArg_VaParse
-            	PyArg_ParseTuple
-            	PyArg_ParseTupleAndKeywords
-            	PyErr_BadArgument
-            	PyErr_BadInternalCall
-            	PyErr_Format
-            	PyErr_NoMemory
-            	PyErr_SetFromErrno
-            	PyErr_SetNone
-            	PyErr_SetString
-            	PyErr_SetObject
-            	PyErr_Occurred
-            	PyErr_Fetch
-            	PyErr_Restore
-            	PyErr_Clear
-            	PyErr_NewException
-            	PyOS_InitInterrupts
-            	PyOS_InterruptOccurred
-            	PyOS_GetLastModificationTime
-            	PyOS_Readline
-            	PyErr_CheckSignals
-            	PyErr_SetInterrupt
-            	PyCallable_Check
-            	Py_Main
-            	Py_GetCopyright
-            	Py_GetVersion
-
-            	PyObject_CallObject
-            	PyObject_CallFunction
-            	PyObject_CallMethod
-            	PyObject_Type
-            	PyObject_Length
-            	PyObject_GetItem
-            	PyObject_SetItem
-            	PyNumber_Check
-            	PyNumber_Add
-            	PyNumber_Subtract
-            	PyNumber_Multiply
-            	PyNumber_Divide
-            	PyNumber_Remainder
-            	PyNumber_Divmod
-            	PyNumber_Power
-            	PyNumber_Negative
-            	PyNumber_Positive
-            	PyNumber_Absolute
-            	PyNumber_Invert
-            	PyNumber_Lshift
-            	PyNumber_Rshift
-            	PyNumber_And
-            	PyNumber_Xor
-            	PyNumber_Or
-            	PyNumber_Int
-            	PyNumber_Long
-            	PyNumber_Float
-            	PySequence_Check
-            	PySequence_Concat
-            	PySequence_Repeat
-            	PySequence_GetItem
-            	PySequence_GetSlice
-            	PySequence_SetItem
-            	PySequence_SetSlice
-            	PySequence_Tuple
-            	PySequence_Count
-            	PySequence_In
-            	PySequence_Index
-            	PySequence_Length
-            	PyMapping_Check
-            	PyMapping_Length
-            	PyMapping_HasKeyString
-            	PyMapping_HasKey
-            	PyMapping_SetItemString
-            	PyMapping_GetItemString
-            	PyComplex_FromCComplex
-            	PyComplex_FromDoubles
-            	PyComplex_RealAsDouble
-            	PyComplex_ImagAsDouble
-            	PyComplex_AsCComplex
-            	Py_AtExit
-            	Py_GetPath
-            	Py_GetExecPrefix
-            	Py_GetPrefix
-            	Py_GetProgramFullPath
-            	Py_GetProgramName
-            	Py_SetProgramName
-            	PySlice_New
-            	PySlice_GetIndices
-            	PyMarshal_WriteLongToFile
-            	PyMarshal_WriteObjectToFile
-            	PyMarshal_ReadLongFromFile
-            	PyMarshal_ReadObjectFromFile
-            	PyMarshal_ReadObjectFromString
-            	_Py_c_pow
-            	_Py_c_quot
-            	_Py_c_neg
-            	_Py_c_sum
-            	_Py_c_prod
-            	_Py_c_diff
-            	PyCObject_FromVoidPtr
-            	PyCObject_AsVoidPtr
-            	PyCObject_Import
-            	Py_GetBuildInfo
-            	Py_FdIsInteractive
-             	PyThread_start_new_thread
-             	PyThread_init_thread
-             	PyThread_get_thread_ident
-             	PyThread_exit_thread
-            	PyThread_allocate_lock
-            	PyThread_free_lock
-            	PyThread_acquire_lock
-            	PyThread_release_lock
-            	PyThread_allocate_sema
-            	PyThread_free_sema
-            	PyThread_down_sema
-            	PyThread_up_sema
-            	Py_NewInterpreter
-            	Py_EndInterpreter
-            	Py_Malloc
-            	Py_Realloc
-            	Py_Free
-            	PyMem_Malloc
-            	PyMem_Realloc
-            	PyMem_Free
-            	PyThreadState_New
-            	PyThreadState_Get
-            	PyThreadState_Swap
-            	PyThreadState_Clear
-            	PyThreadState_Delete
-            	PyInterpreterState_New
-            	PyInterpreterState_Clear
-            	PyInterpreterState_Delete
-
-               ; Freezing Modules
-               PyImport_FrozenModules
-               Py_FrozenMain
-               initimp
-               
+                ; Code
+                PyArg_Parse
+                PyArg_ParseTuple
+                PyArg_ParseTupleAndKeywords
+                PyArg_VaParse
+                PyCFunction_GetFunction
+                PyCFunction_GetSelf
+                PyCFunction_New
+                PyCObject_AsVoidPtr
+                PyCObject_FromVoidPtr
+                PyCObject_Import
+                PyCallable_Check
+                PyClass_IsSubclass
+                PyClass_New
+                PyCode_New
+                PyComplex_AsCComplex
+                PyComplex_FromCComplex
+                PyComplex_FromDoubles
+                PyComplex_ImagAsDouble
+                PyComplex_RealAsDouble
+                PyDict_Clear
+                PyDict_DelItem
+                PyDict_DelItemString
+                PyDict_GetItem
+                PyDict_GetItemString
+                PyDict_Items
+                PyDict_Keys
+                PyDict_New
+                PyDict_Next
+                PyDict_SetItem
+                PyDict_SetItemString
+                PyDict_Size
+                PyDict_Values
+                PyErr_BadArgument
+                PyErr_BadInternalCall
+                PyErr_CheckSignals
+                PyErr_Clear
+                PyErr_Fetch
+                PyErr_Format
+                PyErr_NewException
+                PyErr_NoMemory
+                PyErr_Occurred
+                PyErr_Print
+                PyErr_Restore
+                PyErr_SetFromErrno
+                PyErr_SetInterrupt
+                PyErr_SetNone
+                PyErr_SetObject
+                PyErr_SetString
+                PyEval_AcquireLock
+                PyEval_AcquireThread
+                PyEval_CallObject
+                PyEval_CallObjectWithKeywords
+                PyEval_EvalCode
+                PyEval_GetBuiltins
+                PyEval_GetFrame
+                PyEval_GetGlobals
+                PyEval_GetLocals
+                PyEval_GetRestricted
+                PyEval_InitThreads
+                PyEval_ReleaseLock
+                PyEval_ReleaseThread
+                PyEval_RestoreThread
+                PyEval_SaveThread
+                PyFile_AsFile
+                PyFile_FromFile
+                PyFile_FromString
+                PyFile_GetLine
+                PyFile_Name
+                PyFile_SetBufSize
+                PyFile_SoftSpace
+                PyFile_WriteObject
+                PyFile_WriteString
+                PyFloat_AsDouble
+                PyFloat_AsString
+                PyFloat_FromDouble
+                PyFrame_BlockPop
+                PyFrame_BlockSetup
+                PyFrame_FastToLocals
+                PyFrame_LocalsToFast
+                PyFrame_New
+                PyFunction_GetCode
+                PyFunction_GetGlobals
+                PyFunction_New
+                PyGrammar_AddAccelerators
+                PyGrammar_FindDFA
+                PyGrammar_LabelRepr
+                PyImport_AddModule
+                PyImport_Cleanup
+                PyImport_FrozenModules
+                PyImport_GetMagicNumber
+                PyImport_GetModuleDict
+                PyImport_Import
+                PyImport_ImportFrozenModule
+                PyImport_ImportModule
+                PyImport_ImportModuleEx
+                PyImport_ReloadModule
+                PyInstance_DoBinOp
+                PyInstance_New
+                PyInt_AsLong
+                PyInt_FromLong
+                PyInt_GetMax
+                PyInterpreterState_Clear
+                PyInterpreterState_Delete
+                PyInterpreterState_New
+                PyList_Append
+                PyList_AsTuple
+                PyList_GetItem
+                PyList_GetSlice
+                PyList_Insert
+                PyList_New
+                PyList_Reverse
+                PyList_SetItem
+                PyList_SetSlice
+                PyList_Size
+                PyList_Sort
+                PyLong_AsDouble
+                PyLong_AsLong
+                PyLong_AsUnsignedLong
+                PyLong_FromDouble
+                PyLong_FromLong
+                PyLong_FromString
+                PyLong_FromUnsignedLong
+                PyMapping_Check
+                PyMapping_GetItemString
+                PyMapping_HasKey
+                PyMapping_HasKeyString
+                PyMapping_Length
+                PyMapping_SetItemString
+                PyMarshal_Init
+                PyMarshal_ReadLongFromFile
+                PyMarshal_ReadObjectFromFile
+                PyMarshal_ReadObjectFromString
+                PyMarshal_WriteLongToFile
+                PyMarshal_WriteObjectToFile
+                PyMem_Free
+                PyMem_Malloc
+                PyMem_Realloc
+                PyMember_Get
+                PyMember_Set
+                PyMethod_Class
+                PyMethod_Function
+                PyMethod_New
+                PyMethod_Self
+                PyModule_GetDict
+                PyModule_GetName
+                PyModule_New
+                PyNode_AddChild
+                PyNode_Compile
+                PyNode_Free
+                PyNode_New
+                PyNumber_Absolute
+                PyNumber_Add
+                PyNumber_And
+                PyNumber_Check
+                PyNumber_Coerce
+                PyNumber_Divide
+                PyNumber_Divmod
+                PyNumber_Float
+                PyNumber_Int
+                PyNumber_Invert
+                PyNumber_Long
+                PyNumber_Lshift
+                PyNumber_Multiply
+                PyNumber_Negative
+                PyNumber_Or
+                PyNumber_Positive
+                PyNumber_Power
+                PyNumber_Remainder
+                PyNumber_Rshift
+                PyNumber_Subtract
+                PyNumber_Xor
+                PyOS_GetLastModificationTime
+                PyOS_InitInterrupts
+                PyOS_InterruptOccurred
+                PyOS_Readline
+                PyOS_strtol
+                PyOS_strtoul
+                PyObject_CallFunction
+                PyObject_CallMethod
+                PyObject_CallObject
+                PyObject_Compare
+                PyObject_GetAttr
+                PyObject_GetAttrString
+                PyObject_GetItem
+                PyObject_HasAttrString
+                PyObject_Hash
+                PyObject_IsTrue
+                PyObject_Length
+                PyObject_Print
+                PyObject_Repr
+                PyObject_SetAttr
+                PyObject_SetAttrString
+                PyObject_SetItem
+                PyObject_Str
+                PyObject_Type
+                PyParser_AddToken
+                PyParser_Delete
+                PyParser_New
+                PyParser_ParseFile
+                PyParser_ParseString
+                PyParser_SimpleParseFile
+                PyParser_SimpleParseString
+                PyRange_New
+                PyRun_AnyFile
+                PyRun_File
+                PyRun_InteractiveLoop
+                PyRun_InteractiveOne
+                PyRun_SimpleFile
+                PyRun_SimpleString
+                PyRun_String
+                PySequence_Check
+                PySequence_Concat
+                PySequence_Count
+                PySequence_GetItem
+                PySequence_GetSlice
+                PySequence_In
+                PySequence_Index
+                PySequence_Length
+                PySequence_Repeat
+                PySequence_SetItem
+                PySequence_SetSlice
+                PySequence_Tuple
+                PySlice_GetIndices
+                PySlice_New
+                PyString_AsString
+                PyString_Concat
+                PyString_ConcatAndDel
+                PyString_Format
+                PyString_FromString
+                PyString_FromStringAndSize
+                PyString_Size
+                PySys_GetFile
+                PySys_GetObject
+                PySys_SetArgv
+                PySys_SetObject
+                PySys_SetPath
+                PyThreadState_Clear
+                PyThreadState_Delete
+                PyThreadState_Get
+                PyThreadState_New
+                PyThreadState_Swap
+                PyThread_acquire_lock
+                PyThread_allocate_lock
+                PyThread_allocate_sema
+                PyThread_down_sema
+                PyThread_exit_thread
+                PyThread_free_lock
+                PyThread_free_sema
+                PyThread_get_thread_ident
+                PyThread_init_thread
+                PyThread_release_lock
+                PyThread_start_new_thread
+                PyThread_up_sema
+                PyToken_OneChar
+                PyToken_TwoChars
+                PyTokenizer_Free
+                PyTokenizer_FromFile
+                PyTokenizer_FromString
+                PyTokenizer_Get
+                PyTraceBack_Here
+                PyTraceBack_Print
+                PyTuple_GetItem
+                PyTuple_GetSlice
+                PyTuple_New
+                PyTuple_SetItem
+                PyTuple_Size
+                Py_AtExit
+                Py_BuildValue
+                Py_CompileString
+                Py_EndInterpreter
+                Py_Exit
+                Py_FatalError
+                Py_FdIsInteractive
+                Py_Finalize
+                Py_FindMethod
+                Py_FindMethodInChain
+                Py_FlushLine
+                Py_Free
+                Py_FrozenMain
+                Py_GetBuildInfo
+                Py_GetCopyright
+                Py_GetExecPrefix
+                Py_GetPath
+                Py_GetPrefix
+                Py_GetProgramFullPath
+                Py_GetProgramName
+                Py_GetVersion
+                Py_InitModule4
+                Py_Initialize
+                Py_IsInitialized
+                Py_Main
+                Py_Malloc
+                Py_NewInterpreter
+                Py_Realloc
+                Py_SetProgramName
+                Py_VaBuildValue
+                _PyObject_New
+                _PyObject_NewVar
+                _PyString_Resize
+                _Py_c_diff
+                _Py_c_neg
+                _Py_c_pow
+                _Py_c_prod
+                _Py_c_quot
+                _Py_c_sum
+                initimp