diff --git a/base/base.gyp b/base/base.gyp
index 25d9e32367e39288ccfe13d7f865f82bcec09646..e281a43ad38fe888f40fedf7e58987e0a707d1f6 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -550,11 +550,6 @@
         'gfx/native_theme.h',
         'gfx/native_widget_types.h',
         'gfx/native_widget_types_gtk.cc',
-        'gfx/platform_canvas.h',
-        'gfx/platform_canvas_linux.h',
-        'gfx/platform_canvas_mac.h',
-        'gfx/platform_device_linux.h',
-        'gfx/platform_device_mac.h',
         'gfx/png_decoder.cc',
         'gfx/png_decoder.h',
         'gfx/png_encoder.cc',
diff --git a/base/gfx/platform_canvas.h b/base/gfx/platform_canvas.h
index 427a7f844edf6d0e60b670666a3a6c1e5e607fcb..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/base/gfx/platform_canvas.h
+++ b/base/gfx/platform_canvas.h
@@ -1,7 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// TODO(brettw) this file should be removed and the includes changed to this
-// new location.
-#include "skia/ext/platform_canvas.h"
diff --git a/base/gfx/platform_canvas_linux.h b/base/gfx/platform_canvas_linux.h
index 4a493a4e8eaa68b96ac357f6db596601f64eafcf..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/base/gfx/platform_canvas_linux.h
+++ b/base/gfx/platform_canvas_linux.h
@@ -1,12 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef BASE_GFX_PLATFORM_CANVAS_LINUX_H_
-#define BASE_GFX_PLATFORM_CANVAS_LINUX_H_
-
-// TODO(brettw) this file should be removed and the includes changed to this
-// new location.
-#include "skia/ext/platform_canvas_linux.h"
-
-#endif  // BASE_GFX_PLATFORM_CANVAS_LINUX_H_
diff --git a/base/gfx/platform_canvas_mac.h b/base/gfx/platform_canvas_mac.h
index ba01e73ca3c9769b7a42c41a77c22b8734521f5d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/base/gfx/platform_canvas_mac.h
+++ b/base/gfx/platform_canvas_mac.h
@@ -1,12 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef BASE_GFX_PLATFORM_CANVAS_MAC_H__
-#define BASE_GFX_PLATFORM_CANVAS_MAC_H__
-
-// TODO(brettw) this file should be removed and the includes changed to this
-// new location.
-#include "skia/ext/platform_canvas_mac.h"
-
-#endif  // BASE_GFX_PLATFORM_CANVAS_MAC_H__
diff --git a/base/gfx/platform_device_linux.h b/base/gfx/platform_device_linux.h
index 3cb9572e1fc089cc5b92f3773f2a423ae0b78e96..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/base/gfx/platform_device_linux.h
+++ b/base/gfx/platform_device_linux.h
@@ -1,12 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef BASE_GFX_PLATFORM_DEVICE_LINUX_H_
-#define BASE_GFX_PLATFORM_DEVICE_LINUX_H_
-
-// TODO(brettw) this file should be removed and the includes changed to this
-// new location.
-#include "skia/ext/platform_device_linux.h"
-
-#endif  // BASE_GFX_PLATFORM_DEVICE_LINUX_H_
diff --git a/base/gfx/platform_device_mac.h b/base/gfx/platform_device_mac.h
index 9447f65bcba9a92ce5bf2421af696652d772e433..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/base/gfx/platform_device_mac.h
+++ b/base/gfx/platform_device_mac.h
@@ -1,12 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef BASE_GFX_PLATFORM_DEVICE_MAC_H__
-#define BASE_GFX_PLATFORM_DEVICE_MAC_H__
-
-// TODO(brettw) this file should be removed and the includes changed to this
-// new location.
-#include "skia/ext/platform_device_mac.h"
-
-#endif  // BASE_GFX_PLATFORM_DEVICE_MAC_H__
diff --git a/webkit/glue/media/video_renderer_impl.h b/webkit/glue/media/video_renderer_impl.h
index d57223e3b0f6352f27a2aabb15ac0e3e073d8065..6e7daf2cf0b4360cd4499955d223c16519edf9bb 100644
--- a/webkit/glue/media/video_renderer_impl.h
+++ b/webkit/glue/media/video_renderer_impl.h
@@ -14,13 +14,13 @@
 #ifndef WEBKIT_GLUE_MEDIA_VIDEO_RENDERER_IMPL_H_
 #define WEBKIT_GLUE_MEDIA_VIDEO_RENDERER_IMPL_H_
 
-#include "base/gfx/platform_canvas.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/size.h"
 #include "media/base/buffers.h"
 #include "media/base/factory.h"
 #include "media/base/filters.h"
 #include "media/filters/video_renderer_base.h"
+#include "skia/ext/platform_canvas.h"
 #include "webkit/api/public/WebMediaPlayer.h"
 #include "webkit/glue/webmediaplayer_impl.h"
 
diff --git a/webkit/glue/webmediaplayer_impl.h b/webkit/glue/webmediaplayer_impl.h
index 39726532a71710c0618d425b41a4c35fc22e89f6..a73ea711db5c38e43458656759af916374cc743e 100644
--- a/webkit/glue/webmediaplayer_impl.h
+++ b/webkit/glue/webmediaplayer_impl.h
@@ -55,7 +55,6 @@
 
 #include <vector>
 
-#include "base/gfx/platform_canvas.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/size.h"
 #include "base/lock.h"
@@ -63,6 +62,7 @@
 #include "base/ref_counted.h"
 #include "media/base/filters.h"
 #include "media/base/pipeline_impl.h"
+#include "skia/ext/platform_canvas.h"
 #include "webkit/api/public/WebMediaPlayer.h"
 #include "webkit/api/public/WebMediaPlayerClient.h"
 
diff --git a/webkit/tools/test_shell/mac/webview_host.mm b/webkit/tools/test_shell/mac/webview_host.mm
index 3349546d9a249264e8d700cd10bab69ca1547368..960a55b6ea9f317bee1b2e521fe75f6689cac495 100644
--- a/webkit/tools/test_shell/mac/webview_host.mm
+++ b/webkit/tools/test_shell/mac/webview_host.mm
@@ -7,9 +7,9 @@
 #include "webkit/tools/test_shell/webview_host.h"
 #include "webkit/tools/test_shell/mac/test_shell_webview.h"
 
-#include "base/gfx/platform_canvas.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/size.h"
+#include "skia/ext/platform_canvas.h"
 #include "webkit/api/public/WebSize.h"
 #include "webkit/glue/webview.h"
 
diff --git a/webkit/tools/test_shell/mac/webwidget_host.mm b/webkit/tools/test_shell/mac/webwidget_host.mm
index acb98b63aa50c2b2a3e4ffc878591e40ab85bb37..c6257f7a9804c70c23ea7d0dd03cd08a4cdf2b98 100644
--- a/webkit/tools/test_shell/mac/webwidget_host.mm
+++ b/webkit/tools/test_shell/mac/webwidget_host.mm
@@ -6,10 +6,10 @@
 
 #include "webkit/tools/test_shell/webwidget_host.h"
 
-#include "base/gfx/platform_canvas.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/size.h"
 #include "base/logging.h"
+#include "skia/ext/platform_canvas.h"
 #include "webkit/api/public/mac/WebInputEventFactory.h"
 #include "webkit/api/public/mac/WebScreenInfoFactory.h"
 #include "webkit/api/public/WebInputEvent.h"