diff --git a/xpinstall/packager/mac/ASEncoder/build/ASEncoder.mcp b/xpinstall/packager/mac/ASEncoder/build/ASEncoder.mcp
index 25b185d2c6e..4aaf608fc5c 100644
Binary files a/xpinstall/packager/mac/ASEncoder/build/ASEncoder.mcp and b/xpinstall/packager/mac/ASEncoder/build/ASEncoder.mcp differ
diff --git a/xpinstall/packager/mac/ASEncoder/rsrc/ASEncoder.rsrc b/xpinstall/packager/mac/ASEncoder/rsrc/ASEncoder.rsrc
index 739bd9f9fcf..e69de29bb2d 100644
Binary files a/xpinstall/packager/mac/ASEncoder/rsrc/ASEncoder.rsrc and b/xpinstall/packager/mac/ASEncoder/rsrc/ASEncoder.rsrc differ
diff --git a/xpinstall/packager/mac/ASEncoder/src/nsASEApp.cpp b/xpinstall/packager/mac/ASEncoder/src/nsASEApp.cpp
index 0f5ed244fb1..8a74e1f0a46 100644
--- a/xpinstall/packager/mac/ASEncoder/src/nsASEApp.cpp
+++ b/xpinstall/packager/mac/ASEncoder/src/nsASEApp.cpp
@@ -247,12 +247,12 @@ nsASEApp::MakeMenus()
 	mbarHdl = ::GetNewMBar(rMenuBar);
 	::SetMenuBar(mbarHdl);
 	
-	if (menuHdl = ::GetMenuHandle(rMenuApple)) 
+	if ((menuHdl = ::GetMenuHandle(rMenuApple))!=nil) 
 	{
 		::AppendResMenu(menuHdl, 'DRVR');
 	}
 		
-	if (menuHdl = GetMenuHandle(rMenuEdit))
+	if ((menuHdl = GetMenuHandle(rMenuEdit))!=nil)
 		::DisableItem(menuHdl, 0);
 	
 	::HMGetHelpMenuHandle(&menuHdl);
diff --git a/xpinstall/packager/mac/ASEncoder/src/nsASEApp.h b/xpinstall/packager/mac/ASEncoder/src/nsASEApp.h
index 034d3a8dc2a..1d01e6fd751 100644
--- a/xpinstall/packager/mac/ASEncoder/src/nsASEApp.h
+++ b/xpinstall/packager/mac/ASEncoder/src/nsASEApp.h
@@ -54,6 +54,21 @@ private:
 	AEEventHandlerUPP		mQuitUPP;
 };
 
+/*---------------------------------------------------------------*
+ *   Callbacks
+ *---------------------------------------------------------------*/
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+pascal OSErr EncodeEvent(AppleEvent *appEvent, AppleEvent *reply, SInt32 handlerRefCon);
+pascal OSErr DecodeEvent(AppleEvent *appEvent, AppleEvent *reply, SInt32 handlerRefCon);
+pascal OSErr QuitEvent(AppleEvent *appEvent, AppleEvent *reply, SInt32 handlerRefCon);
+
+#ifdef __cplusplus
+}
+#endif
+
 extern Boolean gDone;
 
 
diff --git a/xpinstall/packager/mac/ASEncoder/src/nsAppleSingleEncoder.h b/xpinstall/packager/mac/ASEncoder/src/nsAppleSingleEncoder.h
index cea151119c1..0b8b23a056c 100644
--- a/xpinstall/packager/mac/ASEncoder/src/nsAppleSingleEncoder.h
+++ b/xpinstall/packager/mac/ASEncoder/src/nsAppleSingleEncoder.h
@@ -63,6 +63,17 @@ private:
 	OSErr				WriteDataFork();
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+pascal void
+EncodeDirIterateFilter(const CInfoPBRec * const cpbPtr, Boolean *quitFlag, void *yourDataPtr);
+
+#ifdef __cplusplus
+}
+#endif
+
 #define kTransientName			"\pzz__ASEncoder_TMP__zz"
 #define kAppleSingleMagicNum 	0x00051600
 #define kAppleSingleVerNum		0x00020000
diff --git a/xpinstall/packager/mac/ASEncoder/src/nsEventHandler.cpp b/xpinstall/packager/mac/ASEncoder/src/nsEventHandler.cpp
index 792afa6ac34..76baac46e90 100644
--- a/xpinstall/packager/mac/ASEncoder/src/nsEventHandler.cpp
+++ b/xpinstall/packager/mac/ASEncoder/src/nsEventHandler.cpp
@@ -172,22 +172,27 @@ nsEventHandler::HandleKeyDown()
 OSErr 
 nsEventHandler::HandleUpdateEvt() 
 { 
+	return noErr;
 }
 
 OSErr 
 nsEventHandler::HandleActivateEvt() 
 { 
+	return noErr;
 }
 
 OSErr 
 nsEventHandler::HandleOSEvt() 
 { 
 	::HiliteMenu(0);
+	
+	return noErr;
 }
 
 OSErr 
 nsEventHandler::HandleInContent() 
 { 
+	return noErr;
 }
 
 OSErr
diff --git a/xpinstall/packager/mac/ASEncoder/src/nsFileSelector.h b/xpinstall/packager/mac/ASEncoder/src/nsFileSelector.h
index 7dcffaaede9..202c35f9c2d 100644
--- a/xpinstall/packager/mac/ASEncoder/src/nsFileSelector.h
+++ b/xpinstall/packager/mac/ASEncoder/src/nsFileSelector.h
@@ -42,6 +42,19 @@ private:
 	FSSpecPtr	mFile;
 };
 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+pascal void
+OurNavEventFunction(NavEventCallbackMessage callBackSelector, NavCBRecPtr callBackParms,
+					NavCallBackUserData callBackUD);
+
+#ifdef __cplusplus
+}
+#endif
+
 #define ERR_CHECK(_func) 			\
 			err = _func;			\
 			if (err != noErr)		\