diff --git a/db/mork/src/morkPool.cpp b/db/mork/src/morkPool.cpp
index 27d8a57fdf43..79f6adc35394 100644
--- a/db/mork/src/morkPool.cpp
+++ b/db/mork/src/morkPool.cpp
@@ -137,10 +137,10 @@ morkPool::ClosePool(morkEnv* ev) // called by CloseMorkNode();
 
       nsIMdbHeap* heap = mPool_Heap;
       nsIMdbEnv* mev = ev->AsMdbEnv();
-      morkLink* link;
+      morkLink* aLink;
       morkDeque* d = &mPool_FreeHandleFrames;
-      while ( (link = d->RemoveFirst()) != 0 )
-        heap->Free(mev, link);
+      while ( (aLink = d->RemoveFirst()) != 0 )
+        heap->Free(mev, aLink);
   
       this->MarkShut();
     }
@@ -162,10 +162,10 @@ morkPool::NewHandle(morkEnv* ev, mork_size inSize, morkZone* ioZone)
   void* newBlock = 0;
   if ( inSize <= sizeof(morkHandleFrame) )
   {
-    morkLink* link = mPool_FreeHandleFrames.RemoveFirst();
-    if ( link )
+    morkLink* firstLink = mPool_FreeHandleFrames.RemoveFirst();
+    if ( firstLink )
     {
-      newBlock = link;
+      newBlock = firstLink;
       if ( mPool_FreeFramesCount )
         --mPool_FreeFramesCount;
       else
@@ -193,8 +193,8 @@ morkPool::ZapHandle(morkEnv* ev, morkHandleFace* ioHandle)
 {
   if ( ioHandle )
   {
-    morkLink* link = (morkLink*) ioHandle;
-    mPool_FreeHandleFrames.AddLast(link);
+    morkLink* handleLink = (morkLink*) ioHandle;
+    mPool_FreeHandleFrames.AddLast(handleLink);
     ++mPool_FreeFramesCount;
   }
 }
diff --git a/db/mork/src/morkSorting.cpp b/db/mork/src/morkSorting.cpp
index ae02c949a6fd..b82aac27ae0c 100644
--- a/db/mork/src/morkSorting.cpp
+++ b/db/mork/src/morkSorting.cpp
@@ -321,8 +321,8 @@ morkSorting::NewSortingRowCursor(morkEnv* ev, mork_pos inRowPos)
   morkSortingRowCursor* outCursor = 0;
   if ( ev->Good() )
   {
-    nsIMdbHeap* heap = mSorting_Table->mTable_Store->mPort_Heap;
-    morkSortingRowCursor* cursor = 0;
+//    nsIMdbHeap* heap = mSorting_Table->mTable_Store->mPort_Heap;
+//    morkSortingRowCursor* cursor = 0;
       
     // $$$$$
     // morkSortingRowCursor* cursor = new(*heap, ev)
diff --git a/db/mork/src/morkStore.cpp b/db/mork/src/morkStore.cpp
index ef851c44775f..3ea332bc740c 100644
--- a/db/mork/src/morkStore.cpp
+++ b/db/mork/src/morkStore.cpp
@@ -292,7 +292,6 @@ mork_bool morkStore::DoPreferLargeOverCompressCommit(morkEnv* ev)
   // true when mStore_CanWriteIncremental && store has file large enough 
 {
   nsIMdbFile* file = mStore_File;
-  nsIMdbEnv* menv = ev->AsMdbEnv();
   if ( file && mStore_CanWriteIncremental )
   {
     mdb_pos fileEof = 0;
@@ -307,7 +306,6 @@ mork_percent morkStore::PercentOfStoreWasted(morkEnv* ev)
 {
   mork_percent outPercent = 0;
   nsIMdbFile* file = mStore_File;
-  nsIMdbEnv* menv = ev->AsMdbEnv();
   
   if ( file )
   {
diff --git a/db/mork/src/morkWriter.cpp b/db/mork/src/morkWriter.cpp
index 5219819f26bc..cb88153507eb 100644
--- a/db/mork/src/morkWriter.cpp
+++ b/db/mork/src/morkWriter.cpp
@@ -2013,7 +2013,7 @@ morkWriter::PutRow(morkEnv* ev, morkRow* ioRow)
           mWriter_LineSize = stream->PutIndent(ev, 0); // no indent
       }
       
-      mork_rid rid = roid->mOid_Id;
+//      mork_rid rid = roid->mOid_Id;
       *p++ = '['; // start row punct=1
       mork_size punctSize = 9; // counting "{ /*r=*/ "