12 files changed, 12 insertions, 12 deletions
diff --git a/remoting/base/DEPS b/remoting/base/DEPS
index b375023..baabd9b 100644
--- a/remoting/base/DEPS
+++ b/remoting/base/DEPS
@@ -1,6 +1,6 @@
 include_rules = [
-  "+gfx",
   "+google/protobuf",
   "+net",
   "+third_party/zlib",
+  "+ui/gfx",
 ]
diff --git a/remoting/base/codec_test.cc b/remoting/base/codec_test.cc
index 0c59659..093eea0 100644
--- a/remoting/base/codec_test.cc
+++ b/remoting/base/codec_test.cc
@@ -5,7 +5,6 @@
 #include <deque>
 #include <stdlib.h>
 
-#include "gfx/rect.h"
 #include "media/base/video_frame.h"
 #include "remoting/base/codec_test.h"
 #include "remoting/base/decoder.h"
@@ -13,6 +12,7 @@
 #include "remoting/base/mock_objects.h"
 #include "remoting/base/util.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/rect.h"
 
 static const int kWidth = 320;
 static const int kHeight = 240;
diff --git a/remoting/base/decoder.h b/remoting/base/decoder.h
index bcb5a54..bc55bd5 100644
--- a/remoting/base/decoder.h
+++ b/remoting/base/decoder.h
@@ -9,9 +9,9 @@
 
 #include "base/task.h"
 #include "base/scoped_ptr.h"
-#include "gfx/rect.h"
 #include "media/base/video_frame.h"
 #include "remoting/proto/video.pb.h"
+#include "ui/gfx/rect.h"
 
 namespace remoting {
 
diff --git a/remoting/base/encoder_row_based.cc b/remoting/base/encoder_row_based.cc
index d9dcb10..e035a42 100644
--- a/remoting/base/encoder_row_based.cc
+++ b/remoting/base/encoder_row_based.cc
@@ -5,12 +5,12 @@
 #include "remoting/base/encoder_row_based.h"
 
 #include "base/logging.h"
-#include "gfx/rect.h"
 #include "remoting/base/capture_data.h"
 #include "remoting/base/compressor_verbatim.h"
 #include "remoting/base/compressor_zlib.h"
 #include "remoting/base/util.h"
 #include "remoting/proto/video.pb.h"
+#include "ui/gfx/rect.h"
 
 namespace remoting {
 
diff --git a/remoting/base/encoder_row_based.h b/remoting/base/encoder_row_based.h
index 11ebd9a..b3b62d5 100644
--- a/remoting/base/encoder_row_based.h
+++ b/remoting/base/encoder_row_based.h
@@ -8,7 +8,7 @@
 #include "remoting/base/encoder.h"
 #include "remoting/proto/video.pb.h"
 
-#include "gfx/rect.h"
+#include "ui/gfx/rect.h"
 
 namespace remoting {
 
diff --git a/remoting/base/types.h b/remoting/base/types.h
index 321bb0a..1c93f6f 100644
--- a/remoting/base/types.h
+++ b/remoting/base/types.h
@@ -7,7 +7,7 @@
 
 #include <set>
 
-#include "gfx/rect.h"
+#include "ui/gfx/rect.h"
 
 namespace remoting {
 
diff --git a/remoting/client/DEPS b/remoting/client/DEPS
index c543943..4a5a738 100644
--- a/remoting/client/DEPS
+++ b/remoting/client/DEPS
@@ -1,7 +1,7 @@
 include_rules = [
-  "+gfx",
   "+ppapi",
   "+third_party/npapi",
+  "+ui/gfx",
 
   "+remoting/protocol",
   "+remoting/jingle_glue",
diff --git a/remoting/client/rectangle_update_decoder.h b/remoting/client/rectangle_update_decoder.h
index 1eb93b5..bcd521a 100644
--- a/remoting/client/rectangle_update_decoder.h
+++ b/remoting/client/rectangle_update_decoder.h
@@ -7,8 +7,8 @@
 
 #include "base/scoped_ptr.h"
 #include "base/task.h"
-#include "gfx/size.h"
 #include "media/base/video_frame.h"
+#include "ui/gfx/size.h"
 
 class MessageLoop;
 
diff --git a/remoting/host/capturer_fake.cc b/remoting/host/capturer_fake.cc
index f9684e2..0cc0f37 100644
--- a/remoting/host/capturer_fake.cc
+++ b/remoting/host/capturer_fake.cc
@@ -4,7 +4,7 @@
 
 #include "remoting/host/capturer_fake.h"
 
-#include "gfx/rect.h"
+#include "ui/gfx/rect.h"
 
 namespace remoting {
 
diff --git a/remoting/host/capturer_fake_ascii.cc b/remoting/host/capturer_fake_ascii.cc
index cbc8471..1729fb6 100644
--- a/remoting/host/capturer_fake_ascii.cc
+++ b/remoting/host/capturer_fake_ascii.cc
@@ -4,7 +4,7 @@
 
 #include "remoting/host/capturer_fake_ascii.h"
 
-#include "gfx/rect.h"
+#include "ui/gfx/rect.h"
 
 namespace remoting {
 
diff --git a/remoting/host/capturer_gdi.cc b/remoting/host/capturer_gdi.cc
index 0465491..c405f3f 100644
--- a/remoting/host/capturer_gdi.cc
+++ b/remoting/host/capturer_gdi.cc
@@ -5,7 +5,7 @@
 #include "remoting/host/capturer_gdi.h"
 #include "remoting/host/differ.h"
 
-#include "gfx/rect.h"
+#include "ui/gfx/rect.h"
 
 namespace remoting {
 
diff --git a/remoting/host/differ.h b/remoting/host/differ.h
index ce76572..d227333 100644
--- a/remoting/host/differ.h
+++ b/remoting/host/differ.h
@@ -9,8 +9,8 @@
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
-#include "gfx/rect.h"
 #include "remoting/base/types.h"
+#include "ui/gfx/rect.h"
 
 namespace remoting {