diff --git a/src/common/LinkedObjectPool.hxx b/src/common/LinkedObjectPool.hxx
index 8d358f84a..f10bd22e9 100644
--- a/src/common/LinkedObjectPool.hxx
+++ b/src/common/LinkedObjectPool.hxx
@@ -55,6 +55,7 @@ class LinkedObjectPool
   public:
     using iter = typename std::list<T>::iterator;
     using const_iter = typename std::list<T>::const_iterator;
+    using size_type = typename std::list<T>::size_type;
 
     /*
       Create a pool of size CAPACITY; the active list starts out empty.
@@ -200,7 +201,7 @@ class LinkedObjectPool
 #endif
     uInt32 capacity() const { return CAPACITY; }
 
-    size_t size() const { return myList.size();             }
+    size_type size() const { return myList.size();             }
     bool empty() const  { return myList.size() == 0;        }
     bool full() const   { return myList.size() >= CAPACITY; }
 
diff --git a/src/common/RewindManager.cxx b/src/common/RewindManager.cxx
index 4193ff375..1b2841a83 100644
--- a/src/common/RewindManager.cxx
+++ b/src/common/RewindManager.cxx
@@ -126,9 +126,9 @@ void RewindManager::compressStates()
   uInt64 lastCycle = currentCycle;
   double expectedCycles = 76 * 262.0; // == cycles of 1 frame, TODO: use actual number of scanlines
   double maxDelta = 0;
-  size_t removeIdx = 0;
+  size_type removeIdx = 0;
 
-  size_t idx = myStateList.size() - 1;
+  size_type idx = myStateList.size() - 1;
   for(auto it = myStateList.last(); it != myStateList.first(); --it)
   {
 cerr << *it << endl << endl;  // debug code
diff --git a/src/common/RewindManager.hxx b/src/common/RewindManager.hxx
index 295fe6799..17740d159 100644
--- a/src/common/RewindManager.hxx
+++ b/src/common/RewindManager.hxx
@@ -99,6 +99,8 @@ class RewindManager
       }
     };
 
+    using size_type = Common::LinkedObjectPool<RewindState>::size_type;
+
     // The linked-list to store states (internally it takes care of reducing
     // frequent (de)-allocations)
     Common::LinkedObjectPool<RewindState, MAX_SIZE> myStateList;