diff --git a/Mac/Build/PythonCore.exp b/Mac/Build/PythonCore.exp
index 26ebcae959f..628d05cd40b 100644
--- a/Mac/Build/PythonCore.exp
+++ b/Mac/Build/PythonCore.exp
@@ -277,6 +277,8 @@ PyNumber_InPlacePower
 PyNumber_InPlaceRemainder
 PyNumber_InPlaceMultiply
 PyNumber_InPlaceAdd
+PyNumber_InPlaceTrueDivide
+PyNumber_InPlaceFloorDivide
 PyNumber_InPlaceDivide
 PyNumber_InPlaceSubtract
 PyNumber_InPlaceRshift
@@ -286,6 +288,8 @@ PyNumber_InPlaceXor
 PyNumber_InPlaceOr
 PyNumber_Power
 PyNumber_Remainder
+PyNumber_TrueDivide
+PyNumber_FloorDivide
 PyNumber_Add
 PyNumber_Divmod
 PyNumber_Divide
@@ -527,6 +531,7 @@ PyTuple_New
 type_getsets
 PyType_Type
 PyBaseObject_Type
+PyType_Ready
 _PyType_Lookup
 PyType_IsSubtype
 PyType_GenericNew
@@ -617,116 +622,6 @@ Py_GetPath
 Py_GetPlatform
 PyMac_ConsoleIsDead
 PyMac_AppearanceCompliant
-PyMac_OSErrException
-PyMacGluePtr_PyMac_GetFSSpec
-PyMacGluePtr_AEDesc_New
-PyMacGluePtr_AEDesc_Convert
-PyMacGluePtr_CmpObj_New
-PyMacGluePtr_CmpObj_Convert
-PyMacGluePtr_CmpInstObj_New
-PyMacGluePtr_CmpInstObj_Convert
-PyMacGluePtr_CtlObj_New
-PyMacGluePtr_CtlObj_Convert
-PyMacGluePtr_DlgObj_New
-PyMacGluePtr_DlgObj_Convert
-PyMacGluePtr_DlgObj_WhichDialog
-PyMacGluePtr_DragObj_New
-PyMacGluePtr_DragObj_Convert
-PyMacGluePtr_ListObj_New
-PyMacGluePtr_ListObj_Convert
-PyMacGluePtr_MenuObj_New
-PyMacGluePtr_MenuObj_Convert
-PyMacGluePtr_GrafObj_New
-PyMacGluePtr_GrafObj_Convert
-PyMacGluePtr_BMObj_New
-PyMacGluePtr_BMObj_Convert
-PyMacGluePtr_QdRGB_New
-PyMacGluePtr_QdRGB_Convert
-PyMacGluePtr_GWorldObj_New
-PyMacGluePtr_GWorldObj_Convert
-PyMacGluePtr_TrackObj_New
-PyMacGluePtr_TrackObj_Convert
-PyMacGluePtr_MovieObj_New
-PyMacGluePtr_MovieObj_Convert
-PyMacGluePtr_MovieCtlObj_New
-PyMacGluePtr_MovieCtlObj_Convert
-PyMacGluePtr_TimeBaseObj_New
-PyMacGluePtr_TimeBaseObj_Convert
-PyMacGluePtr_UserDataObj_New
-PyMacGluePtr_UserDataObj_Convert
-PyMacGluePtr_MediaObj_New
-PyMacGluePtr_MediaObj_Convert
-PyMacGluePtr_ResObj_New
-PyMacGluePtr_ResObj_Convert
-PyMacGluePtr_OptResObj_New
-PyMacGluePtr_OptResObj_Convert
-PyMacGluePtr_TEObj_New
-PyMacGluePtr_TEObj_Convert
-PyMacGluePtr_WinObj_New
-PyMacGluePtr_WinObj_Convert
-PyMacGluePtr_WinObj_WhichWindow
-WinObj_WhichWindow
-WinObj_Convert
-WinObj_New
-TEObj_Convert
-TEObj_New
-OptResObj_Convert
-OptResObj_New
-ResObj_Convert
-ResObj_New
-MediaObj_Convert
-MediaObj_New
-UserDataObj_Convert
-UserDataObj_New
-TimeBaseObj_Convert
-TimeBaseObj_New
-MovieCtlObj_Convert
-MovieCtlObj_New
-MovieObj_Convert
-MovieObj_New
-TrackObj_Convert
-TrackObj_New
-GWorldObj_Convert
-GWorldObj_New
-QdRGB_Convert
-QdRGB_New
-BMObj_Convert
-BMObj_New
-GrafObj_Convert
-GrafObj_New
-MenuObj_Convert
-MenuObj_New
-ListObj_Convert
-ListObj_New
-DragObj_Convert
-DragObj_New
-DlgObj_WhichDialog
-DlgObj_Convert
-DlgObj_New
-CtlObj_Convert
-CtlObj_New
-CmpInstObj_Convert
-CmpInstObj_New
-CmpObj_Convert
-CmpObj_New
-AEDesc_Convert
-AEDesc_New
-PyMac_GetFSSpec
-PyMac_Buildwide
-PyMac_Getwide
-PyMac_BuildFixed
-PyMac_GetFixed
-PyMac_GetEventRecord
-PyMac_BuildPoint
-PyMac_GetPoint
-PyMac_BuildRect
-PyMac_GetRect
-PyMac_BuildOptStr255
-PyMac_BuildStr255
-PyMac_GetStr255
-PyMac_BuildNumVersion
-PyMac_BuildOSType
-PyMac_GetOSType
 PyMac_PromptGetFile
 PyMac_GetDirectory
 SIOUXDoAboutBox
