16 files changed, 26 insertions, 7 deletions
diff --git a/app/tween.cc b/app/tween.cc
index 57cd83e..610e01a 100644
--- a/app/tween.cc
+++ b/app/tween.cc
@@ -10,6 +10,7 @@
 #include <float.h>
 #endif
 
+#include "base/logging.h"
 #include "gfx/rect.h"
 
 // static
diff --git a/app/tween.h b/app/tween.h
index 15396e9..8909906 100644
--- a/app/tween.h
+++ b/app/tween.h
@@ -6,7 +6,7 @@
 #define APP_TWEEN_H_
 #pragma once
 
-#include "base/logging.h"
+#include "base/basictypes.h"
 
 namespace gfx {
 class Rect;
diff --git a/app/x11_util.cc b/app/x11_util.cc
index 101815a..ba014dc 100644
--- a/app/x11_util.cc
+++ b/app/x11_util.cc
@@ -22,6 +22,7 @@
 #include "base/logging.h"
 #include "base/thread.h"
 #include "app/x11_util_internal.h"
+#include "gfx/rect.h"
 #include "gfx/size.h"
 
 namespace x11_util {
diff --git a/app/x11_util.h b/app/x11_util.h
index 2c983fc..3e4c7e1 100644
--- a/app/x11_util.h
+++ b/app/x11_util.h
@@ -15,8 +15,7 @@
 #include <string>
 #include <vector>
 
-#include "base/task.h"
-#include "gfx/rect.h"
+#include "base/basictypes.h"
 
 typedef struct _GdkDrawable GdkWindow;
 typedef struct _GtkWidget GtkWidget;
@@ -30,6 +29,7 @@ class Thread;
 }
 
 namespace gfx {
+class Rect;
 class Size;
 }
 
diff --git a/chrome/browser/gtk/rounded_window.cc b/chrome/browser/gtk/rounded_window.cc
index e2fde09..f0d827d 100644
--- a/chrome/browser/gtk/rounded_window.cc
+++ b/chrome/browser/gtk/rounded_window.cc
@@ -9,6 +9,7 @@
 
 #include "app/gtk_signal_registrar.h"
 #include "base/i18n/rtl.h"
+#include "base/logging.h"
 #include "chrome/browser/gtk/gtk_util.h"
 
 namespace gtk_util {
diff --git a/chrome/browser/renderer_host/video_layer_x.h b/chrome/browser/renderer_host/video_layer_x.h
index 3e00108..5225d4e 100644
--- a/chrome/browser/renderer_host/video_layer_x.h
+++ b/chrome/browser/renderer_host/video_layer_x.h
@@ -8,6 +8,7 @@
 
 #include "app/x11_util.h"
 #include "chrome/browser/renderer_host/video_layer.h"
+#include "gfx/rect.h"
 
 // Implements a YUV data layer using X to hold the RGB data.
 class VideoLayerX : public VideoLayer {
diff --git a/chrome/gpu/gpu_backing_store_glx.h b/chrome/gpu/gpu_backing_store_glx.h
index ad0c683..d5ac83a 100644
--- a/chrome/gpu/gpu_backing_store_glx.h
+++ b/chrome/gpu/gpu_backing_store_glx.h
@@ -9,6 +9,7 @@
 #include "app/surface/transport_dib.h"
 #include "base/basictypes.h"
 #include "base/process.h"
+#include "gfx/size.h"
 #include "ipc/ipc_channel.h"
 
 class GpuViewX;
diff --git a/chrome/gpu/gpu_video_layer_glx.h b/chrome/gpu/gpu_video_layer_glx.h
index 5ece3a9..0a67184 100644
--- a/chrome/gpu/gpu_video_layer_glx.h
+++ b/chrome/gpu/gpu_video_layer_glx.h
@@ -9,6 +9,8 @@
 #include "app/surface/transport_dib.h"
 #include "base/basictypes.h"
 #include "base/process.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 #include "ipc/ipc_channel.h"
 
 class GpuViewX;
diff --git a/gfx/blit.h b/gfx/blit.h
index 0aa02e6..4fda0b5 100644
--- a/gfx/blit.h
+++ b/gfx/blit.h
@@ -7,8 +7,6 @@
 #pragma once
 
 #include "gfx/native_widget_types.h"
-#include "gfx/point.h"
-#include "gfx/rect.h"
 
 namespace skia {
 class PlatformCanvas;
diff --git a/gfx/blit_unittest.cc b/gfx/blit_unittest.cc
index c5bff1e..cea3296 100644
--- a/gfx/blit_unittest.cc
+++ b/gfx/blit_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "base/basictypes.h"
 #include "gfx/blit.h"
+#include "gfx/point.h"
+#include "gfx/rect.h"
 #include "skia/ext/platform_canvas.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/gfx/canvas.h b/gfx/canvas.h
index de06e73..8699807 100644
--- a/gfx/canvas.h
+++ b/gfx/canvas.h
@@ -8,7 +8,6 @@
 
 #include <string>
 
-#include "gfx/brush.h"
 #include "gfx/native_widget_types.h"
 // TODO(beng): remove this include when we no longer depend on SkTypes.
 #include "skia/ext/platform_canvas.h"
diff --git a/gfx/canvas_direct2d.cc b/gfx/canvas_direct2d.cc
index 633ea9f..dbd1287 100644
--- a/gfx/canvas_direct2d.cc
+++ b/gfx/canvas_direct2d.cc
@@ -5,6 +5,7 @@
 #include "gfx/canvas_direct2d.h"
 
 #include "base/scoped_ptr.h"
+#include "gfx/brush.h"
 #include "gfx/rect.h"
 
 namespace {
diff --git a/gfx/canvas_direct2d_unittest.cc b/gfx/canvas_direct2d_unittest.cc
index 6595a4c..95f4398 100644
--- a/gfx/canvas_direct2d_unittest.cc
+++ b/gfx/canvas_direct2d_unittest.cc
@@ -11,6 +11,7 @@
 #include "base/ref_counted_memory.h"
 #include "base/resource_util.h"
 #include "base/scoped_ptr.h"
+#include "gfx/brush.h"
 #include "gfx/canvas_direct2d.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/codec/png_codec.h"
diff --git a/gfx/canvas_skia.cc b/gfx/canvas_skia.cc
index f2c344c..d46e519 100644
--- a/gfx/canvas_skia.cc
+++ b/gfx/canvas_skia.cc
@@ -8,6 +8,7 @@
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
+#include "gfx/brush.h"
 #include "gfx/font.h"
 #include "gfx/rect.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
diff --git a/gfx/path.cc b/gfx/path.cc
index 10d1ddd..e456679 100644
--- a/gfx/path.cc
+++ b/gfx/path.cc
@@ -8,6 +8,11 @@
 
 namespace gfx {
 
+Path::Path()
+    : SkPath() {
+  moveTo(0, 0);
+}
+
 Path::Path(const Point* points, size_t count) {
   DCHECK(count > 1);
   moveTo(SkIntToScalar(points[0].x), SkIntToScalar(points[0].y));
@@ -15,4 +20,7 @@ Path::Path(const Point* points, size_t count) {
     lineTo(SkIntToScalar(points[i].x), SkIntToScalar(points[i].y));
 }
 
+Path::~Path() {
+}
+
 }  // namespace gfx
diff --git a/gfx/path.h b/gfx/path.h
index cdc11c8..36fed4a 100644
--- a/gfx/path.h
+++ b/gfx/path.h
@@ -21,11 +21,13 @@ class Path : public SkPath {
     int y;
   };
 
-  Path() : SkPath() { moveTo(0, 0); }
+  Path();
 
   // Creates a path populated with the specified points.
   Path(const Point* points, size_t count);
 
+  ~Path();
+
 #if defined(OS_WIN) || defined(USE_X11)
   // Creates a NativeRegion from the path. The caller is responsible for freeing
   // resources used by this region. This only supports polygon paths.