diff --git a/src/ca/repeaterSubscribeTimer.cpp b/src/ca/repeaterSubscribeTimer.cpp
index ffdfc8f53..c1775c6f9 100644
--- a/src/ca/repeaterSubscribeTimer.cpp
+++ b/src/ca/repeaterSubscribeTimer.cpp
@@ -22,7 +22,7 @@
 #undef epicsExportSharedSymbols
 
 repeaterSubscribeTimer::repeaterSubscribeTimer ( udpiiu &iiuIn, epicsTimerQueue &queueIn ) :
-    queue ( queueIn ), timer ( queueIn.createTimer () ), iiu ( iiuIn ), 
+    timer ( queueIn.createTimer () ), iiu ( iiuIn ), 
         attempts ( 0 ), registered ( false ), once ( false )
 {
     this->timer.start ( *this, 10.0 );
@@ -30,7 +30,7 @@ repeaterSubscribeTimer::repeaterSubscribeTimer ( udpiiu &iiuIn, epicsTimerQueue
 
 repeaterSubscribeTimer::~repeaterSubscribeTimer ()
 {
-    this->queue.destroyTimer ( this->timer );
+    this->timer.getQueue().destroyTimer ( this->timer );
 }
 
 epicsTimerNotify::expireStatus repeaterSubscribeTimer::expire ( const epicsTime & currentTime )
diff --git a/src/ca/repeaterSubscribeTimer.h b/src/ca/repeaterSubscribeTimer.h
index 6d206607a..28b59a86d 100644
--- a/src/ca/repeaterSubscribeTimer.h
+++ b/src/ca/repeaterSubscribeTimer.h
@@ -29,7 +29,6 @@ public:
     void confirmNotify ();
 	void show ( unsigned level ) const;
 private:
-    epicsTimerQueue &queue;
     epicsTimer &timer;
     udpiiu &iiu;
     unsigned attempts;
diff --git a/src/ca/searchTimer.cpp b/src/ca/searchTimer.cpp
index e08c2ef94..11c7021b2 100644
--- a/src/ca/searchTimer.cpp
+++ b/src/ca/searchTimer.cpp
@@ -37,7 +37,6 @@ static const double maxSearchPeriod = 5.0; // seconds
 searchTimer::searchTimer ( udpiiu &iiuIn, epicsTimerQueue &queueIn, epicsMutex &mutexIn ) :
     period ( initialRoundTripEstimate * 2.0 ),
     roundTripDelayEstimate ( initialRoundTripEstimate ),
-    queue ( queueIn ),
     timer ( queueIn.createTimer () ),
     mutex ( mutexIn ),
     iiu ( iiuIn ),
@@ -58,7 +57,7 @@ searchTimer::searchTimer ( udpiiu &iiuIn, epicsTimerQueue &queueIn, epicsMutex &
 
 searchTimer::~searchTimer ()
 {
-    this->queue.destroyTimer ( this->timer );
+    this->timer.getQueue().destroyTimer ( this->timer );
 }
 
 //
diff --git a/src/ca/searchTimer.h b/src/ca/searchTimer.h
index 17f1bad50..e9dcb6e4e 100644
--- a/src/ca/searchTimer.h
+++ b/src/ca/searchTimer.h
@@ -34,7 +34,6 @@ private:
     epicsTime timeAtLastRetry;
     double period; /* period between tries */
     double roundTripDelayEstimate;
-    epicsTimerQueue &queue;
     epicsTimer &timer;
     epicsMutex &mutex;
     udpiiu &iiu;
diff --git a/src/ca/tcpRecvWatchdog.cpp b/src/ca/tcpRecvWatchdog.cpp
index 7c7734159..8618281f7 100644
--- a/src/ca/tcpRecvWatchdog.cpp
+++ b/src/ca/tcpRecvWatchdog.cpp
@@ -20,7 +20,7 @@
 //
 tcpRecvWatchdog::tcpRecvWatchdog 
     ( tcpiiu &iiuIn, double periodIn, epicsTimerQueue & queueIn ) :
-        period ( periodIn ), queue ( queueIn ), timer ( queueIn.createTimer () ),
+        period ( periodIn ), timer ( queueIn.createTimer () ),
         iiu ( iiuIn ), responsePending ( false ),
         beaconAnomaly ( true )
 {
@@ -28,7 +28,7 @@ tcpRecvWatchdog::tcpRecvWatchdog
 
 tcpRecvWatchdog::~tcpRecvWatchdog ()
 {
-    this->queue.destroyTimer ( this->timer );
+    this->timer.getQueue().destroyTimer ( this->timer );
 }
 
 epicsTimerNotify::expireStatus tcpRecvWatchdog::expire ( const epicsTime & /* currentTime */ )
diff --git a/src/ca/tcpSendWatchdog.cpp b/src/ca/tcpSendWatchdog.cpp
index 9837deaaf..bc07355cb 100644
--- a/src/ca/tcpSendWatchdog.cpp
+++ b/src/ca/tcpSendWatchdog.cpp
@@ -17,14 +17,14 @@
 
 tcpSendWatchdog::tcpSendWatchdog 
     ( tcpiiu &iiuIn, double periodIn, epicsTimerQueue & queueIn ) :
-    period ( periodIn ), queue ( queueIn ), timer ( queueIn.createTimer () ),
+    period ( periodIn ), timer ( queueIn.createTimer () ),
     iiu ( iiuIn )
 {
 }
 
 tcpSendWatchdog::~tcpSendWatchdog ()
 {
-    this->queue.destroyTimer ( this->timer );
+    this->timer.getQueue().destroyTimer ( this->timer );
 }
 
 epicsTimerNotify::expireStatus tcpSendWatchdog::expire ( const epicsTime & currentTime )
diff --git a/src/ca/virtualCircuit.h b/src/ca/virtualCircuit.h
index 17639d31d..d4fde2931 100644
--- a/src/ca/virtualCircuit.h
+++ b/src/ca/virtualCircuit.h
@@ -159,7 +159,6 @@ public:
     void show ( unsigned level ) const;
 private:
     const double period;
-    epicsTimerQueue & queue;
     epicsTimer & timer;
     tcpiiu &iiu;
     bool responsePending;
@@ -175,7 +174,6 @@ public:
     void cancel ();
 private:
     const double period;
-    epicsTimerQueue & queue;
     epicsTimer & timer;
     tcpiiu & iiu;
     expireStatus expire ( const epicsTime & currentTime );
diff --git a/src/libCom/test/epicsTimerTest.cpp b/src/libCom/test/epicsTimerTest.cpp
index dae33d6d8..c7f2e71ef 100644
--- a/src/libCom/test/epicsTimerTest.cpp
+++ b/src/libCom/test/epicsTimerTest.cpp
@@ -49,7 +49,6 @@ public:
 protected:
     virtual ~delayVerify ();
 private:
-    epicsTimerQueue &queue;
     epicsTimer &timer;
     epicsTime beginStamp;
     epicsTime expireStamp;
@@ -63,14 +62,13 @@ static unsigned expireCount;
 static epicsEvent expireEvent;
 
 delayVerify::delayVerify ( double expectedDelayIn, epicsTimerQueue &queueIn ) :
-    queue ( queueIn ), timer ( queueIn.createTimer() ), 
-        expectedDelay ( expectedDelayIn )
+    timer ( queueIn.createTimer() ), expectedDelay ( expectedDelayIn )
 {
 }
 
 delayVerify::~delayVerify ()
 {
-    this->queue.destroyTimer ( this->timer );
+    this->timer.getQueue().destroyTimer ( this->timer );
 }
 
 inline void delayVerify::setBegin ( const epicsTime &beginIn )
@@ -165,7 +163,6 @@ public:
 protected:
     virtual ~cancelVerify ();
 private:
-    epicsTimerQueue &queue;
     epicsTimer &timer;
     bool failOutIfExpireIsCalled;
     expireStatus expire ( const epicsTime & );
@@ -174,14 +171,13 @@ private:
 };
 
 cancelVerify::cancelVerify ( epicsTimerQueue &queueIn ) :
-    queue ( queueIn ), timer ( queueIn.createTimer () ), 
-        failOutIfExpireIsCalled ( false )
+    timer ( queueIn.createTimer () ), failOutIfExpireIsCalled ( false )
 {
 }
 
 cancelVerify::~cancelVerify ()
 {
-    this->queue.destroyTimer ( this->timer );
+    this->timer.getQueue().destroyTimer ( this->timer );
 }
 
 inline void cancelVerify::start ( const epicsTime &expireTime )
@@ -259,7 +255,6 @@ public:
 protected:
     virtual ~periodicVerify ();
 private:
-    epicsTimerQueue &queue;
     epicsTimer &timer;
     unsigned nExpire;
     bool failOutIfExpireIsCalled;
@@ -269,14 +264,14 @@ private:
 };
 
 periodicVerify::periodicVerify ( epicsTimerQueue & queueIn ) :
-    queue ( queueIn ), timer ( queueIn.createTimer () ), 
-        nExpire ( 0u ), failOutIfExpireIsCalled ( false )
+    timer ( queueIn.createTimer () ), nExpire ( 0u ), 
+        failOutIfExpireIsCalled ( false )
 {
 }
 
 periodicVerify::~periodicVerify ()
 {
-    this->queue.destroyTimer ( this->timer );
+    this->timer.getQueue().destroyTimer ( this->timer );
 }
 
 inline void periodicVerify::start ( const epicsTime &expireTime )