diff --git a/modules/calendar/julmain.c b/modules/calendar/julmain.c
index e49de191586..e69de29bb2d 100644
--- a/modules/calendar/julmain.c
+++ b/modules/calendar/julmain.c
@@ -1,42 +0,0 @@
-#ifdef XP_PC 
-#include <windows.h>
-#include "nlsloc.h"
-
-#ifdef _WIN32
-BOOL WINAPI DllMain (HINSTANCE hDLL, DWORD dwReason, LPVOID lpReserved)
-{
-  switch (dwReason)
-  {
-    case DLL_PROCESS_ATTACH:
-      break;
-
-    case DLL_THREAD_ATTACH:
-      break;
-
-    case DLL_THREAD_DETACH:
-      break;
-
-    case DLL_PROCESS_DETACH:
-        NLS_Terminate();
-      break;
-  }
-
-    return TRUE;
-}
-
-#else  /* ! _WIN32 */
-
-int CALLBACK LibMain( HINSTANCE hInst, WORD wDataSeg, 
-                      WORD cbHeapSize, LPSTR lpszCmdLine )
-{
-    return TRUE;
-}
-
-BOOL CALLBACK __loadds WEP(BOOL fSystemExit)
-{
-    return TRUE;
-}
-#endif /* ! _WIN32 */
-
-
-#endif    /* XP_PC */
diff --git a/modules/calendar/makefile.win b/modules/calendar/makefile.win
index 5c543dfa71c..084c3ca5121 100644
--- a/modules/calendar/makefile.win
+++ b/modules/calendar/makefile.win
@@ -29,7 +29,7 @@ LIBDIR=libjulian
 
 LIBRARY_NAME = juls$(MOZ_BITS)$(VERSION_NUMBER)
 
-LCFLAGS= -DLIBJULIAN $(LCFLAGS)
+LCFLAGS= -DLIBJULIAN $(LCFLAGS) 
 
 DLLNAME         = jul$(MOZ_BITS)$(VERSION_NUMBER)
 PDBFILE         = $(DLLNAME).pdb
@@ -41,7 +41,11 @@ MAKE_OBJ_TYPE   = DLL
 
 include <$(NS_DEPTH)/config/config.mak>
 
-REQUIRES=nls
+!ifdef MOZ_TREX
+CFLAGS = $(CFLAGS) -I$(PUBLIC)\public\raptor -I$(PUBLIC)\public\xpcom -DMOZ_TREX
+!endif
+
+REQUIRES=nls raptor xpcom
 
 OBJS = $(OBJS) \
 !ifndef MOZ_TREX
@@ -145,7 +149,7 @@ LLIBS = $(LLIBS) \
 !endif
     $(NULL)
 
-LINCS=-I$(XPDIST)\public\nls
+#LINCS=-I$(XPDIST)\public\nls -I$(PUBLIC)\public\raptor -I$(PUBLIC)\public\xpcom
 
 #// From the old Manifest file
 CSRCS=julmain.c
diff --git a/modules/calendar/src/nlsstub/inc/calendar.h b/modules/calendar/src/nlsstub/inc/calendar.h
index cf577ebcc91..543eebe0620 100644
--- a/modules/calendar/src/nlsstub/inc/calendar.h
+++ b/modules/calendar/src/nlsstub/inc/calendar.h
@@ -25,7 +25,7 @@
 class TimeZone;
 class ParsePosition;
 
