diff --git a/matrix.hpp b/matrix.hpp
index 86941a78..e5d8c02d 100644
--- a/matrix.hpp
+++ b/matrix.hpp
@@ -11,10 +11,8 @@
 #include "point.hpp"
 #include "range.hpp"
 #include "vector.hpp"
-#include "iterator/infix.hpp"
 
 #include <cstdlib>
-#include <ostream>
 
 namespace cruft {
     ///////////////////////////////////////////////////////////////////////////
@@ -530,8 +528,14 @@ namespace cruft {
 
     typedef matrix<4,4,float> matrix4f;
     typedef matrix<4,4,double> matrix4d;
+}
 
 
+#include "iterator/infix.hpp"
+#include "coord/iostream.hpp"
+#include <ostream>
+
+namespace cruft {
     ///////////////////////////////////////////////////////////////////////////
     template <std::size_t Rows, std::size_t Cols, typename T>
     std::ostream&