cc: Remove CC*.h temporary includes, part 4/4.

BUG=155413
TEST=cc_unittests
R=enne@chromium.org,jamesr@chromium.org
TBR=jamesr@chromium.org


Review URL: https://chromiumcodereview.appspot.com/11233025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163225 0039d316-1c4b-4281-b951-d872f2087c98

98 files changed, 175 insertions, 275 deletions

diff --git a/cc/CCLayerTreeHostImpl.h b/cc/CCLayerTreeHostImpl.h
deleted file mode 100644
index 714a528..0000000
--- a/cc/CCLayerTreeHostImpl.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 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.
-
-// Temporary forwarding header
-#include "cc/layer_tree_host_impl.h"
diff --git a/cc/CCMathUtil.h b/cc/CCMathUtil.h
deleted file mode 100644
index 945ffe8..0000000
--- a/cc/CCMathUtil.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 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.
-
-// Temporary forwarding header
-#include "cc/math_util.h"
diff --git a/cc/CCOcclusionTracker.h b/cc/CCOcclusionTracker.h
deleted file mode 100644
index b7c8ce0..0000000
--- a/cc/CCOcclusionTracker.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 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.
-
-// Temporary forwarding header
-#include "cc/occlusion_tracker.h"
diff --git a/cc/CCOverdrawMetrics.h b/cc/CCOverdrawMetrics.h
deleted file mode 100644
index 94a1788..0000000
--- a/cc/CCOverdrawMetrics.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 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.
-
-// Temporary forwarding header
-#include "cc/overdraw_metrics.h"
diff --git a/cc/CCPageScaleAnimation.h b/cc/CCPageScaleAnimation.h
deleted file mode 100644
index 1c59d7d..0000000
--- a/cc/CCPageScaleAnimation.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 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.
-
-// Temporary forwarding header
-#include "cc/page_scale_animation.h"
diff --git a/cc/CCPrioritizedTexture.h b/cc/CCPrioritizedTexture.h
deleted file mode 100644
index 19fdca2..0000000
--- a/cc/CCPrioritizedTexture.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 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.
-
-// Temporary forwarding header
-#include "cc/prioritized_texture.h"
diff --git a/cc/CCPrioritizedTextureManager.h b/cc/CCPrioritizedTextureManager.h
deleted file mode 100644
index cfeb804..0000000
--- a/cc/CCPrioritizedTextureManager.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 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.
-
-// Temporary forwarding header
-#include "cc/prioritized_texture_manager.h"
diff --git a/cc/CCPriorityCalculator.h b/cc/CCPriorityCalculator.h
deleted file mode 100644
index 973da9f..0000000
--- a/cc/CCPriorityCalculator.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 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.
-
-// Temporary forwarding header
-#include "cc/priority_calculator.h"
diff --git a/cc/CCProxy.h b/cc/CCProxy.h
deleted file mode 100644
index 012f06f..0000000
--- a/cc/CCProxy.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 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.
-
-// Temporary forwarding header
-#include "cc/proxy.h"
diff --git a/cc/CCQuadCuller.h b/cc/CCQuadCuller.h
deleted file mode 100644
index 097fb78..0000000
--- a/cc/CCQuadCuller.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 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.
-
-// Temporary forwarding header
-#include "cc/quad_culler.h"
diff --git a/cc/CCQuadSink.h b/cc/CCQuadSink.h
deleted file mode 100644
index a503c6c..0000000
--- a/cc/CCQuadSink.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 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.
-
-// Temporary forwarding header
-#include "cc/quad_sink.h"
diff --git a/cc/CCRenderPass.h b/cc/CCRenderPass.h
deleted file mode 100644
index ab2ae64..0000000
--- a/cc/CCRenderPass.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 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.
-
-// Temporary forwarding header
-#include "cc/render_pass.h"
diff --git a/cc/CCRenderPassDrawQuad.h b/cc/CCRenderPassDrawQuad.h
deleted file mode 100644
index d665960..0000000
--- a/cc/CCRenderPassDrawQuad.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 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.
-
-// Temporary forwarding header
-#include "cc/render_pass_draw_quad.h"
diff --git a/cc/CCRenderPassSink.h b/cc/CCRenderPassSink.h
deleted file mode 100644
index 6f8bf64..0000000
--- a/cc/CCRenderPassSink.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 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.
-
-// Temporary forwarding header
-#include "cc/render_pass_sink.h"
diff --git a/cc/CCRenderSurfaceFilters.h b/cc/CCRenderSurfaceFilters.h
deleted file mode 100644
index f102a22..0000000
--- a/cc/CCRenderSurfaceFilters.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 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.
-
-// Temporary forwarding header
-#include "cc/render_surface_filters.h"
diff --git a/cc/append_quads_data.h b/cc/append_quads_data.h
index b086de0..ad8fcc1 100644
--- a/cc/append_quads_data.h
+++ b/cc/append_quads_data.h
@@ -5,7 +5,7 @@
 #ifndef CCAppendQuadsData_h
 #define CCAppendQuadsData_h
 
