diff --git a/widget/src/xremoteclient/Makefile.in b/widget/src/xremoteclient/Makefile.in
index 9d8051d69ba1..8be52b838a1b 100644
--- a/widget/src/xremoteclient/Makefile.in
+++ b/widget/src/xremoteclient/Makefile.in
@@ -50,11 +50,11 @@ EXPORTS		= \
 PROGRAM         = mozilla-xremote-client$(BIN_SUFFIX)
 
 PROGOBJS        = mozilla-xremote-client.$(OBJ_SUFFIX) \
-		XRemoteClient.$(OBJ_SUFFIX) \
+		XRemoteClient_standalone.$(OBJ_SUFFIX) \
 		$(NULL)
 
 LIBS            = \
-		$(XPCOM_LIBS) $(NSPR_LIBS) \
+		$(NSPR_LIBS) \
 		$(XLDFLAGS) $(XLIBS)
 
 include $(topsrcdir)/config/rules.mk
@@ -66,3 +66,6 @@ endif
 ifeq ($(OS_ARCH), OpenVMS)
 DEFINES		+= -DGENERIC_MOTIF_REDEFINES
 endif
+
+XRemoteClient_standalone.$(OBJ_SUFFIX): XRemoteClient.cpp
+	$(CXX) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) -DXREMOTE_STANDALONE $<
diff --git a/widget/src/xremoteclient/XRemoteClient.cpp b/widget/src/xremoteclient/XRemoteClient.cpp
index 9b7b55099163..af7186598e72 100644
--- a/widget/src/xremoteclient/XRemoteClient.cpp
+++ b/widget/src/xremoteclient/XRemoteClient.cpp
@@ -69,7 +69,9 @@ XRemoteClient::~XRemoteClient()
     Shutdown();
 }
 
+#ifndef XREMOTE_STANDALONE
 NS_IMPL_ISUPPORTS1(XRemoteClient, nsIXRemoteClient);
+#endif
 
 NS_IMETHODIMP
 XRemoteClient::Init (void)
@@ -325,7 +327,6 @@ XRemoteClient::GetLock(Window aWindow, PRBool *aDestroyed)
     status = PR_GetSystemInfo(PR_SI_HOSTNAME, sysinfobuf,
 			      SYS_INFO_BUFFER_LENGTH);
     if (status != PR_SUCCESS) {
-      NS_WARNING("failed to get hostname");
       return NS_ERROR_FAILURE;
     }
     
diff --git a/widget/src/xremoteclient/XRemoteClient.h b/widget/src/xremoteclient/XRemoteClient.h
index 7fa528927bcd..beff8726ee02 100644
--- a/widget/src/xremoteclient/XRemoteClient.h
+++ b/widget/src/xremoteclient/XRemoteClient.h
@@ -20,16 +20,22 @@
 
 #include <X11/X.h>
 #include <X11/Xlib.h>
+
 #include "nsIXRemoteClient.h"
 
-class XRemoteClient : public nsIXRemoteClient
+class XRemoteClient
+#ifndef XREMOTE_STANDALONE
+: public nsIXRemoteClient
+#endif
 {
  public:
   XRemoteClient();
   virtual ~XRemoteClient();
 
+#ifndef XREMOTE_STANDALONE
   // nsISupports
   NS_DECL_ISUPPORTS
+#endif
 
   // nsIXRemoteClient
   NS_DECL_NSIXREMOTECLIENT