diff --git a/mozilla/xpfe/appshell/src/nsAppShellService.cpp b/mozilla/xpfe/appshell/src/nsAppShellService.cpp
index 87491cd264a..53e655cc207 100644
--- a/mozilla/xpfe/appshell/src/nsAppShellService.cpp
+++ b/mozilla/xpfe/appshell/src/nsAppShellService.cpp
@@ -69,7 +69,7 @@
 
 #if defined(XP_MAC) || defined(XP_MACOSX)
 #include <Gestalt.h>
-PRBool OnMacOSX();
+static PRBool OnMacOSX();
 #endif
 
 #include "nsWidgetsCID.h"
@@ -1073,7 +1073,7 @@ nsAppShellService::GetNativeAppSupport( nsINativeAppSupport **aResult ) {
 //
 // Return true if we are on Mac OS X, caching the result after the first call
 //
-PRBool
+static PRBool
 OnMacOSX()
 {
 
diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in
index bbffcce669c..4e935c783bb 100644
--- a/mozilla/xpfe/bootstrap/Makefile.in
+++ b/mozilla/xpfe/bootstrap/Makefile.in
@@ -192,7 +192,7 @@ ifeq ($(OS_ARCH),Darwin)
 EXTRA_DSO_LDOPTS := $(subst -dynamiclib,-execute,$(EXTRA_DSO_LDOPTS))
 
 ifdef BUILD_STATIC_LIBS
-LDFLAGS	+= -framework QuickTime
+LDFLAGS	+= -framework QuickTime $(TK_LIBS)
 endif
 
 endif