@@ -737,7 +632,6 @@ PyMac_SetSchedParams
 PyMac_GetSchedParams
 PyMac_DoYield
 PyMac_HandleEvent
-PyMac_BuildEventRecord
 PyMac_HandleEventIntern
 PyMac_SetEventHandler
 PyOS_InterruptOccurred
@@ -745,10 +639,6 @@ PyErr_CheckSignals
 PyOS_FiniInterrupts
 PyOS_InitInterrupts
 PyOS_CheckStack
-PyMac_Error
-PyErr_Mac
-PyMac_GetOSErrException
-PyMac_StrError
 c2pstrcpy
 Pstring
 PLstrrchr
@@ -758,7 +648,6 @@ PyMac_StopGUSISpin
 RotateCursor
 SpinCursor
 PyMac_GetFullPath
-PyMac_getscript
 PyMac_AppRefNum
 PyMac_options
 console_output_state
@@ -991,6 +880,122 @@ PyDescr_NewMethod
 initgc
 _PyGC_Remove
 _PyGC_Insert
+PyMac_OSErrException
+PyMacGluePtr_PyMac_GetFSSpec
+PyMacGluePtr_AEDesc_New
+PyMacGluePtr_AEDesc_Convert
+PyMacGluePtr_CmpObj_New
+PyMacGluePtr_CmpObj_Convert
+PyMacGluePtr_CmpInstObj_New
+PyMacGluePtr_CmpInstObj_Convert
+PyMacGluePtr_CtlObj_New
+PyMacGluePtr_CtlObj_Convert
+PyMacGluePtr_DlgObj_New
+PyMacGluePtr_DlgObj_Convert
+PyMacGluePtr_DlgObj_WhichDialog
+PyMacGluePtr_DragObj_New
+PyMacGluePtr_DragObj_Convert
+PyMacGluePtr_ListObj_New
+PyMacGluePtr_ListObj_Convert
+PyMacGluePtr_MenuObj_New
+PyMacGluePtr_MenuObj_Convert
+PyMacGluePtr_GrafObj_New
+PyMacGluePtr_GrafObj_Convert
+PyMacGluePtr_BMObj_New
+PyMacGluePtr_BMObj_Convert
+PyMacGluePtr_QdRGB_New
+PyMacGluePtr_QdRGB_Convert
+PyMacGluePtr_GWorldObj_New
+PyMacGluePtr_GWorldObj_Convert
+PyMacGluePtr_TrackObj_New
+PyMacGluePtr_TrackObj_Convert
+PyMacGluePtr_MovieObj_New
+PyMacGluePtr_MovieObj_Convert
+PyMacGluePtr_MovieCtlObj_New
+PyMacGluePtr_MovieCtlObj_Convert
+PyMacGluePtr_TimeBaseObj_New
+PyMacGluePtr_TimeBaseObj_Convert
+PyMacGluePtr_UserDataObj_New
+PyMacGluePtr_UserDataObj_Convert
+PyMacGluePtr_MediaObj_New
+PyMacGluePtr_MediaObj_Convert
+PyMacGluePtr_ResObj_New
+PyMacGluePtr_ResObj_Convert
+PyMacGluePtr_OptResObj_New
+PyMacGluePtr_OptResObj_Convert
+PyMacGluePtr_TEObj_New
+PyMacGluePtr_TEObj_Convert
+PyMacGluePtr_WinObj_New
+PyMacGluePtr_WinObj_Convert
+PyMacGluePtr_WinObj_WhichWindow
+WinObj_WhichWindow
+WinObj_Convert
+WinObj_New
+TEObj_Convert
+TEObj_New
+OptResObj_Convert
+OptResObj_New
+ResObj_Convert
+ResObj_New
+MediaObj_Convert
+MediaObj_New
+UserDataObj_Convert
+UserDataObj_New
+TimeBaseObj_Convert
+TimeBaseObj_New
+MovieCtlObj_Convert
+MovieCtlObj_New
+MovieObj_Convert
+MovieObj_New
+TrackObj_Convert
+TrackObj_New
+GWorldObj_Convert
+GWorldObj_New
+QdRGB_Convert
+QdRGB_New
+BMObj_Convert
+BMObj_New
+GrafObj_Convert
+GrafObj_New
+MenuObj_Convert
+MenuObj_New
+ListObj_Convert
+ListObj_New
+DragObj_Convert
+DragObj_New
+DlgObj_WhichDialog
+DlgObj_Convert
+DlgObj_New
+CtlObj_Convert
+CtlObj_New
+CmpInstObj_Convert
+CmpInstObj_New
+CmpObj_Convert
+CmpObj_New
+AEDesc_Convert
+AEDesc_New
+PyMac_GetFSSpec
+PyMac_Buildwide
+PyMac_Getwide
+PyMac_BuildFixed
+PyMac_GetFixed
+PyMac_BuildEventRecord
+PyMac_GetEventRecord
+PyMac_BuildPoint
+PyMac_GetPoint
+PyMac_BuildRect
+PyMac_GetRect
+PyMac_BuildOptStr255
+PyMac_BuildStr255
+PyMac_GetStr255
+PyMac_BuildNumVersion
+PyMac_BuildOSType
+PyMac_GetOSType
+PyMac_Error
+PyErr_Mac
+PyMac_GetOSErrException
+PyMac_StrError
+PyMac_getscript
 GUSISetupConsoleStdio
 GUSIStdioFlush
 GUSIStdioClose
