diff --git a/mozilla/cmd/xfe/Makefile b/mozilla/cmd/xfe/Makefile
index 9def8a13359..e897fbe0c85 100644
--- a/mozilla/cmd/xfe/Makefile
+++ b/mozilla/cmd/xfe/Makefile
@@ -246,23 +246,15 @@ XFE_WIDGETS_CAPTION_LIB		= $(DIST)/lib/libXfeCaption.a
 XFE_WIDGETS_TOOL_BAR_LIB	= $(DIST)/lib/libXfeToolBar.a
 XFE_WIDGETS_TOOL_TIP_LIB	= $(DIST)/lib/libXfeToolTip.a
 
-ifneq ($(OS_ARCH),IRIX) 
-ifneq ($(OS_ARCH),FreeBSD)
-ifneq ($(OS_ARCH),Rhapsody)
-DYNAMIC_SYMBOLS_F	= -rdynamic # default
-endif
-endif
+DYNAMIC_SYMBOLS_F	=
+ifeq (,$(filter FreeBSD IRIX OpenBSD OSF1 QNX Rhapsody,$(OS_ARCH)))
+DYNAMIC_SYMBOLS_F	= -rdynamic
 endif
 ifeq ($(OS_ARCH),SunOS) 
 ifdef NS_USE_NATIVE
 DYNAMIC_SYMBOLS_F	= -Bdynamic
-else
-DYNAMIC_SYMBOLS_F	= # nothing for gcc
 endif
 endif
-ifeq ($(OS_ARCH),OSF1)
-DYNAMIC_SYMBOLS_F	=
-endif
 
 ifeq ($(OS_ARCH),AIX)
 NSPR_LIB	= 
diff --git a/mozilla/cmd/xfe/XfeWidgets/Xfe/Debug.c b/mozilla/cmd/xfe/XfeWidgets/Xfe/Debug.c
index 2ae5f0be933..4187c68636b 100644
--- a/mozilla/cmd/xfe/XfeWidgets/Xfe/Debug.c
+++ b/mozilla/cmd/xfe/XfeWidgets/Xfe/Debug.c
@@ -292,4 +292,8 @@ XfeDebugPrintfFunction(Widget w,char * func_name,char * format, ...)
 }
 /*----------------------------------------------------------------------*/
 
-#endif											/* endif DEBUG			*/
+#else
+#ifdef OSF1
+static int dumbcc = 0;  /* The 3.2 compiler aborts when there's "nothing to compile", and 4.0 warns.  This fixes both problems. */
+#endif
+#endif /* DEBUG */
diff --git a/mozilla/cmd/xfe/mozilla.c b/mozilla/cmd/xfe/mozilla.c
index 229788662f4..0f05c3a7c4f 100644
--- a/mozilla/cmd/xfe/mozilla.c
+++ b/mozilla/cmd/xfe/mozilla.c
@@ -1940,13 +1940,15 @@ build_user_agent_string(char *versionLocale)
 	strcat (buf, "FreeBSD");
 #elif defined(__NetBSD__)
 	strcat (buf, "NetBSD");
+#elif defined(__OpenBSD__)
+	strcat (buf, "OpenBSD");
 #elif defined(__386BSD__)
 	strcat (buf, "BSD/386");
 #elif defined(__bsdi__)
 	strcat (buf, "BSD/OS");
 #elif defined(__osf__)
-	strcat (buf, "OSF1");
-#elif defined(AIXV3)
+	strcat (buf, "OSF/1");
+#elif defined(AIX)
 	strcat (buf, "AIX");
 #elif defined(_HPUX_SOURCE)
 	strcat (buf, "HP-UX");
@@ -1961,11 +1963,13 @@ build_user_agent_string(char *versionLocale)
 #elif defined(nec_ews)
 	strcat (buf, "NEC/EWS-UX/V");
 #elif defined(SNI)
-	strcat (buf, "SINIX-N");
+	strcat (buf, "SINIX");
 #elif defined(DGUX)
         strcat (buf, "DG/UX");
 #elif defined(RHAPSODY)
         strcat (buf, "Rhapsody");
+#elif defined(QNX)
+        strcat (buf, "QNX");
 #else
 	ERROR!! run "uname -s" and put the result here.
 #endif
diff --git a/mozilla/cmd/xfe/src/DragDrop.cpp b/mozilla/cmd/xfe/src/DragDrop.cpp
index a951920fedc..7b961692707 100644
--- a/mozilla/cmd/xfe/src/DragDrop.cpp
+++ b/mozilla/cmd/xfe/src/DragDrop.cpp
@@ -47,7 +47,7 @@
 #include "DragDrop.h"
 #include <Xm/DisplayP.h>
 
-#if defined(SOLARIS)||defined(AIX)||defined(UNIXWARE)
+#if defined(SOLARIS) || (defined(AIX) && !defined(AIX4_2)) || (defined(UNIXWARE) && !defined(UNIXWARE7))
 extern "C" int gethostname(char *, int);
 #endif