diff --git a/src/OpenMesh/Core/Mesh/ArrayKernel.hh b/src/OpenMesh/Core/Mesh/ArrayKernel.hh
index e832e766..946545bb 100644
--- a/src/OpenMesh/Core/Mesh/ArrayKernel.hh
+++ b/src/OpenMesh/Core/Mesh/ArrayKernel.hh
@@ -316,10 +316,10 @@ public:
   void clean();
 
   // --- number of items ---
-  unsigned int n_vertices()  const { return vertices_.size(); }
-  unsigned int n_halfedges() const { return 2*edges_.size(); }
-  unsigned int n_edges()     const { return edges_.size(); }
-  unsigned int n_faces()     const { return faces_.size(); }
+  size_t n_vertices()  const { return vertices_.size(); }
+  size_t n_halfedges() const { return 2*edges_.size(); }
+  size_t n_edges()     const { return edges_.size(); }
+  size_t n_faces()     const { return faces_.size(); }
 
   bool vertices_empty()  const { return vertices_.empty(); }
   bool halfedges_empty() const { return edges_.empty(); }
diff --git a/src/OpenMesh/Core/Mesh/BaseKernel.hh b/src/OpenMesh/Core/Mesh/BaseKernel.hh
index b6f035ce..790a1ba8 100644
--- a/src/OpenMesh/Core/Mesh/BaseKernel.hh
+++ b/src/OpenMesh/Core/Mesh/BaseKernel.hh
@@ -630,10 +630,10 @@ protected: // low-level access non-public
 public: //----------------------------------------------------- element numbers
 
 
-  virtual uint n_vertices()  const { return 0; }
-  virtual uint n_halfedges() const { return 0; }
-  virtual uint n_edges()     const { return 0; }
-  virtual uint n_faces()     const { return 0; }
+  virtual size_t n_vertices()  const { return 0; }
+  virtual size_t n_halfedges() const { return 0; }
+  virtual size_t n_edges()     const { return 0; }
+  virtual size_t n_faces()     const { return 0; }
 
 
 protected: //------------------------------------------- synchronize properties
diff --git a/src/OpenMesh/Core/Mesh/IteratorsT.hh b/src/OpenMesh/Core/Mesh/IteratorsT.hh
index 98e5927a..9bfaf9fc 100644
--- a/src/OpenMesh/Core/Mesh/IteratorsT.hh
+++ b/src/OpenMesh/Core/Mesh/IteratorsT.hh
@@ -77,7 +77,7 @@ template <class Mesh> class ConstFaceIterT;
 template <class Mesh> class FaceIterT;
 
 
-template <class Mesh, class ValueHandle, class MemberOwner, bool (MemberOwner::*PrimitiveStatusMember)() const, uint (MemberOwner::*PrimitiveCountMember)() const>
+template <class Mesh, class ValueHandle, class MemberOwner, bool (MemberOwner::*PrimitiveStatusMember)() const, size_t (MemberOwner::*PrimitiveCountMember)() const>
 class GenericIteratorT {
     public:
         //--- Typedefs ---