3 files changed, 3 insertions, 17 deletions
diff --git a/base/gfx/point.h b/base/gfx/point.h
index c36c1d4d..1dbf5bd 100644
--- a/base/gfx/point.h
+++ b/base/gfx/point.h
@@ -7,9 +7,7 @@
 
 #include "build/build_config.h"
 
-#ifdef UNIT_TEST
 #include <iostream>
-#endif
 
 #if defined(OS_WIN)
 typedef struct tagPOINT POINT;
@@ -71,13 +69,9 @@ class Point {
 
 }  // namespace gfx
 
-#ifdef UNIT_TEST
-
 inline std::ostream& operator<<(std::ostream& out, const gfx::Point& p) {
   return out << p.x() << "," << p.y();
 }
 
-#endif  // #ifdef UNIT_TEST
-
 #endif // BASE_GFX_POINT_H__
 
diff --git a/base/gfx/rect.h b/base/gfx/rect.h
index 54e864d..a1759f5 100755
--- a/base/gfx/rect.h
+++ b/base/gfx/rect.h
@@ -12,8 +12,10 @@
 #ifndef BASE_GFX_RECT_H__
 #define BASE_GFX_RECT_H__
 
-#include "base/gfx/size.h"
+#include <iostream>
+
 #include "base/gfx/point.h"
+#include "base/gfx/size.h"
 
 #if defined(OS_WIN)
 typedef struct tagRECT RECT;
@@ -155,13 +157,9 @@ class Rect {
 
 }  // namespace gfx
 
-#ifdef UNIT_TEST
-
 inline std::ostream& operator<<(std::ostream& out, const gfx::Rect& r) {
   return out << r.origin() << " " << r.size();
 }
 
-#endif  // #ifdef UNIT_TEST
-
 #endif  // BASE_GFX_RECT_H__
 
diff --git a/base/gfx/size.h b/base/gfx/size.h
index 175a206..e4666d6 100644
--- a/base/gfx/size.h
+++ b/base/gfx/size.h
@@ -7,9 +7,7 @@
 
 #include "build/build_config.h"
 
-#ifdef UNIT_TEST
 #include <iostream>
-#endif
 
 #if defined(OS_WIN)
 typedef struct tagSIZE SIZE;
@@ -70,13 +68,9 @@ class Size {
 
 }  // namespace gfx
 
-#ifdef UNIT_TEST
-
 inline std::ostream& operator<<(std::ostream& out, const gfx::Size& s) {
   return out << s.width() << "x" << s.height();
 }
 
-#endif  // #ifdef UNIT_TEST
-
 #endif // BASE_GFX_SIZE_H__