diff --git a/aabb.hpp b/aabb.hpp
index d005416d..22179e2a 100644
--- a/aabb.hpp
+++ b/aabb.hpp
@@ -45,12 +45,12 @@ namespace util {
     };
 
     typedef AABB<2,float> AABB2f;
-    typedef AABB<2,uint32_t> AABB2u;
-    typedef AABB<2,int32_t> AABB2i;
+    typedef AABB<2,size_t> AABB2u;
+    typedef AABB<2,intmax_t> AABB2i;
 
     typedef AABB<3,float> AABB3f;
-    typedef AABB<3,uint32_t> AABB3u;
-    typedef AABB<3,uint32_t> AABB3i;
+    typedef AABB<3,size_t> AABB3u;
+    typedef AABB<3,intmax_t> AABB3i;
 
     template <size_t S, typename T>
     std::ostream& operator<< (std::ostream&, AABB<S,T>);
diff --git a/extent.hpp b/extent.hpp
index 11785cb4..c6014e99 100644
--- a/extent.hpp
+++ b/extent.hpp
@@ -55,7 +55,7 @@ namespace util {
         static const extent MIN;
     };
 
-    typedef extent<2,int> extent2i;
+    typedef extent<2,intmax_t> extent2i;
     typedef extent<2,size_t> extent2u;
     typedef extent<2,float> extent2f;
     typedef extent<2,double> extent2d;
diff --git a/point.hpp b/point.hpp
index 87ab14e2..c54efcc7 100644
--- a/point.hpp
+++ b/point.hpp
@@ -70,6 +70,7 @@ namespace util {
     typedef point<3,double> point3d;
 
     typedef point<2,size_t> point2u;
+    typedef point<2,intmax_t> point2i;
 }
 
 #include <functional>
diff --git a/vector.hpp b/vector.hpp
index 1fa01caa..996f1a58 100644
--- a/vector.hpp
+++ b/vector.hpp
@@ -71,7 +71,7 @@ namespace util {
 
     // convenience typedefs
     typedef vector<2,size_t> vector2u;
-    typedef vector<2,long> vector2i;
+    typedef vector<2,intmax_t> vector2i;
 
     typedef vector<2,float> vector2f;
     typedef vector<3,float> vector3f;