154 files changed, 842 insertions, 857 deletions

diff --git a/o3d/build/o3d_all.gyp b/o3d/build/o3d_all.gyp
index 80447b7..f30de4c 100644
--- a/o3d/build/o3d_all.gyp
+++ b/o3d/build/o3d_all.gyp
@@ -50,7 +50,8 @@
         ['renderer=="cb"',
           {
             'dependencies': [
-              '../gpu_plugin/gpu_plugin.gyp:*',
+              '../gpu/gpu.gyp:gpu_plugin_unittests',
+              '../gpu/gpu.gyp:np_utils_unittests',
             ],
           },
         ],
diff --git a/o3d/command_buffer/command_buffer.gyp b/o3d/command_buffer/command_buffer.gyp
deleted file mode 100644
index 71865ba..0000000
--- a/o3d/command_buffer/command_buffer.gyp
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright (c) 2009 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.
-
-{
-  'variables': {
-    'chromium_code': 1,
-  },
-  'includes': [
-    '../build/common.gypi',
-  ],
-  'target_defaults': {
-    'include_dirs': [
-      '..',
-      '../..',
-      '../../<(gtestdir)',
-      '../../<(nacldir)',
-    ],
-    # TODO(rlp): remove this after fixing signed / unsigned issues in
-    # command buffer code and tests.
-    'target_conditions': [
-      ['OS == "mac"',
-        {
-          'xcode_settings': {
-            'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO'
-          },
-        },
-      ],
-    ],
-  },
-  'targets': [
-    {
-      'target_name': 'command_buffer_common',
-      'type': 'static_library',
-      'all_dependent_settings': {
-        'include_dirs': [
-          '..',
-        ],
-      },  # 'all_dependent_settings'
-      'sources': [
-        'common/bitfield_helpers.h',
-        'common/cmd_buffer_common.h',
-        'common/cmd_buffer_common.cc',
-        'common/o3d_cmd_format.h',
-        'common/o3d_cmd_format.cc',
-        'common/gapi_interface.h',
-        'common/logging.h',
-        'common/mocks.h',
-        'common/resource.cc',
-        'common/resource.h',
-        'common/types.h',
-      ],
-    },
-    {
-      'target_name': 'command_buffer_common_test',
-      'type': 'none',
-      'direct_dependent_settings': {
-        'sources': [
-          'common/bitfield_helpers_test.cc',
-        ],
-      },
-    },
-    {
-      'target_name': 'command_buffer_client',
-      'type': 'static_library',
-      'dependencies': [
-        'command_buffer_common',
-        '../gpu_plugin/gpu_plugin.gyp:np_utils',
-      ],
-      'sources': [
-        'client/cmd_buffer_helper.cc',
-        'client/cmd_buffer_helper.h',
-        'client/effect_helper.cc',
-        'client/effect_helper.h',
-        'client/fenced_allocator.cc',
-        'client/fenced_allocator.h',
-        'client/id_allocator.cc',
-        'client/id_allocator.h',
-        'client/o3d_cmd_helper.cc',
-        'client/o3d_cmd_helper.h',
-      ],
-    },
-    {
-      'target_name': 'command_buffer_client_test',
-      'type': 'none',
-      'direct_dependent_settings': {
-        'sources': [
-          'client/cmd_buffer_helper_test.cc',
-          'client/fenced_allocator_test.cc',
-          'client/id_allocator_test.cc',
-        ],
-      },
-    },
-    {
-      'target_name': 'command_buffer_service',
-      'type': 'static_library',
-      'all_dependent_settings': {
-        'include_dirs': [
-          '..',
-        ],
-        'conditions': [
-          ['OS == "win" and (renderer == "gl" or cb_service == "gl")',
-            {
-              'include_dirs': [
-                '../../<(glewdir)/include',
-                '../../<(cgdir)/include',
-              ],
-            },
-          ],
-        ],
-      },  # 'all_dependent_settings'
-      'dependencies': [
-        'command_buffer_common',
-      ],
-      'sources': [
-        'service/common_decoder.cc',
-        'service/common_decoder.h',
-        'service/cmd_buffer_engine.h',
-        'service/cmd_parser.cc',
-        'service/cmd_parser.h',
-        'service/effect_utils.cc',
-        'service/effect_utils.h',
-        'service/gapi_decoder.cc',
-        'service/gapi_decoder.h',
-        'service/mocks.h',
-        'service/precompile.cc',
-        'service/precompile.h',
-        'service/resource.cc',
-        'service/resource.h',
-        'service/texture_utils.cc',
-        'service/texture_utils.h',
-      ],
-      'conditions': [
-        ['OS == "win"',
-          {
-            'msvs_settings': {
-              'VCCLCompilerTool': {
-                'ForcedIncludeFiles':
-                'command_buffer/service/precompile.h',
-              },
-            },
-          },
-        ],
-        ['OS == "mac"',
-          {
-            'xcode_settings': {
-              'GCC_PREFIX_HEADER': 'service/precompile.h',
-            },
-          },
-        ],
-        ['OS == "linux"',
-          {
-            'cflags': [
-              '-include',
-              'command_buffer/service/precompile.h',
-            ],
-          },
-        ],
-        ['cb_service == "d3d9"',
-          {
-            'include_dirs': [
-              '$(DXSDK_DIR)/Include',
-            ],
-            'all_dependent_settings': {
-              'include_dirs': [
-                '$(DXSDK_DIR)/Include',
-              ],
-              'link_settings': {
-                'libraries': [
-                  '"$(DXSDK_DIR)/Lib/x86/DxErr.lib"',
-                ],
-              },
-            },  # 'all_dependent_settings'
-            'sources': [
-              'service/d3d9_utils.h',
-              'service/effect_d3d9.cc',
-              'service/effect_d3d9.h',
-              'service/gapi_d3d9.cc',
-              'service/gapi_d3d9.h',
-              'service/geometry_d3d9.cc',
-              'service/geometry_d3d9.h',
-              'service/render_surface_d3d9.cc',
-              'service/render_surface_d3d9.h',
-              'service/sampler_d3d9.cc',
-              'service/sampler_d3d9.h',
-              'service/states_d3d9.cc',
-              'service/texture_d3d9.cc',
-              'service/texture_d3d9.h',
-            ],  # 'sources'
-          },
-        ],
-        ['cb_service == "gl"',
-          {
-            'dependencies': [
-              '../build/libs.gyp:gl_libs',
-              '../build/libs.gyp:cg_libs',
-            ],
-            'sources': [
-              'service/effect_gl.cc',
-              'service/effect_gl.h',
-              'service/gapi_gl.cc',
-              'service/gapi_gl.h',
-              'service/geometry_gl.cc',
-              'service/geometry_gl.h',
-              'service/gl_utils.h',
-              'service/render_surface_gl.cc',
-              'service/render_surface_gl.h',
-              'service/sampler_gl.cc',
-              'service/sampler_gl.h',
-              'service/states_gl.cc',
-              'service/texture_gl.cc',
-              'service/texture_gl.h',
-            ],  # 'sources'
-          },
-        ],
-        ['OS == "linux"',
-          {
-            'sources': [
-              'service/linux/x_utils.cc',
-              'service/linux/x_utils.h',
-            ],
-          },
-        ],
-      ],  # 'conditions'
-    },
-    {
-      'target_name': 'command_buffer_service_test',
-      'type': 'none',
-      'direct_dependent_settings': {
-        'sources': [
-          'service/cmd_parser_test.cc',
-          'service/resource_test.cc',
-        ],
-      },
-    },
-  ],  # 'targets'
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/o3d/core/core.gyp b/o3d/core/core.gyp
index cd2a8d9..1f3afa8 100644
--- a/o3d/core/core.gyp
+++ b/o3d/core/core.gyp
@@ -398,8 +398,8 @@
         ['renderer == "cb"',
           {
             'dependencies': [
-              '../command_buffer/command_buffer.gyp:command_buffer_client',
-              '../gpu_plugin/gpu_plugin.gyp:np_utils',
+              '../gpu/gpu.gyp:command_buffer_client',
+              '../gpu/gpu.gyp:np_utils',
             ],
             'sources': [
               'cross/command_buffer/buffer_cb.cc',
@@ -430,11 +430,11 @@
         ['renderer == "cb" and cb_service != "remote"',
           {
             'dependencies': [
-              '../command_buffer/command_buffer.gyp:command_buffer_service',
+              '../gpu/gpu.gyp:command_buffer_service',
 
               # These dependencies are only needed for RendererCBLocal. They can
               # be removed when RendererCBLocal is not needed.
-              '../gpu_plugin/gpu_plugin.gyp:command_buffer',
+              '../gpu/gpu.gyp:command_buffer',
             ],
           },
         ],
diff --git a/o3d/core/cross/command_buffer/buffer_cb.cc b/o3d/core/cross/command_buffer/buffer_cb.cc
index d2ee8dc..301dfa7 100644
--- a/o3d/core/cross/command_buffer/buffer_cb.cc
+++ b/o3d/core/cross/command_buffer/buffer_cb.cc
@@ -34,8 +34,8 @@
 
 #include "core/cross/precompile.h"
 #include "core/cross/command_buffer/buffer_cb.h"
-#include "command_buffer/client/o3d_cmd_helper.h"
-#include "command_buffer/client/fenced_allocator.h"
+#include "gpu/command_buffer/client/o3d_cmd_helper.h"
+#include "gpu/command_buffer/client/fenced_allocator.h"
 
 namespace o3d {
 using command_buffer::CommandBufferEntry;
diff --git a/o3d/core/cross/command_buffer/display_window_cb.h b/o3d/core/cross/command_buffer/display_window_cb.h
index 06b494e..74486bf 100644
--- a/o3d/core/cross/command_buffer/display_window_cb.h
+++ b/o3d/core/cross/command_buffer/display_window_cb.h
@@ -34,8 +34,8 @@
 #define O3D_CORE_WIN_DISPLAY_WINDOW_CB_H_
 
 #include "core/cross/display_window.h"
-#include "gpu_plugin/command_buffer.h"
-#include "gpu_plugin/np_utils/np_object_pointer.h"
+#include "gpu/gpu_plugin/command_buffer.h"
+#include "gpu/np_utils/np_object_pointer.h"
 
 namespace o3d {
 
diff --git a/o3d/core/cross/command_buffer/effect_cb.cc b/o3d/core/cross/command_buffer/effect_cb.cc
index a3b5e66..9e860dd 100644
--- a/o3d/core/cross/command_buffer/effect_cb.cc
+++ b/o3d/core/cross/command_buffer/effect_cb.cc
@@ -37,10 +37,10 @@
 #include "core/cross/semantic_manager.h"
 #include "core/cross/service_locator.h"
 #include "core/cross/command_buffer/effect_cb.h"
-#include "command_buffer/common/constants.h"
-#include "command_buffer/common/o3d_cmd_format.h"
-#include "command_buffer/client/fenced_allocator.h"
-#include "command_buffer/client/o3d_cmd_helper.h"
+#include "gpu/command_buffer/common/constants.h"
+#include "gpu/command_buffer/common/o3d_cmd_format.h"
+#include "gpu/command_buffer/client/fenced_allocator.h"
+#include "gpu/command_buffer/client/o3d_cmd_helper.h"
 
 namespace o3d {
 
diff --git a/o3d/core/cross/command_buffer/effect_cb.h b/o3d/core/cross/command_buffer/effect_cb.h
index d193b55..21b4d7c 100644
--- a/o3d/core/cross/command_buffer/effect_cb.h
+++ b/o3d/core/cross/command_buffer/effect_cb.h
@@ -38,7 +38,7 @@
 #include <vector>
 #include "core/cross/effect.h"
 #include "core/cross/command_buffer/renderer_cb.h"
-#include "command_buffer/client/effect_helper.h"
+#include "gpu/command_buffer/client/effect_helper.h"
 
 namespace o3d {
 
diff --git a/o3d/core/cross/command_buffer/param_cache_cb.cc b/o3d/core/cross/command_buffer/param_cache_cb.cc
index b850ffb..5c5f64e 100644
--- a/o3d/core/cross/command_buffer/param_cache_cb.cc
+++ b/o3d/core/cross/command_buffer/param_cache_cb.cc
@@ -39,8 +39,8 @@
 #include "core/cross/command_buffer/effect_cb.h"
 #include "core/cross/command_buffer/param_cache_cb.h"
 #include "core/cross/command_buffer/sampler_cb.h"
-#include "command_buffer/common/o3d_cmd_format.h"
-#include "command_buffer/client/o3d_cmd_helper.h"
+#include "gpu/command_buffer/common/o3d_cmd_format.h"
+#include "gpu/command_buffer/client/o3d_cmd_helper.h"
 
 namespace o3d {
 
diff --git a/o3d/core/cross/command_buffer/primitive_cb.cc b/o3d/core/cross/command_buffer/primitive_cb.cc
index 68d5bbc..f97039a 100644
--- a/o3d/core/cross/command_buffer/primitive_cb.cc
+++ b/o3d/core/cross/command_buffer/primitive_cb.cc
@@ -40,8 +40,8 @@
 #include "core/cross/command_buffer/effect_cb.h"
 #include "core/cross/command_buffer/stream_bank_cb.h"
 #include "core/cross/error.h"
-#include "command_buffer/common/gapi_interface.h"
-#include "command_buffer/client/o3d_cmd_helper.h"
+#include "gpu/command_buffer/common/gapi_interface.h"
+#include "gpu/command_buffer/client/o3d_cmd_helper.h"
 
 // TODO: add unit tests.
 
diff --git a/o3d/core/cross/command_buffer/primitive_cb.h b/o3d/core/cross/command_buffer/primitive_cb.h
index 3484a1d..955150c 100644
--- a/o3d/core/cross/command_buffer/primitive_cb.h
+++ b/o3d/core/cross/command_buffer/primitive_cb.h
@@ -37,7 +37,7 @@
 
 #include "core/cross/precompile.h"
 #include "core/cross/primitive.h"
-#include "command_buffer/common/resource.h"
+#include "gpu/command_buffer/common/resource.h"
 
 namespace o3d {
 
diff --git a/o3d/core/cross/command_buffer/render_surface_cb.cc b/o3d/core/cross/command_buffer/render_surface_cb.cc
index 773f07c..83ebce4 100644
--- a/o3d/core/cross/command_buffer/render_surface_cb.cc
+++ b/o3d/core/cross/command_buffer/render_surface_cb.cc
@@ -31,7 +31,7 @@
 
 
 #include "core/cross/command_buffer/render_surface_cb.h"
-#include "command_buffer/client/o3d_cmd_helper.h"
+#include "gpu/command_buffer/client/o3d_cmd_helper.h"
 
 namespace o3d {
 
diff --git a/o3d/core/cross/command_buffer/render_surface_cb.h b/o3d/core/cross/command_buffer/render_surface_cb.h
index 81dccb8..3028b6f 100644
--- a/o3d/core/cross/command_buffer/render_surface_cb.h
+++ b/o3d/core/cross/command_buffer/render_surface_cb.h
@@ -38,7 +38,7 @@
 

 #include "core/cross/render_surface.h"

 #include "core/cross/command_buffer/renderer_cb.h"

-#include "command_buffer/common/resource.h"

+#include "gpu/command_buffer/common/resource.h"

 

 namespace o3d {

 

diff --git a/o3d/core/cross/command_buffer/renderer_cb.cc b/o3d/core/cross/command_buffer/renderer_cb.cc
index f4bb89d..a6a07d8 100644
--- a/o3d/core/cross/command_buffer/renderer_cb.cc
+++ b/o3d/core/cross/command_buffer/renderer_cb.cc
@@ -34,9 +34,9 @@
 
 #include "core/cross/precompile.h"
 
-#include "command_buffer/client/o3d_cmd_helper.h"
-#include "command_buffer/client/fenced_allocator.h"
-#include "command_buffer/common/gapi_interface.h"
+#include "gpu/command_buffer/client/o3d_cmd_helper.h"
+#include "gpu/command_buffer/client/fenced_allocator.h"
+#include "gpu/command_buffer/common/gapi_interface.h"
 #include "core/cross/command_buffer/buffer_cb.h"
 #include "core/cross/command_buffer/effect_cb.h"
 #include "core/cross/command_buffer/param_cache_cb.h"
@@ -49,13 +49,13 @@
 #include "core/cross/command_buffer/texture_cb.h"
 #include "core/cross/command_buffer/display_window_cb.h"
 #include "core/cross/renderer_platform.h"
-#include "gpu_plugin/command_buffer.h"
-#include "gpu_plugin/gpu_processor.h"
-#include "gpu_plugin/np_utils/np_browser.h"
-#include "gpu_plugin/np_utils/np_utils.h"
+#include "gpu/gpu_plugin/command_buffer.h"
+#include "gpu/gpu_plugin/gpu_processor.h"
+#include "gpu/np_utils/np_browser.h"
+#include "gpu/np_utils/np_utils.h"
 
 #if !defined(CB_SERVICE_REMOTE)
-#include "gpu_plugin/gpu_processor.h"
+#include "gpu/gpu_plugin/gpu_processor.h"
 #endif
 
 namespace o3d {
diff --git a/o3d/core/cross/command_buffer/renderer_cb.h b/o3d/core/cross/command_buffer/renderer_cb.h
index a424922..9168bb5 100644
--- a/o3d/core/cross/command_buffer/renderer_cb.h
+++ b/o3d/core/cross/command_buffer/renderer_cb.h
@@ -39,12 +39,12 @@
 #include "core/cross/precompile.h"
 #include <vector>
 #include "core/cross/renderer.h"
-#include "command_buffer/common/constants.h"
-#include "command_buffer/common/resource.h"
-#include "command_buffer/client/fenced_allocator.h"
-#include "command_buffer/client/id_allocator.h"
-#include "gpu_plugin/command_buffer.h"
-#include "gpu_plugin/np_utils/np_object_pointer.h"
+#include "gpu/command_buffer/common/constants.h"
+#include "gpu/command_buffer/common/resource.h"
+#include "gpu/command_buffer/client/fenced_allocator.h"
+#include "gpu/command_buffer/client/id_allocator.h"
+#include "gpu/gpu_plugin/command_buffer.h"
+#include "gpu/np_utils/np_object_pointer.h"
 
 namespace command_buffer {
 class O3DCmdHelper;
diff --git a/o3d/core/cross/command_buffer/sampler_cb.cc b/o3d/core/cross/command_buffer/sampler_cb.cc
index 32bccba..887b9ad 100644
--- a/o3d/core/cross/command_buffer/sampler_cb.cc
+++ b/o3d/core/cross/command_buffer/sampler_cb.cc
@@ -36,8 +36,8 @@
 #include "core/cross/error.h"
 #include "core/cross/command_buffer/sampler_cb.h"
 #include "core/cross/command_buffer/renderer_cb.h"
-#include "command_buffer/common/o3d_cmd_format.h"
-#include "command_buffer/client/o3d_cmd_helper.h"
+#include "gpu/command_buffer/common/o3d_cmd_format.h"
+#include "gpu/command_buffer/client/o3d_cmd_helper.h"
 
 namespace o3d {
 
diff --git a/o3d/core/cross/command_buffer/sampler_cb.h b/o3d/core/cross/command_buffer/sampler_cb.h
index 3543436..25892d55 100644
--- a/o3d/core/cross/command_buffer/sampler_cb.h
+++ b/o3d/core/cross/command_buffer/sampler_cb.h
@@ -38,7 +38,7 @@
 
 #include "core/cross/precompile.h"
 #include "core/cross/sampler.h"
-#include "command_buffer/common/resource.h"
+#include "gpu/command_buffer/common/resource.h"
 
 namespace o3d {
 
diff --git a/o3d/core/cross/command_buffer/states_cb.cc b/o3d/core/cross/command_buffer/states_cb.cc
index 6903107..8572827d 100644
--- a/o3d/core/cross/command_buffer/states_cb.cc
+++ b/o3d/core/cross/command_buffer/states_cb.cc
@@ -37,7 +37,7 @@
 #include "core/cross/state.h"
 #include "core/cross/command_buffer/renderer_cb.h"
 #include "core/cross/command_buffer/states_cb.h"
-#include "command_buffer/common/gapi_interface.h"
+#include "gpu/command_buffer/common/gapi_interface.h"
 
 namespace o3d {
 using command_buffer::CommandBufferEntry;
diff --git a/o3d/core/cross/command_buffer/states_cb.h b/o3d/core/cross/command_buffer/states_cb.h
index 0b8e1cf..0732978 100644
--- a/o3d/core/cross/command_buffer/states_cb.h
+++ b/o3d/core/cross/command_buffer/states_cb.h
@@ -37,8 +37,8 @@
 #define O3D_CORE_CROSS_COMMAND_BUFFER_STATES_CB_H_
 
 #include "core/cross/command_buffer/renderer_cb.h"
-#include "command_buffer/common/o3d_cmd_format.h"
-#include "command_buffer/client/cmd_buffer_helper.h"
+#include "gpu/command_buffer/common/o3d_cmd_format.h"
+#include "gpu/command_buffer/client/cmd_buffer_helper.h"
 
 namespace o3d {
 
diff --git a/o3d/core/cross/command_buffer/stream_bank_cb.cc b/o3d/core/cross/command_buffer/stream_bank_cb.cc
index c10e256..d7aebf4 100644
--- a/o3d/core/cross/command_buffer/stream_bank_cb.cc
+++ b/o3d/core/cross/command_buffer/stream_bank_cb.cc
@@ -39,8 +39,8 @@
 #include "core/cross/command_buffer/buffer_cb.h"
 #include "core/cross/command_buffer/effect_cb.h"
 #include "core/cross/command_buffer/stream_bank_cb.h"
-#include "command_buffer/common/gapi_interface.h"
-#include "command_buffer/client/o3d_cmd_helper.h"
+#include "gpu/command_buffer/common/gapi_interface.h"
+#include "gpu/command_buffer/client/o3d_cmd_helper.h"
 
 // TODO: add unit tests.
 
diff --git a/o3d/core/cross/command_buffer/stream_bank_cb.h b/o3d/core/cross/command_buffer/stream_bank_cb.h
index bef497e..4f0656c 100644
--- a/o3d/core/cross/command_buffer/stream_bank_cb.h
+++ b/o3d/core/cross/command_buffer/stream_bank_cb.h
@@ -37,7 +37,7 @@
 
 #include "core/cross/precompile.h"
 #include "core/cross/stream_bank.h"
-#include "command_buffer/common/resource.h"
+#include "gpu/command_buffer/common/resource.h"
 
 namespace o3d {
 
diff --git a/o3d/core/cross/command_buffer/texture_cb.cc b/o3d/core/cross/command_buffer/texture_cb.cc
index 31c1c15..8793339 100644
--- a/o3d/core/cross/command_buffer/texture_cb.cc
+++ b/o3d/core/cross/command_buffer/texture_cb.cc
@@ -38,10 +38,10 @@
 #include "core/cross/command_buffer/renderer_cb.h"
 #include "core/cross/command_buffer/texture_cb.h"
 
-#include "command_buffer/common/o3d_cmd_format.h"
-#include "command_buffer/common/resource.h"
-#include "command_buffer/client/o3d_cmd_helper.h"
-#include "command_buffer/client/fenced_allocator.h"
+#include "gpu/command_buffer/common/o3d_cmd_format.h"
+#include "gpu/command_buffer/common/resource.h"
+#include "gpu/command_buffer/client/o3d_cmd_helper.h"
+#include "gpu/command_buffer/client/fenced_allocator.h"
 
 namespace o3d {
 
diff --git a/o3d/core/cross/command_buffer/texture_cb.h b/o3d/core/cross/command_buffer/texture_cb.h
index 6fd21da..9e37023 100644
--- a/o3d/core/cross/command_buffer/texture_cb.h
+++ b/o3d/core/cross/command_buffer/texture_cb.h
@@ -39,7 +39,7 @@
 #include "core/cross/bitmap.h"
 #include "core/cross/texture.h"
 #include "core/cross/types.h"
-#include "command_buffer/common/resource.h"
+#include "gpu/command_buffer/common/resource.h"
 #include "core/cross/command_buffer/render_surface_cb.h"
 
 namespace o3d {
diff --git a/o3d/command_buffer/client/cmd_buffer_helper.cc b/o3d/gpu/command_buffer/client/cmd_buffer_helper.cc
index 4dd2ece..e6a49d1 100644
--- a/o3d/command_buffer/client/cmd_buffer_helper.cc
+++ b/o3d/gpu/command_buffer/client/cmd_buffer_helper.cc
@@ -32,8 +32,8 @@
 
 // This file contains the implementation of the command buffer helper class.
 
-#include "command_buffer/client/cmd_buffer_helper.h"
-#include "o3d/gpu_plugin/np_utils/np_utils.h"
+#include "gpu/command_buffer/client/cmd_buffer_helper.h"
+#include "gpu/np_utils/np_utils.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/client/cmd_buffer_helper.h b/o3d/gpu/command_buffer/client/cmd_buffer_helper.h
index e17e234..d63a53e 100644
--- a/o3d/command_buffer/client/cmd_buffer_helper.h
+++ b/o3d/gpu/command_buffer/client/cmd_buffer_helper.h
@@ -35,11 +35,11 @@
 #ifndef GPU_COMMAND_BUFFER_CLIENT_CROSS_CMD_BUFFER_HELPER_H_
 #define GPU_COMMAND_BUFFER_CLIENT_CROSS_CMD_BUFFER_HELPER_H_
 
-#include "command_buffer/common/logging.h"
-#include "command_buffer/common/constants.h"
-#include "command_buffer/common/cmd_buffer_common.h"
-#include "o3d/gpu_plugin/command_buffer.h"
-#include "o3d/gpu_plugin/np_utils/np_object_pointer.h"
+#include "gpu/command_buffer/common/logging.h"
+#include "gpu/command_buffer/common/constants.h"
+#include "gpu/command_buffer/common/cmd_buffer_common.h"
+#include "gpu/gpu_plugin/command_buffer.h"
+#include "gpu/np_utils/np_object_pointer.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/client/cmd_buffer_helper_test.cc b/o3d/gpu/command_buffer/client/cmd_buffer_helper_test.cc
index b7a4f85..b2f5bde 100644
--- a/o3d/command_buffer/client/cmd_buffer_helper_test.cc
+++ b/o3d/gpu/command_buffer/client/cmd_buffer_helper_test.cc
@@ -34,11 +34,11 @@
 
 #include "tests/common/win/testing_common.h"
 #include "base/message_loop.h"
-#include "command_buffer/client/cmd_buffer_helper.h"
-#include "command_buffer/service/mocks.h"
-#include "gpu_plugin/command_buffer.h"
-#include "gpu_plugin/gpu_processor.h"
-#include "gpu_plugin/np_utils/np_object_pointer.h"
+#include "gpu/command_buffer/client/cmd_buffer_helper.h"
+#include "gpu/command_buffer/service/mocks.h"
+#include "gpu/gpu_plugin/command_buffer.h"
+#include "gpu/gpu_plugin/gpu_processor.h"
+#include "gpu/np_utils/np_object_pointer.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/client/effect_helper.cc b/o3d/gpu/command_buffer/client/effect_helper.cc
index eb7faf9..f3daaae 100644
--- a/o3d/command_buffer/client/effect_helper.cc
+++ b/o3d/gpu/command_buffer/client/effect_helper.cc
@@ -32,11 +32,11 @@
 
 // This file implements the EffectHelper class.
 
-#include "command_buffer/common/o3d_cmd_format.h"
-#include "command_buffer/client/cmd_buffer_helper.h"
-#include "command_buffer/client/effect_helper.h"
-#include "command_buffer/client/fenced_allocator.h"
-#include "command_buffer/client/id_allocator.h"
+#include "gpu/command_buffer/common/o3d_cmd_format.h"
+#include "gpu/command_buffer/client/cmd_buffer_helper.h"
+#include "gpu/command_buffer/client/effect_helper.h"
+#include "gpu/command_buffer/client/fenced_allocator.h"
+#include "gpu/command_buffer/client/id_allocator.h"
 
 // TODO: write a unit test.
 
diff --git a/o3d/command_buffer/client/effect_helper.h b/o3d/gpu/command_buffer/client/effect_helper.h
index a20375c..dc11b24 100644
--- a/o3d/command_buffer/client/effect_helper.h
+++ b/o3d/gpu/command_buffer/client/effect_helper.h
@@ -36,8 +36,8 @@
 #define GPU_COMMAND_BUFFER_CLIENT_CROSS_EFFECT_HELPER_H_
 
 #include <vector>
-#include "command_buffer/common/resource.h"
-#include "command_buffer/client/o3d_cmd_helper.h"
+#include "gpu/command_buffer/common/resource.h"
+#include "gpu/command_buffer/client/o3d_cmd_helper.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/client/fenced_allocator.cc b/o3d/gpu/command_buffer/client/fenced_allocator.cc
index 990d013..810feb5 100644
--- a/o3d/command_buffer/client/fenced_allocator.cc
+++ b/o3d/gpu/command_buffer/client/fenced_allocator.cc
@@ -32,9 +32,9 @@
 
 // This file contains the implementation of the FencedAllocator class.
 
-#include "command_buffer/client/fenced_allocator.h"
+#include "gpu/command_buffer/client/fenced_allocator.h"
 #include <algorithm>
-#include "command_buffer/client/cmd_buffer_helper.h"
+#include "gpu/command_buffer/client/cmd_buffer_helper.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/client/fenced_allocator.h b/o3d/gpu/command_buffer/client/fenced_allocator.h
index 96c3a8a..72bba33 100644
--- a/o3d/command_buffer/client/fenced_allocator.h
+++ b/o3d/gpu/command_buffer/client/fenced_allocator.h
@@ -37,7 +37,7 @@
 
 #include <vector>
 #include "base/basictypes.h"
-#include "command_buffer/common/logging.h"
+#include "gpu/command_buffer/common/logging.h"
 
 namespace command_buffer {
 class CommandBufferHelper;
diff --git a/o3d/command_buffer/client/fenced_allocator_test.cc b/o3d/gpu/command_buffer/client/fenced_allocator_test.cc
index aa59be1..ce76542 100644
--- a/o3d/command_buffer/client/fenced_allocator_test.cc
+++ b/o3d/gpu/command_buffer/client/fenced_allocator_test.cc
@@ -34,13 +34,13 @@
 
 #include "tests/common/win/testing_common.h"
 #include "base/message_loop.h"
-#include "command_buffer/client/cmd_buffer_helper.h"
-#include "command_buffer/client/fenced_allocator.h"
-#include "command_buffer/service/cmd_buffer_engine.h"
-#include "command_buffer/service/mocks.h"
-#include "gpu_plugin/command_buffer.h"
-#include "gpu_plugin/gpu_processor.h"
-#include "gpu_plugin/np_utils/np_object_pointer.h"
+#include "gpu/command_buffer/client/cmd_buffer_helper.h"
+#include "gpu/command_buffer/client/fenced_allocator.h"
+#include "gpu/command_buffer/service/cmd_buffer_engine.h"
+#include "gpu/command_buffer/service/mocks.h"
+#include "gpu/gpu_plugin/command_buffer.h"
+#include "gpu/gpu_plugin/gpu_processor.h"
+#include "gpu/np_utils/np_object_pointer.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/client/id_allocator.cc b/o3d/gpu/command_buffer/client/id_allocator.cc
index fc3250d..49104e5 100644
--- a/o3d/command_buffer/client/id_allocator.cc
+++ b/o3d/gpu/command_buffer/client/id_allocator.cc
@@ -32,7 +32,7 @@
 
 // This file contains the implementation of IdAllocator.
 
-#include "command_buffer/client/id_allocator.h"
+#include "gpu/command_buffer/client/id_allocator.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/client/id_allocator.h b/o3d/gpu/command_buffer/client/id_allocator.h
index 819d13e..b2b14b9 100644
--- a/o3d/command_buffer/client/id_allocator.h
+++ b/o3d/gpu/command_buffer/client/id_allocator.h
@@ -37,8 +37,8 @@
 
 #include <vector>
 #include "base/basictypes.h"
-#include "command_buffer/common/types.h"
-#include "command_buffer/common/resource.h"
+#include "gpu/command_buffer/common/types.h"
+#include "gpu/command_buffer/common/resource.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/client/id_allocator_test.cc b/o3d/gpu/command_buffer/client/id_allocator_test.cc
index b344ab5..10c7809 100644
--- a/o3d/command_buffer/client/id_allocator_test.cc
+++ b/o3d/gpu/command_buffer/client/id_allocator_test.cc
@@ -33,7 +33,7 @@
 // This file has the unit tests for the IdAllocator class.
 
 #include "tests/common/win/testing_common.h"
-#include "command_buffer/client/id_allocator.h"
+#include "gpu/command_buffer/client/id_allocator.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/client/o3d_cmd_helper.cc b/o3d/gpu/command_buffer/client/o3d_cmd_helper.cc
index cb9ffe1..85c6a27 100644
--- a/o3d/command_buffer/client/o3d_cmd_helper.cc
+++ b/o3d/gpu/command_buffer/client/o3d_cmd_helper.cc
@@ -32,7 +32,7 @@
 
 // This file contains the implementation of the o3d buffer helper class.
 
-#include "command_buffer/client/o3d_cmd_helper.h"
+#include "gpu/command_buffer/client/o3d_cmd_helper.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/client/o3d_cmd_helper.h b/o3d/gpu/command_buffer/client/o3d_cmd_helper.h
index 4f4aed2..0dbbff4 100644
--- a/o3d/command_buffer/client/o3d_cmd_helper.h
+++ b/o3d/gpu/command_buffer/client/o3d_cmd_helper.h
@@ -35,11 +35,11 @@
 #ifndef GPU_COMMAND_BUFFER_CLIENT_CROSS_O3D_CMD_HELPER_H_
 #define GPU_COMMAND_BUFFER_CLIENT_CROSS_O3D_CMD_HELPER_H_
 
-#include "command_buffer/common/logging.h"
-#include "command_buffer/common/constants.h"
-#include "command_buffer/client/cmd_buffer_helper.h"
-#include "command_buffer/common/o3d_cmd_format.h"
-#include "o3d/gpu_plugin/np_utils/np_object_pointer.h"
+#include "gpu/command_buffer/common/logging.h"
+#include "gpu/command_buffer/common/constants.h"
+#include "gpu/command_buffer/client/cmd_buffer_helper.h"
+#include "gpu/command_buffer/common/o3d_cmd_format.h"
+#include "gpu/np_utils/np_object_pointer.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/common/GLES2/gl2.h b/o3d/gpu/command_buffer/common/GLES2/gl2.h
index 94c643b..94c643b 100644
--- a/o3d/command_buffer/common/GLES2/gl2.h
+++ b/o3d/gpu/command_buffer/common/GLES2/gl2.h
diff --git a/o3d/command_buffer/common/GLES2/gl2platform.h b/o3d/gpu/command_buffer/common/GLES2/gl2platform.h
index 3e9036c..3e9036c 100644
--- a/o3d/command_buffer/common/GLES2/gl2platform.h
+++ b/o3d/gpu/command_buffer/common/GLES2/gl2platform.h
diff --git a/o3d/command_buffer/common/KHR/khrplatform.h b/o3d/gpu/command_buffer/common/KHR/khrplatform.h
index 8341f71b..8341f71b 100644
--- a/o3d/command_buffer/common/KHR/khrplatform.h
+++ b/o3d/gpu/command_buffer/common/KHR/khrplatform.h
diff --git a/o3d/command_buffer/common/bitfield_helpers.h b/o3d/gpu/command_buffer/common/bitfield_helpers.h
index b74374d..b74374d 100644
--- a/o3d/command_buffer/common/bitfield_helpers.h
+++ b/o3d/gpu/command_buffer/common/bitfield_helpers.h
diff --git a/o3d/command_buffer/common/bitfield_helpers_test.cc b/o3d/gpu/command_buffer/common/bitfield_helpers_test.cc
index 310ccf0..60014d2 100644
--- a/o3d/command_buffer/common/bitfield_helpers_test.cc
+++ b/o3d/gpu/command_buffer/common/bitfield_helpers_test.cc
@@ -33,7 +33,7 @@
 // Tests for the bitfield helper class.
 
 #include "gtest/gtest.h"
-#include "command_buffer/common/bitfield_helpers.h"
+#include "gpu/command_buffer/common/bitfield_helpers.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/common/cmd_buffer_common.cc b/o3d/gpu/command_buffer/common/cmd_buffer_common.cc
index b23b0e9..e9172eb 100644
--- a/o3d/command_buffer/common/cmd_buffer_common.cc
+++ b/o3d/gpu/command_buffer/common/cmd_buffer_common.cc
@@ -33,7 +33,7 @@
 // This file contains the binary format definition of the command buffer and
 // command buffer commands.
 
-#include "command_buffer/common/cmd_buffer_common.h"
+#include "gpu/command_buffer/common/cmd_buffer_common.h"
 
 namespace command_buffer {
 namespace cmd {
diff --git a/o3d/command_buffer/common/cmd_buffer_common.h b/o3d/gpu/command_buffer/common/cmd_buffer_common.h
index cbafa98..0e44f86 100644
--- a/o3d/command_buffer/common/cmd_buffer_common.h
+++ b/o3d/gpu/command_buffer/common/cmd_buffer_common.h
@@ -36,9 +36,9 @@
 #define GPU_COMMAND_BUFFER_COMMON_CROSS_CMD_BUFFER_COMMON_H_
 
 #include "base/basictypes.h"
-#include "command_buffer/common/types.h"
-#include "command_buffer/common/bitfield_helpers.h"
-#include "command_buffer/common/logging.h"
+#include "gpu/command_buffer/common/types.h"
+#include "gpu/command_buffer/common/bitfield_helpers.h"
+#include "gpu/command_buffer/common/logging.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/common/constants.h b/o3d/gpu/command_buffer/common/constants.h
index ee874cd..ee874cd 100644
--- a/o3d/command_buffer/common/constants.h
+++ b/o3d/gpu/command_buffer/common/constants.h
diff --git a/o3d/command_buffer/common/gapi_interface.h b/o3d/gpu/command_buffer/common/gapi_interface.h
index d946b5d..a032f0e 100644
--- a/o3d/command_buffer/common/gapi_interface.h
+++ b/o3d/gpu/command_buffer/common/gapi_interface.h
@@ -36,9 +36,9 @@
 #ifndef GPU_COMMAND_BUFFER_COMMON_CROSS_GAPI_INTERFACE_H_
 #define GPU_COMMAND_BUFFER_COMMON_CROSS_GAPI_INTERFACE_H_
 
-#include "command_buffer/common/constants.h"
-#include "command_buffer/common/resource.h"
-#include "command_buffer/common/o3d_cmd_format.h"
+#include "gpu/command_buffer/common/constants.h"
+#include "gpu/command_buffer/common/resource.h"
+#include "gpu/command_buffer/common/o3d_cmd_format.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/common/logging.h b/o3d/gpu/command_buffer/common/logging.h
index a9bbad8..a9bbad8 100644
--- a/o3d/command_buffer/common/logging.h
+++ b/o3d/gpu/command_buffer/common/logging.h
diff --git a/o3d/command_buffer/common/o3d_cmd_format.cc b/o3d/gpu/command_buffer/common/o3d_cmd_format.cc
index c373446..c70dde7 100644
--- a/o3d/command_buffer/common/o3d_cmd_format.cc
+++ b/o3d/gpu/command_buffer/common/o3d_cmd_format.cc
@@ -33,7 +33,7 @@
 // This file contains the binary format definition of the command buffer and
 // command buffer commands.
 
-#include "command_buffer/common/o3d_cmd_format.h"
+#include "gpu/command_buffer/common/o3d_cmd_format.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/common/o3d_cmd_format.h b/o3d/gpu/command_buffer/common/o3d_cmd_format.h
index 937ae0a..86503f4 100644
--- a/o3d/command_buffer/common/o3d_cmd_format.h
+++ b/o3d/gpu/command_buffer/common/o3d_cmd_format.h
@@ -59,8 +59,8 @@
 #ifndef GPU_COMMAND_BUFFER_COMMON_CROSS_CMD_BUFFER_FORMAT_H_
 #define GPU_COMMAND_BUFFER_COMMON_CROSS_CMD_BUFFER_FORMAT_H_
 
-#include "command_buffer/common/cmd_buffer_common.h"
-#include "command_buffer/common/resource.h"
+#include "gpu/command_buffer/common/cmd_buffer_common.h"
+#include "gpu/command_buffer/common/resource.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/common/resource.cc b/o3d/gpu/command_buffer/common/resource.cc
index 08a5957..f3b75ec 100644
--- a/o3d/command_buffer/common/resource.cc
+++ b/o3d/gpu/command_buffer/common/resource.cc
@@ -32,7 +32,7 @@
 
 // This file contains the implementation of the helper functions for resources.
 
-#include "command_buffer/common/resource.h"
+#include "gpu/command_buffer/common/resource.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/common/resource.h b/o3d/gpu/command_buffer/common/resource.h
index 851198b..01de6a1 100644
--- a/o3d/command_buffer/common/resource.h
+++ b/o3d/gpu/command_buffer/common/resource.h
@@ -39,8 +39,8 @@
 #include <algorithm>
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
-#include "command_buffer/common/types.h"
-#include "command_buffer/common/logging.h"
+#include "gpu/command_buffer/common/types.h"
+#include "gpu/command_buffer/common/logging.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/common/types.h b/o3d/gpu/command_buffer/common/types.h
index daa01cb..daa01cb 100644
--- a/o3d/command_buffer/common/types.h
+++ b/o3d/gpu/command_buffer/common/types.h
diff --git a/o3d/command_buffer/service/big_test_main.cc b/o3d/gpu/command_buffer/service/big_test_main.cc
index 656f908..cda7d0e 100644
--- a/o3d/command_buffer/service/big_test_main.cc
+++ b/o3d/gpu/command_buffer/service/big_test_main.cc
@@ -32,9 +32,10 @@
 
 // This file contains the entry to the big test program, for linux.
 
-#include "command_buffer/service/cross/big_test_helpers.h"
-#include "command_buffer/service/cross/gl/gapi_gl.h"
-#include "command_buffer/service/linux/x_utils.h"
+#include "gpu/command_buffer/service/precompile.h"
+#include "gpu/command_buffer/service/cross/big_test_helpers.h"
+#include "gpu/command_buffer/service/cross/gl/gapi_gl.h"
+#include "gpu/command_buffer/service/linux/x_utils.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/service/cmd_buffer_engine.h b/o3d/gpu/command_buffer/service/cmd_buffer_engine.h
index 74ad649..74ad649 100644
--- a/o3d/command_buffer/service/cmd_buffer_engine.h
+++ b/o3d/gpu/command_buffer/service/cmd_buffer_engine.h
diff --git a/o3d/command_buffer/service/cmd_parser.cc b/o3d/gpu/command_buffer/service/cmd_parser.cc
index 0108953..b3486ec 100644
--- a/o3d/command_buffer/service/cmd_parser.cc
+++ b/o3d/gpu/command_buffer/service/cmd_parser.cc
@@ -32,9 +32,10 @@
 
 // This file contains the implementation of the command parser.
 
-#include "command_buffer/service/cmd_parser.h"
+#include "gpu/command_buffer/service/precompile.h"
+#include "gpu/command_buffer/service/cmd_parser.h"
 // TODO(gman): remove this so we can use this code for different formats.
-#include "command_buffer/common/o3d_cmd_format.h"
+#include "gpu/command_buffer/common/o3d_cmd_format.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/service/cmd_parser.h b/o3d/gpu/command_buffer/service/cmd_parser.h
index 4147c78..2209cf8 100644
--- a/o3d/command_buffer/service/cmd_parser.h
+++ b/o3d/gpu/command_buffer/service/cmd_parser.h
@@ -35,8 +35,8 @@
 #ifndef GPU_COMMAND_BUFFER_SERVICE_CROSS_CMD_PARSER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_CROSS_CMD_PARSER_H_
 
-#include "command_buffer/common/constants.h"
-#include "command_buffer/common/cmd_buffer_common.h"
+#include "gpu/command_buffer/common/constants.h"
+#include "gpu/command_buffer/common/cmd_buffer_common.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/service/cmd_parser_test.cc b/o3d/gpu/command_buffer/service/cmd_parser_test.cc
index 153c20a..3c9871e 100644
--- a/o3d/command_buffer/service/cmd_parser_test.cc
+++ b/o3d/gpu/command_buffer/service/cmd_parser_test.cc
@@ -32,9 +32,11 @@
 
 // Tests for the command parser.
 
+#include "gpu/command_buffer/service/precompile.h"
+
 #include "tests/common/win/testing_common.h"
-#include "command_buffer/service/cmd_parser.h"
-#include "command_buffer/service/mocks.h"
+#include "gpu/command_buffer/service/cmd_parser.h"
+#include "gpu/command_buffer/service/mocks.h"
 #include "base/scoped_ptr.h"
 
 namespace command_buffer {
diff --git a/o3d/command_buffer/service/common_decoder.cc b/o3d/gpu/command_buffer/service/common_decoder.cc
index 3d53c1f..22bf445 100644
--- a/o3d/command_buffer/service/common_decoder.cc
+++ b/o3d/gpu/command_buffer/service/common_decoder.cc
@@ -29,8 +29,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "command_buffer/service/common_decoder.h"
-#include "command_buffer/service/cmd_buffer_engine.h"
+#include "gpu/command_buffer/service/precompile.h"
+#include "gpu/command_buffer/service/common_decoder.h"
+#include "gpu/command_buffer/service/cmd_buffer_engine.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/service/common_decoder.h b/o3d/gpu/command_buffer/service/common_decoder.h
index 9b77e77..25d1dbe 100644
--- a/o3d/command_buffer/service/common_decoder.h
+++ b/o3d/gpu/command_buffer/service/common_decoder.h
@@ -32,7 +32,7 @@
 #ifndef GPU_COMMAND_BUFFER_SERVICE_CROSS_COMMON_DECODER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_CROSS_COMMON_DECODER_H_
 
-#include "command_buffer/service/cmd_parser.h"
+#include "gpu/command_buffer/service/cmd_parser.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/service/d3d9_utils.h b/o3d/gpu/command_buffer/service/d3d9_utils.h
index 714be3f..5938ac0 100644
--- a/o3d/command_buffer/service/d3d9_utils.h
+++ b/o3d/gpu/command_buffer/service/d3d9_utils.h
@@ -32,8 +32,8 @@
 
 // This file defines a few utilities for Direct3D.
 
-#ifndef GPU_COMMAND_BUFFER_SERVICE_WIN_D3D9_D3D9_UTILS_H_
-#define GPU_COMMAND_BUFFER_SERVICE_WIN_D3D9_D3D9_UTILS_H_
+#ifndef GPU_COMMAND_BUFFER_SERVICE_D3D9_UTILS_H_
+#define GPU_COMMAND_BUFFER_SERVICE_D3D9_UTILS_H_
 
 #ifndef NOMINMAX
 // windows.h defines min() and max() as macros, conflicting with std::min and
@@ -45,7 +45,7 @@
 #include <d3dx9.h>
 #include <dxerr.h>
 #include <algorithm>
-#include "command_buffer/common/gapi_interface.h"
+#include "gpu/command_buffer/common/gapi_interface.h"
 
 #if defined (_DEBUG)
 
@@ -142,4 +142,4 @@ static bool D3DSemanticToCBSemantic(
 }
 }  // namespace command_buffer
 
-#endif  // GPU_COMMAND_BUFFER_SERVICE_WIN_D3D9_D3D9_UTILS_H_
+#endif  // GPU_COMMAND_BUFFER_SERVICE_D3D9_UTILS_H_
diff --git a/o3d/command_buffer/service/effect_d3d9.cc b/o3d/gpu/command_buffer/service/effect_d3d9.cc
index 6ed3bc4..4bfae53 100644
--- a/o3d/command_buffer/service/effect_d3d9.cc
+++ b/o3d/gpu/command_buffer/service/effect_d3d9.cc
@@ -34,13 +34,15 @@
 // Effect resource.
 // This file also contains the related GAPID3D9 function implementations.
 
+#include "gpu/command_buffer/service/precompile.h"
+
 #include <algorithm>
-#include "command_buffer/service/d3d9_utils.h"
-#include "command_buffer/service/geometry_d3d9.h"
-#include "command_buffer/service/gapi_d3d9.h"
-#include "command_buffer/service/effect_d3d9.h"
-#include "command_buffer/service/sampler_d3d9.h"
-#include "command_buffer/service/effect_utils.h"
+#include "gpu/command_buffer/service/d3d9_utils.h"
+#include "gpu/command_buffer/service/geometry_d3d9.h"
+#include "gpu/command_buffer/service/gapi_d3d9.h"
+#include "gpu/command_buffer/service/effect_d3d9.h"
+#include "gpu/command_buffer/service/sampler_d3d9.h"
+#include "gpu/command_buffer/service/effect_utils.h"
 
 // TODO: remove link-dependency on D3DX.
 
diff --git a/o3d/command_buffer/service/effect_d3d9.h b/o3d/gpu/command_buffer/service/effect_d3d9.h
index cbe32a3..db2df41 100644
--- a/o3d/command_buffer/service/effect_d3d9.h
+++ b/o3d/gpu/command_buffer/service/effect_d3d9.h
@@ -33,13 +33,13 @@
 // This file contains the definition of the D3D9 versions of effect-related
 // resource classes.
 
-#ifndef GPU_COMMAND_BUFFER_SERVICE_WIN_D3D9_EFFECT_D3D9_H_
-#define GPU_COMMAND_BUFFER_SERVICE_WIN_D3D9_EFFECT_D3D9_H_
+#ifndef GPU_COMMAND_BUFFER_SERVICE_EFFECT_D3D9_H_
+#define GPU_COMMAND_BUFFER_SERVICE_EFFECT_D3D9_H_
 
 #include <vector>
-#include "command_buffer/common/gapi_interface.h"
-#include "command_buffer/service/d3d9_utils.h"
-#include "command_buffer/service/resource.h"
+#include "gpu/command_buffer/common/gapi_interface.h"
+#include "gpu/command_buffer/service/d3d9_utils.h"
+#include "gpu/command_buffer/service/resource.h"
 
 namespace command_buffer {
 namespace o3d {
@@ -136,4 +136,4 @@ class EffectD3D9 : public Effect {
 }  // namespace o3d
 }  // namespace command_buffer
 
-#endif  // GPU_COMMAND_BUFFER_SERVICE_WIN_D3D9_EFFECT_D3D9_H_
+#endif  // GPU_COMMAND_BUFFER_SERVICE_EFFECT_D3D9_H_
diff --git a/o3d/command_buffer/service/effect_gl.cc b/o3d/gpu/command_buffer/service/effect_gl.cc
index 881f6b7..b8f9601 100644
--- a/o3d/command_buffer/service/effect_gl.cc
+++ b/o3d/gpu/command_buffer/service/effect_gl.cc
@@ -33,12 +33,14 @@
 // This file contains the implementation of the EffectParamGL and EffectGL
 // classes, as well as the effect-related GAPI functions on GL.
 
+#include "gpu/command_buffer/service/precompile.h"
+
 #include <map>
 
 #include "base/cross/std_functional.h"
-#include "command_buffer/service/effect_gl.h"
-#include "command_buffer/service/gapi_gl.h"
-#include "command_buffer/service/effect_utils.h"
+#include "gpu/command_buffer/service/effect_gl.h"
+#include "gpu/command_buffer/service/gapi_gl.h"
+#include "gpu/command_buffer/service/effect_utils.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/effect_gl.h b/o3d/gpu/command_buffer/service/effect_gl.h
index b639489..b38cc92 100644
--- a/o3d/command_buffer/service/effect_gl.h
+++ b/o3d/gpu/command_buffer/service/effect_gl.h
@@ -32,14 +32,14 @@
 
 // This file contains the declaration of the EffectParamGL and EffectGL classes.
 
-#ifndef GPU_COMMAND_BUFFER_SERVICE_CROSS_GL_EFFECT_GL_H_
-#define GPU_COMMAND_BUFFER_SERVICE_CROSS_GL_EFFECT_GL_H_
+#ifndef GPU_COMMAND_BUFFER_SERVICE_EFFECT_GL_H_
+#define GPU_COMMAND_BUFFER_SERVICE_EFFECT_GL_H_
 
 #include <vector>
 
-#include "command_buffer/common/gapi_interface.h"
-#include "command_buffer/service/resource.h"
-#include "command_buffer/service/gl_utils.h"
+#include "gpu/command_buffer/common/gapi_interface.h"
+#include "gpu/command_buffer/service/resource.h"
+#include "gpu/command_buffer/service/gl_utils.h"
 
 namespace command_buffer {
 namespace o3d {
@@ -159,4 +159,4 @@ class EffectGL : public Effect {
 }  // namespace o3d
 }  // namespace command_buffer
 
-#endif  // GPU_COMMAND_BUFFER_SERVICE_CROSS_GL_EFFECT_GL_H_
+#endif  // GPU_COMMAND_BUFFER_SERVICE_EFFECT_GL_H_
diff --git a/o3d/command_buffer/service/effect_utils.cc b/o3d/gpu/command_buffer/service/effect_utils.cc
index 203aa1b..021b49f 100644
--- a/o3d/command_buffer/service/effect_utils.cc
+++ b/o3d/gpu/command_buffer/service/effect_utils.cc
@@ -32,7 +32,8 @@
 
 // This file implements effect related utilities.
 
-#include "command_buffer/service/effect_utils.h"
+#include "gpu/command_buffer/service/precompile.h"
+#include "gpu/command_buffer/service/effect_utils.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/service/effect_utils.h b/o3d/gpu/command_buffer/service/effect_utils.h
index dcfe718..ae22fb9 100644
--- a/o3d/command_buffer/service/effect_utils.h
+++ b/o3d/gpu/command_buffer/service/effect_utils.h
@@ -35,7 +35,7 @@
 #ifndef GPU_COMMAND_BUFFER_SERVICE_CROSS_EFFECT_UTILS_H_
 #define GPU_COMMAND_BUFFER_SERVICE_CROSS_EFFECT_UTILS_H_
 
-#include "command_buffer/common/types.h"
+#include "gpu/command_buffer/common/types.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/service/effect_utils_test.cc b/o3d/gpu/command_buffer/service/effect_utils_test.cc
index d37db9d..695291e 100644
--- a/o3d/command_buffer/service/effect_utils_test.cc
+++ b/o3d/gpu/command_buffer/service/effect_utils_test.cc
@@ -32,8 +32,9 @@
 
 // This file contains the unit tests for the effect utilities.
 
+#include "gpu/command_buffer/service/precompile.h"
 #include "tests/common/win/testing_common.h"
-#include "command_buffer/service/cross/effect_utils.h"
+#include "gpu/command_buffer/service/cross/effect_utils.h"
 
 namespace o3d {
 namespace command_buffer {
diff --git a/o3d/command_buffer/service/gapi_d3d9.cc b/o3d/gpu/command_buffer/service/gapi_d3d9.cc
index 1d840eb..8ca8cfd 100644
--- a/o3d/command_buffer/service/gapi_d3d9.cc
+++ b/o3d/gpu/command_buffer/service/gapi_d3d9.cc
@@ -32,7 +32,8 @@
 
 // This file contains the implementation of the GAPID3D9 class.
 
-#include "command_buffer/service/gapi_d3d9.h"
+#include "gpu/command_buffer/service/precompile.h"
+#include "gpu/command_buffer/service/gapi_d3d9.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/gapi_d3d9.h b/o3d/gpu/command_buffer/service/gapi_d3d9.h
index bac33a8..1056dc1 100644
--- a/o3d/command_buffer/service/gapi_d3d9.h
+++ b/o3d/gpu/command_buffer/service/gapi_d3d9.h
@@ -33,16 +33,16 @@
 // This file contains the GAPID3D9 class, implementing the GAPI interface for
 // D3D9.
 
-#ifndef GPU_COMMAND_BUFFER_SERVICE_WIN_D3D9_GAPI_D3D9_H_
-#define GPU_COMMAND_BUFFER_SERVICE_WIN_D3D9_GAPI_D3D9_H_
+#ifndef GPU_COMMAND_BUFFER_SERVICE_GAPI_D3D9_H_
+#define GPU_COMMAND_BUFFER_SERVICE_GAPI_D3D9_H_
 
-#include "command_buffer/common/gapi_interface.h"
-#include "command_buffer/service/d3d9_utils.h"
-#include "command_buffer/service/geometry_d3d9.h"
-#include "command_buffer/service/effect_d3d9.h"
-#include "command_buffer/service/texture_d3d9.h"
-#include "command_buffer/service/sampler_d3d9.h"
-#include "command_buffer/service/render_surface_d3d9.h"
+#include "gpu/command_buffer/common/gapi_interface.h"
+#include "gpu/command_buffer/service/d3d9_utils.h"
+#include "gpu/command_buffer/service/geometry_d3d9.h"
+#include "gpu/command_buffer/service/effect_d3d9.h"
+#include "gpu/command_buffer/service/texture_d3d9.h"
+#include "gpu/command_buffer/service/sampler_d3d9.h"
+#include "gpu/command_buffer/service/render_surface_d3d9.h"
 
 namespace command_buffer {
 namespace o3d {
@@ -504,5 +504,5 @@ class GAPID3D9 : public GAPIInterface {
 }  // namespace o3d
 }  // namespace command_buffer
 
-#endif  // GPU_COMMAND_BUFFER_SERVICE_WIN_D3D9_GAPI_D3D9_H_
+#endif  // GPU_COMMAND_BUFFER_SERVICE_GAPI_D3D9_H_
 
diff --git a/o3d/command_buffer/service/gapi_decoder.cc b/o3d/gpu/command_buffer/service/gapi_decoder.cc
index ec079f9..4d91b69 100644
--- a/o3d/command_buffer/service/gapi_decoder.cc
+++ b/o3d/gpu/command_buffer/service/gapi_decoder.cc
@@ -33,9 +33,11 @@
 // This class contains the implementation of the GAPI decoder class, decoding
 // GAPI commands into calls to a GAPIInterface class.
 
+#include "gpu/command_buffer/service/precompile.h"
+
 #include "base/cross/bits.h"
-#include "command_buffer/common/gapi_interface.h"
-#include "command_buffer/service/gapi_decoder.h"
+#include "gpu/command_buffer/common/gapi_interface.h"
+#include "gpu/command_buffer/service/gapi_decoder.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/gapi_decoder.h b/o3d/gpu/command_buffer/service/gapi_decoder.h
index 5641311..e043598 100644
--- a/o3d/command_buffer/service/gapi_decoder.h
+++ b/o3d/gpu/command_buffer/service/gapi_decoder.h
@@ -35,8 +35,8 @@
 #ifndef GPU_COMMAND_BUFFER_SERVICE_CROSS_GAPI_DECODER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_CROSS_GAPI_DECODER_H_
 
-#include "command_buffer/service/common_decoder.h"
-#include "command_buffer/common/o3d_cmd_format.h"
+#include "gpu/command_buffer/service/common_decoder.h"
+#include "gpu/command_buffer/common/o3d_cmd_format.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/gapi_gl.cc b/o3d/gpu/command_buffer/service/gapi_gl.cc
index 5bc587d..c5f82de 100644
--- a/o3d/command_buffer/service/gapi_gl.cc
+++ b/o3d/gpu/command_buffer/service/gapi_gl.cc
@@ -32,11 +32,14 @@
 
 // This file implements the GAPIGL class.
 
+#include "gpu/command_buffer/service/precompile.h"
+
 #include <build/build_config.h>
-#include "command_buffer/service/gapi_gl.h"
+
+#include "gpu/command_buffer/service/gapi_gl.h"
 
 #ifdef OS_LINUX
-#include "command_buffer/service/linux/x_utils.h"
+#include "gpu/command_buffer/service/linux/x_utils.h"
 #endif  // OS_LINUX
 
 namespace command_buffer {
diff --git a/o3d/command_buffer/service/gapi_gl.h b/o3d/gpu/command_buffer/service/gapi_gl.h
index e46bd7f..0719fba 100644
--- a/o3d/command_buffer/service/gapi_gl.h
+++ b/o3d/gpu/command_buffer/service/gapi_gl.h
@@ -33,20 +33,20 @@
 // This file contains the GAPIGL class, implementing the GAPI interface for
 // GL.
 
-#ifndef GPU_COMMAND_BUFFER_SERVICE_CROSS_GL_GAPI_GL_H_
-#define GPU_COMMAND_BUFFER_SERVICE_CROSS_GL_GAPI_GL_H_
+#ifndef GPU_COMMAND_BUFFER_SERVICE_GAPI_GL_H_
+#define GPU_COMMAND_BUFFER_SERVICE_GAPI_GL_H_
 
 #include <build/build_config.h>
 #include <GL/glew.h>
 #include <Cg/cg.h>
 #include <Cg/cgGL.h>
-#include "command_buffer/common/gapi_interface.h"
-#include "command_buffer/service/gl_utils.h"
-#include "command_buffer/service/effect_gl.h"
-#include "command_buffer/service/geometry_gl.h"
-#include "command_buffer/service/render_surface_gl.h"
-#include "command_buffer/service/sampler_gl.h"
-#include "command_buffer/service/texture_gl.h"
+#include "gpu/command_buffer/common/gapi_interface.h"
+#include "gpu/command_buffer/service/gl_utils.h"
+#include "gpu/command_buffer/service/effect_gl.h"
+#include "gpu/command_buffer/service/geometry_gl.h"
+#include "gpu/command_buffer/service/render_surface_gl.h"
+#include "gpu/command_buffer/service/sampler_gl.h"
+#include "gpu/command_buffer/service/texture_gl.h"
 
 namespace command_buffer {
 namespace o3d {
@@ -462,4 +462,4 @@ class GAPIGL : public GAPIInterface {
 }  // namespace o3d
 }  // namespace command_buffer
 
-#endif  // GPU_COMMAND_BUFFER_SERVICE_CROSS_GL_GAPI_GL_H_
+#endif  // GPU_COMMAND_BUFFER_SERVICE_GAPI_GL_H_
diff --git a/o3d/command_buffer/service/geometry_d3d9.cc b/o3d/gpu/command_buffer/service/geometry_d3d9.cc
index 8fb3f35..c3b5eb5 100644
--- a/o3d/command_buffer/service/geometry_d3d9.cc
+++ b/o3d/gpu/command_buffer/service/geometry_d3d9.cc
@@ -34,10 +34,13 @@
 // VertexBuffer, IndexBuffer and VertexStruct resources.
 // This file also contains the related GAPID3D9 function implementations.
 
+#include "gpu/command_buffer/service/precompile.h"
+
 #include <algorithm>
-#include "command_buffer/service/d3d9_utils.h"
-#include "command_buffer/service/geometry_d3d9.h"
-#include "command_buffer/service/gapi_d3d9.h"
+
+#include "gpu/command_buffer/service/d3d9_utils.h"
+#include "gpu/command_buffer/service/geometry_d3d9.h"
+#include "gpu/command_buffer/service/gapi_d3d9.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/geometry_d3d9.h b/o3d/gpu/command_buffer/service/geometry_d3d9.h
index 201a69e..50f534d 100644
--- a/o3d/command_buffer/service/geometry_d3d9.h
+++ b/o3d/gpu/command_buffer/service/geometry_d3d9.h
@@ -33,14 +33,14 @@
 // This file contains the definition of the D3D9 versions of geometry-related
 // resource classes.
 
-#ifndef GPU_COMMAND_BUFFER_SERVICE_WIN_D3D9_GEOMETRY_D3D9_H_
-#define GPU_COMMAND_BUFFER_SERVICE_WIN_D3D9_GEOMETRY_D3D9_H_
+#ifndef GPU_COMMAND_BUFFER_SERVICE_GEOMETRY_D3D9_H_
+#define GPU_COMMAND_BUFFER_SERVICE_GEOMETRY_D3D9_H_
 
 #include <vector>
 #include <utility>
-#include "command_buffer/common/gapi_interface.h"
-#include "command_buffer/service/d3d9_utils.h"
-#include "command_buffer/service/resource.h"
+#include "gpu/command_buffer/common/gapi_interface.h"
+#include "gpu/command_buffer/service/d3d9_utils.h"
+#include "gpu/command_buffer/service/resource.h"
 
 namespace command_buffer {
 namespace o3d {
@@ -123,4 +123,4 @@ class VertexStructD3D9 : public VertexStruct {
 }  // namespace o3d
 }  // namespace command_buffer
 
-#endif  // GPU_COMMAND_BUFFER_SERVICE_WIN_D3D9_GEOMETRY_D3D9_H_
+#endif  // GPU_COMMAND_BUFFER_SERVICE_GEOMETRY_D3D9_H_
diff --git a/o3d/command_buffer/service/geometry_gl.cc b/o3d/gpu/command_buffer/service/geometry_gl.cc
index f6194a2..13390a9 100644
--- a/o3d/command_buffer/service/geometry_gl.cc
+++ b/o3d/gpu/command_buffer/service/geometry_gl.cc
@@ -33,8 +33,9 @@
 // This file contains the implementation of the VertexBufferGL, IndexBufferGL
 // and VertexStructGL classes, as well as the geometry-related GAPI functions.
 
-#include "command_buffer/service/gapi_gl.h"
-#include "command_buffer/service/geometry_gl.h"
+#include "gpu/command_buffer/service/precompile.h"
+#include "gpu/command_buffer/service/gapi_gl.h"
+#include "gpu/command_buffer/service/geometry_gl.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/geometry_gl.h b/o3d/gpu/command_buffer/service/geometry_gl.h
index 4849330..b4d4b5f 100644
--- a/o3d/command_buffer/service/geometry_gl.h
+++ b/o3d/gpu/command_buffer/service/geometry_gl.h
@@ -33,12 +33,12 @@
 // This file declares the VertexBufferGL, IndexBufferGL and VertexStructGL
 // classes.
 
-#ifndef GPU_COMMAND_BUFFER_SERVICE_CROSS_GL_GEOMETRY_GL_H_
-#define GPU_COMMAND_BUFFER_SERVICE_CROSS_GL_GEOMETRY_GL_H_
+#ifndef GPU_COMMAND_BUFFER_SERVICE_GEOMETRY_GL_H_
+#define GPU_COMMAND_BUFFER_SERVICE_GEOMETRY_GL_H_
 
-#include "command_buffer/common/gapi_interface.h"
-#include "command_buffer/service/resource.h"
-#include "command_buffer/service/gl_utils.h"
+#include "gpu/command_buffer/common/gapi_interface.h"
+#include "gpu/command_buffer/service/resource.h"
+#include "gpu/command_buffer/service/gl_utils.h"
 
 namespace command_buffer {
 namespace o3d {
@@ -141,4 +141,4 @@ class VertexStructGL : public VertexStruct {
 }  // namespace o3d
 }  // namespace command_buffer
 
-#endif  // GPU_COMMAND_BUFFER_SERVICE_CROSS_GL_GEOMETRY_GL_H_
+#endif  // GPU_COMMAND_BUFFER_SERVICE_GEOMETRY_GL_H_
diff --git a/o3d/command_buffer/service/gl_utils.h b/o3d/gpu/command_buffer/service/gl_utils.h
index 2034260..292b2d6 100644
--- a/o3d/command_buffer/service/gl_utils.h
+++ b/o3d/gpu/command_buffer/service/gl_utils.h
@@ -33,8 +33,8 @@
 // This file includes all the necessary GL/Cg headers and implements some useful
 // utilities.
 
-#ifndef GPU_COMMAND_BUFFER_SERVICE_CROSS_GL_GL_UTILS_H_
-#define GPU_COMMAND_BUFFER_SERVICE_CROSS_GL_GL_UTILS_H_
+#ifndef GPU_COMMAND_BUFFER_SERVICE_GL_UTILS_H_
+#define GPU_COMMAND_BUFFER_SERVICE_GL_UTILS_H_
 
 #include <GL/glew.h>
 #if defined(OS_WIN)
@@ -57,4 +57,4 @@
 #define CHECK_GL_ERROR() void(0)
 #endif  // GL_ERROR_DEBUGGING
 
-#endif  // GPU_COMMAND_BUFFER_SERVICE_CROSS_GL_GL_UTILS_H_
+#endif  // GPU_COMMAND_BUFFER_SERVICE_GL_UTILS_H_
diff --git a/o3d/command_buffer/service/mocks.h b/o3d/gpu/command_buffer/service/mocks.h
index 9cbfe67..dbfb160 100644
--- a/o3d/command_buffer/service/mocks.h
+++ b/o3d/gpu/command_buffer/service/mocks.h
@@ -41,8 +41,8 @@
 
 #include <vector>
 #include "gmock/gmock.h"
-#include "command_buffer/service/cmd_parser.h"
-#include "command_buffer/service/cmd_buffer_engine.h"
+#include "gpu/command_buffer/service/cmd_parser.h"
+#include "gpu/command_buffer/service/cmd_buffer_engine.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/service/precompile.cc b/o3d/gpu/command_buffer/service/precompile.cc
index 62eb0f4..3e219b0 100644
--- a/o3d/command_buffer/service/precompile.cc
+++ b/o3d/gpu/command_buffer/service/precompile.cc
@@ -30,4 +30,4 @@
  */
 
 
-#include "command_buffer/service/precompile.h"
+#include "gpu/command_buffer/service/precompile.h"
diff --git a/o3d/command_buffer/service/precompile.h b/o3d/gpu/command_buffer/service/precompile.h
index 55d2b21..55d2b21 100644
--- a/o3d/command_buffer/service/precompile.h
+++ b/o3d/gpu/command_buffer/service/precompile.h
diff --git a/o3d/command_buffer/service/render_surface_d3d9.cc b/o3d/gpu/command_buffer/service/render_surface_d3d9.cc
index daa5ee2..a3880f8 100644
--- a/o3d/command_buffer/service/render_surface_d3d9.cc
+++ b/o3d/gpu/command_buffer/service/render_surface_d3d9.cc
@@ -33,9 +33,10 @@
 // This file implements the D3D9 versions of the render surface resources,
 // as well as the related GAPID3D9 function implementations.
 
-#include "command_buffer/service/render_surface_d3d9.h"
-#include "command_buffer/service/gapi_d3d9.h"
-#include "command_buffer/service/texture_d3d9.h"
+#include "gpu/command_buffer/service/precompile.h"
+#include "gpu/command_buffer/service/render_surface_d3d9.h"
+#include "gpu/command_buffer/service/gapi_d3d9.h"
+#include "gpu/command_buffer/service/texture_d3d9.h"
 
 
 namespace command_buffer {
diff --git a/o3d/command_buffer/service/render_surface_d3d9.h b/o3d/gpu/command_buffer/service/render_surface_d3d9.h
index 1094a5b..4769f1f 100644
--- a/o3d/command_buffer/service/render_surface_d3d9.h
+++ b/o3d/gpu/command_buffer/service/render_surface_d3d9.h
@@ -30,18 +30,18 @@
  */
 
 
-#ifndef GPU_COMMAND_BUFFER_SERVICE_WIN_D3D9_RENDER_SURFACE_D3D9_H_
-#define GPU_COMMAND_BUFFER_SERVICE_WIN_D3D9_RENDER_SURFACE_D3D9_H_
+#ifndef GPU_COMMAND_BUFFER_SERVICE_RENDER_SURFACE_D3D9_H_
+#define GPU_COMMAND_BUFFER_SERVICE_RENDER_SURFACE_D3D9_H_
 
 // This file contains the definition of the D3D9 versions of
 // render surface-related resource classes.
 
 #include <d3d9.h>
 #include "base/scoped_ptr.h"
-#include "command_buffer/common/gapi_interface.h"
-#include "command_buffer/service/resource.h"
-#include "command_buffer/service/d3d9_utils.h"
-#include "command_buffer/service/texture_d3d9.h"
+#include "gpu/command_buffer/common/gapi_interface.h"
+#include "gpu/command_buffer/service/resource.h"
+#include "gpu/command_buffer/service/d3d9_utils.h"
+#include "gpu/command_buffer/service/texture_d3d9.h"
 
 namespace command_buffer {
 namespace o3d {
@@ -157,5 +157,5 @@ class RenderDepthStencilSurfaceD3D9 : public RenderDepthStencilSurface {
 }  // namespace o3d
 }  // namespace command_buffer
 
-#endif  // GPU_COMMAND_BUFFER_SERVICE_WIN_D3D9_RENDER_SURFACE_D3D9_H_
+#endif  // GPU_COMMAND_BUFFER_SERVICE_RENDER_SURFACE_D3D9_H_
 
diff --git a/o3d/command_buffer/service/render_surface_gl.cc b/o3d/gpu/command_buffer/service/render_surface_gl.cc
index 1c06131..5485323 100644
--- a/o3d/command_buffer/service/render_surface_gl.cc
+++ b/o3d/gpu/command_buffer/service/render_surface_gl.cc
@@ -33,8 +33,9 @@
 // This file implements the OpenGL versions of the render surface resources,
 // as well as the related GAPIGL function implementations.
 
-#include "command_buffer/service/gapi_gl.h"
-#include "command_buffer/service/render_surface_gl.h"
+#include "gpu/command_buffer/service/precompile.h"
+#include "gpu/command_buffer/service/gapi_gl.h"
+#include "gpu/command_buffer/service/render_surface_gl.h"
 
 
 namespace command_buffer {
diff --git a/o3d/command_buffer/service/render_surface_gl.h b/o3d/gpu/command_buffer/service/render_surface_gl.h
index db6860d..01d6137 100644
--- a/o3d/command_buffer/service/render_surface_gl.h
+++ b/o3d/gpu/command_buffer/service/render_surface_gl.h
@@ -30,14 +30,14 @@
  */
 
 
-#ifndef GPU_COMMAND_BUFFER_SERVICE_CROSS_GL_RENDER_SURFACE_GL_H__
-#define GPU_COMMAND_BUFFER_SERVICE_CROSS_GL_RENDER_SURFACE_GL_H__
+#ifndef GPU_COMMAND_BUFFER_SERVICE_RENDER_SURFACE_GL_H__
+#define GPU_COMMAND_BUFFER_SERVICE_RENDER_SURFACE_GL_H__
 
 // This file contains the definition of the OpenGL versions of
 // render surface-related resource classes.
 
-#include "command_buffer/service/texture_gl.h"
-#include "command_buffer/service/resource.h"
+#include "gpu/command_buffer/service/texture_gl.h"
+#include "gpu/command_buffer/service/resource.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/resource.cc b/o3d/gpu/command_buffer/service/resource.cc
index c09b450..1208d30 100644
--- a/o3d/command_buffer/service/resource.cc
+++ b/o3d/gpu/command_buffer/service/resource.cc
@@ -32,7 +32,8 @@
 
 // This file contains the implementation of ResourceMapBase.
 
-#include "command_buffer/service/resource.h"
+#include "gpu/command_buffer/service/precompile.h"
+#include "gpu/command_buffer/service/resource.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/service/resource.h b/o3d/gpu/command_buffer/service/resource.h
index 6a2c2e2..20e3038 100644
--- a/o3d/command_buffer/service/resource.h
+++ b/o3d/gpu/command_buffer/service/resource.h
@@ -37,7 +37,7 @@
 
 #include <vector>
 #include "base/scoped_ptr.h"
-#include "command_buffer/common/resource.h"
+#include "gpu/command_buffer/common/resource.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/service/resource_test.cc b/o3d/gpu/command_buffer/service/resource_test.cc
index ed6154a..3e95dfb 100644
--- a/o3d/command_buffer/service/resource_test.cc
+++ b/o3d/gpu/command_buffer/service/resource_test.cc
@@ -32,8 +32,9 @@
 
 // Tests for the ResourceMap.
 
+#include "gpu/command_buffer/service/precompile.h"
 #include "tests/common/win/testing_common.h"
-#include "command_buffer/service/resource.h"
+#include "gpu/command_buffer/service/resource.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/service/sampler_d3d9.cc b/o3d/gpu/command_buffer/service/sampler_d3d9.cc
index 1436d26..e4c3b26 100644
--- a/o3d/command_buffer/service/sampler_d3d9.cc
+++ b/o3d/gpu/command_buffer/service/sampler_d3d9.cc
@@ -32,9 +32,10 @@
 
 // This file contains the implementation of the SamplerD3D9 class.
 
-#include "command_buffer/service/gapi_d3d9.h"
-#include "command_buffer/service/sampler_d3d9.h"
-#include "command_buffer/service/texture_d3d9.h"
+#include "gpu/command_buffer/service/precompile.h"
+#include "gpu/command_buffer/service/gapi_d3d9.h"
+#include "gpu/command_buffer/service/sampler_d3d9.h"
+#include "gpu/command_buffer/service/texture_d3d9.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/sampler_d3d9.h b/o3d/gpu/command_buffer/service/sampler_d3d9.h
index 2f1c31b..55a6e9a 100644
--- a/o3d/command_buffer/service/sampler_d3d9.h
+++ b/o3d/gpu/command_buffer/service/sampler_d3d9.h
@@ -33,12 +33,12 @@
 // This file contains the definition of the SamplerD3D9 class, implementing
 // samplers for D3D.
 
-#ifndef GPU_COMMAND_BUFFER_SERVICE_WIN_D3D9_SAMPLER_D3D9_H_
-#define GPU_COMMAND_BUFFER_SERVICE_WIN_D3D9_SAMPLER_D3D9_H_
+#ifndef GPU_COMMAND_BUFFER_SERVICE_SAMPLER_D3D9_H_
+#define GPU_COMMAND_BUFFER_SERVICE_SAMPLER_D3D9_H_
 
-#include "command_buffer/common/gapi_interface.h"
-#include "command_buffer/service/d3d9_utils.h"
-#include "command_buffer/service/resource.h"
+#include "gpu/command_buffer/common/gapi_interface.h"
+#include "gpu/command_buffer/service/d3d9_utils.h"
+#include "gpu/command_buffer/service/resource.h"
 
 namespace command_buffer {
 namespace o3d {
@@ -82,4 +82,4 @@ class SamplerD3D9 : public Sampler {
 }  // namespace o3d
 }  // namespace command_buffer
 
-#endif  // GPU_COMMAND_BUFFER_SERVICE_WIN_D3D9_SAMPLER_D3D9_H_
+#endif  // GPU_COMMAND_BUFFER_SERVICE_SAMPLER_D3D9_H_
diff --git a/o3d/command_buffer/service/sampler_gl.cc b/o3d/gpu/command_buffer/service/sampler_gl.cc
index 2c6622e..32335e1 100644
--- a/o3d/command_buffer/service/sampler_gl.cc
+++ b/o3d/gpu/command_buffer/service/sampler_gl.cc
@@ -32,8 +32,9 @@
 
 // This file implements the sampler-related GAPI functions on GL.
 
-#include "command_buffer/service/gapi_gl.h"
-#include "command_buffer/service/sampler_gl.h"
+#include "gpu/command_buffer/service/precompile.h"
+#include "gpu/command_buffer/service/gapi_gl.h"
+#include "gpu/command_buffer/service/sampler_gl.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/sampler_gl.h b/o3d/gpu/command_buffer/service/sampler_gl.h
index eae8f2c..8809ea5 100644
--- a/o3d/command_buffer/service/sampler_gl.h
+++ b/o3d/gpu/command_buffer/service/sampler_gl.h
@@ -32,12 +32,12 @@
 
 // This file declares the SamplerGL class.
 
-#ifndef GPU_COMMAND_BUFFER_SERVICE_CROSS_GL_SAMPLER_GL_H_
-#define GPU_COMMAND_BUFFER_SERVICE_CROSS_GL_SAMPLER_GL_H_
+#ifndef GPU_COMMAND_BUFFER_SERVICE_SAMPLER_GL_H_
+#define GPU_COMMAND_BUFFER_SERVICE_SAMPLER_GL_H_
 
-#include "command_buffer/common/gapi_interface.h"
-#include "command_buffer/service/gl_utils.h"
-#include "command_buffer/service/resource.h"
+#include "gpu/command_buffer/common/gapi_interface.h"
+#include "gpu/command_buffer/service/gl_utils.h"
+#include "gpu/command_buffer/service/resource.h"
 
 namespace command_buffer {
 namespace o3d {
@@ -84,4 +84,4 @@ class SamplerGL : public Sampler {
 }  // namespace o3d
 }  // namespace command_buffer
 
-#endif  // GPU_COMMAND_BUFFER_SERVICE_CROSS_GL_SAMPLER_GL_H_
+#endif  // GPU_COMMAND_BUFFER_SERVICE_SAMPLER_GL_H_
diff --git a/o3d/command_buffer/service/states_d3d9.cc b/o3d/gpu/command_buffer/service/states_d3d9.cc
index 8252e28..7abcada 100644
--- a/o3d/command_buffer/service/states_d3d9.cc
+++ b/o3d/gpu/command_buffer/service/states_d3d9.cc
@@ -33,9 +33,12 @@
 // This file contains the implementation of the state-related GAPID3D9
 // functions.
 
+#include "gpu/command_buffer/service/precompile.h"
+
 #include <algorithm>
-#include "command_buffer/common/o3d_cmd_format.h"
-#include "command_buffer/service/gapi_d3d9.h"
+
+#include "gpu/command_buffer/common/o3d_cmd_format.h"
+#include "gpu/command_buffer/service/gapi_d3d9.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/states_gl.cc b/o3d/gpu/command_buffer/service/states_gl.cc
index 49859ec..2d6fce4 100644
--- a/o3d/command_buffer/service/states_gl.cc
+++ b/o3d/gpu/command_buffer/service/states_gl.cc
@@ -32,8 +32,9 @@
 
 // This file implements the render state-related GAPI functions on GL.
 
-#include "command_buffer/common/o3d_cmd_format.h"
-#include "command_buffer/service/gapi_gl.h"
+#include "gpu/command_buffer/service/precompile.h"
+#include "gpu/command_buffer/common/o3d_cmd_format.h"
+#include "gpu/command_buffer/service/gapi_gl.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/texture_d3d9.cc b/o3d/gpu/command_buffer/service/texture_d3d9.cc
index ec55850..9f25ff0 100644
--- a/o3d/command_buffer/service/texture_d3d9.cc
+++ b/o3d/gpu/command_buffer/service/texture_d3d9.cc
@@ -33,8 +33,9 @@
 // This file implements the D3D9 versions of the texture resources, as well as
 // the related GAPID3D9 function implementations.
 
-#include "command_buffer/service/gapi_d3d9.h"
-#include "command_buffer/service/texture_d3d9.h"
+#include "gpu/command_buffer/service/precompile.h"
+#include "gpu/command_buffer/service/gapi_d3d9.h"
+#include "gpu/command_buffer/service/texture_d3d9.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/texture_d3d9.h b/o3d/gpu/command_buffer/service/texture_d3d9.h
index 5171d04..de913a8 100644
--- a/o3d/command_buffer/service/texture_d3d9.h
+++ b/o3d/gpu/command_buffer/service/texture_d3d9.h
@@ -30,17 +30,17 @@
  */
 
 
-#ifndef GPU_COMMAND_BUFFER_SERVICE_WIN_D3D9_TEXTURE_D3D9_H_
-#define GPU_COMMAND_BUFFER_SERVICE_WIN_D3D9_TEXTURE_D3D9_H_
+#ifndef GPU_COMMAND_BUFFER_SERVICE_TEXTURE_D3D9_H_
+#define GPU_COMMAND_BUFFER_SERVICE_TEXTURE_D3D9_H_
 
 // This file contains the definition of the D3D9 versions of texture-related
 // resource classes.
 #include <atlbase.h>
 
-#include "command_buffer/common/gapi_interface.h"
-#include "command_buffer/service/d3d9_utils.h"
-#include "command_buffer/service/resource.h"
-#include "command_buffer/service/texture_utils.h"
+#include "gpu/command_buffer/common/gapi_interface.h"
+#include "gpu/command_buffer/service/d3d9_utils.h"
+#include "gpu/command_buffer/service/resource.h"
+#include "gpu/command_buffer/service/texture_utils.h"
 
 namespace command_buffer {
 namespace o3d {
@@ -279,4 +279,4 @@ class TextureCubeD3D9 : public TextureD3D9 {
 }  // namespace o3d
 }  // namespace command_buffer
 
-#endif  // GPU_COMMAND_BUFFER_SERVICE_WIN_D3D9_TEXTURE_D3D9_H_
+#endif  // GPU_COMMAND_BUFFER_SERVICE_TEXTURE_D3D9_H_
diff --git a/o3d/command_buffer/service/texture_gl.cc b/o3d/gpu/command_buffer/service/texture_gl.cc
index 954a007..386c5ec 100644
--- a/o3d/command_buffer/service/texture_gl.cc
+++ b/o3d/gpu/command_buffer/service/texture_gl.cc
@@ -32,8 +32,9 @@
 
 // This file implements the texture-related GAPI functions on GL.
 
-#include "command_buffer/service/gapi_gl.h"
-#include "command_buffer/service/texture_gl.h"
+#include "gpu/command_buffer/service/precompile.h"
+#include "gpu/command_buffer/service/gapi_gl.h"
+#include "gpu/command_buffer/service/texture_gl.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/texture_gl.h b/o3d/gpu/command_buffer/service/texture_gl.h
index 9037eb7..d3e774c 100644
--- a/o3d/command_buffer/service/texture_gl.h
+++ b/o3d/gpu/command_buffer/service/texture_gl.h
@@ -33,13 +33,13 @@
 // This file declares the TextureGL, Texture2DGL, Texture3DGL and TextureCubeGL
 // classes.
 
-#ifndef GPU_COMMAND_BUFFER_SERVICE_CROSS_GL_TEXTURE_GL_H_
-#define GPU_COMMAND_BUFFER_SERVICE_CROSS_GL_TEXTURE_GL_H_
+#ifndef GPU_COMMAND_BUFFER_SERVICE_TEXTURE_GL_H_
+#define GPU_COMMAND_BUFFER_SERVICE_TEXTURE_GL_H_
 
-#include "command_buffer/common/gapi_interface.h"
-#include "command_buffer/service/gl_utils.h"
-#include "command_buffer/service/resource.h"
-#include "command_buffer/service/texture_utils.h"
+#include "gpu/command_buffer/common/gapi_interface.h"
+#include "gpu/command_buffer/service/gl_utils.h"
+#include "gpu/command_buffer/service/resource.h"
+#include "gpu/command_buffer/service/texture_utils.h"
 
 namespace command_buffer {
 namespace o3d {
@@ -281,4 +281,4 @@ class TextureCubeGL : public TextureGL {
 }  // namespace o3d
 }  // namespace command_buffer
 
-#endif  // GPU_COMMAND_BUFFER_SERVICE_CROSS_GL_TEXTURE_GL_H_
+#endif  // GPU_COMMAND_BUFFER_SERVICE_TEXTURE_GL_H_
diff --git a/o3d/command_buffer/service/texture_utils.cc b/o3d/gpu/command_buffer/service/texture_utils.cc
index d1d26dd..4aac8fa 100644
--- a/o3d/command_buffer/service/texture_utils.cc
+++ b/o3d/gpu/command_buffer/service/texture_utils.cc
@@ -32,8 +32,11 @@
 
 // This file contains the implementation of some utilities for textures.
 
+#include "gpu/command_buffer/service/precompile.h"
+
 #include <stdlib.h>
-#include "command_buffer/service/texture_utils.h"
+
+#include "gpu/command_buffer/service/texture_utils.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/service/texture_utils.h b/o3d/gpu/command_buffer/service/texture_utils.h
index 427e06c..0ace181 100644
--- a/o3d/command_buffer/service/texture_utils.h
+++ b/o3d/gpu/command_buffer/service/texture_utils.h
@@ -36,8 +36,8 @@
 #ifndef GPU_COMMAND_BUFFER_SERVICE_CROSS_TEXTURE_UTILS_H_
 #define GPU_COMMAND_BUFFER_SERVICE_CROSS_TEXTURE_UTILS_H_
 
-#include "command_buffer/common/logging.h"
-#include "command_buffer/common/resource.h"
+#include "gpu/command_buffer/common/logging.h"
+#include "gpu/command_buffer/common/resource.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/service/x_utils.cc b/o3d/gpu/command_buffer/service/x_utils.cc
index 96e62db..b9eb9d9 100644
--- a/o3d/command_buffer/service/x_utils.cc
+++ b/o3d/gpu/command_buffer/service/x_utils.cc
@@ -32,8 +32,9 @@
 
 // This class implements the XWindowWrapper class.
 
-#include "command_buffer/common/cross/logging.h"
-#include "command_buffer/service/linux/x_utils.h"
+#include "gpu/command_buffer/service/precompile.h"
+#include "gpu/command_buffer/common/cross/logging.h"
+#include "gpu/command_buffer/service/linux/x_utils.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/service/x_utils.h b/o3d/gpu/command_buffer/service/x_utils.h
index a05cc35..0d8c26a 100644
--- a/o3d/command_buffer/service/x_utils.h
+++ b/o3d/gpu/command_buffer/service/x_utils.h
@@ -32,12 +32,12 @@
 
 // This file declares the XWindowWrapper class.
 
-#ifndef GPU_COMMAND_BUFFER_SERVICE_LINUX_X_UTILS_H_
-#define GPU_COMMAND_BUFFER_SERVICE_LINUX_X_UTILS_H_
+#ifndef GPU_COMMAND_BUFFER_SERVICE_X_UTILS_H_
+#define GPU_COMMAND_BUFFER_SERVICE_X_UTILS_H_
 
 #include <GL/glx.h>
 #include "base/basictypes.h"
-#include "command_buffer/common/cross/logging.h"
+#include "gpu/command_buffer/common/cross/logging.h"
 
 namespace command_buffer {
 
@@ -73,4 +73,4 @@ class XWindowWrapper {
 
 }  // namespace command_buffer
 
-#endif  // GPU_COMMAND_BUFFER_SERVICE_LINUX_X_UTILS_H_
+#endif  // GPU_COMMAND_BUFFER_SERVICE_X_UTILS_H_
diff --git a/o3d/gpu/gpu.gyp b/o3d/gpu/gpu.gyp
new file mode 100644
index 0000000..60b56b8
--- /dev/null
+++ b/o3d/gpu/gpu.gyp
@@ -0,0 +1,351 @@
+# Copyright (c) 2009 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.
+
+{
+  'variables': {
+    'chromium_code': 1,
+  },
+  'includes': [
+    '../build/common.gypi',
+  ],
+  'targets': [
+    {
+      'target_name': 'command_buffer_common',
+      'type': 'static_library',
+      'include_dirs': [
+        '..',
+        '../..',
+      ],
+      'all_dependent_settings': {
+        'include_dirs': [
+          '..',
+          '../..',
+        ],
+      },  # 'all_dependent_settings'
+      'sources': [
+        'command_buffer/common/bitfield_helpers.h',
+        'command_buffer/common/cmd_buffer_common.h',
+        'command_buffer/common/cmd_buffer_common.cc',
+        'command_buffer/common/o3d_cmd_format.h',
+        'command_buffer/common/o3d_cmd_format.cc',
+        'command_buffer/common/gapi_interface.h',
+        'command_buffer/common/logging.h',
+        'command_buffer/common/mocks.h',
+        'command_buffer/common/resource.cc',
+        'command_buffer/common/resource.h',
+        'command_buffer/common/types.h',
+      ],
+    },
+    {
+      'target_name': 'command_buffer_common_test',
+      'type': 'none',
+      'direct_dependent_settings': {
+        'sources': [
+          'command_buffer/common/bitfield_helpers_test.cc',
+        ],
+      },
+    },
+    {
+      'target_name': 'command_buffer_client',
+      'type': 'static_library',
+      'dependencies': [
+        'command_buffer_common',
+        'np_utils',
+      ],
+      'sources': [
+        'command_buffer/client/cmd_buffer_helper.cc',
+        'command_buffer/client/cmd_buffer_helper.h',
+        'command_buffer/client/effect_helper.cc',
+        'command_buffer/client/effect_helper.h',
+        'command_buffer/client/fenced_allocator.cc',
+        'command_buffer/client/fenced_allocator.h',
+        'command_buffer/client/id_allocator.cc',
+        'command_buffer/client/id_allocator.h',
+        'command_buffer/client/o3d_cmd_helper.cc',
+        'command_buffer/client/o3d_cmd_helper.h',
+      ],
+    },
+    {
+      'target_name': 'command_buffer_client_test',
+      'type': 'none',
+      'direct_dependent_settings': {
+        'sources': [
+          'command_buffer/client/cmd_buffer_helper_test.cc',
+          'command_buffer/client/fenced_allocator_test.cc',
+          'command_buffer/client/id_allocator_test.cc',
+        ],
+      },
+    },
+    {
+      'target_name': 'command_buffer_service',
+      'type': 'static_library',
+      'all_dependent_settings': {
+        'include_dirs': [
+          '..',
+        ],
+        'conditions': [
+          ['OS == "win" and (renderer == "gl" or cb_service == "gl")',
+            {
+              'include_dirs': [
+                '../../<(glewdir)/include',
+                '../../<(cgdir)/include',
+              ],
+            },
+          ],
+        ],
+      },  # 'all_dependent_settings'
+      'dependencies': [
+        'command_buffer_common',
+      ],
+      'sources': [
+        'command_buffer/service/common_decoder.cc',
+        'command_buffer/service/common_decoder.h',
+        'command_buffer/service/cmd_buffer_engine.h',
+        'command_buffer/service/cmd_parser.cc',
+        'command_buffer/service/cmd_parser.h',
+        'command_buffer/service/effect_utils.cc',
+        'command_buffer/service/effect_utils.h',
+        'command_buffer/service/gapi_decoder.cc',
+        'command_buffer/service/gapi_decoder.h',
+        'command_buffer/service/mocks.h',
+        'command_buffer/service/precompile.cc',
+        'command_buffer/service/precompile.h',
+        'command_buffer/service/resource.cc',
+        'command_buffer/service/resource.h',
+        'command_buffer/service/texture_utils.cc',
+        'command_buffer/service/texture_utils.h',
+      ],
+      'conditions': [
+        ['cb_service == "d3d9"',
+          {
+            'include_dirs': [
+              '$(DXSDK_DIR)/Include',
+            ],
+            'all_dependent_settings': {
+              'include_dirs': [
+                '$(DXSDK_DIR)/Include',
+              ],
+              'link_settings': {
+                'libraries': [
+                  '"$(DXSDK_DIR)/Lib/x86/DxErr.lib"',
+                ],
+              },
+            },  # 'all_dependent_settings'
+            'sources': [
+              'command_buffer/service/d3d9_utils.h',
+              'command_buffer/service/effect_d3d9.cc',
+              'command_buffer/service/effect_d3d9.h',
+              'command_buffer/service/gapi_d3d9.cc',
+              'command_buffer/service/gapi_d3d9.h',
+              'command_buffer/service/geometry_d3d9.cc',
+              'command_buffer/service/geometry_d3d9.h',
+              'command_buffer/service/render_surface_d3d9.cc',
+              'command_buffer/service/render_surface_d3d9.h',
+              'command_buffer/service/sampler_d3d9.cc',
+              'command_buffer/service/sampler_d3d9.h',
+              'command_buffer/service/states_d3d9.cc',
+              'command_buffer/service/texture_d3d9.cc',
+              'command_buffer/service/texture_d3d9.h',
+            ],  # 'sources'
+          },
+        ],
+        ['cb_service == "gl"',
+          {
+            'dependencies': [
+              '../build/libs.gyp:gl_libs',
+              '../build/libs.gyp:cg_libs',
+            ],
+            'sources': [
+              'command_buffer/service/effect_gl.cc',
+              'command_buffer/service/effect_gl.h',
+              'command_buffer/service/gapi_gl.cc',
+              'command_buffer/service/gapi_gl.h',
+              'command_buffer/service/geometry_gl.cc',
+              'command_buffer/service/geometry_gl.h',
+              'command_buffer/service/gl_utils.h',
+              'command_buffer/service/render_surface_gl.cc',
+              'command_buffer/service/render_surface_gl.h',
+              'command_buffer/service/sampler_gl.cc',
+              'command_buffer/service/sampler_gl.h',
+              'command_buffer/service/states_gl.cc',
+              'command_buffer/service/texture_gl.cc',
+              'command_buffer/service/texture_gl.h',
+            ],  # 'sources'
+          },
+        ],
+        ['OS == "linux"',
+          {
+            'sources': [
+              'command_buffer/service/linux/x_utils.cc',
+              'command_buffer/service/linux/x_utils.h',
+            ],
+          },
+        ],
+      ],  # 'conditions'
+    },
+    {
+      'target_name': 'command_buffer_service_test',
+      'type': 'none',
+      'direct_dependent_settings': {
+        'sources': [
+          'command_buffer/service/cmd_parser_test.cc',
+          'command_buffer/service/resource_test.cc',
+        ],
+      },
+    },
+    {
+      'target_name': 'np_utils',
+      'type': '<(library)',
+      'dependencies': [
+        '../../base/base.gyp:base',
+        '../build/o3d_in_chrome.gyp:o3d_in_chrome',
+      ],
+      'include_dirs': [
+        '..',
+        '../..',
+        '../../third_party/npapi',
+      ],
+      'all_dependent_settings': {
+        'include_dirs': [
+          '..',
+          '../..',
+          '../../third_party/npapi',
+        ],
+      },  # 'all_dependent_settings'
+      'sources': [
+        'np_utils/default_np_object.h',
+        'np_utils/dynamic_np_object.cc',
+        'np_utils/dynamic_np_object.h',
+        'np_utils/np_browser.cc',
+        'np_utils/np_browser.h',
+        'np_utils/np_browser_mock.h',
+        'np_utils/np_browser_stub.cc',
+        'np_utils/np_browser_stub.h',
+        'np_utils/np_class.h',
+        'np_utils/np_dispatcher.cc',
+        'np_utils/np_dispatcher.h',
+        'np_utils/np_dispatcher_specializations.h',
+        'np_utils/np_headers.h',
+        'np_utils/np_object_mock.h',
+        'np_utils/np_object_pointer.h',
+        'np_utils/np_plugin_object.h',
+        'np_utils/np_plugin_object_mock.h',
+        'np_utils/np_plugin_object_factory.cc',
+        'np_utils/np_plugin_object_factory.h',
+        'np_utils/np_plugin_object_factory_mock.h',
+        'np_utils/np_utils.cc',
+        'np_utils/np_utils.h',
+        'np_utils/webkit_browser.h',
+      ],
+    },
+
+    # This is a standalone executable until O3D is fully moved over to using
+    # gyp. At that point these can become part of the regular O3D unit tests.
+    {
+      'target_name': 'np_utils_unittests',
+      'type': 'executable',
+      'dependencies': [
+        'np_utils',
+        '../../testing/gmock.gyp:gmock',
+        '../../testing/gmock.gyp:gmockmain',
+        '../../testing/gtest.gyp:gtest',
+      ],
+      'include_dirs': [
+        '../..',
+      ],
+      'all_dependent_settings': {
+        'include_dirs': [
+          '../..',
+        ],
+      },  # 'all_dependent_settings'
+      'sources': [
+        'np_utils/dispatched_np_object_unittest.cc',
+        'np_utils/dynamic_np_object_unittest.cc',
+        'np_utils/np_class_unittest.cc',
+        'np_utils/np_object_pointer_unittest.cc',
+        'np_utils/np_utils_unittest.cc',
+      ],
+    },
+
+    # These can eventually be merged back into the gpu_plugin target. There
+    # separated for now so O3D can statically link against them and use command
+    # buffers in-process without the GPU plugin.
+    {
+      'target_name': 'command_buffer',
+      'type': '<(library)',
+      'dependencies': [
+        '../../base/base.gyp:base',
+        'command_buffer_service',
+        'np_utils',
+      ],
+      'all_dependent_settings': {
+        'include_dirs': [
+          '../..',
+        ],
+      },  # 'all_dependent_settings'
+      'sources': [
+        'gpu_plugin/command_buffer.cc',
+        'gpu_plugin/command_buffer.h',
+        'gpu_plugin/command_buffer_mock.h',
+        'gpu_plugin/gpu_processor.h',
+        'gpu_plugin/gpu_processor.cc',
+        'gpu_plugin/gpu_processor_mock.h',
+        'gpu_plugin/gpu_processor_win.cc',
+      ],
+    },
+
+    {
+      'target_name': 'gpu_plugin',
+      'type': '<(library)',
+      'dependencies': [
+        '../../base/base.gyp:base',
+        'command_buffer',
+        'np_utils',
+      ],
+      'include_dirs': [
+        '../..',
+      ],
+      'sources': [
+        'gpu_plugin/gpu_plugin.cc',
+        'gpu_plugin/gpu_plugin.h',
+        'gpu_plugin/gpu_plugin_object.cc',
+        'gpu_plugin/gpu_plugin_object.h',
+        'gpu_plugin/gpu_plugin_object_win.cc',
+        'gpu_plugin/gpu_plugin_object_factory.cc',
+        'gpu_plugin/gpu_plugin_object_factory.h',
+      ],
+    },
+
+    # This is a standalone executable until O3D is fully moved over to using
+    # gyp. At that point these can become part of the regular O3D unit tests.
+    {
+      'target_name': 'gpu_plugin_unittests',
+      'type': 'executable',
+      'dependencies': [
+        'command_buffer_service',
+        'gpu_plugin',
+        'np_utils',
+        '../../testing/gmock.gyp:gmock',
+        '../../testing/gmock.gyp:gmockmain',
+        '../../testing/gtest.gyp:gtest',
+      ],
+      'include_dirs': [
+        '../..',
+      ],
+      'sources': [
+        'gpu_plugin/command_buffer_unittest.cc',
+        'gpu_plugin/gpu_plugin_unittest.cc',
+        'gpu_plugin/gpu_plugin_object_unittest.cc',
+        'gpu_plugin/gpu_plugin_object_factory_unittest.cc',
+        'gpu_plugin/gpu_processor_unittest.cc',
+      ],
+    },
+  ]
+}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/o3d/gpu_plugin/command_buffer.cc b/o3d/gpu/gpu_plugin/command_buffer.cc
index 15f52da..b293693 100644
--- a/o3d/gpu_plugin/command_buffer.cc
+++ b/o3d/gpu/gpu_plugin/command_buffer.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "o3d/gpu_plugin/command_buffer.h"
+#include "gpu/gpu_plugin/command_buffer.h"
 
 using ::base::SharedMemory;
 
diff --git a/o3d/gpu_plugin/command_buffer.h b/o3d/gpu/gpu_plugin/command_buffer.h
index 84457c0..c92e0f3 100644
--- a/o3d/gpu_plugin/command_buffer.h
+++ b/o3d/gpu/gpu_plugin/command_buffer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef O3D_GPU_PLUGIN_COMMAND_BUFFER_H_
-#define O3D_GPU_PLUGIN_COMMAND_BUFFER_H_
+#ifndef GPU_GPU_PLUGIN_COMMAND_BUFFER_H_
+#define GPU_GPU_PLUGIN_COMMAND_BUFFER_H_
 
 #include <set>
 #include <vector>
@@ -12,8 +12,8 @@
 #include "base/scoped_ptr.h"
 #include "base/shared_memory.h"
 #include "base/task.h"
-#include "o3d/gpu_plugin/np_utils/default_np_object.h"
-#include "o3d/gpu_plugin/np_utils/np_dispatcher.h"
+#include "gpu/np_utils/default_np_object.h"
+#include "gpu/np_utils/np_dispatcher.h"
 
 namespace gpu_plugin {
 
@@ -127,4 +127,4 @@ class CommandBuffer : public DefaultNPObject<NPObject> {
 
 }  // namespace gpu_plugin
 
-#endif  // O3D_GPU_PLUGIN_COMMAND_BUFFER_H_
+#endif  // GPU_GPU_PLUGIN_COMMAND_BUFFER_H_
diff --git a/o3d/gpu_plugin/command_buffer_mock.h b/o3d/gpu/gpu_plugin/command_buffer_mock.h
index ab82bdb..bb55f52 100644
--- a/o3d/gpu_plugin/command_buffer_mock.h
+++ b/o3d/gpu/gpu_plugin/command_buffer_mock.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef O3D_GPU_PLUGIN_COMMAND_BUFFER_MOCK_H_
-#define O3D_GPU_PLUGIN_COMMAND_BUFFER_MOCK_H_
+#ifndef GPU_GPU_PLUGIN_COMMAND_BUFFER_MOCK_H_
+#define GPU_GPU_PLUGIN_COMMAND_BUFFER_MOCK_H_
 
-#include "o3d/gpu_plugin/command_buffer.h"
+#include "gpu/gpu_plugin/command_buffer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace gpu_plugin {
@@ -39,4 +39,4 @@ class MockCommandBuffer : public CommandBuffer {
 
 }  // namespace gpu_plugin
 
-#endif  // O3D_GPU_PLUGIN_COMMAND_BUFFER_MOCK_H_
+#endif  // GPU_GPU_PLUGIN_COMMAND_BUFFER_MOCK_H_
diff --git a/o3d/gpu_plugin/command_buffer_unittest.cc b/o3d/gpu/gpu_plugin/command_buffer_unittest.cc
index 5041d48..00e5640 100644
--- a/o3d/gpu_plugin/command_buffer_unittest.cc
+++ b/o3d/gpu/gpu_plugin/command_buffer_unittest.cc
@@ -3,11 +3,11 @@
 // found in the LICENSE file.
 
 #include "base/thread.h"
-#include "o3d/gpu_plugin/command_buffer.h"
-#include "o3d/gpu_plugin/np_utils/np_browser_mock.h"
-#include "o3d/gpu_plugin/np_utils/dynamic_np_object.h"
-#include "o3d/gpu_plugin/np_utils/np_object_mock.h"
-#include "o3d/gpu_plugin/np_utils/np_object_pointer.h"
+#include "gpu/gpu_plugin/command_buffer.h"
+#include "gpu/np_utils/np_browser_mock.h"
+#include "gpu/np_utils/dynamic_np_object.h"
+#include "gpu/np_utils/np_object_mock.h"
+#include "gpu/np_utils/np_object_pointer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
diff --git a/o3d/gpu_plugin/gpu_plugin.cc b/o3d/gpu/gpu_plugin/gpu_plugin.cc
index fa270f7..d8cfb58 100644
--- a/o3d/gpu_plugin/gpu_plugin.cc
+++ b/o3d/gpu/gpu_plugin/gpu_plugin.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "o3d/gpu_plugin/gpu_plugin.h"
-#include "o3d/gpu_plugin/gpu_plugin_object_factory.h"
-#include "o3d/gpu_plugin/np_utils/np_browser.h"
-#include "o3d/gpu_plugin/np_utils/np_plugin_object.h"
-#include "o3d/gpu_plugin/np_utils/np_plugin_object_factory.h"
+#include "gpu/gpu_plugin/gpu_plugin.h"
+#include "gpu/gpu_plugin/gpu_plugin_object_factory.h"
+#include "gpu/np_utils/np_browser.h"
+#include "gpu/np_utils/np_plugin_object.h"
+#include "gpu/np_utils/np_plugin_object_factory.h"
 
 #if defined(O3D_IN_CHROME)
 #include "webkit/glue/plugins/nphostapi.h"
diff --git a/o3d/gpu_plugin/gpu_plugin.h b/o3d/gpu/gpu_plugin/gpu_plugin.h
index 1cefa29..0f90f77 100644
--- a/o3d/gpu_plugin/gpu_plugin.h
+++ b/o3d/gpu/gpu_plugin/gpu_plugin.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef O3D_GPU_PLUGIN_GPU_PLUGIN_H_
-#define O3D_GPU_PLUGIN_GPU_PLUGIN_H_
+#ifndef GPU_GPU_PLUGIN_GPU_PLUGIN_H_
+#define GPU_GPU_PLUGIN_GPU_PLUGIN_H_
 
-#include "o3d/gpu_plugin/np_utils/np_headers.h"
+#include "gpu/np_utils/np_headers.h"
 
 typedef struct _NPPluginFuncs NPPluginFuncs;
 typedef struct _NPNetscapeFuncs NPNetscapeFuncs;
@@ -27,4 +27,4 @@ NPError NP_Shutdown();
 
 }  // namespace gpu_plugin
 
-#endif  // O3D_GPU_PLUGIN_GPU_PLUGIN_H_
+#endif  // GPU_GPU_PLUGIN_GPU_PLUGIN_H_
diff --git a/o3d/gpu_plugin/gpu_plugin_object.cc b/o3d/gpu/gpu_plugin/gpu_plugin_object.cc
index 801cbca..6a2bd6c 100644
--- a/o3d/gpu_plugin/gpu_plugin_object.cc
+++ b/o3d/gpu/gpu_plugin/gpu_plugin_object.cc
@@ -5,9 +5,9 @@
 #include <stdlib.h>
 
 #include "base/logging.h"
-#include "o3d/gpu_plugin/np_utils/np_utils.h"
-#include "o3d/gpu_plugin/gpu_plugin_object.h"
-#include "o3d/gpu_plugin/gpu_processor.h"
+#include "gpu/np_utils/np_utils.h"
+#include "gpu/gpu_plugin/gpu_plugin_object.h"
+#include "gpu/gpu_plugin/gpu_processor.h"
 
 using ::base::SharedMemory;
 
diff --git a/o3d/gpu_plugin/gpu_plugin_object.h b/o3d/gpu/gpu_plugin/gpu_plugin_object.h
index 63f44fb..09f612d 100644
--- a/o3d/gpu_plugin/gpu_plugin_object.h
+++ b/o3d/gpu/gpu_plugin/gpu_plugin_object.h
@@ -2,20 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef O3D_GPU_PLUGIN_GPU_PLUGIN_OBJECT_H_
-#define O3D_GPU_PLUGIN_GPU_PLUGIN_OBJECT_H_
+#ifndef GPU_GPU_PLUGIN_GPU_PLUGIN_OBJECT_H_
+#define GPU_GPU_PLUGIN_GPU_PLUGIN_OBJECT_H_
 
 #include <string>
 
 #include "base/ref_counted.h"
 #include "base/thread.h"
-#include "o3d/gpu_plugin/command_buffer.h"
-#include "o3d/gpu_plugin/gpu_processor.h"
-#include "o3d/gpu_plugin/np_utils/default_np_object.h"
-#include "o3d/gpu_plugin/np_utils/np_dispatcher.h"
-#include "o3d/gpu_plugin/np_utils/np_headers.h"
-#include "o3d/gpu_plugin/np_utils/np_plugin_object.h"
-#include "o3d/gpu_plugin/np_utils/np_utils.h"
+#include "gpu/gpu_plugin/command_buffer.h"
+#include "gpu/gpu_plugin/gpu_processor.h"
+#include "gpu/np_utils/default_np_object.h"
+#include "gpu/np_utils/np_dispatcher.h"
+#include "gpu/np_utils/np_headers.h"
+#include "gpu/np_utils/np_plugin_object.h"
+#include "gpu/np_utils/np_utils.h"
 
 namespace gpu_plugin {
 
@@ -129,4 +129,4 @@ class GPUPluginObject : public DefaultNPObject<NPObject>,
 
 }  // namespace gpu_plugin
 
-#endif  // O3D_GPU_PLUGIN_GPU_PLUGIN_OBJECT_H_
+#endif  // GPU_GPU_PLUGIN_GPU_PLUGIN_OBJECT_H_
diff --git a/o3d/gpu_plugin/gpu_plugin_object_factory.cc b/o3d/gpu/gpu_plugin/gpu_plugin_object_factory.cc
index 7727f50..cfdced8 100644
--- a/o3d/gpu_plugin/gpu_plugin_object_factory.cc
+++ b/o3d/gpu/gpu_plugin/gpu_plugin_object_factory.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "o3d/gpu_plugin/gpu_plugin_object.h"
-#include "o3d/gpu_plugin/gpu_plugin_object_factory.h"
-#include "o3d/gpu_plugin/np_utils/np_utils.h"
+#include "gpu/gpu_plugin/gpu_plugin_object.h"
+#include "gpu/gpu_plugin/gpu_plugin_object_factory.h"
+#include "gpu/np_utils/np_utils.h"
 
 namespace gpu_plugin {
 
diff --git a/o3d/gpu_plugin/gpu_plugin_object_factory.h b/o3d/gpu/gpu_plugin/gpu_plugin_object_factory.h
index d038297..1a73baf 100644
--- a/o3d/gpu_plugin/gpu_plugin_object_factory.h
+++ b/o3d/gpu/gpu_plugin/gpu_plugin_object_factory.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef O3D_GPU_PLUGIN_GPU_PLUGIN_OBJECT_FACTORY_H_
-#define O3D_GPU_PLUGIN_GPU_PLUGIN_OBJECT_FACTORY_H_
+#ifndef GPU_GPU_PLUGIN_GPU_PLUGIN_OBJECT_FACTORY_H_
+#define GPU_GPU_PLUGIN_GPU_PLUGIN_OBJECT_FACTORY_H_
 
-#include "o3d/gpu_plugin/np_utils/np_plugin_object_factory.h"
+#include "gpu/np_utils/np_plugin_object_factory.h"
 
 namespace gpu_plugin {
 
@@ -23,4 +23,4 @@ class GPUPluginObjectFactory : public NPPluginObjectFactory {
 
 }  // namespace gpu_plugin
 
-#endif  // O3D_GPU_PLUGIN_GPU_PLUGIN_OBJECT_FACTORY_H_
+#endif  // GPU_GPU_PLUGIN_GPU_PLUGIN_OBJECT_FACTORY_H_
diff --git a/o3d/gpu_plugin/gpu_plugin_object_factory_unittest.cc b/o3d/gpu/gpu_plugin/gpu_plugin_object_factory_unittest.cc
index 8a3413d..7b006c2 100644
--- a/o3d/gpu_plugin/gpu_plugin_object_factory_unittest.cc
+++ b/o3d/gpu/gpu_plugin/gpu_plugin_object_factory_unittest.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "o3d/gpu_plugin/gpu_plugin_object.h"
-#include "o3d/gpu_plugin/gpu_plugin_object_factory.h"
-#include "o3d/gpu_plugin/np_utils/np_browser_stub.h"
+#include "gpu/gpu_plugin/gpu_plugin_object.h"
+#include "gpu/gpu_plugin/gpu_plugin_object_factory.h"
+#include "gpu/np_utils/np_browser_stub.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/o3d/gpu_plugin/gpu_plugin_object_unittest.cc b/o3d/gpu/gpu_plugin/gpu_plugin_object_unittest.cc
index 8bc7bfb..2f91225 100644
--- a/o3d/gpu_plugin/gpu_plugin_object_unittest.cc
+++ b/o3d/gpu/gpu_plugin/gpu_plugin_object_unittest.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "o3d/gpu_plugin/command_buffer_mock.h"
-#include "o3d/gpu_plugin/gpu_plugin_object.h"
-#include "o3d/gpu_plugin/gpu_processor_mock.h"
-#include "o3d/gpu_plugin/np_utils/np_browser_mock.h"
-#include "o3d/gpu_plugin/np_utils/dynamic_np_object.h"
-#include "o3d/gpu_plugin/np_utils/np_object_mock.h"
-#include "o3d/gpu_plugin/np_utils/np_object_pointer.h"
+#include "gpu/gpu_plugin/command_buffer_mock.h"
+#include "gpu/gpu_plugin/gpu_plugin_object.h"
+#include "gpu/gpu_plugin/gpu_processor_mock.h"
+#include "gpu/np_utils/np_browser_mock.h"
+#include "gpu/np_utils/dynamic_np_object.h"
+#include "gpu/np_utils/np_object_mock.h"
+#include "gpu/np_utils/np_object_pointer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
diff --git a/o3d/gpu_plugin/gpu_plugin_object_win.cc b/o3d/gpu/gpu_plugin/gpu_plugin_object_win.cc
index 5ff5cf5..7108a09 100644
--- a/o3d/gpu_plugin/gpu_plugin_object_win.cc
+++ b/o3d/gpu/gpu_plugin/gpu_plugin_object_win.cc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#include "o3d/gpu_plugin/gpu_plugin_object.h"
-#include "o3d/gpu_plugin/gpu_processor.h"
+#include "gpu/gpu_plugin/gpu_plugin_object.h"
+#include "gpu/gpu_plugin/gpu_processor.h"
 
 namespace gpu_plugin {
 
diff --git a/o3d/gpu_plugin/gpu_plugin_unittest.cc b/o3d/gpu/gpu_plugin/gpu_plugin_unittest.cc
index 0bc53fd..7d9ae86 100644
--- a/o3d/gpu_plugin/gpu_plugin_unittest.cc
+++ b/o3d/gpu/gpu_plugin/gpu_plugin_unittest.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "o3d/gpu_plugin/gpu_plugin.h"
-#include "o3d/gpu_plugin/gpu_plugin_object.h"
-#include "o3d/gpu_plugin/np_utils/np_object_mock.h"
-#include "o3d/gpu_plugin/np_utils/np_plugin_object_factory_mock.h"
-#include "o3d/gpu_plugin/np_utils/np_plugin_object_mock.h"
+#include "gpu/gpu_plugin/gpu_plugin.h"
+#include "gpu/gpu_plugin/gpu_plugin_object.h"
+#include "gpu/np_utils/np_object_mock.h"
+#include "gpu/np_utils/np_plugin_object_factory_mock.h"
+#include "gpu/np_utils/np_plugin_object_mock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(O3D_IN_CHROME)
diff --git a/o3d/gpu_plugin/gpu_processor.cc b/o3d/gpu/gpu_plugin/gpu_processor.cc
index f554fb5..7b97917 100644
--- a/o3d/gpu_plugin/gpu_processor.cc
+++ b/o3d/gpu/gpu_plugin/gpu_processor.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "o3d/gpu_plugin/gpu_processor.h"
+#include "gpu/gpu_plugin/gpu_processor.h"
 
 using ::base::SharedMemory;
 
diff --git a/o3d/gpu_plugin/gpu_processor.h b/o3d/gpu/gpu_plugin/gpu_processor.h
index 49c6eea..31617b0 100644
--- a/o3d/gpu_plugin/gpu_processor.h
+++ b/o3d/gpu/gpu_plugin/gpu_processor.h
@@ -2,22 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef O3D_GPU_PLUGIN_GPU_PROCESSOR_H_
-#define O3D_GPU_PLUGIN_GPU_PROCESSOR_H_
+#ifndef GPU_GPU_PLUGIN_GPU_PROCESSOR_H_
+#define GPU_GPU_PLUGIN_GPU_PROCESSOR_H_
 
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/shared_memory.h"
-#include "o3d/command_buffer/service/cmd_buffer_engine.h"
-#include "o3d/command_buffer/service/cmd_parser.h"
-#include "o3d/command_buffer/service/gapi_decoder.h"
-#include "o3d/gpu_plugin/command_buffer.h"
-#include "o3d/gpu_plugin/np_utils/np_object_pointer.h"
+#include "gpu/command_buffer/service/cmd_buffer_engine.h"
+#include "gpu/command_buffer/service/cmd_parser.h"
+#include "gpu/command_buffer/service/gapi_decoder.h"
+#include "gpu/gpu_plugin/command_buffer.h"
+#include "gpu/np_utils/np_object_pointer.h"
 
 #if defined(CB_SERVICE_D3D9)
-#include "o3d/command_buffer/service/gapi_d3d9.h"
+#include "gpu/command_buffer/service/gapi_d3d9.h"
 #elif defined(CB_SERVICE_GL)
-#include "o3d/command_buffer/service/gapi_gl.h"
+#include "gpu/command_buffer/service/gapi_gl.h"
 #else
 #error command buffer service not defined
 #endif
@@ -116,4 +116,4 @@ class CallbackStorage<gpu_plugin::GPUProcessor, Method> {
   DISALLOW_COPY_AND_ASSIGN(CallbackStorage);
 };
 
-#endif  // O3D_GPU_PLUGIN_GPU_PROCESSOR_H_
+#endif  // GPU_GPU_PLUGIN_GPU_PROCESSOR_H_
diff --git a/o3d/gpu_plugin/gpu_processor_mock.h b/o3d/gpu/gpu_plugin/gpu_processor_mock.h
index d98f5af..e93c155 100644
--- a/o3d/gpu_plugin/gpu_processor_mock.h
+++ b/o3d/gpu/gpu_plugin/gpu_processor_mock.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef O3D_GPU_PLUGIN_GPU_PROCESSOR_MOCK_H_
-#define O3D_GPU_PLUGIN_GPU_PROCESSOR_MOCK_H_
+#ifndef GPU_GPU_PLUGIN_GPU_PROCESSOR_MOCK_H_
+#define GPU_GPU_PLUGIN_GPU_PROCESSOR_MOCK_H_
 
-#include "o3d/gpu_plugin/gpu_processor.h"
+#include "gpu/gpu_plugin/gpu_processor.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace gpu_plugin {
@@ -38,4 +38,4 @@ class MockGPUProcessor : public GPUProcessor {
 
 }  // namespace gpu_plugin
 
-#endif  // O3D_GPU_PLUGIN_GPU_PROCESSOR_MOCK_H_
+#endif  // GPU_GPU_PLUGIN_GPU_PROCESSOR_MOCK_H_
diff --git a/o3d/gpu_plugin/gpu_processor_unittest.cc b/o3d/gpu/gpu_plugin/gpu_processor_unittest.cc
index 74c593c..97c44b9 100644
--- a/o3d/gpu_plugin/gpu_processor_unittest.cc
+++ b/o3d/gpu/gpu_plugin/gpu_processor_unittest.cc
@@ -4,11 +4,11 @@
 
 #include "base/at_exit.h"
 #include "base/message_loop.h"
-#include "o3d/command_buffer/service/mocks.h"
-#include "o3d/gpu_plugin/command_buffer_mock.h"
-#include "o3d/gpu_plugin/gpu_processor.h"
-#include "o3d/gpu_plugin/np_utils/np_browser_mock.h"
-#include "o3d/gpu_plugin/np_utils/np_object_pointer.h"
+#include "gpu/command_buffer/service/mocks.h"
+#include "gpu/gpu_plugin/command_buffer_mock.h"
+#include "gpu/gpu_plugin/gpu_processor.h"
+#include "gpu/np_utils/np_browser_mock.h"
+#include "gpu/np_utils/np_object_pointer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
diff --git a/o3d/gpu_plugin/gpu_processor_win.cc b/o3d/gpu/gpu_plugin/gpu_processor_win.cc
index 21a1c4a..4c62098 100644
--- a/o3d/gpu_plugin/gpu_processor_win.cc
+++ b/o3d/gpu/gpu_plugin/gpu_processor_win.cc
@@ -4,7 +4,7 @@
 
 #include <windows.h>
 
-#include "o3d/gpu_plugin/gpu_processor.h"
+#include "gpu/gpu_plugin/gpu_processor.h"
 
 using ::base::SharedMemory;
 
diff --git a/o3d/gpu_plugin/np_utils/default_np_object.h b/o3d/gpu/np_utils/default_np_object.h
index 388a043..575dabc 100644
--- a/o3d/gpu_plugin/np_utils/default_np_object.h
+++ b/o3d/gpu/np_utils/default_np_object.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef O3D_GPU_PLUGIN_NP_UTILS_DEFAULT_NP_OBJECT_H_
-#define O3D_GPU_PLUGIN_NP_UTILS_DEFAULT_NP_OBJECT_H_
+#ifndef GPU_NP_UTILS_DEFAULT_NP_OBJECT_H_
+#define GPU_NP_UTILS_DEFAULT_NP_OBJECT_H_
 
 #include "base/basictypes.h"
-#include "o3d/gpu_plugin/np_utils/np_headers.h"
+#include "gpu/np_utils/np_headers.h"
 
 namespace gpu_plugin {
 
@@ -81,4 +81,4 @@ class DefaultNPObject : public RootClass {
 };
 }  // namespace gpu_plugin
 
-#endif  // O3D_GPU_PLUGIN_NP_UTILS_DEFAULT_NP_OBJECT_H_
+#endif  // GPU_NP_UTILS_DEFAULT_NP_OBJECT_H_
diff --git a/o3d/gpu_plugin/np_utils/dispatched_np_object_unittest.cc b/o3d/gpu/np_utils/dispatched_np_object_unittest.cc
index 9e660da..d4b2f96 100644
--- a/o3d/gpu_plugin/np_utils/dispatched_np_object_unittest.cc
+++ b/o3d/gpu/np_utils/dispatched_np_object_unittest.cc
@@ -4,10 +4,10 @@
 
 #include <string>
 
-#include "o3d/gpu_plugin/np_utils/default_np_object.h"
-#include "o3d/gpu_plugin/np_utils/np_browser_stub.h"
-#include "o3d/gpu_plugin/np_utils/np_dispatcher.h"
-#include "o3d/gpu_plugin/np_utils/np_object_mock.h"
+#include "gpu/np_utils/default_np_object.h"
+#include "gpu/np_utils/np_browser_stub.h"
+#include "gpu/np_utils/np_dispatcher.h"
+#include "gpu/np_utils/np_object_mock.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/o3d/gpu_plugin/np_utils/dynamic_np_object.cc b/o3d/gpu/np_utils/dynamic_np_object.cc
index 6c5a309..153c189 100644
--- a/o3d/gpu_plugin/np_utils/dynamic_np_object.cc
+++ b/o3d/gpu/np_utils/dynamic_np_object.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "o3d/gpu_plugin/np_utils/dynamic_np_object.h"
+#include "gpu/np_utils/dynamic_np_object.h"
 
 namespace gpu_plugin {
 
diff --git a/o3d/gpu_plugin/np_utils/dynamic_np_object.h b/o3d/gpu/np_utils/dynamic_np_object.h
index b80a160..8dd4892 100644
--- a/o3d/gpu_plugin/np_utils/dynamic_np_object.h
+++ b/o3d/gpu/np_utils/dynamic_np_object.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef O3D_GPU_PLUGIN_NP_UTILS_DYNAMIC_NP_OBJECT_H_
-#define O3D_GPU_PLUGIN_NP_UTILS_DYNAMIC_NP_OBJECT_H_
+#ifndef GPU_NP_UTILS_DYNAMIC_NP_OBJECT_H_
+#define GPU_NP_UTILS_DYNAMIC_NP_OBJECT_H_
 
 #include <map>
 
-#include "o3d/gpu_plugin/np_utils/default_np_object.h"
-#include "o3d/gpu_plugin/np_utils/np_utils.h"
+#include "gpu/np_utils/default_np_object.h"
+#include "gpu/np_utils/np_utils.h"
 
 namespace gpu_plugin {
 
@@ -32,4 +32,4 @@ class DynamicNPObject : public DefaultNPObject<NPObject> {
 };
 }  // namespace gpu_plugin
 
-#endif  // O3D_GPU_PLUGIN_NP_UTILS_DYNAMIC_NP_OBJECT_H_
+#endif  // GPU_NP_UTILS_DYNAMIC_NP_OBJECT_H_
diff --git a/o3d/gpu_plugin/np_utils/dynamic_np_object_unittest.cc b/o3d/gpu/np_utils/dynamic_np_object_unittest.cc
index 6a73167..56fcff7 100644
--- a/o3d/gpu_plugin/np_utils/dynamic_np_object_unittest.cc
+++ b/o3d/gpu/np_utils/dynamic_np_object_unittest.cc
@@ -4,9 +4,9 @@
 
 #include <string>
 
-#include "o3d/gpu_plugin/np_utils/dynamic_np_object.h"
-#include "o3d/gpu_plugin/np_utils/np_browser_stub.h"
-#include "o3d/gpu_plugin/np_utils/np_utils.h"
+#include "gpu/np_utils/dynamic_np_object.h"
+#include "gpu/np_utils/np_browser_stub.h"
+#include "gpu/np_utils/np_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/o3d/gpu_plugin/np_utils/np_browser.cc b/o3d/gpu/np_utils/np_browser.cc
index 3fc9185..3754d3b 100644
--- a/o3d/gpu_plugin/np_utils/np_browser.cc
+++ b/o3d/gpu/np_utils/np_browser.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "o3d/gpu_plugin/np_utils/np_browser.h"
+#include "gpu/np_utils/np_browser.h"
 #include "base/logging.h"
 
 #if defined(O3D_IN_CHROME)
diff --git a/o3d/gpu_plugin/np_utils/np_browser.h b/o3d/gpu/np_utils/np_browser.h
index 5e71aac..d792316 100644
--- a/o3d/gpu_plugin/np_utils/np_browser.h
+++ b/o3d/gpu/np_utils/np_browser.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef O3D_GPU_PLUGIN_NP_UTILS_NP_BROWSER_H_
-#define O3D_GPU_PLUGIN_NP_UTILS_NP_BROWSER_H_
+#ifndef GPU_NP_UTILS_NP_BROWSER_H_
+#define GPU_NP_UTILS_NP_BROWSER_H_
 
 #include "base/basictypes.h"
-#include "o3d/gpu_plugin/np_utils/np_headers.h"
+#include "gpu/np_utils/np_headers.h"
 
 typedef struct _NPNetscapeFuncs NPNetscapeFuncs;
 
@@ -92,4 +92,4 @@ class NPBrowser {
 
 }  // namespace gpu_plugin
 
-#endif  // O3D_GPU_PLUGIN_NP_UTILS_NP_BROWSER_H_
+#endif  // GPU_NP_UTILS_NP_BROWSER_H_
diff --git a/o3d/gpu_plugin/np_utils/np_browser_mock.h b/o3d/gpu/np_utils/np_browser_mock.h
index 9175e42..1ef574e 100644
--- a/o3d/gpu_plugin/np_utils/np_browser_mock.h
+++ b/o3d/gpu/np_utils/np_browser_mock.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef O3D_GPU_PLUGIN_NP_UTILS_NP_BROWSER_MOCK_H_
-#define O3D_GPU_PLUGIN_NP_UTILS_NP_BROWSER_MOCK_H_
+#ifndef GPU_NP_UTILS_NP_BROWSER_MOCK_H_
+#define GPU_NP_UTILS_NP_BROWSER_MOCK_H_
 
-#include "o3d/gpu_plugin/np_utils/np_browser_stub.h"
+#include "gpu/np_utils/np_browser_stub.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace gpu_plugin {
@@ -47,4 +47,4 @@ class MockNPBrowser : public StubNPBrowser {
 
 }  // namespace gpu_plugin
 
-#endif  // O3D_GPU_PLUGIN_NP_UTILS_NP_BROWSER_MOCK_H_
+#endif  // GPU_NP_UTILS_NP_BROWSER_MOCK_H_
diff --git a/o3d/gpu_plugin/np_utils/np_browser_stub.cc b/o3d/gpu/np_utils/np_browser_stub.cc
index f20bbda..2bc1c6a 100644
--- a/o3d/gpu_plugin/np_utils/np_browser_stub.cc
+++ b/o3d/gpu/np_utils/np_browser_stub.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "o3d/gpu_plugin/np_utils/np_browser_stub.h"
+#include "gpu/np_utils/np_browser_stub.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 
diff --git a/o3d/gpu_plugin/np_utils/np_browser_stub.h b/o3d/gpu/np_utils/np_browser_stub.h
index 0740244..b18d52d 100644
--- a/o3d/gpu_plugin/np_utils/np_browser_stub.h
+++ b/o3d/gpu/np_utils/np_browser_stub.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef O3D_GPU_PLUGIN_NP_UTILS_NP_BROWSER_STUB_H_
-#define O3D_GPU_PLUGIN_NP_UTILS_NP_BROWSER_STUB_H_
+#ifndef GPU_NP_UTILS_NP_BROWSER_STUB_H_
+#define GPU_NP_UTILS_NP_BROWSER_STUB_H_
 
 #include <set>
 #include <string>
 
-#include "o3d/gpu_plugin/np_utils/np_browser.h"
+#include "gpu/np_utils/np_browser.h"
 
 namespace gpu_plugin {
 
@@ -81,4 +81,4 @@ class StubNPBrowser : public NPBrowser {
 
 }  // namespace gpu_plugin
 
-#endif  // O3D_GPU_PLUGIN_NP_UTILS_NP_BROWSER_STUB_H_
+#endif  // GPU_NP_UTILS_NP_BROWSER_STUB_H_
diff --git a/o3d/gpu_plugin/np_utils/np_class.h b/o3d/gpu/np_utils/np_class.h
index a6d557e..113f493 100644
--- a/o3d/gpu_plugin/np_utils/np_class.h
+++ b/o3d/gpu/np_utils/np_class.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef O3D_GPU_PLUGIN_NP_UTILS_NP_CLASS_H_
-#define O3D_GPU_PLUGIN_NP_UTILS_NP_CLASS_H_
+#ifndef GPU_NP_UTILS_NP_CLASS_H_
+#define GPU_NP_UTILS_NP_CLASS_H_
 
-#include "o3d/gpu_plugin/np_utils/np_object_pointer.h"
-#include "o3d/gpu_plugin/np_utils/np_headers.h"
+#include "gpu/np_utils/np_object_pointer.h"
+#include "gpu/np_utils/np_headers.h"
 
 // This file implements NPGetClass<T>. This function returns an NPClass
 // that can be used to instantiate an NPObject subclass T. The NPClass
@@ -122,4 +122,4 @@ const NPClass* NPGetClass() {
 
 }  // namespace gpu_plugin
 
-#endif  // O3D_GPU_PLUGIN_NP_UTILS_NP_CLASS_H_
+#endif  // GPU_NP_UTILS_NP_CLASS_H_
diff --git a/o3d/gpu_plugin/np_utils/np_class_unittest.cc b/o3d/gpu/np_utils/np_class_unittest.cc
index a58f47a..0db632b 100644
--- a/o3d/gpu_plugin/np_utils/np_class_unittest.cc
+++ b/o3d/gpu/np_utils/np_class_unittest.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "o3d/gpu_plugin/np_utils/np_class.h"
-#include "o3d/gpu_plugin/np_utils/np_object_mock.h"
+#include "gpu/np_utils/np_class.h"
+#include "gpu/np_utils/np_object_mock.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/o3d/gpu_plugin/np_utils/np_dispatcher.cc b/o3d/gpu/np_utils/np_dispatcher.cc
index 06658b4..7859f8b 100644
--- a/o3d/gpu_plugin/np_utils/np_dispatcher.cc
+++ b/o3d/gpu/np_utils/np_dispatcher.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "o3d/gpu_plugin/np_utils/np_dispatcher.h"
+#include "gpu/np_utils/np_dispatcher.h"
 
 namespace gpu_plugin {
 
@@ -31,7 +31,8 @@ bool DispatcherInvokeHelper(BaseNPDispatcher* chain,
   for (BaseNPDispatcher* dispatcher = chain;
        dispatcher;
        dispatcher = dispatcher->next()) {
-    if (dispatcher->name() == name && dispatcher->num_args() == num_args) {
+    if (dispatcher->name() == name &&
+        dispatcher->num_args() == static_cast<int>(num_args)) {
       if (dispatcher->Invoke(object, args, num_args, result))
         return true;
     }
diff --git a/o3d/gpu_plugin/np_utils/np_dispatcher.h b/o3d/gpu/np_utils/np_dispatcher.h
index bc4ac02..5b84f86 100644
--- a/o3d/gpu_plugin/np_utils/np_dispatcher.h
+++ b/o3d/gpu/np_utils/np_dispatcher.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef O3D_GPU_PLUGIN_NP_UTILS_NP_DISPATCHER_H_
-#define O3D_GPU_PLUGIN_NP_UTILS_NP_DISPATCHER_H_
+#ifndef GPU_NP_UTILS_NP_DISPATCHER_H_
+#define GPU_NP_UTILS_NP_DISPATCHER_H_
 
 #include <string>
 
-#include "o3d/gpu_plugin/np_utils/np_utils.h"
-#include "o3d/gpu_plugin/np_utils/np_headers.h"
+#include "gpu/np_utils/np_utils.h"
+#include "gpu/np_utils/np_headers.h"
 
 // Dispatchers make regular member functions available as NPObject methods.
 // Usage:
@@ -141,7 +141,7 @@ struct NPDispatcher {
 
 #define PARAM_TO_NVPARIANT_CONVERSIONS                                         \
 
-#include "o3d/gpu_plugin/np_utils/np_dispatcher_specializations.h"  // NOLINT
+#include "gpu/np_utils/np_dispatcher_specializations.h"  // NOLINT
 
 
 #define NUM_PARAMS 1
@@ -153,7 +153,7 @@ struct NPDispatcher {
 #define PARAM_TO_NVPARIANT_CONVERSIONS                                         \
   TO_NPVARIANT(0);                                                             \
 
-#include "o3d/gpu_plugin/np_utils/np_dispatcher_specializations.h"  // NOLINT
+#include "gpu/np_utils/np_dispatcher_specializations.h"  // NOLINT
 
 
 #define NUM_PARAMS 2
@@ -166,7 +166,7 @@ struct NPDispatcher {
   TO_NPVARIANT(0);                                                             \
   TO_NPVARIANT(1);                                                             \
 
-#include "o3d/gpu_plugin/np_utils/np_dispatcher_specializations.h"  // NOLINT
+#include "gpu/np_utils/np_dispatcher_specializations.h"  // NOLINT
 
 
 #define NUM_PARAMS 3
@@ -180,7 +180,7 @@ struct NPDispatcher {
   TO_NPVARIANT(1);                                                             \
   TO_NPVARIANT(2);                                                             \
 
-#include "o3d/gpu_plugin/np_utils/np_dispatcher_specializations.h"  // NOLINT
+#include "gpu/np_utils/np_dispatcher_specializations.h"  // NOLINT
 
 
 #define NUM_PARAMS 4
@@ -195,7 +195,7 @@ struct NPDispatcher {
   TO_NPVARIANT(2);                                                             \
   TO_NPVARIANT(3);                                                             \
 
-#include "o3d/gpu_plugin/np_utils/np_dispatcher_specializations.h"  // NOLINT
+#include "gpu/np_utils/np_dispatcher_specializations.h"  // NOLINT
 
 
 #define NUM_PARAMS 5
@@ -212,11 +212,11 @@ struct NPDispatcher {
   TO_NPVARIANT(3);                                                             \
   TO_NPVARIANT(4);                                                             \
 
-#include "o3d/gpu_plugin/np_utils/np_dispatcher_specializations.h"  // NOLINT
+#include "gpu/np_utils/np_dispatcher_specializations.h"  // NOLINT
 
 
 #undef TO_NPVARIANT
 
 }  // namespace gpu_plugin
 
-#endif  // O3D_GPU_PLUGIN_NP_UTILS_NP_DISPATCHER_H_
+#endif  // GPU_NP_UTILS_NP_DISPATCHER_H_
diff --git a/o3d/gpu_plugin/np_utils/np_dispatcher_specializations.h b/o3d/gpu/np_utils/np_dispatcher_specializations.h
index 62fb8c4..62fb8c4 100644
--- a/o3d/gpu_plugin/np_utils/np_dispatcher_specializations.h
+++ b/o3d/gpu/np_utils/np_dispatcher_specializations.h
diff --git a/o3d/gpu_plugin/np_utils/np_headers.h b/o3d/gpu/np_utils/np_headers.h
index 89e666a..5f60d8e 100644
--- a/o3d/gpu_plugin/np_utils/np_headers.h
+++ b/o3d/gpu/np_utils/np_headers.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef O3D_GPU_PLUGIN_NP_UTILS_NP_HEADERS_H_
-#define O3D_GPU_PLUGIN_NP_UTILS_NP_HEADERS_H_
+#ifndef GPU_NP_UTILS_NP_HEADERS_H_
+#define GPU_NP_UTILS_NP_HEADERS_H_
 
 #if defined(O3D_IN_CHROME)
 #include "third_party/npapi/bindings/npapi.h"
@@ -13,4 +13,4 @@
 #include "o3d/third_party/npapi/include/npruntime.h"
 #endif
 
-#endif  // O3D_GPU_PLUGIN_NP_UTILS_NP_HEADERS_H_
+#endif  // GPU_NP_UTILS_NP_HEADERS_H_
diff --git a/o3d/gpu_plugin/np_utils/np_object_mock.h b/o3d/gpu/np_utils/np_object_mock.h
index 84e0912..8c3d0e7 100644
--- a/o3d/gpu_plugin/np_utils/np_object_mock.h
+++ b/o3d/gpu/np_utils/np_object_mock.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef O3D_GPU_PLUGIN_NP_UTILS_NP_OBJECT_MOCK_H_
-#define O3D_GPU_PLUGIN_NP_UTILS_NP_OBJECT_MOCK_H_
+#ifndef GPU_NP_UTILS_NP_OBJECT_MOCK_H_
+#define GPU_NP_UTILS_NP_OBJECT_MOCK_H_
 
-#include "o3d/gpu_plugin/np_utils/np_browser.h"
+#include "gpu/np_utils/np_browser.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace gpu_plugin {
@@ -33,4 +33,4 @@ class MockNPObject : public NPObject {
 
 }  // namespace gpu_plugin
 
-#endif  // O3D_GPU_PLUGIN_NP_UTILS_NP_OBJECT_MOCK_H_
+#endif  // GPU_NP_UTILS_NP_OBJECT_MOCK_H_
diff --git a/o3d/gpu_plugin/np_utils/np_object_pointer.h b/o3d/gpu/np_utils/np_object_pointer.h
index 5cf3bbe..a8987be 100644
--- a/o3d/gpu_plugin/np_utils/np_object_pointer.h
+++ b/o3d/gpu/np_utils/np_object_pointer.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef O3D_GPU_PLUGIN_NP_UTILS_NP_OBJECT_POINTER_H_
-#define O3D_GPU_PLUGIN_NP_UTILS_NP_OBJECT_POINTER_H_
+#ifndef GPU_NP_UTILS_NP_OBJECT_POINTER_H_
+#define GPU_NP_UTILS_NP_OBJECT_POINTER_H_
 
 #include "base/logging.h"
-#include "o3d/gpu_plugin/np_utils/np_browser.h"
-#include "o3d/gpu_plugin/np_utils/np_headers.h"
+#include "gpu/np_utils/np_browser.h"
+#include "gpu/np_utils/np_headers.h"
 
 namespace gpu_plugin {
 
@@ -116,4 +116,4 @@ std::ostream& operator<<(std::ostream& stream,
 }
 }  // namespace gpu_plugin
 
-#endif  // O3D_GPU_PLUGIN_NP_UTILS_NP_OBJECT_POINTER_H_
+#endif  // GPU_NP_UTILS_NP_OBJECT_POINTER_H_
diff --git a/o3d/gpu_plugin/np_utils/np_object_pointer_unittest.cc b/o3d/gpu/np_utils/np_object_pointer_unittest.cc
index c043c08..c14f6ed 100644
--- a/o3d/gpu_plugin/np_utils/np_object_pointer_unittest.cc
+++ b/o3d/gpu/np_utils/np_object_pointer_unittest.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "o3d/gpu_plugin/np_utils/np_class.h"
-#include "o3d/gpu_plugin/np_utils/np_object_mock.h"
-#include "o3d/gpu_plugin/np_utils/np_browser_stub.h"
-#include "o3d/gpu_plugin/np_utils/np_object_pointer.h"
+#include "gpu/np_utils/np_class.h"
+#include "gpu/np_utils/np_object_mock.h"
+#include "gpu/np_utils/np_browser_stub.h"
+#include "gpu/np_utils/np_object_pointer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/o3d/gpu_plugin/np_utils/np_plugin_object.h b/o3d/gpu/np_utils/np_plugin_object.h
index 06e0136..063079f 100644
--- a/o3d/gpu_plugin/np_utils/np_plugin_object.h
+++ b/o3d/gpu/np_utils/np_plugin_object.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef O3D_GPU_PLUGIN_NP_UTILS_NP_PLUGIN_OBJECT_H_
-#define O3D_GPU_PLUGIN_NP_UTILS_NP_PLUGIN_OBJECT_H_
+#ifndef GPU_NP_UTILS_NP_PLUGIN_OBJECT_H_
+#define GPU_NP_UTILS_NP_PLUGIN_OBJECT_H_
 
-#include "o3d/gpu_plugin/np_utils/np_object_pointer.h"
-#include "o3d/gpu_plugin/np_utils/np_headers.h"
+#include "gpu/np_utils/np_object_pointer.h"
+#include "gpu/np_utils/np_headers.h"
 
 namespace gpu_plugin {
 
@@ -47,4 +47,4 @@ class PluginObject {
 
 }  // namespace gpu_plugin
 
-#endif  // O3D_GPU_PLUGIN_NP_UTILS_NP_PLUGIN_OBJECT_H_
+#endif  // GPU_NP_UTILS_NP_PLUGIN_OBJECT_H_
diff --git a/o3d/gpu_plugin/np_utils/np_plugin_object_factory.cc b/o3d/gpu/np_utils/np_plugin_object_factory.cc
index 96cb595..831a4bd 100644
--- a/o3d/gpu_plugin/np_utils/np_plugin_object_factory.cc
+++ b/o3d/gpu/np_utils/np_plugin_object_factory.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "o3d/gpu_plugin/gpu_plugin_object_factory.h"
+#include "gpu/gpu_plugin/gpu_plugin_object_factory.h"
 #include "base/logging.h"
 
 namespace gpu_plugin {
diff --git a/o3d/gpu_plugin/np_utils/np_plugin_object_factory.h b/o3d/gpu/np_utils/np_plugin_object_factory.h
index 4c8d61c..403d8d5 100644
--- a/o3d/gpu_plugin/np_utils/np_plugin_object_factory.h
+++ b/o3d/gpu/np_utils/np_plugin_object_factory.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef O3D_GPU_PLUGIN_NP_UTILS_NP_PLUGIN_OBJECT_FACTORY_H_
-#define O3D_GPU_PLUGIN_NP_UTILS_NP_PLUGIN_OBJECT_FACTORY_H_
+#ifndef GPU_NP_UTILS_NP_PLUGIN_OBJECT_FACTORY_H_
+#define GPU_NP_UTILS_NP_PLUGIN_OBJECT_FACTORY_H_
 
 #include "base/basictypes.h"
-#include "o3d/gpu_plugin/np_utils/np_headers.h"
+#include "gpu/np_utils/np_headers.h"
 
 namespace gpu_plugin {
 
@@ -34,4 +34,4 @@ class NPPluginObjectFactory {
 
 }  // namespace gpu_plugin
 
-#endif  // O3D_GPU_PLUGIN_NP_UTILS_NP_PLUGIN_OBJECT_FACTORY_H_
+#endif  // GPU_NP_UTILS_NP_PLUGIN_OBJECT_FACTORY_H_
diff --git a/o3d/gpu_plugin/np_utils/np_plugin_object_factory_mock.h b/o3d/gpu/np_utils/np_plugin_object_factory_mock.h
index 9a61537..e15447a 100644
--- a/o3d/gpu_plugin/np_utils/np_plugin_object_factory_mock.h
+++ b/o3d/gpu/np_utils/np_plugin_object_factory_mock.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef O3D_GPU_PLUGIN_NP_UTILS_NP_PLUGIN_OBJECT_FACTORY_MOCK_H_
-#define O3D_GPU_PLUGIN_NP_UTILS_NP_PLUGIN_OBJECT_FACTORY_MOCK_H_
+#ifndef GPU_NP_UTILS_NP_PLUGIN_OBJECT_FACTORY_MOCK_H_
+#define GPU_NP_UTILS_NP_PLUGIN_OBJECT_FACTORY_MOCK_H_
 
-#include "o3d/gpu_plugin/np_utils/np_plugin_object_factory.h"
+#include "gpu/np_utils/np_plugin_object_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -20,4 +20,4 @@ class MockPluginObjectFactory : public NPPluginObjectFactory {
 
 }  // namespace gpu_plugin
 
-#endif  // O3D_GPU_PLUGIN_NP_UTILS_NP_PLUGIN_OBJECT_FACTORY_MOCK_H_
+#endif  // GPU_NP_UTILS_NP_PLUGIN_OBJECT_FACTORY_MOCK_H_
diff --git a/o3d/gpu_plugin/np_utils/np_plugin_object_mock.h b/o3d/gpu/np_utils/np_plugin_object_mock.h
index fe1f407..e67861b 100644
--- a/o3d/gpu_plugin/np_utils/np_plugin_object_mock.h
+++ b/o3d/gpu/np_utils/np_plugin_object_mock.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef O3D_GPU_PLUGIN_NP_UTILS_NP_PLUGIN_OBJECT_MOCK_H_
-#define O3D_GPU_PLUGIN_NP_UTILS_NP_PLUGIN_OBJECT_MOCK_H_
+#ifndef GPU_NP_UTILS_NP_PLUGIN_OBJECT_MOCK_H_
+#define GPU_NP_UTILS_NP_PLUGIN_OBJECT_MOCK_H_
 
-#include "o3d/gpu_plugin/np_utils/np_plugin_object.h"
+#include "gpu/np_utils/np_plugin_object.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -23,4 +23,4 @@ class MockPluginObject : public PluginObject {
 
 }  // namespace gpu_plugin
 
-#endif  // O3D_GPU_PLUGIN_NP_UTILS_NP_PLUGIN_OBJECT_MOCK_H_
+#endif  // GPU_NP_UTILS_NP_PLUGIN_OBJECT_MOCK_H_
diff --git a/o3d/gpu_plugin/np_utils/np_utils.cc b/o3d/gpu/np_utils/np_utils.cc
index d1400e6..03c4a20 100644
--- a/o3d/gpu_plugin/np_utils/np_utils.cc
+++ b/o3d/gpu/np_utils/np_utils.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "o3d/gpu_plugin/np_utils/np_utils.h"
+#include "gpu/np_utils/np_utils.h"
 
 namespace gpu_plugin {
 
diff --git a/o3d/gpu_plugin/np_utils/np_utils.h b/o3d/gpu/np_utils/np_utils.h
index d5a27c5..2ab9384 100644
--- a/o3d/gpu_plugin/np_utils/np_utils.h
+++ b/o3d/gpu/np_utils/np_utils.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef O3D_GPU_PLUGIN_NP_UTILS_NP_UTILS_H_
-#define O3D_GPU_PLUGIN_NP_UTILS_NP_UTILS_H_
+#ifndef GPU_NP_UTILS_NP_UTILS_H_
+#define GPU_NP_UTILS_NP_UTILS_H_
 
 #include <string>
 
-#include "o3d/gpu_plugin/np_utils/np_browser.h"
-#include "o3d/gpu_plugin/np_utils/np_class.h"
-#include "o3d/gpu_plugin/np_utils/np_object_pointer.h"
-#include "o3d/gpu_plugin/np_utils/np_headers.h"
+#include "gpu/np_utils/np_browser.h"
+#include "gpu/np_utils/np_class.h"
+#include "gpu/np_utils/np_object_pointer.h"
+#include "gpu/np_utils/np_headers.h"
 
 namespace gpu_plugin {
 
@@ -268,4 +268,4 @@ NPObjectPointer<NPObjectType> NPCreateObject(NPP npp) {
 
 }  // namespace gpu_plugin
 
-#endif  // O3D_GPU_PLUGIN_NP_UTILS_NP_UTILS_H_
+#endif  // GPU_NP_UTILS_NP_UTILS_H_
diff --git a/o3d/gpu_plugin/np_utils/np_utils_unittest.cc b/o3d/gpu/np_utils/np_utils_unittest.cc
index d281c88..e481187 100644
--- a/o3d/gpu_plugin/np_utils/np_utils_unittest.cc
+++ b/o3d/gpu/np_utils/np_utils_unittest.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "o3d/gpu_plugin/np_utils/np_object_mock.h"
-#include "o3d/gpu_plugin/np_utils/np_browser_stub.h"
-#include "o3d/gpu_plugin/np_utils/np_utils.h"
+#include "gpu/np_utils/np_object_mock.h"
+#include "gpu/np_utils/np_browser_stub.h"
+#include "gpu/np_utils/np_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/o3d/gpu_plugin/np_utils/webkit_browser.h b/o3d/gpu/np_utils/webkit_browser.h
index e45e65f..8afc167 100644
--- a/o3d/gpu_plugin/np_utils/webkit_browser.h
+++ b/o3d/gpu/np_utils/webkit_browser.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef O3D_GPU_PLUGIN_NP_UTILS_WEBKIT_BROWSER_H_
-#define O3D_GPU_PLUGIN_NP_UTILS_WEBKIT_BROWSER_H_
+#ifndef GPU_NP_UTILS_WEBKIT_BROWSER_H_
+#define GPU_NP_UTILS_WEBKIT_BROWSER_H_
 
 // TODO(apatrick): This does not belong in np_utils. np_utils should not be
 //    dependent on WebKit (and it isn't - that's why the member functions are
@@ -11,7 +11,7 @@
 
 #include <stdlib.h>
 
-#include "o3d/gpu_plugin/np_utils/np_browser.h"
+#include "gpu/np_utils/np_browser.h"
 #include "WebKit/api/public/WebBindings.h"
 
 typedef struct _NPNetscapeFuncs NPNetscapeFuncs;
@@ -114,4 +114,4 @@ class WebKitBrowser : public NPBrowser {
 
 }  // namespace gpu_plugin
 
-#endif  // O3D_GPU_PLUGIN_NP_UTILS_WEBKIT_BROWSER_H_
+#endif  // GPU_NP_UTILS_WEBKIT_BROWSER_H_
diff --git a/o3d/gpu_plugin/gpu_plugin.gyp b/o3d/gpu_plugin/gpu_plugin.gyp
deleted file mode 100644
index c604a30..0000000
--- a/o3d/gpu_plugin/gpu_plugin.gyp
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright (c) 2009 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.
-
-{
-  'includes': [
-    '../build/common.gypi',
-  ],
-  'targets': [
-    {
-      'target_name': 'np_utils',
-      'type': '<(library)',
-      'dependencies': [
-        '../../base/base.gyp:base',
-        '../build/o3d_in_chrome.gyp:o3d_in_chrome',
-      ],
-      'include_dirs': [
-        '../..',
-        '../../third_party/npapi',
-      ],
-      'all_dependent_settings': {
-        'include_dirs': [
-          '../..',
-          '../../third_party/npapi',
-        ],
-      },  # 'all_dependent_settings'
-      'sources': [
-        'np_utils/default_np_object.h',
-        'np_utils/dynamic_np_object.cc',
-        'np_utils/dynamic_np_object.h',
-        'np_utils/np_browser.cc',
-        'np_utils/np_browser.h',
-        'np_utils/np_browser_mock.h',
-        'np_utils/np_browser_stub.cc',
-        'np_utils/np_browser_stub.h',
-        'np_utils/np_class.h',
-        'np_utils/np_dispatcher.cc',
-        'np_utils/np_dispatcher.h',
-        'np_utils/np_dispatcher_specializations.h',
-        'np_utils/np_headers.h',
-        'np_utils/np_object_mock.h',
-        'np_utils/np_object_pointer.h',
-        'np_utils/np_plugin_object.h',
-        'np_utils/np_plugin_object_mock.h',
-        'np_utils/np_plugin_object_factory.cc',
-        'np_utils/np_plugin_object_factory.h',
-        'np_utils/np_plugin_object_factory_mock.h',
-        'np_utils/np_utils.cc',
-        'np_utils/np_utils.h',
-        'np_utils/webkit_browser.h',
-      ],
-    },
-
-    # This is a standalone executable until O3D is fully moved over to using
-    # gyp. At that point these can become part of the regular O3D unit tests.
-    {
-      'target_name': 'np_utils_unittests',
-      'type': 'executable',
-      'dependencies': [
-        'np_utils',
-        '../../testing/gmock.gyp:gmock',
-        '../../testing/gmock.gyp:gmockmain',
-        '../../testing/gtest.gyp:gtest',
-      ],
-      'include_dirs': [
-        '../..',
-      ],
-      'all_dependent_settings': {
-        'include_dirs': [
-          '../..',
-        ],
-      },  # 'all_dependent_settings'
-      'sources': [
-        'np_utils/dispatched_np_object_unittest.cc',
-        'np_utils/dynamic_np_object_unittest.cc',
-        'np_utils/np_class_unittest.cc',
-        'np_utils/np_object_pointer_unittest.cc',
-        'np_utils/np_utils_unittest.cc',
-      ],
-    },
-
-    # These can eventually be merged back into the gpu_plugin target. There
-    # separated for now so O3D can statically link against them and use command
-    # buffers in-process without the GPU plugin.
-    {
-      'target_name': 'command_buffer',
-      'type': '<(library)',
-      'dependencies': [
-        '../../base/base.gyp:base',
-        '../command_buffer/command_buffer.gyp:command_buffer_service',
-        'np_utils',
-      ],
-      'all_dependent_settings': {
-        'include_dirs': [
-          '../..',
-        ],
-      },  # 'all_dependent_settings'
-      'sources': [
-        'command_buffer.cc',
-        'command_buffer.h',
-        'command_buffer_mock.h',
-        'gpu_processor.h',
-        'gpu_processor.cc',
-        'gpu_processor_mock.h',
-        'gpu_processor_win.cc',
-      ],
-    },
-
-    {
-      'target_name': 'gpu_plugin',
-      'type': '<(library)',
-      'dependencies': [
-        '../../base/base.gyp:base',
-        'command_buffer',
-        'np_utils',
-      ],
-      'include_dirs': [
-        '../..',
-      ],
-      'sources': [
-        'gpu_plugin.cc',
-        'gpu_plugin.h',
-        'gpu_plugin_object.cc',
-        'gpu_plugin_object.h',
-        'gpu_plugin_object_win.cc',
-        'gpu_plugin_object_factory.cc',
-        'gpu_plugin_object_factory.h',
-      ],
-    },
-
-    # This is a standalone executable until O3D is fully moved over to using
-    # gyp. At that point these can become part of the regular O3D unit tests.
-    {
-      'target_name': 'gpu_plugin_unittests',
-      'type': 'executable',
-      'dependencies': [
-        '../command_buffer/command_buffer.gyp:command_buffer_service',
-        'gpu_plugin',
-        'np_utils',
-        '../../testing/gmock.gyp:gmock',
-        '../../testing/gmock.gyp:gmockmain',
-        '../../testing/gtest.gyp:gtest',
-      ],
-      'include_dirs': [
-        '../..',
-      ],
-      'sources': [
-        'command_buffer_unittest.cc',
-        'gpu_plugin_unittest.cc',
-        'gpu_plugin_object_unittest.cc',
-        'gpu_plugin_object_factory_unittest.cc',
-        'gpu_processor_unittest.cc',
-      ],
-    },
-  ]
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/o3d/plugin/cross/o3d_glue.cc b/o3d/plugin/cross/o3d_glue.cc
index f2cfb4f..075ca5d 100644
--- a/o3d/plugin/cross/o3d_glue.cc
+++ b/o3d/plugin/cross/o3d_glue.cc
@@ -40,9 +40,9 @@
 #include "core/cross/renderer.h"
 #include "core/cross/client_info.h"
 #include "core/cross/command_buffer/display_window_cb.h"
-#include "gpu_plugin/np_utils/np_headers.h"
-#include "gpu_plugin/np_utils/np_object_pointer.h"
-#include "gpu_plugin/np_utils/np_utils.h"
+#include "gpu/np_utils/np_headers.h"
+#include "gpu/np_utils/np_object_pointer.h"
+#include "gpu/np_utils/np_utils.h"
 #include "plugin/cross/o3d_glue.h"
 #include "plugin/cross/config.h"
 #include "plugin/cross/stream_manager.h"
diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp
index 10cb1c4..c128c70 100644
--- a/o3d/plugin/plugin.gyp
+++ b/o3d/plugin/plugin.gyp
@@ -50,7 +50,7 @@
       '../../v8/tools/gyp/v8.gyp:v8',
       '../core/core.gyp:o3dCore',
       '../core/core.gyp:o3dCorePlatform',
-      '../gpu_plugin/gpu_plugin.gyp:np_utils',
+      '../gpu/gpu.gyp:np_utils',
       '../import/archive.gyp:o3dArchive',
       '../utils/utils.gyp:o3dUtils',
       '../../native_client/src/shared/imc/imc.gyp:google_nacl_imc',
diff --git a/o3d/plugin/win/main_win.cc b/o3d/plugin/win/main_win.cc
index 785e771..13cfc12 100644
--- a/o3d/plugin/win/main_win.cc
+++ b/o3d/plugin/win/main_win.cc
@@ -54,7 +54,7 @@
 #if defined(RENDERER_CB)
 #include "core/cross/command_buffer/renderer_cb.h"
 #include "core/cross/command_buffer/display_window_cb.h"
-#include "gpu_plugin/command_buffer.h"
+#include "gpu/gpu_plugin/command_buffer.h"
 #endif
 
 using glue::_o3d::PluginObject;
diff --git a/o3d/tests/common/win/testing_common.cc b/o3d/tests/common/win/testing_common.cc
index 5479719..ba7c402 100644
--- a/o3d/tests/common/win/testing_common.cc
+++ b/o3d/tests/common/win/testing_common.cc
@@ -53,8 +53,8 @@
 #if defined(RENDERER_CB)
 #include "core/cross/command_buffer/renderer_cb.h"
 #include "core/cross/command_buffer/display_window_cb.h"
-#include "gpu_plugin/command_buffer.h"
-#include "gpu_plugin/np_utils/np_browser_stub.h"
+#include "gpu/gpu_plugin/command_buffer.h"
+#include "gpu/np_utils/np_browser_stub.h"
 #endif
 
 using o3d::DisplayWindowWindows;
diff --git a/o3d/tests/tests.gyp b/o3d/tests/tests.gyp
index 27e48a6..1942b35 100644
--- a/o3d/tests/tests.gyp
+++ b/o3d/tests/tests.gyp
@@ -105,16 +105,16 @@
         ['renderer == "cb"',
           {
             'dependencies': [
-              '../gpu_plugin/gpu_plugin.gyp:np_utils',
+              '../gpu/gpu.gyp:np_utils',
             ]
           },
         ],
         ['renderer == "cb" and cb_service != "remote"',
           {
             'dependencies': [
-              '../command_buffer/command_buffer.gyp:command_buffer_client_test',
-              '../command_buffer/command_buffer.gyp:command_buffer_common_test',
-              '../command_buffer/command_buffer.gyp:command_buffer_service_test',
+              '../gpu/gpu.gyp:command_buffer_client_test',
+              '../gpu/gpu.gyp:command_buffer_common_test',
+              '../gpu/gpu.gyp:command_buffer_service_test',
             ]
           },
         ],