diff --git a/extent.cpp b/extent.cpp
index 2992aa43..0ff56eb2 100644
--- a/extent.cpp
+++ b/extent.cpp
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with libgim.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Copyright 2010-2012 Danny Robson <danny@nerdcruft.net>
+ * Copyright 2010-2015 Danny Robson <danny@nerdcruft.net>
  */
 
 #include "extent.hpp"
@@ -113,15 +113,15 @@ namespace util {
 //-----------------------------------------------------------------------------
 template <typename T>
 std::ostream&
-operator<< (std::ostream &os, util::extent<T> e) {
+util::operator<< (std::ostream &os, util::extent<T> e) {
     os << "[" << e.w << ", " << e.h << "]";
     return os;
 }
 
 
-template std::ostream& operator<< (std::ostream&, util::extent<uint16_t>);
-template std::ostream& operator<< (std::ostream&, util::extent<uint32_t>);
-template std::ostream& operator<< (std::ostream&, util::extent<uint64_t>);
+template std::ostream& util::operator<< (std::ostream&, util::extent<uint16_t>);
+template std::ostream& util::operator<< (std::ostream&, util::extent<uint32_t>);
+template std::ostream& util::operator<< (std::ostream&, util::extent<uint64_t>);
 
 //-----------------------------------------------------------------------------
 namespace util {
diff --git a/extent.hpp b/extent.hpp
index e36e75f8..866bb7ff 100644
--- a/extent.hpp
+++ b/extent.hpp
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with libgim.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Copyright 2010-2012 Danny Robson <danny@nerdcruft.net>
+ * Copyright 2010-2015 Danny Robson <danny@nerdcruft.net>
  */
 
 #ifndef __UTIL_EXTENT_HPP
@@ -50,10 +50,13 @@ namespace util {
 
         void sanity (void) const;
     };
+
+    typedef extent<size_t> extent2u;
+
+    template <typename T>
+    std::ostream& operator<< (std::ostream&, util::extent<T>);
 }
 
-template <typename T>
-std::ostream& operator<< (std::ostream&, util::extent<T>);
 
 #include "extent.ipp"