-class Calendar 
+class NS_NLS Calendar 
 {
 
 public:
diff --git a/modules/calendar/src/nlsstub/inc/datefmt.h b/modules/calendar/src/nlsstub/inc/datefmt.h
index 3ffeb0d91fc..9f3aca5288b 100644
--- a/modules/calendar/src/nlsstub/inc/datefmt.h
+++ b/modules/calendar/src/nlsstub/inc/datefmt.h
@@ -26,7 +26,7 @@ class ParsePosition;
 class Format;
 class TimeZone;
 
-class DateFormat
+class NS_NLS DateFormat
 {
 
 public:
diff --git a/modules/calendar/src/nlsstub/inc/gregocal.h b/modules/calendar/src/nlsstub/inc/gregocal.h
index 531748bb279..043932ca83c 100644
--- a/modules/calendar/src/nlsstub/inc/gregocal.h
+++ b/modules/calendar/src/nlsstub/inc/gregocal.h
@@ -25,7 +25,7 @@
 class TimeZone;
 class Locale;
 
-class GregorianCalendar : public Calendar
+class NS_NLS GregorianCalendar : public Calendar
 {
 
 public:
diff --git a/modules/calendar/src/nlsstub/inc/locid.h b/modules/calendar/src/nlsstub/inc/locid.h
index 3dc1ac00115..04263908e92 100644
--- a/modules/calendar/src/nlsstub/inc/locid.h
+++ b/modules/calendar/src/nlsstub/inc/locid.h
@@ -23,7 +23,7 @@
 
 class UnicodeString;
 
-class Locale 
+class NS_NLS Locale 
 {
 
 public:
diff --git a/modules/calendar/src/nlsstub/inc/nlsloc.h b/modules/calendar/src/nlsstub/inc/nlsloc.h
index db9e2670458..b4edbab9e6b 100644
--- a/modules/calendar/src/nlsstub/inc/nlsloc.h
+++ b/modules/calendar/src/nlsstub/inc/nlsloc.h
@@ -24,7 +24,7 @@
 typedef PRUint32 NLS_ThreadInfo;
 typedef PRUint32 NLS_ErrorCode;
 
-NLS_ErrorCode NLS_Initialize(const NLS_ThreadInfo * aThreadInfo, const char * aDataDirectory);
-NLS_ErrorCode NLS_Terminate(void);
+NLS_ErrorCode NS_NLS NLS_Initialize(const NLS_ThreadInfo * aThreadInfo, const char * aDataDirectory);
+NLS_ErrorCode NS_NLS NLS_Terminate(void);
 
 #endif
diff --git a/modules/calendar/src/nlsstub/inc/parsepos.h b/modules/calendar/src/nlsstub/inc/parsepos.h
index 61c4165069d..aed0d20b940 100644
--- a/modules/calendar/src/nlsstub/inc/parsepos.h
+++ b/modules/calendar/src/nlsstub/inc/parsepos.h
@@ -21,7 +21,7 @@
 
 #include "ptypes.h"
 
-class ParsePosition
+class NS_NLS ParsePosition
 {
 
 public:
diff --git a/modules/calendar/src/nlsstub/inc/ptypes.h b/modules/calendar/src/nlsstub/inc/ptypes.h
index 042cce981e6..0fd1ab552ed 100644
--- a/modules/calendar/src/nlsstub/inc/ptypes.h
+++ b/modules/calendar/src/nlsstub/inc/ptypes.h
@@ -19,6 +19,7 @@
 #ifndef ptypes_h__
 #define ptypes_h__
 
+#include "nscore.h"
 #include "nspr.h"
 
 typedef double Date;
diff --git a/modules/calendar/src/nlsstub/inc/simpletz.h b/modules/calendar/src/nlsstub/inc/simpletz.h
index 8c0873a8025..e864f98f736 100644
--- a/modules/calendar/src/nlsstub/inc/simpletz.h
+++ b/modules/calendar/src/nlsstub/inc/simpletz.h
@@ -21,7 +21,7 @@
 
 #include "timezone.h"
 
-class SimpleTimeZone : public TimeZone
+class NS_NLS SimpleTimeZone : public TimeZone
 {
 
 public:
diff --git a/modules/calendar/src/nlsstub/inc/smpdtfmt.h b/modules/calendar/src/nlsstub/inc/smpdtfmt.h
index b3e74b7796c..8109feb2f20 100644
--- a/modules/calendar/src/nlsstub/inc/smpdtfmt.h
+++ b/modules/calendar/src/nlsstub/inc/smpdtfmt.h
@@ -27,7 +27,7 @@ class Formattable;
 class ParsePosition;
 class Format;
 
-class FieldPosition
+class NS_NLS FieldPosition
 {
 public:
   FieldPosition();
@@ -35,7 +35,7 @@ public:
   FieldPosition(PRInt32 aField);
 };
 
-class SimpleDateFormat : public DateFormat 
+class NS_NLS SimpleDateFormat : public DateFormat 
 {
 public:
   SimpleDateFormat();
diff --git a/modules/calendar/src/nlsstub/inc/timezone.h b/modules/calendar/src/nlsstub/inc/timezone.h
index bb8e0d39438..3031db6babf 100644
--- a/modules/calendar/src/nlsstub/inc/timezone.h
+++ b/modules/calendar/src/nlsstub/inc/timezone.h
@@ -23,7 +23,7 @@
 
 class UnicodeString;
 
-class TimeZone 
+class NS_NLS TimeZone 
 {
 
 public: