diff --git a/mozilla/widget/tests/scribble/Makefile.in b/mozilla/widget/tests/scribble/Makefile.in
index 792af91f9c3..2f47cf4e2c0 100644
--- a/mozilla/widget/tests/scribble/Makefile.in
+++ b/mozilla/widget/tests/scribble/Makefile.in
@@ -75,7 +75,6 @@ OBJS	= $(CPPSRCS:.cpp=.o)
 EX_LIBS = \
 	-L$(DIST)/bin \
 	-lraptorbase    \
-	$(PNG_LIBS) \
 	-lpref \
 	-lraptorbase \
 	$(TOOLKIT_WIDGET_LIB) \
@@ -93,6 +92,7 @@ EX_LIBS = \
 	-lgophurl \
 	-lhttpurl \
 	-limg \
+	$(PNG_LIBS) \
 	$(JPEG_LIBS) \
 	-ljs \
 	-ljsdom \
@@ -104,6 +104,7 @@ EX_LIBS = \
 	-lnetlib \
 	-lnetutil \
 	-lnetwork \
+	-lpwcac \
 	-lraptorwebwidget \
 	-lreg \
 	-lremoturl \
@@ -119,14 +120,8 @@ EX_LIBS = \
 	-lxpcom \
 	$(ZLIB_LIBS) \
 	-lraptorplugin \
-	$(NULL)
-
-ifneq (,$(filter FreeBSD Linux SunOS,$(OS_ARCH)))
-EX_LIBS += \
-	-lpwcac \
 	-ldbm \
 	$(NULL)
-endif
 
 PROGS   = main
 
diff --git a/mozilla/widget/tests/scribble/main.cpp b/mozilla/widget/tests/scribble/main.cpp
index f1771b99d41..98ebe591771 100644
--- a/mozilla/widget/tests/scribble/main.cpp
+++ b/mozilla/widget/tests/scribble/main.cpp
@@ -59,7 +59,7 @@ extern "C" char *fe_GetConfigDir(void)
 }
 
 /* dist/public/xp/xp_linebuf.h */
-int XP_ReBuffer (const char *net_buffer, int32 net_buffer_size,
+extern "C" int XP_ReBuffer (const char *net_buffer, int32 net_buffer_size,
                  uint32 desired_buffer_size,
                  char **bufferP, uint32 *buffer_sizeP,
                  uint32 *buffer_fpP,
@@ -72,7 +72,7 @@ int XP_ReBuffer (const char *net_buffer, int32 net_buffer_size,
   return(0); 
 }
 
-void main(int argc, char **argv)
+int main(int argc, char **argv)
 {
   int argC = argc;
   return(CreateApplication(&argC, argv));