diff --git a/mozilla/cmd/xfe/src/Frame.cpp b/mozilla/cmd/xfe/src/Frame.cpp
index 130911a52ff..e7900b66be9 100644
--- a/mozilla/cmd/xfe/src/Frame.cpp
+++ b/mozilla/cmd/xfe/src/Frame.cpp
@@ -83,7 +83,7 @@
 #include "xeditor.h"
 #endif /*EDITOR*/
 
-#ifndef __sgi
+#if !defined(__sgi) && !defined(__hpux)
 #include <X11/Xmu/Editres.h>	/* For editres to work on anything but Irix */
 #endif
 
@@ -1328,7 +1328,7 @@ XFE_Frame::createBaseWidgetShell(Widget parent,String name)
 
 	// This hackery must die too.  It will go away as soon as the 
 	// XfeFrameShell widget supports XmNtrackEditres
-#ifndef __sgi
+#if !defined(__sgi) && !defined(__hpux)
 	XtAddEventHandler(shell, (EventMask)0, True,
 					  (XtEventHandler)_XEditResCheckMessages, 0);
 #endif
diff --git a/mozilla/cmd/xfe/src/context_funcs.cpp b/mozilla/cmd/xfe/src/context_funcs.cpp
index 93b43cc9ba4..ffcdd7216d4 100644
--- a/mozilla/cmd/xfe/src/context_funcs.cpp
+++ b/mozilla/cmd/xfe/src/context_funcs.cpp
@@ -32,6 +32,10 @@
 #include "HTMLView.h"
 #include <Xm/XmP.h>
 
+#if XmVersion >= 2000
+extern "C" char * _XmStringGetTextConcat(XmString);
+#endif
+
 #ifdef MOZ_MAIL_NEWS
 #include "MsgFrame.h"
 #include "addrbk.h"