diff --git a/mozilla/timer/public/nsITimer.h b/mozilla/timer/public/nsITimer.h
index 55f071beb7d..e35a5a722f3 100644
--- a/mozilla/timer/public/nsITimer.h
+++ b/mozilla/timer/public/nsITimer.h
@@ -95,7 +95,7 @@ extern
 #ifdef XP_MAC // On the macintosh, this is built into the network library.
 NS_NET
 #else
-NS_GFX
+NS_TIMER
 #endif
 nsresult NS_NewTimer(nsITimer** aInstancePtrResult);
 
diff --git a/mozilla/timer/src/Makefile.in b/mozilla/timer/src/Makefile.in
index bb95eb8f598..d9926f93991 100644
--- a/mozilla/timer/src/Makefile.in
+++ b/mozilla/timer/src/Makefile.in
@@ -25,7 +25,7 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 ifneq (,$(filter beos os2 rhapsody photon,$(OS_ARCH)))
-DIRS = $(MOZ_GFX_TOOLKIT)
+DIRS = $(MOZ_WIDGET_TOOLKIT)
 else
 DIRS = unix
 endif
diff --git a/mozilla/timer/src/beos/Makefile.in b/mozilla/timer/src/beos/Makefile.in
index 5597f68375f..3dc1cbf8ce5 100644
--- a/mozilla/timer/src/beos/Makefile.in
+++ b/mozilla/timer/src/beos/Makefile.in
@@ -24,12 +24,13 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
-LIBRARY_NAME = timer_beos_s
+LIBRARY_NAME = timer_s
 
 MODULE=timer
 
 REQUIRES=xpcom
 
+DEFINES += -D_IMPL_NS_TIMER
 CXXFLAGS += $(TK_CFLAGS)
 INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
 
diff --git a/mozilla/timer/src/beos/nsTimer.cpp b/mozilla/timer/src/beos/nsTimer.cpp
index 70881951488..57aed4c1d70 100644
--- a/mozilla/timer/src/beos/nsTimer.cpp
+++ b/mozilla/timer/src/beos/nsTimer.cpp
@@ -341,7 +341,7 @@ void TimerImpl::Cancel()
 	TimerImpl::sTimerManager.RemoveRequest(this);
 }
 
-NS_BASE nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
+NS_TIMER nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
 {
     NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
     if(nsnull == aInstancePtrResult)
diff --git a/mozilla/timer/src/mac/nsTimer.cpp b/mozilla/timer/src/mac/nsTimer.cpp
index ab16b217fab..c2f6e8d859f 100644
--- a/mozilla/timer/src/mac/nsTimer.cpp
+++ b/mozilla/timer/src/mac/nsTimer.cpp
@@ -342,7 +342,7 @@ void  TimerPeriodical::RepeatAction( const EventRecord &inMacEvent)
 }
 
                 