-#include "CCRenderPass.h"
+#include "cc/render_pass.h"
 
 namespace cc {
 
diff --git a/cc/cc.gyp b/cc/cc.gyp
index 329cbb4..2397cd2 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -72,35 +72,35 @@
       'layer_tree_host_common.cc',
       'CCLayerTreeHostCommon.h',
       'layer_tree_host_impl.cc',
-      'CCLayerTreeHostImpl.h',
+      'layer_tree_host_impl.h',
       'math_util.cc',
-      'CCMathUtil.h',
+      'math_util.h',
       'occlusion_tracker.cc',
-      'CCOcclusionTracker.h',
+      'occlusion_tracker.h',
       'overdraw_metrics.cc',
-      'CCOverdrawMetrics.h',
+      'overdraw_metrics.h',
       'page_scale_animation.cc',
-      'CCPageScaleAnimation.h',
+      'page_scale_animation.h',
       'prioritized_texture.cc',
-      'CCPrioritizedTexture.h',
+      'prioritized_texture.h',
       'prioritized_texture_manager.cc',
-      'CCPrioritizedTextureManager.h',
+      'prioritized_texture_manager.h',
       'priority_calculator.cc',
-      'CCPriorityCalculator.h',
+      'priority_calculator.h',
       'proxy.cc',
-      'CCProxy.h',
+      'proxy.h',
       'quad_culler.cc',
-      'CCQuadCuller.h',
-      'CCQuadSink.h',
+      'quad_culler.h',
+      'quad_sink.h',
       'render_pass.cc',
-      'CCRenderPass.h',
+      'render_pass.h',
       'render_pass_draw_quad.cc',
-      'CCRenderPassDrawQuad.h',
-      'CCRenderPassSink.h',
+      'render_pass_draw_quad.h',
+      'render_pass_sink.h',
       'render_surface_impl.cc',
       'CCRenderSurface.h',
       'render_surface_filters.cc',
-      'CCRenderSurfaceFilters.h',
+      'render_surface_filters.h',
       'renderer.cc',
       'renderer.h',
       'gl_renderer.cc',
@@ -252,21 +252,6 @@
       'layer_tree_host_client.h',
       'layer_tree_host_common.h',
       'layer_tree_host.h',
-      'layer_tree_host_impl.h',
-      'math_util.h',
-      'occlusion_tracker.h',
-      'overdraw_metrics.h',
-      'page_scale_animation.h',
-      'prioritized_texture.h',
-      'prioritized_texture_manager.h',
-      'priority_calculator.h',
-      'proxy.h',
-      'quad_culler.h',
-      'quad_sink.h',
-      'render_pass_draw_quad.h',
-      'render_pass.h',
-      'render_pass_sink.h',
-      'render_surface_filters.h',
       'render_surface_impl.h',
       'resource_update.h',
       'threaded_test.h',
diff --git a/cc/damage_tracker.cc b/cc/damage_tracker.cc
index f6ad5fb..b907e3e 100644
--- a/cc/damage_tracker.cc
+++ b/cc/damage_tracker.cc
@@ -8,8 +8,8 @@
 
 #include "CCLayerImpl.h"
 #include "CCLayerTreeHostCommon.h"
-#include "CCMathUtil.h"
 #include "CCRenderSurface.h"
+#include "cc/math_util.h"
 #include <public/WebFilterOperations.h>
 
 using WebKit::WebTransformationMatrix;
diff --git a/cc/damage_tracker_unittest.cc b/cc/damage_tracker_unittest.cc
index b266558..17f7d2f 100644
--- a/cc/damage_tracker_unittest.cc
+++ b/cc/damage_tracker_unittest.cc
@@ -9,7 +9,7 @@
 #include "CCLayerImpl.h"
 #include "CCLayerSorter.h"
 #include "CCLayerTreeHostCommon.h"
-#include "CCMathUtil.h"
+#include "cc/math_util.h"
 #include "cc/single_thread_proxy.h"
 #include "cc/test/geometry_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/debug_rect_history.cc b/cc/debug_rect_history.cc
index 7ff9f75..b4b9d1f 100644
--- a/cc/debug_rect_history.cc
+++ b/cc/debug_rect_history.cc
@@ -9,7 +9,7 @@
 #include "CCDamageTracker.h"
 #include "CCLayerImpl.h"
 #include "CCLayerTreeHost.h"
-#include "CCMathUtil.h"
+#include "cc/math_util.h"
 
 namespace cc {
 
diff --git a/cc/delegated_renderer_layer_impl.cc b/cc/delegated_renderer_layer_impl.cc
index 5bddbe7..3936696 100644
--- a/cc/delegated_renderer_layer_impl.cc
+++ b/cc/delegated_renderer_layer_impl.cc
@@ -7,10 +7,10 @@
 #include "CCDelegatedRendererLayerImpl.h"
 
 #include "CCAppendQuadsData.h"
-#include "CCQuadSink.h"
-#include "CCMathUtil.h"
-#include "CCRenderPassDrawQuad.h"
-#include "CCRenderPassSink.h"
+#include "cc/math_util.h"
+#include "cc/quad_sink.h"
+#include "cc/render_pass_draw_quad.h"
+#include "cc/render_pass_sink.h"
 
 namespace cc {
 
diff --git a/cc/delegated_renderer_layer_impl_unittest.cc b/cc/delegated_renderer_layer_impl_unittest.cc
index 4457556..2ebc763 100644
--- a/cc/delegated_renderer_layer_impl_unittest.cc
+++ b/cc/delegated_renderer_layer_impl_unittest.cc
@@ -7,9 +7,9 @@
 #include "CCDelegatedRendererLayerImpl.h"
 
 #include "CCAppendQuadsData.h"
-#include "CCLayerTreeHostImpl.h"
-#include "CCQuadSink.h"
-#include "CCRenderPassDrawQuad.h"
+#include "cc/layer_tree_host_impl.h"
+#include "cc/quad_sink.h"
+#include "cc/render_pass_draw_quad.h"
 #include "cc/scoped_ptr_vector.h"
 #include "cc/single_thread_proxy.h"
 #include "cc/solid_color_draw_quad.h"
diff --git a/cc/direct_renderer.cc b/cc/direct_renderer.cc
index 14c7af0..bac67bb 100644
--- a/cc/direct_renderer.cc
+++ b/cc/direct_renderer.cc
@@ -6,7 +6,7 @@
 
 #include "CCDirectRenderer.h"
 
-#include "CCMathUtil.h"
+#include "cc/math_util.h"
 #include "ui/gfx/rect_conversions.h"
 #include <public/WebTransformationMatrix.h>
 #include <vector>
diff --git a/cc/draw_quad.cc b/cc/draw_quad.cc
index 28a5a4a..c136fb7 100644
--- a/cc/draw_quad.cc
+++ b/cc/draw_quad.cc
@@ -9,8 +9,8 @@
 #include "CCCheckerboardDrawQuad.h"
 #include "CCDebugBorderDrawQuad.h"
 #include "CCIOSurfaceDrawQuad.h"
-#include "CCRenderPassDrawQuad.h"
 #include "base/logging.h"
+#include "cc/render_pass_draw_quad.h"
 #include "cc/solid_color_draw_quad.h"
 #include "cc/stream_video_draw_quad.h"
 #include "cc/texture_draw_quad.h"
diff --git a/cc/draw_quad_unittest.cc b/cc/draw_quad_unittest.cc
index fb1c8cd..21cf831 100644
--- a/cc/draw_quad_unittest.cc
+++ b/cc/draw_quad_unittest.cc
@@ -9,7 +9,7 @@
 #include "CCCheckerboardDrawQuad.h"
 #include "CCDebugBorderDrawQuad.h"
 #include "CCIOSurfaceDrawQuad.h"
-#include "CCRenderPassDrawQuad.h"
+#include "cc/render_pass_draw_quad.h"
 #include "cc/solid_color_draw_quad.h"
 #include "cc/stream_video_draw_quad.h"
 #include "cc/test/geometry_test_utils.h"
diff --git a/cc/float_quad_unittest.cc b/cc/float_quad_unittest.cc
index aac1a4a..3c794b3 100644
--- a/cc/float_quad_unittest.cc
+++ b/cc/float_quad_unittest.cc
@@ -4,8 +4,8 @@
 
 #include "config.h"
 
-#include "CCMathUtil.h"
 #include "FloatQuad.h"
+#include "cc/math_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
 
diff --git a/cc/font_atlas.cc b/cc/font_atlas.cc
index 9a48300..a1c4dd5 100644
--- a/cc/font_atlas.cc
+++ b/cc/font_atlas.cc
@@ -9,9 +9,9 @@
 #include <vector>
 
 #include "base/string_split.h"
-#include "ui/gfx/point.h"
-#include "CCProxy.h"
+#include "cc/proxy.h"
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "ui/gfx/point.h"
 
 namespace cc {
 
diff --git a/cc/frame_rate_counter.cc b/cc/frame_rate_counter.cc
index ee10b81..565bcfc 100644
--- a/cc/frame_rate_counter.cc
+++ b/cc/frame_rate_counter.cc
@@ -8,8 +8,8 @@
 
 #include <cmath>
 
-#include "CCProxy.h"
 #include "base/metrics/histogram.h"
+#include "cc/proxy.h"
 
 namespace cc {
 
diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc
index 7510571..51d46f5 100644
--- a/cc/gl_renderer.cc
+++ b/cc/gl_renderer.cc
@@ -8,10 +8,6 @@
 
 #include "CCDamageTracker.h"
 #include "CCLayerQuad.h"
-#include "CCMathUtil.h"
-#include "CCProxy.h"
-#include "CCRenderPass.h"
-#include "CCRenderSurfaceFilters.h"
 #include "FloatQuad.h"
 #include "GrTexture.h"
 #include "NotImplemented.h"
@@ -20,7 +16,11 @@
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "cc/geometry_binding.h"
+#include "cc/math_util.h"
 #include "cc/platform_color.h"
+#include "cc/proxy.h"
+#include "cc/render_pass.h"
+#include "cc/render_surface_filters.h"
 #include "cc/scoped_texture.h"
 #include "cc/settings.h"
 #include "cc/single_thread_proxy.h"
diff --git a/cc/gl_renderer.h b/cc/gl_renderer.h
index 038a71684..34e58d7 100644
--- a/cc/gl_renderer.h
+++ b/cc/gl_renderer.h
@@ -9,7 +9,7 @@
 #include "CCDebugBorderDrawQuad.h"
 #include "CCDirectRenderer.h"
 #include "CCIOSurfaceDrawQuad.h"
-#include "CCRenderPassDrawQuad.h"
+#include "cc/render_pass_draw_quad.h"
 #include "cc/renderer.h"
 #include "cc/solid_color_draw_quad.h"
 #include "cc/tile_draw_quad.h"
diff --git a/cc/gl_renderer_unittest.cc b/cc/gl_renderer_unittest.cc
index b86be22..33bf8c7 100644
--- a/cc/gl_renderer_unittest.cc
+++ b/cc/gl_renderer_unittest.cc
@@ -6,7 +6,7 @@
 #include "cc/gl_renderer.h"
 
 #include "CCDrawQuad.h"
-#include "CCPrioritizedTextureManager.h"
+#include "cc/prioritized_texture_manager.h"
 #include "cc/resource_provider.h"
 #include "cc/settings.h"
 #include "cc/single_thread_proxy.h"
diff --git a/cc/heads_up_display_layer_impl.cc b/cc/heads_up_display_layer_impl.cc
index 298c0cb..1c7499e 100644
--- a/cc/heads_up_display_layer_impl.cc
+++ b/cc/heads_up_display_layer_impl.cc
@@ -9,9 +9,9 @@
 #include "CCDebugRectHistory.h"
 #include "CCFontAtlas.h"
 #include "CCFrameRateCounter.h"
-#include "CCLayerTreeHostImpl.h"
-#include "CCQuadSink.h"
 #include "base/stringprintf.h"
+#include "cc/layer_tree_host_impl.h"
+#include "cc/quad_sink.h"
 #include "cc/texture_draw_quad.h"
 #include "skia/ext/platform_canvas.h"
 #include "skia/ext/platform_canvas.h"
diff --git a/cc/io_surface_layer_impl.cc b/cc/io_surface_layer_impl.cc
index f085fa9..f953f8f 100644
--- a/cc/io_surface_layer_impl.cc
+++ b/cc/io_surface_layer_impl.cc
@@ -8,10 +8,10 @@
 
 #include "CCGraphicsContext.h"
 #include "CCIOSurfaceDrawQuad.h"
-#include "CCLayerTreeHostImpl.h"
-#include "CCQuadSink.h"
 #include "base/stringprintf.h"
 #include "cc/gl_renderer.h" // For the GLC() macro.
+#include "cc/layer_tree_host_impl.h"
+#include "cc/quad_sink.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 #include <public/WebGraphicsContext3D.h>
diff --git a/cc/layer.h b/cc/layer.h
index cfb80b0..1db1c3b 100644
--- a/cc/layer.h
+++ b/cc/layer.h
@@ -6,10 +6,10 @@
 #define LayerChromium_h
 
 #include "CCLayerAnimationController.h"
-#include "CCOcclusionTracker.h"
 #include "FloatPoint.h"
 #include "Region.h"
 #include "base/memory/ref_counted.h"
+#include "cc/occlusion_tracker.h"
 #include "cc/render_surface.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include <public/WebFilterOperations.h>
diff --git a/cc/layer_impl.cc b/cc/layer_impl.cc
index 3111b6c..d7f06e1 100644
--- a/cc/layer_impl.cc
+++ b/cc/layer_impl.cc
@@ -8,11 +8,11 @@
 
 #include "CCDebugBorderDrawQuad.h"
 #include "CCLayerSorter.h"
-#include "CCMathUtil.h"
-#include "CCProxy.h"
-#include "CCQuadSink.h"
 #include "base/debug/trace_event.h"
 #include "base/stringprintf.h"
+#include "cc/math_util.h"
+#include "cc/proxy.h"
+#include "cc/quad_sink.h"
 #include "cc/scrollbar_animation_controller.h"
 #include "cc/settings.h"
 
diff --git a/cc/layer_impl.h b/cc/layer_impl.h
index 32d6eef..ea9d54b 100644
--- a/cc/layer_impl.h
+++ b/cc/layer_impl.h
@@ -7,13 +7,13 @@
 
 #include "CCInputHandler.h"
 #include "CCLayerAnimationController.h"
-#include "CCRenderPass.h"
 #include "CCRenderSurface.h"
 #include "FloatRect.h"
 #include "IntRect.h"
 #include "Region.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/render_pass.h"
 #include "cc/resource_provider.h"
 #include "cc/scoped_ptr_vector.h"
 #include "cc/shared_quad_state.h"
diff --git a/cc/layer_sorter.cc b/cc/layer_sorter.cc
index d106442..e99bfea 100644
--- a/cc/layer_sorter.cc
+++ b/cc/layer_sorter.cc
@@ -6,12 +6,12 @@
 
 #include "CCLayerSorter.h"
 
-#include "CCMathUtil.h"
 #include "CCRenderSurface.h"
 #include "base/logging.h"
-#include <limits.h>
+#include "cc/math_util.h"
 #include <public/WebTransformationMatrix.h>
 #include <deque>
+#include <limits>
 #include <vector>
 
 using namespace std;
diff --git a/cc/layer_sorter_unittest.cc b/cc/layer_sorter_unittest.cc
index 09e4055..6d8804b 100644
--- a/cc/layer_sorter_unittest.cc
+++ b/cc/layer_sorter_unittest.cc
@@ -7,7 +7,7 @@
 #include "CCLayerSorter.h"
 
 #include "CCLayerImpl.h"
-#include "CCMathUtil.h"
+#include "cc/math_util.h"
 #include "cc/single_thread_proxy.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
diff --git a/cc/layer_texture_updater.h b/cc/layer_texture_updater.h
index 838e342..b8c7dd4 100644
--- a/cc/layer_texture_updater.h
+++ b/cc/layer_texture_updater.h
@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-
 #ifndef LayerTextureUpdater_h
 #define LayerTextureUpdater_h
 
-#include "CCPrioritizedTexture.h"
 #include "base/memory/ref_counted.h"
+#include "cc/prioritized_texture.h"
 #include "third_party/khronos/GLES2/gl2.h"
 
 namespace cc {
@@ -64,5 +63,6 @@ private:
     friend class base::RefCounted<LayerTextureUpdater>;
 };
 
-} // namespace cc
+}  // namespace cc
+
 #endif // LayerTextureUpdater_h
diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
index 393f09d..c6d3003 100644
--- a/cc/layer_tree_host.cc
+++ b/cc/layer_tree_host.cc
@@ -13,13 +13,13 @@
 #include "CCLayerIterator.h"
 #include "CCLayerTreeHostClient.h"
 #include "CCLayerTreeHostCommon.h"
-#include "CCLayerTreeHostImpl.h"
-#include "CCOcclusionTracker.h"
-#include "CCOverdrawMetrics.h"
 #include "Region.h"
 #include "base/debug/trace_event.h"
 #include "cc/heads_up_display_layer.h"
 #include "cc/layer.h"
+#include "cc/layer_tree_host_impl.h"
+#include "cc/occlusion_tracker.h"
+#include "cc/overdraw_metrics.h"
 #include "cc/settings.h"
 #include "cc/single_thread_proxy.h"
 #include "cc/thread_proxy.h"
diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h
index c78fb09..4405d58 100644
--- a/cc/layer_tree_host.h
+++ b/cc/layer_tree_host.h
@@ -5,23 +5,24 @@
 #ifndef CCLayerTreeHost_h
 #define CCLayerTreeHost_h
 
+#include <limits>
+
 #include "CCAnimationEvents.h"
 #include "CCGraphicsContext.h"
 #include "CCLayerTreeHostClient.h"
 #include "CCLayerTreeHostCommon.h"
-#include "CCOcclusionTracker.h"
-#include "CCPrioritizedTextureManager.h"
-#include "CCProxy.h"
 #include "IntRect.h"
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/occlusion_tracker.h"
+#include "cc/prioritized_texture_manager.h"
+#include "cc/proxy.h"
 #include "cc/rate_limiter.h"
 #include "cc/rendering_stats.h"
 #include "cc/scoped_ptr_vector.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include <limits>
 
 #if defined(COMPILER_GCC)
 namespace BASE_HASH_NAMESPACE {
diff --git a/cc/layer_tree_host_common.cc b/cc/layer_tree_host_common.cc
index 43c98ee..b13e689 100644
--- a/cc/layer_tree_host_common.cc
+++ b/cc/layer_tree_host_common.cc
@@ -9,11 +9,11 @@
 #include "CCLayerImpl.h"
 #include "CCLayerIterator.h"
 #include "CCLayerSorter.h"
-#include "CCMathUtil.h"
 #include "CCRenderSurface.h"
 #include "FloatQuad.h"
 #include "IntRect.h"
 #include "cc/layer.h"
+#include "cc/math_util.h"
 #include "cc/render_surface.h"
 #include <public/WebTransformationMatrix.h>
 
diff --git a/cc/layer_tree_host_common_unittest.cc b/cc/layer_tree_host_common_unittest.cc
index db13577..1333ff1 100644
--- a/cc/layer_tree_host_common_unittest.cc
+++ b/cc/layer_tree_host_common_unittest.cc
@@ -9,11 +9,11 @@
 #include "CCLayerAnimationController.h"
 #include "CCLayerImpl.h"
 #include "CCLayerSorter.h"
-#include "CCMathUtil.h"
-#include "CCProxy.h"
 #include "cc/content_layer.h"
 #include "cc/content_layer_client.h"
 #include "cc/layer.h"
+#include "cc/math_util.h"
+#include "cc/proxy.h"
 #include "cc/single_thread_proxy.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/geometry_test_utils.h"
diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
index 422fa65..d762b0c 100644
--- a/cc/layer_tree_host_impl.cc
+++ b/cc/layer_tree_host_impl.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCLayerTreeHostImpl.h"
+#include "cc/layer_tree_host_impl.h"
 
 #include "CCAppendQuadsData.h"
 #include "CCDamageTracker.h"
@@ -16,14 +16,14 @@
 #include "CCLayerIterator.h"
 #include "CCLayerTreeHost.h"
 #include "CCLayerTreeHostCommon.h"
-#include "CCMathUtil.h"
-#include "CCOverdrawMetrics.h"
-#include "CCPageScaleAnimation.h"
-#include "CCPrioritizedTextureManager.h"
-#include "CCRenderPassDrawQuad.h"
 #include "base/basictypes.h"
 #include "base/debug/trace_event.h"
 #include "cc/gl_renderer.h"
+#include "cc/math_util.h"
+#include "cc/overdraw_metrics.h"
+#include "cc/page_scale_animation.h"
+#include "cc/prioritized_texture_manager.h"
+#include "cc/render_pass_draw_quad.h"
 #include "cc/rendering_stats.h"
 #include "cc/scrollbar_animation_controller.h"
 #include "cc/scrollbar_layer_impl.h"
diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h
index 9f6d132..bcdc355 100644
--- a/cc/layer_tree_host_impl.h
+++ b/cc/layer_tree_host_impl.h
@@ -8,11 +8,11 @@
 #include "CCAnimationEvents.h"
 #include "CCInputHandler.h"
 #include "CCLayerSorter.h"
-#include "CCRenderPass.h"
-#include "CCRenderPassSink.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
+#include "cc/render_pass.h"
+#include "cc/render_pass_sink.h"
 #include "cc/renderer.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include <public/WebCompositorOutputSurfaceClient.h>
diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc
index 3203761..795020d 100644
--- a/cc/layer_tree_host_impl_unittest.cc
+++ b/cc/layer_tree_host_impl_unittest.cc
@@ -4,18 +4,18 @@
 
 #include "config.h"
 
-#include "CCLayerTreeHostImpl.h"
+#include "cc/layer_tree_host_impl.h"
 
 #include "CCDelegatedRendererLayerImpl.h"
 #include "CCHeadsUpDisplayLayerImpl.h"
 #include "CCIOSurfaceLayerImpl.h"
 #include "CCLayerImpl.h"
 #include "CCLayerTilingData.h"
-#include "CCQuadSink.h"
-#include "CCRenderPassDrawQuad.h"
 #include "base/command_line.h"
 #include "base/hash_tables.h"
 #include "cc/gl_renderer.h"
+#include "cc/quad_sink.h"
+#include "cc/render_pass_draw_quad.h"
 #include "cc/scrollbar_geometry_fixed_thumb.h"
 #include "cc/scrollbar_layer_impl.h"
 #include "cc/settings.h"
diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc
index a5ba166..d1259b0 100644
--- a/cc/layer_tree_host_unittest.cc
+++ b/cc/layer_tree_host_unittest.cc
@@ -7,11 +7,11 @@
 #include "CCLayerTreeHost.h"
 
 #include "CCGraphicsContext.h"
-#include "CCLayerTreeHostImpl.h"
 #include "CCThreadedTest.h"
 #include "base/synchronization/lock.h"
 #include "cc/content_layer.h"
 #include "cc/content_layer_client.h"
+#include "cc/layer_tree_host_impl.h"
 #include "cc/settings.h"
 #include "cc/single_thread_proxy.h"
 #include "cc/test/fake_web_compositor_output_surface.h"
diff --git a/cc/math_util.cc b/cc/math_util.cc
index 417e0c9..561a539 100644
--- a/cc/math_util.cc
+++ b/cc/math_util.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCMathUtil.h"
+#include "cc/math_util.h"
 
 #include "FloatPoint.h"
 #include "FloatQuad.h"
diff --git a/cc/math_util_unittest.cc b/cc/math_util_unittest.cc
index b246923..049a8c3 100644
--- a/cc/math_util_unittest.cc
+++ b/cc/math_util_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCMathUtil.h"
+#include "cc/math_util.h"
 
 #include "FloatRect.h"
 #include "cc/test/geometry_test_utils.h"
diff --git a/cc/occlusion_tracker.cc b/cc/occlusion_tracker.cc
index 7d5640d..083e366 100644
--- a/cc/occlusion_tracker.cc
+++ b/cc/occlusion_tracker.cc
@@ -4,12 +4,12 @@
 
 #include "config.h"
 
-#include "CCOcclusionTracker.h"
+#include "cc/occlusion_tracker.h"
 
 #include "CCLayerImpl.h"
-#include "CCMathUtil.h"
-#include "CCOverdrawMetrics.h"
 #include "cc/layer.h"
+#include "cc/math_util.h"
+#include "cc/overdraw_metrics.h"
 #include <algorithm>
 
 using namespace std;
diff --git a/cc/occlusion_tracker_unittest.cc b/cc/occlusion_tracker_unittest.cc
index a662d3d..ea6c34a 100644
--- a/cc/occlusion_tracker_unittest.cc
+++ b/cc/occlusion_tracker_unittest.cc
@@ -4,15 +4,15 @@
 
 #include "config.h"
 
-#include "CCOcclusionTracker.h"
+#include "cc/occlusion_tracker.h"
 
 #include "CCLayerAnimationController.h"
 #include "CCLayerImpl.h"
 #include "CCLayerTreeHostCommon.h"
-#include "CCMathUtil.h"
-#include "CCOverdrawMetrics.h"
 #include "Region.h"
 #include "cc/layer.h"
+#include "cc/math_util.h"
+#include "cc/overdraw_metrics.h"
 #include "cc/single_thread_proxy.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/geometry_test_utils.h"
diff --git a/cc/overdraw_metrics.cc b/cc/overdraw_metrics.cc
index 765d245..42b6055 100644
--- a/cc/overdraw_metrics.cc
+++ b/cc/overdraw_metrics.cc
@@ -4,15 +4,15 @@
 
 #include "config.h"
 
-#include "CCOverdrawMetrics.h"
+#include "cc/overdraw_metrics.h"
 
 #include "CCLayerTreeHost.h"
-#include "CCLayerTreeHostImpl.h"
-#include "CCMathUtil.h"
 #include "FloatQuad.h"
 #include "IntRect.h"
 #include "base/debug/trace_event.h"
 #include "base/metrics/histogram.h"
+#include "cc/layer_tree_host_impl.h"
+#include "cc/math_util.h"
 #include <public/WebTransformationMatrix.h>
 
 using WebKit::WebTransformationMatrix;
diff --git a/cc/page_scale_animation.cc b/cc/page_scale_animation.cc
index 7a7ebfe..203b3e3 100644
--- a/cc/page_scale_animation.cc
+++ b/cc/page_scale_animation.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCPageScaleAnimation.h"
+#include "cc/page_scale_animation.h"
 
 #include "FloatRect.h"
 #include "FloatSize.h"
diff --git a/cc/prioritized_texture.cc b/cc/prioritized_texture.cc
index bfda4de..dddbe84 100644
--- a/cc/prioritized_texture.cc
+++ b/cc/prioritized_texture.cc
@@ -4,11 +4,11 @@
 
 #include "config.h"
 
-#include "CCPrioritizedTexture.h"
+#include "cc/prioritized_texture.h"
 
-#include "CCPrioritizedTextureManager.h"
-#include "CCPriorityCalculator.h"
-#include "CCProxy.h"
+#include "cc/prioritized_texture_manager.h"
+#include "cc/priority_calculator.h"
+#include "cc/proxy.h"
 #include <algorithm>
 
 using namespace std;
diff --git a/cc/prioritized_texture.h b/cc/prioritized_texture.h
index 255a3a8..2996c57 100644
--- a/cc/prioritized_texture.h
+++ b/cc/prioritized_texture.h
@@ -5,12 +5,12 @@
 #ifndef CCPrioritizedTexture_h
 #define CCPrioritizedTexture_h
 
-#include "CCPriorityCalculator.h"
 #include "IntRect.h"
 #include "IntSize.h"
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/priority_calculator.h"
 #include "cc/resource_provider.h"
 #include "cc/texture.h"
 #include "third_party/khronos/GLES2/gl2.h"
diff --git a/cc/prioritized_texture_manager.cc b/cc/prioritized_texture_manager.cc
index 208a764..1b18be2 100644
--- a/cc/prioritized_texture_manager.cc
+++ b/cc/prioritized_texture_manager.cc
@@ -4,13 +4,13 @@
 
 #include "config.h"
 
-#include "CCPrioritizedTextureManager.h"
+#include "cc/prioritized_texture_manager.h"
 
 #include "base/debug/trace_event.h"
 #include "base/stl_util.h"
-#include "CCPrioritizedTexture.h"
-#include "CCPriorityCalculator.h"
-#include "CCProxy.h"
+#include "cc/prioritized_texture.h"
+#include "cc/priority_calculator.h"
+#include "cc/proxy.h"
 #include <algorithm>
 
 using namespace std;
diff --git a/cc/prioritized_texture_manager.h b/cc/prioritized_texture_manager.h
index b23ef2e..439fe81 100644
--- a/cc/prioritized_texture_manager.h
+++ b/cc/prioritized_texture_manager.h
@@ -8,13 +8,13 @@
 #include <list>
 #include <vector>
 
-#include "CCPrioritizedTexture.h"
-#include "CCPriorityCalculator.h"
 #include "IntRect.h"
 #include "IntSize.h"
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/prioritized_texture.h"
+#include "cc/priority_calculator.h"
 #include "cc/texture.h"
 #include "third_party/khronos/GLES2/gl2.h"
 
diff --git a/cc/prioritized_texture_unittest.cc b/cc/prioritized_texture_unittest.cc
index 10372ea..ccad1cc 100644
--- a/cc/prioritized_texture_unittest.cc
+++ b/cc/prioritized_texture_unittest.cc
@@ -4,9 +4,9 @@
 
 #include "config.h"
 
-#include "CCPrioritizedTexture.h"
+#include "cc/prioritized_texture.h"
 
-#include "CCPrioritizedTextureManager.h"
+#include "cc/prioritized_texture_manager.h"
 #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread
 #include "cc/test/fake_graphics_context.h"
 #include "cc/test/tiled_layer_test_common.h"
diff --git a/cc/priority_calculator.cc b/cc/priority_calculator.cc
index 055520c..0d527e0 100644
--- a/cc/priority_calculator.cc
+++ b/cc/priority_calculator.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCPriorityCalculator.h"
+#include "cc/priority_calculator.h"
 
 using namespace std;
 
diff --git a/cc/proxy.cc b/cc/proxy.cc
index d133da6..bc15bc5 100644
--- a/cc/proxy.cc
+++ b/cc/proxy.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCProxy.h"
+#include "cc/proxy.h"
 
 #include "cc/thread_task.h"
 
diff --git a/cc/quad_culler.cc b/cc/quad_culler.cc
index 7e820fd..df5eb1b 100644
--- a/cc/quad_culler.cc
+++ b/cc/quad_culler.cc
@@ -4,15 +4,15 @@
 
 #include "config.h"
 
-#include "CCQuadCuller.h"
+#include "cc/quad_culler.h"
 
 #include "CCAppendQuadsData.h"
 #include "CCDebugBorderDrawQuad.h"
 #include "CCLayerImpl.h"
-#include "CCOcclusionTracker.h"
-#include "CCOverdrawMetrics.h"
-#include "CCRenderPass.h"
 #include "Region.h"
+#include "cc/occlusion_tracker.h"
+#include "cc/overdraw_metrics.h"
+#include "cc/render_pass.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include <public/WebTransformationMatrix.h>
 
diff --git a/cc/quad_culler.h b/cc/quad_culler.h
index b3927cc..b908dfd 100644
--- a/cc/quad_culler.h
+++ b/cc/quad_culler.h
@@ -5,8 +5,8 @@
 #ifndef CCQuadCuller_h
 #define CCQuadCuller_h
 
-#include "CCQuadSink.h"
-#include "CCRenderPass.h"
+#include "cc/quad_sink.h"
+#include "cc/render_pass.h"
 
 namespace cc {
 class CCLayerImpl;
diff --git a/cc/quad_culler_unittest.cc b/cc/quad_culler_unittest.cc
index 7256bb8..6b83eaa 100644
--- a/cc/quad_culler_unittest.cc
+++ b/cc/quad_culler_unittest.cc
@@ -4,13 +4,13 @@
 
 #include "config.h"
 
-#include "CCQuadCuller.h"
+#include "cc/quad_culler.h"
 
 #include "CCAppendQuadsData.h"
 #include "CCLayerTilingData.h"
-#include "CCMathUtil.h"
-#include "CCOcclusionTracker.h"
-#include "CCOverdrawMetrics.h"
+#include "cc/math_util.h"
+#include "cc/occlusion_tracker.h"
+#include "cc/overdraw_metrics.h"
 #include "cc/single_thread_proxy.h"
 #include "cc/tile_draw_quad.h"
 #include "cc/tiled_layer_impl.h"
diff --git a/cc/rate_limiter.cc b/cc/rate_limiter.cc
index 8b3d232..7b9809f 100644
--- a/cc/rate_limiter.cc
+++ b/cc/rate_limiter.cc
@@ -6,8 +6,8 @@
 
 #include "cc/rate_limiter.h"
 
-#include "CCProxy.h"
 #include "base/debug/trace_event.h"
+#include "cc/proxy.h"
 #include "cc/thread.h"
 #include <public/WebGraphicsContext3D.h>
 
diff --git a/cc/render_pass.cc b/cc/render_pass.cc
index d6e298f..c14a51a 100644
--- a/cc/render_pass.cc
+++ b/cc/render_pass.cc
@@ -4,12 +4,12 @@
 
 #include "config.h"
 
-#include "CCRenderPass.h"
+#include "cc/render_pass.h"
 
 #include "CCLayerImpl.h"
-#include "CCMathUtil.h"
-#include "CCOcclusionTracker.h"
-#include "CCQuadCuller.h"
+#include "cc/math_util.h"
+#include "cc/occlusion_tracker.h"
+#include "cc/quad_culler.h"
 #include "cc/shared_quad_state.h"
 #include "cc/solid_color_draw_quad.h"
 
diff --git a/cc/render_pass_draw_quad.cc b/cc/render_pass_draw_quad.cc
index 9457b08..f76daad 100644
--- a/cc/render_pass_draw_quad.cc
+++ b/cc/render_pass_draw_quad.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCRenderPassDrawQuad.h"
+#include "cc/render_pass_draw_quad.h"
 
 namespace cc {
 
diff --git a/cc/render_pass_draw_quad.h b/cc/render_pass_draw_quad.h
index c88f048..3e202c8 100644
--- a/cc/render_pass_draw_quad.h
+++ b/cc/render_pass_draw_quad.h
@@ -6,9 +6,9 @@
 #define CCRenderPassDrawQuad_h
 
 #include "CCDrawQuad.h"
-#include "CCRenderPass.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/render_pass.h"
 #include "cc/resource_provider.h"
 
 namespace cc {
diff --git a/cc/render_pass_unittest.cc b/cc/render_pass_unittest.cc
index f7a3a75..6e8f44f 100644
--- a/cc/render_pass_unittest.cc
+++ b/cc/render_pass_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCRenderPass.h"
+#include "cc/render_pass.h"
 
 #include "CCCheckerboardDrawQuad.h"
 #include "cc/test/geometry_test_utils.h"
diff --git a/cc/render_surface.cc b/cc/render_surface.cc
index 769a622..f8005af 100644
--- a/cc/render_surface.cc
+++ b/cc/render_surface.cc
@@ -6,8 +6,8 @@
 
 #include "cc/render_surface.h"
 
-#include "CCMathUtil.h"
 #include "cc/layer.h"
+#include "cc/math_util.h"
 #include <public/WebTransformationMatrix.h>
 
 using WebKit::WebTransformationMatrix;
diff --git a/cc/render_surface_filters.cc b/cc/render_surface_filters.cc
index 5f683bf..c2e2d2e 100644
--- a/cc/render_surface_filters.cc
+++ b/cc/render_surface_filters.cc
@@ -4,10 +4,10 @@
 
 #include "config.h"
 
-#include "CCRenderSurfaceFilters.h"
+#include "cc/render_surface_filters.h"
 
-#include "base/logging.h"
 #include "FloatSize.h"
+#include "base/logging.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
 #include "third_party/skia/include/effects/SkColorMatrixFilter.h"
diff --git a/cc/render_surface_filters_unittest.cc b/cc/render_surface_filters_unittest.cc
index a793197..ffe226b 100644
--- a/cc/render_surface_filters_unittest.cc
+++ b/cc/render_surface_filters_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCRenderSurfaceFilters.h"
+#include "cc/render_surface_filters.h"
 
 #include "cc/test/compositor_fake_web_graphics_context_3d.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/render_surface_impl.cc b/cc/render_surface_impl.cc
index 7f7a568..3091d7c 100644
--- a/cc/render_surface_impl.cc
+++ b/cc/render_surface_impl.cc
@@ -10,13 +10,13 @@
 #include "CCDebugBorderDrawQuad.h"
 #include "CCDelegatedRendererLayerImpl.h"
 #include "CCLayerImpl.h"
-#include "CCMathUtil.h"
-#include "CCQuadSink.h"
-#include "CCRenderPass.h"
-#include "CCRenderPassDrawQuad.h"
-#include "CCRenderPassSink.h"
 #include "base/logging.h"
 #include "base/stringprintf.h"
+#include "cc/math_util.h"
+#include "cc/quad_sink.h"
+#include "cc/render_pass.h"
+#include "cc/render_pass_draw_quad.h"
+#include "cc/render_pass_sink.h"
 #include "cc/shared_quad_state.h"
 #include <public/WebTransformationMatrix.h>
 
diff --git a/cc/render_surface_impl.h b/cc/render_surface_impl.h
index 972e613..f1ae706 100644
--- a/cc/render_surface_impl.h
+++ b/cc/render_surface_impl.h
@@ -5,11 +5,11 @@
 #ifndef CCRenderSurface_h
 #define CCRenderSurface_h
 
-#include "CCRenderPass.h"
 #include "FloatRect.h"
 #include "IntRect.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/render_pass.h"
 #include "cc/shared_quad_state.h"
 #include <public/WebTransformationMatrix.h>
 
diff --git a/cc/render_surface_unittest.cc b/cc/render_surface_unittest.cc
index e59a2a1..20d908c 100644
--- a/cc/render_surface_unittest.cc
+++ b/cc/render_surface_unittest.cc
@@ -8,7 +8,7 @@
 
 #include "CCAppendQuadsData.h"
 #include "CCLayerImpl.h"
-#include "CCRenderPassSink.h"
+#include "cc/render_pass_sink.h"
 #include "cc/scoped_ptr_vector.h"
 #include "cc/shared_quad_state.h"
 #include "cc/single_thread_proxy.h"
diff --git a/cc/renderer.h b/cc/renderer.h
index 4106eee..6ac38e2 100644
--- a/cc/renderer.h
+++ b/cc/renderer.h
@@ -5,10 +5,10 @@
 #ifndef CCRenderer_h
 #define CCRenderer_h
 
-#include "base/basictypes.h"
 #include "CCLayerTreeHost.h"
-#include "CCRenderPass.h"
 #include "FloatQuad.h"
+#include "base/basictypes.h"
+#include "cc/render_pass.h"
 
 namespace cc {
 
diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc
index a31dfa5..8d1ac0b 100644
--- a/cc/resource_provider.cc
+++ b/cc/resource_provider.cc
@@ -8,7 +8,6 @@
 
 #include <limits.h>
 
-#include "CCProxy.h"
 #include "IntRect.h"
 #include "base/debug/alias.h"
 #include "base/hash_tables.h"
@@ -16,6 +15,7 @@
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "cc/gl_renderer.h" // For the GLC() macro.
+#include "cc/proxy.h"
 #include "cc/texture_uploader.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
diff --git a/cc/scrollbar_layer_impl.cc b/cc/scrollbar_layer_impl.cc
index ad39213..a15c9ec 100644
--- a/cc/scrollbar_layer_impl.cc
+++ b/cc/scrollbar_layer_impl.cc
@@ -6,7 +6,7 @@
 
 #include "cc/scrollbar_layer_impl.h"
 
-#include "CCQuadSink.h"
+#include "cc/quad_sink.h"
 #include "cc/scrollbar_animation_controller.h"
 #include "cc/texture_draw_quad.h"
 
diff --git a/cc/single_thread_proxy.h b/cc/single_thread_proxy.h
index 35bd7cc..67c7faa 100644
--- a/cc/single_thread_proxy.h
+++ b/cc/single_thread_proxy.h
@@ -5,11 +5,12 @@
 #ifndef CCSingleThreadProxy_h
 #define CCSingleThreadProxy_h
 
+#include <limits>
+
 #include "CCAnimationEvents.h"
-#include "CCLayerTreeHostImpl.h"
-#include "CCProxy.h"
 #include "base/time.h"
-#include <limits>
+#include "cc/layer_tree_host_impl.h"
+#include "cc/proxy.h"
 
 namespace cc {
 
diff --git a/cc/software_renderer.cc b/cc/software_renderer.cc
index 028a276..da8626e 100644
--- a/cc/software_renderer.cc
+++ b/cc/software_renderer.cc
@@ -7,7 +7,7 @@
 #include "cc/software_renderer.h"
 
 #include "CCDebugBorderDrawQuad.h"
-#include "CCRenderPassDrawQuad.h"
+#include "cc/render_pass_draw_quad.h"
 #include "cc/solid_color_draw_quad.h"
 #include "cc/texture_draw_quad.h"
 #include "cc/tile_draw_quad.h"
diff --git a/cc/software_renderer_unittest.cc b/cc/software_renderer_unittest.cc
index e22d709..fa45efe 100644
--- a/cc/software_renderer_unittest.cc
+++ b/cc/software_renderer_unittest.cc
@@ -6,9 +6,9 @@
 
 #include "cc/software_renderer.h"
 
-#include "CCQuadSink.h"
-#include "CCRenderPass.h"
-#include "CCRenderPassDrawQuad.h"
+#include "cc/quad_sink.h"
+#include "cc/render_pass.h"
+#include "cc/render_pass_draw_quad.h"
 #include "cc/settings.h"
 #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread
 #include "cc/solid_color_draw_quad.h"
diff --git a/cc/solid_color_layer_impl.cc b/cc/solid_color_layer_impl.cc
index 565fa5d..2d45efb 100644
--- a/cc/solid_color_layer_impl.cc
+++ b/cc/solid_color_layer_impl.cc
@@ -6,7 +6,7 @@
 
 #include "cc/solid_color_layer_impl.h"
 
-#include "CCQuadSink.h"
+#include "cc/quad_sink.h"
 #include "cc/solid_color_draw_quad.h"
 #include <wtf/MathExtras.h>
 
diff --git a/cc/test/layer_test_common.h b/cc/test/layer_test_common.h
index 9627ba1..f237608 100644
--- a/cc/test/layer_test_common.h
+++ b/cc/test/layer_test_common.h
@@ -5,9 +5,9 @@
 #ifndef CCLayerTestCommon_h
 #define CCLayerTestCommon_h
 
-#include "CCRenderPass.h"
 #include "IntRect.h"
 #include "Region.h"
+#include "cc/render_pass.h"
 
 namespace CCLayerTestCommon {
 
diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc
index a14a9e6..13dd138 100644
--- a/cc/test/layer_tree_test_common.cc
+++ b/cc/test/layer_tree_test_common.cc
@@ -10,10 +10,10 @@
 #include "CCInputHandler.h"
 #include "CCLayerAnimationController.h"
 #include "CCLayerImpl.h"
-#include "CCLayerTreeHostImpl.h"
 #include "base/stl_util.h"
 #include "cc/content_layer.h"
 #include "cc/layer.h"
+#include "cc/layer_tree_host_impl.h"
 #include "cc/scoped_thread_proxy.h"
 #include "cc/settings.h"
 #include "cc/single_thread_proxy.h"
diff --git a/cc/test/layer_tree_test_common.h b/cc/test/layer_tree_test_common.h
index 4c75fe2..a15378f 100644
--- a/cc/test/layer_tree_test_common.h
+++ b/cc/test/layer_tree_test_common.h
@@ -6,8 +6,8 @@
 #define CC_TEST_LAYER_TREE_TEST_COMMON_H_
 
 #include "CCLayerTreeHost.h"
-#include "CCLayerTreeHostImpl.h"
 #include "base/hash_tables.h"
+#include "cc/layer_tree_host_impl.h"
 #include "cc/scoped_thread_proxy.h"
 #include "cc/test/compositor_fake_web_graphics_context_3d.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/test/mock_quad_culler.h b/cc/test/mock_quad_culler.h
index d853b58..354ee2d 100644
--- a/cc/test/mock_quad_culler.h
+++ b/cc/test/mock_quad_culler.h
@@ -6,10 +6,10 @@
 #define MockCCQuadCuller_h
 
 #include "CCDrawQuad.h"
-#include "CCQuadSink.h"
-#include "CCRenderPass.h"
 #include "IntRect.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/quad_sink.h"
+#include "cc/render_pass.h"
 
 namespace cc {
 
@@ -34,5 +34,6 @@ private:
     CCSharedQuadStateList m_sharedQuadStateStorage;
 };
 
-} // namespace cc
+}  // namespace cc
+
 #endif // MockCCQuadCuller_h
diff --git a/cc/test/occlusion_tracker_test_common.h b/cc/test/occlusion_tracker_test_common.h
index 0bc9a4c..33ba4f6 100644
--- a/cc/test/occlusion_tracker_test_common.h
+++ b/cc/test/occlusion_tracker_test_common.h
@@ -5,10 +5,10 @@
 #ifndef CCOcclusionTrackerTestCommon_h
 #define CCOcclusionTrackerTestCommon_h
 
-#include "CCOcclusionTracker.h"
 #include "CCRenderSurface.h"
 #include "IntRect.h"
 #include "Region.h"
+#include "cc/occlusion_tracker.h"
 #include "cc/render_surface.h"
 
 namespace WebKitTests {
diff --git a/cc/test/render_pass_test_common.h b/cc/test/render_pass_test_common.h
index 9f17781..cb04a5f 100644
--- a/cc/test/render_pass_test_common.h
+++ b/cc/test/render_pass_test_common.h
@@ -5,7 +5,7 @@
 #ifndef CCRenderPassTestCommon_h
 #define CCRenderPassTestCommon_h
 
-#include "CCRenderPass.h"
+#include "cc/render_pass.h"
 
 namespace WebKitTests {
 
@@ -18,6 +18,6 @@ public:
     void appendSharedQuadState(scoped_ptr<cc::CCSharedQuadState> state) { m_sharedQuadStateList.append(state.Pass()); }
 };
 
-} //namespace WebKitTests
+}  // namespace WebKitTests
 
 #endif // CCRenderPassTestCommon_h
diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h
index 09e620c..8cf1c70 100644
--- a/cc/test/tiled_layer_test_common.h
+++ b/cc/test/tiled_layer_test_common.h
@@ -6,11 +6,11 @@
 #define CCTiledLayerTestCommon_h
 
 #include "CCGraphicsContext.h"
-#include "CCPrioritizedTexture.h"
 #include "IntRect.h"
 #include "IntSize.h"
 #include "Region.h"
 #include "cc/layer_texture_updater.h"
+#include "cc/prioritized_texture.h"
 #include "cc/resource_provider.h"
 #include "cc/texture_copier.h"
 #include "cc/texture_update_queue.h"
diff --git a/cc/texture_layer_impl.cc b/cc/texture_layer_impl.cc
index 224f359..0ed1105 100644
--- a/cc/texture_layer_impl.cc
+++ b/cc/texture_layer_impl.cc
@@ -6,8 +6,8 @@
 
 #include "cc/texture_layer_impl.h"
 
-#include "CCQuadSink.h"
 #include "base/stringprintf.h"
+#include "cc/quad_sink.h"
 #include "cc/renderer.h"
 #include "cc/texture_draw_quad.h"
 
diff --git a/cc/texture_update_queue.cc b/cc/texture_update_queue.cc
index 8e19193..8793e1c 100644
--- a/cc/texture_update_queue.cc
+++ b/cc/texture_update_queue.cc
@@ -6,7 +6,7 @@
 
 #include "cc/texture_update_queue.h"
 
-#include "CCPrioritizedTexture.h"
+#include "cc/prioritized_texture.h"
 
 namespace cc {
 
diff --git a/cc/texture_uploader.cc b/cc/texture_uploader.cc
index 8695dc6..64b3de52 100644
--- a/cc/texture_uploader.cc
+++ b/cc/texture_uploader.cc
@@ -3,17 +3,19 @@
 // found in the LICENSE file.
 
 #include "config.h"
+
 #include "cc/texture_uploader.h"
 
-#include "CCPrioritizedTexture.h"
+#include <algorithm>
+#include <vector>
+
 #include "base/debug/alias.h"
 #include "base/debug/trace_event.h"
 #include "base/metrics/histogram.h"
+#include "cc/prioritized_texture.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
-#include <algorithm>
 #include <public/WebGraphicsContext3D.h>
-#include <vector>
 
 namespace {
 
diff --git a/cc/texture_uploader_unittest.cc b/cc/texture_uploader_unittest.cc
index 50d3481..2da921e 100644
--- a/cc/texture_uploader_unittest.cc
+++ b/cc/texture_uploader_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "cc/texture_uploader.h"
 
-#include "CCPrioritizedTexture.h"
+#include "cc/prioritized_texture.h"
 #include "cc/test/fake_web_graphics_context_3d.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/thread_proxy.h b/cc/thread_proxy.h
index 2952366..c6c3a16 100644
--- a/cc/thread_proxy.h
+++ b/cc/thread_proxy.h
@@ -7,9 +7,9 @@
 
 #include "CCAnimationEvents.h"
 #include "CCCompletionEvent.h"
-#include "CCLayerTreeHostImpl.h"
-#include "CCProxy.h"
 #include "base/time.h"
+#include "cc/layer_tree_host_impl.h"
+#include "cc/proxy.h"
 #include "cc/scheduler.h"
 #include "cc/texture_update_controller.h"
 
diff --git a/cc/tiled_layer.cc b/cc/tiled_layer.cc
index ca8407c..4e78fa6 100644
--- a/cc/tiled_layer.cc
+++ b/cc/tiled_layer.cc
@@ -8,9 +8,9 @@
 
 #include "CCLayerImpl.h"
 #include "CCLayerTreeHost.h"
-#include "CCOverdrawMetrics.h"
 #include "Region.h"
 #include "base/basictypes.h"
+#include "cc/overdraw_metrics.h"
 #include "cc/tiled_layer_impl.h"
 #include "third_party/khronos/GLES2/gl2.h"
 
diff --git a/cc/tiled_layer_impl.cc b/cc/tiled_layer_impl.cc
index a28d598..5b7aff4 100644
--- a/cc/tiled_layer_impl.cc
+++ b/cc/tiled_layer_impl.cc
@@ -10,11 +10,11 @@
 #include "CCCheckerboardDrawQuad.h"
 #include "CCDebugBorderDrawQuad.h"
 #include "CCLayerTilingData.h"
-#include "CCMathUtil.h"
-#include "CCQuadSink.h"
 #include "FloatQuad.h"
 #include "base/basictypes.h"
 #include "base/stringprintf.h"
+#include "cc/math_util.h"
+#include "cc/quad_sink.h"
 #include "cc/solid_color_draw_quad.h"
 #include "cc/tile_draw_quad.h"
 #include "third_party/khronos/GLES2/gl2.h"
diff --git a/cc/tiled_layer_unittest.cc b/cc/tiled_layer_unittest.cc
index cb599af..664e16e 100644
--- a/cc/tiled_layer_unittest.cc
+++ b/cc/tiled_layer_unittest.cc
@@ -6,9 +6,9 @@
 
 #include "cc/tiled_layer.h"
 
-#include "CCOverdrawMetrics.h"
 #include "cc/bitmap_canvas_layer_texture_updater.h"
 #include "cc/layer_painter.h"
+#include "cc/overdraw_metrics.h"
 #include "cc/rendering_stats.h"
 #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread
 #include "cc/test/animation_test_common.h"
diff --git a/cc/tree_synchronizer_unittest.cc b/cc/tree_synchronizer_unittest.cc
index 288cc20..35119d3 100644
--- a/cc/tree_synchronizer_unittest.cc
+++ b/cc/tree_synchronizer_unittest.cc
@@ -8,9 +8,9 @@
 
 #include "CCLayerAnimationController.h"
 #include "CCLayerImpl.h"
-#include "CCProxy.h"
 #include "Region.h"
 #include "cc/layer.h"
+#include "cc/proxy.h"
 #include "cc/single_thread_proxy.h"
 #include "cc/test/animation_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/video_layer_impl.cc b/cc/video_layer_impl.cc
index 8528214d..a81e982 100644
--- a/cc/video_layer_impl.cc
+++ b/cc/video_layer_impl.cc
@@ -7,10 +7,10 @@
 #include "cc/video_layer_impl.h"
 
 #include "CCIOSurfaceDrawQuad.h"
-#include "CCLayerTreeHostImpl.h"
-#include "CCProxy.h"
-#include "CCQuadSink.h"
 #include "NotImplemented.h"
+#include "cc/layer_tree_host_impl.h"
+#include "cc/proxy.h"
+#include "cc/quad_sink.h"
 #include "cc/resource_provider.h"
 #include "cc/stream_video_draw_quad.h"
 #include "cc/texture_draw_quad.h"