diff --git a/mozilla/mailnews/news/src/nsNntpIncomingServer.cpp b/mozilla/mailnews/news/src/nsNntpIncomingServer.cpp
index f55ec10971c..6e9255e48d5 100644
--- a/mozilla/mailnews/news/src/nsNntpIncomingServer.cpp
+++ b/mozilla/mailnews/news/src/nsNntpIncomingServer.cpp
@@ -31,14 +31,7 @@
 #include "nsIFileSpec.h"
 #include "nsFileStream.h"
 
-// sorry, unix & mac will have to wait for tomorrow.  camelot is down.
-#if defined(XP_WIN) 
-#define HAVE_REAL_SUBSCRIBE 1
-#endif
 
-#ifdef HAVE_REAL_SUBSCRIBE
-#include "nsISubscribeDialogListener.h"
-#endif
 #ifdef DEBUG_seth
 #define DO_HASHING_OF_HOSTNAME 1
 #endif /* DEBUG_seth */
diff --git a/mozilla/mailnews/news/src/nsNntpIncomingServer.h b/mozilla/mailnews/news/src/nsNntpIncomingServer.h
index 1fa9d395eda..f084690cd50 100644
--- a/mozilla/mailnews/news/src/nsNntpIncomingServer.h
+++ b/mozilla/mailnews/news/src/nsNntpIncomingServer.h
@@ -35,16 +35,27 @@
 #include "plstr.h"
 #include "prprf.h"
 
+#ifdef HAVE_REAL_SUBSCRIBE
+#include "nsISubscribeDialogListener.h"
+#endif
+
 /* get some implementation from nsMsgIncomingServer */
+#ifdef HAVE_REAL_SUBSCRIBE
 class nsNntpIncomingServer : public nsMsgIncomingServer,
                              public nsINntpIncomingServer,
 							 public nsISubscribeDialogMaster
+#else
+class nsNntpIncomingServer : public nsMsgIncomingServer,
+                             public nsINntpIncomingServer
+#endif
                              
 {
 public:
     NS_DECL_ISUPPORTS_INHERITED
     NS_DECL_NSINNTPINCOMINGSERVER
+#ifdef HAVE_REAL_SUBSCRIBE
 	NS_DECL_NSISUBSCRIBEDIALOGMASTER
+#endif
     nsNntpIncomingServer();
     virtual ~nsNntpIncomingServer();