-NS_GFX nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
+NS_TIMER nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
 {
     NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
     if (nsnull == aInstancePtrResult) {
diff --git a/mozilla/timer/src/os2/Makefile.in b/mozilla/timer/src/os2/Makefile.in
index 5aa5778de9c..4f126588b26 100644
--- a/mozilla/timer/src/os2/Makefile.in
+++ b/mozilla/timer/src/os2/Makefile.in
@@ -28,12 +28,13 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
-LIBRARY_NAME = timer_os2_s
+LIBRARY_NAME = timer_s
 
 MODULE=timer
 
 REQUIRES=xpcom
 
+DEFINES += -D_IMPL_NS_TIMER
 CXXFLAGS += $(TK_CFLAGS)
 INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
 
diff --git a/mozilla/timer/src/os2/nsTimerOS2.cpp b/mozilla/timer/src/os2/nsTimerOS2.cpp
index b2140aa290a..b3a1fbaa257 100644
--- a/mozilla/timer/src/os2/nsTimerOS2.cpp
+++ b/mozilla/timer/src/os2/nsTimerOS2.cpp
@@ -576,7 +576,7 @@ class nsTimerManagers
 // Entry into the DLL.  No, I dunno why there's not a normal factory
 // for this either.  Ease of use?
 
-NS_BASE nsresult NS_NewTimer( nsITimer **aInstance)
+NS_TIMER nsresult NS_NewTimer( nsITimer **aInstance)
 {
    if( !aInstance)
       return NS_ERROR_NULL_POINTER;
diff --git a/mozilla/timer/src/photon/Makefile.in b/mozilla/timer/src/photon/Makefile.in
index 85c1df52ad1..3dc1cbf8ce5 100644
--- a/mozilla/timer/src/photon/Makefile.in
+++ b/mozilla/timer/src/photon/Makefile.in
@@ -24,12 +24,13 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
-LIBRARY_NAME = timer_photon_s
+LIBRARY_NAME = timer_s
 
 MODULE=timer
 
 REQUIRES=xpcom
 
+DEFINES += -D_IMPL_NS_TIMER
 CXXFLAGS += $(TK_CFLAGS)
 INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
 
diff --git a/mozilla/timer/src/photon/nsTimer.cpp b/mozilla/timer/src/photon/nsTimer.cpp
index 5b949e57c6c..89cee121bea 100644
--- a/mozilla/timer/src/photon/nsTimer.cpp
+++ b/mozilla/timer/src/photon/nsTimer.cpp
@@ -246,7 +246,7 @@ int TimerImpl::TimerEventHandler( void *aData, pid_t aRcvId, void *aMsg, size_t
 }
 
 
-NS_BASE nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
+NS_TIMER nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
 {
   NS_PRECONDITION(nsnull != aInstancePtrResult, "NS_NewTimer - null ptr");
   if (nsnull == aInstancePtrResult)
diff --git a/mozilla/timer/src/rhapsody/Makefile.in b/mozilla/timer/src/rhapsody/Makefile.in
index 2a4b468cfb6..3dc1cbf8ce5 100644
--- a/mozilla/timer/src/rhapsody/Makefile.in
+++ b/mozilla/timer/src/rhapsody/Makefile.in
@@ -24,12 +24,13 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
-LIBRARY_NAME = timer_rhapsody_s
+LIBRARY_NAME = timer_s
 
 MODULE=timer
 
 REQUIRES=xpcom
 
+DEFINES += -D_IMPL_NS_TIMER
 CXXFLAGS += $(TK_CFLAGS)
 INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
 
diff --git a/mozilla/timer/src/rhapsody/nsTimer.cpp b/mozilla/timer/src/rhapsody/nsTimer.cpp
index d93a2bb2804..266d7fecef5 100644
--- a/mozilla/timer/src/rhapsody/nsTimer.cpp
+++ b/mozilla/timer/src/rhapsody/nsTimer.cpp
@@ -177,7 +177,7 @@ TimerImpl::Cancel()
 #endif
 }
 
-NS_GFX nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
+NS_TIMER nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
 {
     NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
     if (nsnull == aInstancePtrResult) {
diff --git a/mozilla/timer/src/unix/Makefile.in b/mozilla/timer/src/unix/Makefile.in
index 6d075247461..6660908b8ab 100644
--- a/mozilla/timer/src/unix/Makefile.in
+++ b/mozilla/timer/src/unix/Makefile.in
@@ -24,10 +24,10 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
-DIRS = $(MOZ_GFX_TOOLKIT)
+DIRS = $(MOZ_WIDGET_TOOLKIT)
 ### XXX ### DIRS = gtk motif xlib
 ### XXX ### 
-### XXX ### LIBRARY_NAME = timerutil_s
+### XXX ### LIBRARY_NAME = timer_s
 ### XXX ### 
 ### XXX ### REQUIRES=xpcom
 ### XXX ### 
diff --git a/mozilla/timer/src/unix/gtk/Makefile.in b/mozilla/timer/src/unix/gtk/Makefile.in
index 0cba3118724..d496403bf20 100644
--- a/mozilla/timer/src/unix/gtk/Makefile.in
+++ b/mozilla/timer/src/unix/gtk/Makefile.in
@@ -24,12 +24,12 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
-LIBRARY_NAME = timer_gtk_s
+LIBRARY_NAME = timer_s
 ### XXX ### IS_COMPONENT=1
 
 REQUIRES=xpcom
 
-### XXX ### DEFINES += -D_IMPL_NS_GFXNONXP
+DEFINES += -D_IMPL_NS_TIMER
 CXXFLAGS += $(TK_CFLAGS)
 INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
 
diff --git a/mozilla/timer/src/unix/gtk/nsTimerGtk.cpp b/mozilla/timer/src/unix/gtk/nsTimerGtk.cpp
index 1f0e8fb464a..500d2f3e4f0 100644
--- a/mozilla/timer/src/unix/gtk/nsTimerGtk.cpp
+++ b/mozilla/timer/src/unix/gtk/nsTimerGtk.cpp
@@ -132,7 +132,7 @@ nsTimerGtk::Cancel()
   if (mTimerId)
     gtk_timeout_remove(mTimerId);
 
-  NS_RELEASE(me);
+//  NS_RELEASE(me);
 }
 
 gint nsTimerExpired(gpointer aCallData)
@@ -143,8 +143,7 @@ gint nsTimerExpired(gpointer aCallData)
   return 0;
 }
 
-#if 1
-/* NS_GFXNONXP */ nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
+NS_TIMER nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
 {
     NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
     if (nsnull == aInstancePtrResult) {
@@ -158,4 +157,3 @@ gint nsTimerExpired(gpointer aCallData)
 
     return timer->QueryInterface(kITimerIID, (void **) aInstancePtrResult);
 }
-#endif
diff --git a/mozilla/timer/src/unix/motif/Makefile.in b/mozilla/timer/src/unix/motif/Makefile.in
index 0e53e0c9d70..e6356fa828b 100644
--- a/mozilla/timer/src/unix/motif/Makefile.in
+++ b/mozilla/timer/src/unix/motif/Makefile.in
@@ -24,12 +24,12 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
-LIBRARY_NAME = timer_motif_s
+LIBRARY_NAME = timer_s
 ### XXX ### IS_COMPONENT=1
 
 REQUIRES=xpcom
 
-### XXX ### DEFINES += -D_IMPL_NS_GFXNONXP
+DEFINES += -D_IMPL_NS_TIMER
 CXXFLAGS += $(TK_CFLAGS)
 INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
 
diff --git a/mozilla/timer/src/unix/motif/nsTimerMotif.cpp b/mozilla/timer/src/unix/motif/nsTimerMotif.cpp
index c15439394cd..b1a55f8267d 100644
--- a/mozilla/timer/src/unix/motif/nsTimerMotif.cpp
+++ b/mozilla/timer/src/unix/motif/nsTimerMotif.cpp
@@ -112,30 +112,13 @@ nsTimerMotif::Cancel()
   XtRemoveTimeOut(mTimerId);
 }
 
-NS_GFX nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
-{
-    NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
-    if (nsnull == aInstancePtrResult) {
-      return NS_ERROR_NULL_POINTER;
-    }  
-
-    nsTimerMotif *timer = new nsTimerMotif();
-    if (nsnull == timer) {
-        return NS_ERROR_OUT_OF_MEMORY;
-    }
-
-    return timer->QueryInterface(kITimerIID, (void **) aInstancePtrResult);
-}
-
-
 void nsTimerExpired(XtPointer aCallData)
 {
   nsTimerMotif* timer = (nsTimerMotif *)aCallData;
   timer->FireTimeout();
 }
 
-#if 1
-/* NS_GFXNONXP */ nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
+NS_TIMER nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
 {
     NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
     if (nsnull == aInstancePtrResult) {
@@ -149,4 +132,3 @@ void nsTimerExpired(XtPointer aCallData)
 
     return timer->QueryInterface(kITimerIID, (void **) aInstancePtrResult);
 }
-#endif
diff --git a/mozilla/timer/src/unix/xlib/Makefile.in b/mozilla/timer/src/unix/xlib/Makefile.in
index 973a42438de..73c13a5b731 100644
--- a/mozilla/timer/src/unix/xlib/Makefile.in
+++ b/mozilla/timer/src/unix/xlib/Makefile.in
@@ -24,12 +24,12 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
-LIBRARY_NAME = timer_xlib_s
+LIBRARY_NAME = timer_s
 ### XXX ### IS_COMPONENT=1
 
 REQUIRES=xpcom
 
-### XXX ### DEFINES += -D_IMPL_NS_GFXNONXP
+DEFINES += -D_IMPL_NS_TIMER
 CXXFLAGS += $(TK_CFLAGS)
 INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
 
diff --git a/mozilla/timer/src/unix/xlib/nsTimerXlib.cpp b/mozilla/timer/src/unix/xlib/nsTimerXlib.cpp
index 7666aa008db..d1209a08483 100644
--- a/mozilla/timer/src/unix/xlib/nsTimerXlib.cpp
+++ b/mozilla/timer/src/unix/xlib/nsTimerXlib.cpp
@@ -200,23 +200,6 @@ nsTimerXlib::ProcessTimeouts(struct timeval *aNow)
   }
 }
 
-#if 0
-NS_GFX nsresult NS_NewTimer(nsITimer **aInstancePtrResult)
-{
-  NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
-  if (nsnull == aInstancePtrResult) {
-    return NS_ERROR_NULL_POINTER;
-  }  
-  
-  nsTimerXlib *timer = new nsTimerXlib();
-  if (nsnull == timer) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-  
-  return timer->QueryInterface(kITimerIID, (void **) aInstancePtrResult);
-}
-#endif
-
 int NS_TimeToNextTimeout(struct timeval *aTimer) {
   nsTimerXlib *timer;
   timer = nsTimerXlib::gTimerList;
@@ -255,8 +238,7 @@ void NS_ProcessTimeouts(void) {
   nsTimerXlib::ProcessTimeouts(&now);
 }
 
-#if 1
-/* NS_GFXNONXP */ nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
+NS_TIMER nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
 {
     NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
     if (nsnull == aInstancePtrResult) {
@@ -270,4 +252,3 @@ void NS_ProcessTimeouts(void) {
 
     return timer->QueryInterface(kITimerIID, (void **) aInstancePtrResult);
 }
-#endif
diff --git a/mozilla/timer/src/windows/makefile.win b/mozilla/timer/src/windows/makefile.win
index a155ac69c71..2f1f09432f9 100644
--- a/mozilla/timer/src/windows/makefile.win
+++ b/mozilla/timer/src/windows/makefile.win
@@ -18,7 +18,7 @@
 DEPTH=..\..\..
 LIBRARY_NAME=timer_s
 
-DEFINES=#-D_IMPL_NS_GFX -D_IMPL_NS_GFXNONXP -DWIN32_LEAN_AND_MEAN -DSTRICT
+DEFINES=-D_IMPL_NS_TIMER -DWIN32_LEAN_AND_MEAN -DSTRICT
 
 CPPSRCS =			\
 	nsTimer.cpp		\
diff --git a/mozilla/timer/src/windows/nsTimer.cpp b/mozilla/timer/src/windows/nsTimer.cpp
index b652feecb70..8da495f6788 100644
--- a/mozilla/timer/src/windows/nsTimer.cpp
+++ b/mozilla/timer/src/windows/nsTimer.cpp
@@ -346,7 +346,7 @@ TimerImpl::Cancel()
     SyncTimeoutPeriod(0);
 }
 
-NS_GFX nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
+NS_TIMER nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
 {
     NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
     if (nsnull == aInstancePtrResult) {