@@ -2631,6 +2636,8 @@ GetTSMTEDialogDocumentID
 GetTSMTEDialogTSMTERecHandle
 SetTSMTEDialogDocumentID
 SetTSMTEDialogTSMTERecHandle
+EnableMenuItem
+DisableMenuItem
 GetMenuID
 GetMenuWidth
 GetMenuHeight
@@ -2674,5 +2681,9 @@ CopyPascalStringToC
 CopyCStringToPascal
 p2cstrcpy
 GetQDGlobals
+InvalWindowRgn
+InvalWindowRect
+ValidWindowRgn
+ValidWindowRect
 GetWindowList
 GetNextWindow
diff --git a/Mac/Build/PythonCoreCarbon.exp b/Mac/Build/PythonCoreCarbon.exp
index 308398403a0..64bcbcd75f4 100644
--- a/Mac/Build/PythonCoreCarbon.exp
+++ b/Mac/Build/PythonCoreCarbon.exp
@@ -277,6 +277,8 @@ PyNumber_InPlacePower
 PyNumber_InPlaceRemainder
 PyNumber_InPlaceMultiply
 PyNumber_InPlaceAdd
+PyNumber_InPlaceTrueDivide
+PyNumber_InPlaceFloorDivide
 PyNumber_InPlaceDivide
 PyNumber_InPlaceSubtract
 PyNumber_InPlaceRshift
@@ -286,6 +288,8 @@ PyNumber_InPlaceXor
 PyNumber_InPlaceOr
 PyNumber_Power
 PyNumber_Remainder
+PyNumber_TrueDivide
+PyNumber_FloorDivide
 PyNumber_Add
 PyNumber_Divmod
 PyNumber_Divide
@@ -527,6 +531,7 @@ PyTuple_New
 type_getsets
 PyType_Type
 PyBaseObject_Type
+PyType_Ready
 _PyType_Lookup
 PyType_IsSubtype
 PyType_GenericNew
@@ -617,116 +622,6 @@ Py_GetPath
 Py_GetPlatform
 PyMac_ConsoleIsDead
 PyMac_AppearanceCompliant
-PyMac_OSErrException
-PyMacGluePtr_PyMac_GetFSSpec
-PyMacGluePtr_AEDesc_New
-PyMacGluePtr_AEDesc_Convert
-PyMacGluePtr_CmpObj_New
-PyMacGluePtr_CmpObj_Convert
-PyMacGluePtr_CmpInstObj_New
-PyMacGluePtr_CmpInstObj_Convert
-PyMacGluePtr_CtlObj_New
-PyMacGluePtr_CtlObj_Convert
-PyMacGluePtr_DlgObj_New
-PyMacGluePtr_DlgObj_Convert
-PyMacGluePtr_DlgObj_WhichDialog
-PyMacGluePtr_DragObj_New
-PyMacGluePtr_DragObj_Convert
-PyMacGluePtr_ListObj_New
-PyMacGluePtr_ListObj_Convert
-PyMacGluePtr_MenuObj_New
-PyMacGluePtr_MenuObj_Convert
-PyMacGluePtr_GrafObj_New
-PyMacGluePtr_GrafObj_Convert
-PyMacGluePtr_BMObj_New
-PyMacGluePtr_BMObj_Convert
-PyMacGluePtr_QdRGB_New
-PyMacGluePtr_QdRGB_Convert
-PyMacGluePtr_GWorldObj_New
-PyMacGluePtr_GWorldObj_Convert
-PyMacGluePtr_TrackObj_New
-PyMacGluePtr_TrackObj_Convert
-PyMacGluePtr_MovieObj_New
-PyMacGluePtr_MovieObj_Convert
-PyMacGluePtr_MovieCtlObj_New
-PyMacGluePtr_MovieCtlObj_Convert
-PyMacGluePtr_TimeBaseObj_New
-PyMacGluePtr_TimeBaseObj_Convert
-PyMacGluePtr_UserDataObj_New
-PyMacGluePtr_UserDataObj_Convert
-PyMacGluePtr_MediaObj_New
-PyMacGluePtr_MediaObj_Convert
-PyMacGluePtr_ResObj_New
-PyMacGluePtr_ResObj_Convert
-PyMacGluePtr_OptResObj_New
-PyMacGluePtr_OptResObj_Convert
-PyMacGluePtr_TEObj_New
-PyMacGluePtr_TEObj_Convert
-PyMacGluePtr_WinObj_New
-PyMacGluePtr_WinObj_Convert
-PyMacGluePtr_WinObj_WhichWindow
-WinObj_WhichWindow
-WinObj_Convert
-WinObj_New
-TEObj_Convert
-TEObj_New
-OptResObj_Convert
-OptResObj_New
-ResObj_Convert
-ResObj_New
-MediaObj_Convert
-MediaObj_New
-UserDataObj_Convert
-UserDataObj_New
-TimeBaseObj_Convert
-TimeBaseObj_New
-MovieCtlObj_Convert
-MovieCtlObj_New
-MovieObj_Convert
-MovieObj_New
-TrackObj_Convert
-TrackObj_New
-GWorldObj_Convert
-GWorldObj_New
-QdRGB_Convert
-QdRGB_New
-BMObj_Convert
-BMObj_New
-GrafObj_Convert
-GrafObj_New
-MenuObj_Convert
-MenuObj_New
-ListObj_Convert
-ListObj_New
-DragObj_Convert
-DragObj_New
-DlgObj_WhichDialog
-DlgObj_Convert
-DlgObj_New
-CtlObj_Convert
-CtlObj_New
-CmpInstObj_Convert
-CmpInstObj_New
-CmpObj_Convert
-CmpObj_New
-AEDesc_Convert
-AEDesc_New
-PyMac_GetFSSpec
-PyMac_Buildwide
-PyMac_Getwide
-PyMac_BuildFixed
-PyMac_GetFixed
-PyMac_GetEventRecord
-PyMac_BuildPoint
-PyMac_GetPoint
-PyMac_BuildRect
-PyMac_GetRect
-PyMac_BuildOptStr255
-PyMac_BuildStr255
-PyMac_GetStr255
-PyMac_BuildNumVersion
-PyMac_BuildOSType
-PyMac_GetOSType
 SIOUXDoAboutBox
 PyMac_RaiseConsoleWindow
 PyMac_RestoreMenuBar
@@ -735,7 +630,6 @@ PyMac_SetSchedParams
 PyMac_GetSchedParams
 PyMac_DoYield
 PyMac_HandleEvent
-PyMac_BuildEventRecord
 PyMac_HandleEventIntern
 PyMac_SetEventHandler
 PyOS_InterruptOccurred
@@ -743,16 +637,11 @@ PyErr_CheckSignals
 PyOS_FiniInterrupts
 PyOS_InitInterrupts
 PyOS_CheckStack
-PyMac_Error
-PyErr_Mac
-PyMac_GetOSErrException
-PyMac_StrError
 Pstring
 PyMac_StopGUSISpin
 RotateCursor
 SpinCursor
 PyMac_GetFullPath
-PyMac_getscript
 PyMac_AppRefNum
 PyMac_options
 console_output_state
