diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index 603dda750d..144adcf67d 100644
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -52,10 +52,10 @@
 #include "native_mate/dictionary.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/geometry/size_conversions.h"
-#include "ui/gfx/point.h"
-#include "ui/gfx/rect.h"
+#include "ui/gfx/geometry/point.h"
+#include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/screen.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/size.h"
 
 #if defined(OS_WIN)
 #include "ui/gfx/switches.h"
diff --git a/atom/browser/ui/win/notify_icon.cc b/atom/browser/ui/win/notify_icon.cc
index 1a472e2edc..99b7153631 100644
--- a/atom/browser/ui/win/notify_icon.cc
+++ b/atom/browser/ui/win/notify_icon.cc
@@ -11,8 +11,8 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/icon_util.h"
 #include "ui/gfx/image/image.h"
-#include "ui/gfx/point.h"
-#include "ui/gfx/rect.h"
+#include "ui/gfx/geometry/point.h"
+#include "ui/gfx/geometry/rect.h"
 #include "ui/views/controls/menu/menu_runner.h"
 
 namespace atom {
diff --git a/atom/common/draggable_region.h b/atom/common/draggable_region.h
index dafd91259e..a007c8cb9f 100644
--- a/atom/common/draggable_region.h
+++ b/atom/common/draggable_region.h
@@ -5,7 +5,7 @@
 #ifndef ATOM_COMMON_DRAGGABLE_REGION_H_
 #define ATOM_COMMON_DRAGGABLE_REGION_H_
 
-#include "ui/gfx/rect.h"
+#include "ui/gfx/geometry/rect.h"
 
 namespace atom {
 
diff --git a/atom/common/native_mate_converters/gfx_converter.cc b/atom/common/native_mate_converters/gfx_converter.cc
index 7b8aa7af0e..7f18debb96 100644
--- a/atom/common/native_mate_converters/gfx_converter.cc
+++ b/atom/common/native_mate_converters/gfx_converter.cc
@@ -5,10 +5,10 @@
 #include "atom/common/native_mate_converters/gfx_converter.h"
 
 #include "native_mate/dictionary.h"
-#include "ui/gfx/point.h"
-#include "ui/gfx/rect.h"
+#include "ui/gfx/geometry/point.h"
+#include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/screen.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace mate {
 
diff --git a/chromium_src/chrome/common/print_messages.cc b/chromium_src/chrome/common/print_messages.cc
index c17b845082..5f8e30f369 100644
--- a/chromium_src/chrome/common/print_messages.cc
+++ b/chromium_src/chrome/common/print_messages.cc
@@ -6,7 +6,7 @@
 
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/size.h"
 
 PrintMsg_Print_Params::PrintMsg_Print_Params()
   : page_size(),
diff --git a/chromium_src/chrome/common/print_messages.h b/chromium_src/chrome/common/print_messages.h
index f98c3f7b6a..4ca8db82ae 100644
--- a/chromium_src/chrome/common/print_messages.h
+++ b/chromium_src/chrome/common/print_messages.h
@@ -15,7 +15,7 @@
 #include "printing/print_job_constants.h"
 #include "third_party/WebKit/public/web/WebPrintScalingOption.h"
 #include "ui/gfx/native_widget_types.h"
-#include "ui/gfx/rect.h"
+#include "ui/gfx/geometry/rect.h"
 
 #ifndef CHROME_COMMON_PRINT_MESSAGES_H_
 #define CHROME_COMMON_PRINT_MESSAGES_H_
diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper.h b/chromium_src/chrome/renderer/printing/print_web_view_helper.h
index 25ba2f668a..498a01b53d 100644
--- a/chromium_src/chrome/renderer/printing/print_web_view_helper.h
+++ b/chromium_src/chrome/renderer/printing/print_web_view_helper.h
@@ -19,7 +19,7 @@
 #include "third_party/WebKit/public/platform/WebCanvas.h"
 #include "third_party/WebKit/public/web/WebNode.h"
 #include "third_party/WebKit/public/web/WebPrintParams.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/size.h"
 
 struct PrintMsg_Print_Params;
 struct PrintMsg_PrintPage_Params;