@@ -985,6 +874,122 @@ PyDescr_NewMethod
 initgc
 _PyGC_Remove
 _PyGC_Insert
+PyMac_OSErrException
+PyMacGluePtr_PyMac_GetFSSpec
+PyMacGluePtr_AEDesc_New
+PyMacGluePtr_AEDesc_Convert
+PyMacGluePtr_CmpObj_New
+PyMacGluePtr_CmpObj_Convert
+PyMacGluePtr_CmpInstObj_New
+PyMacGluePtr_CmpInstObj_Convert
+PyMacGluePtr_CtlObj_New
+PyMacGluePtr_CtlObj_Convert
+PyMacGluePtr_DlgObj_New
+PyMacGluePtr_DlgObj_Convert
+PyMacGluePtr_DlgObj_WhichDialog
+PyMacGluePtr_DragObj_New
+PyMacGluePtr_DragObj_Convert
+PyMacGluePtr_ListObj_New
+PyMacGluePtr_ListObj_Convert
+PyMacGluePtr_MenuObj_New
+PyMacGluePtr_MenuObj_Convert
+PyMacGluePtr_GrafObj_New
+PyMacGluePtr_GrafObj_Convert
+PyMacGluePtr_BMObj_New
+PyMacGluePtr_BMObj_Convert
+PyMacGluePtr_QdRGB_New
+PyMacGluePtr_QdRGB_Convert
+PyMacGluePtr_GWorldObj_New
+PyMacGluePtr_GWorldObj_Convert
+PyMacGluePtr_TrackObj_New
+PyMacGluePtr_TrackObj_Convert
+PyMacGluePtr_MovieObj_New
+PyMacGluePtr_MovieObj_Convert
+PyMacGluePtr_MovieCtlObj_New
+PyMacGluePtr_MovieCtlObj_Convert
+PyMacGluePtr_TimeBaseObj_New
+PyMacGluePtr_TimeBaseObj_Convert
+PyMacGluePtr_UserDataObj_New
+PyMacGluePtr_UserDataObj_Convert
+PyMacGluePtr_MediaObj_New
+PyMacGluePtr_MediaObj_Convert
+PyMacGluePtr_ResObj_New
+PyMacGluePtr_ResObj_Convert
+PyMacGluePtr_OptResObj_New
+PyMacGluePtr_OptResObj_Convert
+PyMacGluePtr_TEObj_New
+PyMacGluePtr_TEObj_Convert
+PyMacGluePtr_WinObj_New
+PyMacGluePtr_WinObj_Convert
+PyMacGluePtr_WinObj_WhichWindow
+WinObj_WhichWindow
+WinObj_Convert
+WinObj_New
+TEObj_Convert
+TEObj_New
+OptResObj_Convert
+OptResObj_New
+ResObj_Convert
+ResObj_New
+MediaObj_Convert
+MediaObj_New
+UserDataObj_Convert
+UserDataObj_New
+TimeBaseObj_Convert
+TimeBaseObj_New
+MovieCtlObj_Convert
+MovieCtlObj_New
+MovieObj_Convert
+MovieObj_New
+TrackObj_Convert
+TrackObj_New
+GWorldObj_Convert
+GWorldObj_New
+QdRGB_Convert
+QdRGB_New
+BMObj_Convert
+BMObj_New
+GrafObj_Convert
+GrafObj_New
+MenuObj_Convert
+MenuObj_New
+ListObj_Convert
+ListObj_New
+DragObj_Convert
+DragObj_New
+DlgObj_WhichDialog
+DlgObj_Convert
+DlgObj_New
+CtlObj_Convert
+CtlObj_New
+CmpInstObj_Convert
+CmpInstObj_New
+CmpObj_Convert
+CmpObj_New
+AEDesc_Convert
+AEDesc_New
+PyMac_GetFSSpec
+PyMac_Buildwide
+PyMac_Getwide
+PyMac_BuildFixed
+PyMac_GetFixed
+PyMac_BuildEventRecord
+PyMac_GetEventRecord
+PyMac_BuildPoint
+PyMac_GetPoint
+PyMac_BuildRect
+PyMac_GetRect
+PyMac_BuildOptStr255
+PyMac_BuildStr255
+PyMac_GetStr255
+PyMac_BuildNumVersion
+PyMac_BuildOSType
+PyMac_GetOSType
+PyMac_Error
+PyErr_Mac
+PyMac_GetOSErrException
+PyMac_StrError
+PyMac_getscript
 GUSISetupConsoleStdio
 GUSIStdioFlush
 GUSIStdioClose