Moved platform specific out of platform directories. This is the Chrome convention.

Review URL: http://codereview.chromium.org/372077

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

99 files changed, 265 insertions, 265 deletions

diff --git a/o3d/command_buffer/client/cross/cmd_buffer_helper.cc b/o3d/command_buffer/client/cmd_buffer_helper.cc
index 39f06ba..4dd2ece 100644
--- a/o3d/command_buffer/client/cross/cmd_buffer_helper.cc
+++ b/o3d/command_buffer/client/cmd_buffer_helper.cc
@@ -32,7 +32,7 @@
 
 // This file contains the implementation of the command buffer helper class.
 
-#include "command_buffer/client/cross/cmd_buffer_helper.h"
+#include "command_buffer/client/cmd_buffer_helper.h"
 #include "o3d/gpu_plugin/np_utils/np_utils.h"
 
 namespace command_buffer {
diff --git a/o3d/command_buffer/client/cross/cmd_buffer_helper.h b/o3d/command_buffer/client/cmd_buffer_helper.h
index 8ee23d5..e17e234 100644
--- a/o3d/command_buffer/client/cross/cmd_buffer_helper.h
+++ b/o3d/command_buffer/client/cmd_buffer_helper.h
@@ -35,9 +35,9 @@
 #ifndef GPU_COMMAND_BUFFER_CLIENT_CROSS_CMD_BUFFER_HELPER_H_
 #define GPU_COMMAND_BUFFER_CLIENT_CROSS_CMD_BUFFER_HELPER_H_
 
-#include "command_buffer/common/cross/logging.h"
-#include "command_buffer/common/cross/constants.h"
-#include "command_buffer/common/cross/cmd_buffer_common.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"
 
diff --git a/o3d/command_buffer/client/cross/cmd_buffer_helper_test.cc b/o3d/command_buffer/client/cmd_buffer_helper_test.cc
index cb41668..b7a4f85 100644
--- a/o3d/command_buffer/client/cross/cmd_buffer_helper_test.cc
+++ b/o3d/command_buffer/client/cmd_buffer_helper_test.cc
@@ -34,8 +34,8 @@
 
 #include "tests/common/win/testing_common.h"
 #include "base/message_loop.h"
-#include "command_buffer/client/cross/cmd_buffer_helper.h"
-#include "command_buffer/service/cross/mocks.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"
diff --git a/o3d/command_buffer/client/cross/effect_helper.cc b/o3d/command_buffer/client/effect_helper.cc
index 93fdcd6..eb7faf9 100644
--- a/o3d/command_buffer/client/cross/effect_helper.cc
+++ b/o3d/command_buffer/client/effect_helper.cc
@@ -32,11 +32,11 @@
 
 // This file implements the EffectHelper class.
 
-#include "command_buffer/common/cross/o3d_cmd_format.h"
-#include "command_buffer/client/cross/cmd_buffer_helper.h"
-#include "command_buffer/client/cross/effect_helper.h"
-#include "command_buffer/client/cross/fenced_allocator.h"
-#include "command_buffer/client/cross/id_allocator.h"
+#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"
 
 // TODO: write a unit test.
 
diff --git a/o3d/command_buffer/client/cross/effect_helper.h b/o3d/command_buffer/client/effect_helper.h
index 0af7520..a20375c 100644
--- a/o3d/command_buffer/client/cross/effect_helper.h
+++ b/o3d/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/cross/resource.h"
-#include "command_buffer/client/cross/o3d_cmd_helper.h"
+#include "command_buffer/common/resource.h"
+#include "command_buffer/client/o3d_cmd_helper.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/client/cross/fenced_allocator.cc b/o3d/command_buffer/client/fenced_allocator.cc
index a6e0f9d..990d013 100644
--- a/o3d/command_buffer/client/cross/fenced_allocator.cc
+++ b/o3d/command_buffer/client/fenced_allocator.cc
@@ -32,9 +32,9 @@
 
 // This file contains the implementation of the FencedAllocator class.
 
-#include "command_buffer/client/cross/fenced_allocator.h"
+#include "command_buffer/client/fenced_allocator.h"
 #include <algorithm>
-#include "command_buffer/client/cross/cmd_buffer_helper.h"
+#include "command_buffer/client/cmd_buffer_helper.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/client/cross/fenced_allocator.h b/o3d/command_buffer/client/fenced_allocator.h
index da772aa..96c3a8a 100644
--- a/o3d/command_buffer/client/cross/fenced_allocator.h
+++ b/o3d/command_buffer/client/fenced_allocator.h
@@ -37,7 +37,7 @@
 
 #include <vector>
 #include "base/basictypes.h"
-#include "command_buffer/common/cross/logging.h"
+#include "command_buffer/common/logging.h"
 
 namespace command_buffer {
 class CommandBufferHelper;
diff --git a/o3d/command_buffer/client/cross/fenced_allocator_test.cc b/o3d/command_buffer/client/fenced_allocator_test.cc
index 5d629da..aa59be1 100644
--- a/o3d/command_buffer/client/cross/fenced_allocator_test.cc
+++ b/o3d/command_buffer/client/fenced_allocator_test.cc
@@ -34,10 +34,10 @@
 
 #include "tests/common/win/testing_common.h"
 #include "base/message_loop.h"
-#include "command_buffer/client/cross/cmd_buffer_helper.h"
-#include "command_buffer/client/cross/fenced_allocator.h"
-#include "command_buffer/service/cross/cmd_buffer_engine.h"
-#include "command_buffer/service/cross/mocks.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"
diff --git a/o3d/command_buffer/client/cross/id_allocator.cc b/o3d/command_buffer/client/id_allocator.cc
index a7e6e83..fc3250d 100644
--- a/o3d/command_buffer/client/cross/id_allocator.cc
+++ b/o3d/command_buffer/client/id_allocator.cc
@@ -32,7 +32,7 @@
 
 // This file contains the implementation of IdAllocator.
 
-#include "command_buffer/client/cross/id_allocator.h"
+#include "command_buffer/client/id_allocator.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/client/cross/id_allocator.h b/o3d/command_buffer/client/id_allocator.h
index c8e3a42..819d13e 100644
--- a/o3d/command_buffer/client/cross/id_allocator.h
+++ b/o3d/command_buffer/client/id_allocator.h
@@ -37,8 +37,8 @@
 
 #include <vector>
 #include "base/basictypes.h"
-#include "command_buffer/common/cross/types.h"
-#include "command_buffer/common/cross/resource.h"
+#include "command_buffer/common/types.h"
+#include "command_buffer/common/resource.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/client/cross/id_allocator_test.cc b/o3d/command_buffer/client/id_allocator_test.cc
index 0b14a5f..b344ab5 100644
--- a/o3d/command_buffer/client/cross/id_allocator_test.cc
+++ b/o3d/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/cross/id_allocator.h"
+#include "command_buffer/client/id_allocator.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/client/cross/o3d_cmd_helper.cc b/o3d/command_buffer/client/o3d_cmd_helper.cc
index b084a17..cb9ffe1 100644
--- a/o3d/command_buffer/client/cross/o3d_cmd_helper.cc
+++ b/o3d/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/cross/o3d_cmd_helper.h"
+#include "command_buffer/client/o3d_cmd_helper.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/client/cross/o3d_cmd_helper.h b/o3d/command_buffer/client/o3d_cmd_helper.h
index a42d89b..4f4aed2 100644
--- a/o3d/command_buffer/client/cross/o3d_cmd_helper.h
+++ b/o3d/command_buffer/client/o3d_cmd_helper.h
@@ -35,10 +35,10 @@
 #ifndef GPU_COMMAND_BUFFER_CLIENT_CROSS_O3D_CMD_HELPER_H_
 #define GPU_COMMAND_BUFFER_CLIENT_CROSS_O3D_CMD_HELPER_H_
 
-#include "command_buffer/common/cross/logging.h"
-#include "command_buffer/common/cross/constants.h"
-#include "command_buffer/client/cross/cmd_buffer_helper.h"
-#include "command_buffer/common/cross/o3d_cmd_format.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"
 
 namespace command_buffer {
diff --git a/o3d/command_buffer/command_buffer.gyp b/o3d/command_buffer/command_buffer.gyp
index e398830..71865ba 100644
--- a/o3d/command_buffer/command_buffer.gyp
+++ b/o3d/command_buffer/command_buffer.gyp
@@ -38,17 +38,17 @@
         ],
       },  # 'all_dependent_settings'
       'sources': [
-        'common/cross/bitfield_helpers.h',
-        'common/cross/cmd_buffer_common.h',
-        'common/cross/cmd_buffer_common.cc',
-        'common/cross/o3d_cmd_format.h',
-        'common/cross/o3d_cmd_format.cc',
-        'common/cross/gapi_interface.h',
-        'common/cross/logging.h',
-        'common/cross/mocks.h',
-        'common/cross/resource.cc',
-        'common/cross/resource.h',
-        'common/cross/types.h',
+        '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',
       ],
     },
     {
@@ -56,7 +56,7 @@
       'type': 'none',
       'direct_dependent_settings': {
         'sources': [
-          'common/cross/bitfield_helpers_test.cc',
+          'common/bitfield_helpers_test.cc',
         ],
       },
     },
@@ -68,16 +68,16 @@
         '../gpu_plugin/gpu_plugin.gyp:np_utils',
       ],
       'sources': [
-        'client/cross/cmd_buffer_helper.cc',
-        'client/cross/cmd_buffer_helper.h',
-        'client/cross/effect_helper.cc',
-        'client/cross/effect_helper.h',
-        'client/cross/fenced_allocator.cc',
-        'client/cross/fenced_allocator.h',
-        'client/cross/id_allocator.cc',
-        'client/cross/id_allocator.h',
-        'client/cross/o3d_cmd_helper.cc',
-        'client/cross/o3d_cmd_helper.h',
+        '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',
       ],
     },
     {
@@ -85,9 +85,9 @@
       'type': 'none',
       'direct_dependent_settings': {
         'sources': [
-          'client/cross/cmd_buffer_helper_test.cc',
-          'client/cross/fenced_allocator_test.cc',
-          'client/cross/id_allocator_test.cc',
+          'client/cmd_buffer_helper_test.cc',
+          'client/fenced_allocator_test.cc',
+          'client/id_allocator_test.cc',
         ],
       },
     },
@@ -113,22 +113,22 @@
         'command_buffer_common',
       ],
       'sources': [
-        'service/cross/common_decoder.cc',
-        'service/cross/common_decoder.h',
-        'service/cross/cmd_buffer_engine.h',
-        'service/cross/cmd_parser.cc',
-        'service/cross/cmd_parser.h',
-        'service/cross/effect_utils.cc',
-        'service/cross/effect_utils.h',
-        'service/cross/gapi_decoder.cc',
-        'service/cross/gapi_decoder.h',
-        'service/cross/mocks.h',
-        'service/cross/precompile.cc',
-        'service/cross/precompile.h',
-        'service/cross/resource.cc',
-        'service/cross/resource.h',
-        'service/cross/texture_utils.cc',
-        'service/cross/texture_utils.h',
+        '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"',
@@ -136,7 +136,7 @@
             'msvs_settings': {
               'VCCLCompilerTool': {
                 'ForcedIncludeFiles':
-                'command_buffer/service/cross/precompile.h',
+                'command_buffer/service/precompile.h',
               },
             },
           },
@@ -144,7 +144,7 @@
         ['OS == "mac"',
           {
             'xcode_settings': {
-              'GCC_PREFIX_HEADER': 'service/cross/precompile.h',
+              'GCC_PREFIX_HEADER': 'service/precompile.h',
             },
           },
         ],
@@ -152,7 +152,7 @@
           {
             'cflags': [
               '-include',
-              'command_buffer/service/cross/precompile.h',
+              'command_buffer/service/precompile.h',
             ],
           },
         ],
@@ -172,20 +172,20 @@
               },
             },  # 'all_dependent_settings'
             'sources': [
-              'service/win/d3d9/d3d9_utils.h',
-              'service/win/d3d9/effect_d3d9.cc',
-              'service/win/d3d9/effect_d3d9.h',
-              'service/win/d3d9/gapi_d3d9.cc',
-              'service/win/d3d9/gapi_d3d9.h',
-              'service/win/d3d9/geometry_d3d9.cc',
-              'service/win/d3d9/geometry_d3d9.h',
-              'service/win/d3d9/render_surface_d3d9.cc',
-              'service/win/d3d9/render_surface_d3d9.h',
-              'service/win/d3d9/sampler_d3d9.cc',
-              'service/win/d3d9/sampler_d3d9.h',
-              'service/win/d3d9/states_d3d9.cc',
-              'service/win/d3d9/texture_d3d9.cc',
-              'service/win/d3d9/texture_d3d9.h',
+              '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'
           },
         ],
@@ -196,20 +196,20 @@
               '../build/libs.gyp:cg_libs',
             ],
             'sources': [
-              'service/cross/gl/effect_gl.cc',
-              'service/cross/gl/effect_gl.h',
-              'service/cross/gl/gapi_gl.cc',
-              'service/cross/gl/gapi_gl.h',
-              'service/cross/gl/geometry_gl.cc',
-              'service/cross/gl/geometry_gl.h',
-              'service/cross/gl/gl_utils.h',
-              'service/cross/gl/render_surface_gl.cc',
-              'service/cross/gl/render_surface_gl.h',
-              'service/cross/gl/sampler_gl.cc',
-              'service/cross/gl/sampler_gl.h',
-              'service/cross/gl/states_gl.cc',
-              'service/cross/gl/texture_gl.cc',
-              'service/cross/gl/texture_gl.h',
+              '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'
           },
         ],
@@ -228,8 +228,8 @@
       'type': 'none',
       'direct_dependent_settings': {
         'sources': [
-          'service/cross/cmd_parser_test.cc',
-          'service/cross/resource_test.cc',
+          'service/cmd_parser_test.cc',
+          'service/resource_test.cc',
         ],
       },
     },
diff --git a/o3d/command_buffer/common/cross/GLES2/gl2.h b/o3d/command_buffer/common/GLES2/gl2.h
index 94c643b..94c643b 100644
--- a/o3d/command_buffer/common/cross/GLES2/gl2.h
+++ b/o3d/command_buffer/common/GLES2/gl2.h
diff --git a/o3d/command_buffer/common/cross/GLES2/gl2platform.h b/o3d/command_buffer/common/GLES2/gl2platform.h
index 3e9036c..3e9036c 100644
--- a/o3d/command_buffer/common/cross/GLES2/gl2platform.h
+++ b/o3d/command_buffer/common/GLES2/gl2platform.h
diff --git a/o3d/command_buffer/common/cross/KHR/khrplatform.h b/o3d/command_buffer/common/KHR/khrplatform.h
index 8341f71b..8341f71b 100644
--- a/o3d/command_buffer/common/cross/KHR/khrplatform.h
+++ b/o3d/command_buffer/common/KHR/khrplatform.h
diff --git a/o3d/command_buffer/common/cross/bitfield_helpers.h b/o3d/command_buffer/common/bitfield_helpers.h
index b74374d..b74374d 100644
--- a/o3d/command_buffer/common/cross/bitfield_helpers.h
+++ b/o3d/command_buffer/common/bitfield_helpers.h
diff --git a/o3d/command_buffer/common/cross/bitfield_helpers_test.cc b/o3d/command_buffer/common/bitfield_helpers_test.cc
index 56ed1ed..310ccf0 100644
--- a/o3d/command_buffer/common/cross/bitfield_helpers_test.cc
+++ b/o3d/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/cross/bitfield_helpers.h"
+#include "command_buffer/common/bitfield_helpers.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/common/cross/cmd_buffer_common.cc b/o3d/command_buffer/common/cmd_buffer_common.cc
index e8fdbbc..b23b0e9 100644
--- a/o3d/command_buffer/common/cross/cmd_buffer_common.cc
+++ b/o3d/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/cross/cmd_buffer_common.h"
+#include "command_buffer/common/cmd_buffer_common.h"
 
 namespace command_buffer {
 namespace cmd {
diff --git a/o3d/command_buffer/common/cross/cmd_buffer_common.h b/o3d/command_buffer/common/cmd_buffer_common.h
index 8934c94..cbafa98 100644
--- a/o3d/command_buffer/common/cross/cmd_buffer_common.h
+++ b/o3d/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/cross/types.h"
-#include "command_buffer/common/cross/bitfield_helpers.h"
-#include "command_buffer/common/cross/logging.h"
+#include "command_buffer/common/types.h"
+#include "command_buffer/common/bitfield_helpers.h"
+#include "command_buffer/common/logging.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/common/cross/constants.h b/o3d/command_buffer/common/constants.h
index ee874cd..ee874cd 100644
--- a/o3d/command_buffer/common/cross/constants.h
+++ b/o3d/command_buffer/common/constants.h
diff --git a/o3d/command_buffer/common/cross/gapi_interface.h b/o3d/command_buffer/common/gapi_interface.h
index 847b923..d946b5d 100644
--- a/o3d/command_buffer/common/cross/gapi_interface.h
+++ b/o3d/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/cross/constants.h"
-#include "command_buffer/common/cross/resource.h"
-#include "command_buffer/common/cross/o3d_cmd_format.h"
+#include "command_buffer/common/constants.h"
+#include "command_buffer/common/resource.h"
+#include "command_buffer/common/o3d_cmd_format.h"
 
 namespace command_buffer {
 namespace o3d {
@@ -776,8 +776,8 @@ class GAPIInterface {
   //   passed, parse_error::kParseNoError otherwise.
   virtual ParseError CreateRenderSurface(ResourceId id,
                                          unsigned int width,
-                                         unsigned int height,

-                                         unsigned int mip_level,

+                                         unsigned int height,
+                                         unsigned int mip_level,
                                          unsigned int side,
                                          ResourceId texture_id) = 0;
 
diff --git a/o3d/command_buffer/common/cross/logging.h b/o3d/command_buffer/common/logging.h
index a9bbad8..a9bbad8 100644
--- a/o3d/command_buffer/common/cross/logging.h
+++ b/o3d/command_buffer/common/logging.h
diff --git a/o3d/command_buffer/common/cross/o3d_cmd_format.cc b/o3d/command_buffer/common/o3d_cmd_format.cc
index 6bb413e..c373446 100644
--- a/o3d/command_buffer/common/cross/o3d_cmd_format.cc
+++ b/o3d/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/cross/o3d_cmd_format.h"
+#include "command_buffer/common/o3d_cmd_format.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/common/cross/o3d_cmd_format.h b/o3d/command_buffer/common/o3d_cmd_format.h
index 9830774..937ae0a 100644
--- a/o3d/command_buffer/common/cross/o3d_cmd_format.h
+++ b/o3d/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/cross/cmd_buffer_common.h"
-#include "command_buffer/common/cross/resource.h"
+#include "command_buffer/common/cmd_buffer_common.h"
+#include "command_buffer/common/resource.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/common/cross/resource.cc b/o3d/command_buffer/common/resource.cc
index aa22628..08a5957 100644
--- a/o3d/command_buffer/common/cross/resource.cc
+++ b/o3d/command_buffer/common/resource.cc
@@ -32,7 +32,7 @@
 
 // This file contains the implementation of the helper functions for resources.
 
-#include "command_buffer/common/cross/resource.h"
+#include "command_buffer/common/resource.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/common/cross/resource.h b/o3d/command_buffer/common/resource.h
index e045338..851198b 100644
--- a/o3d/command_buffer/common/cross/resource.h
+++ b/o3d/command_buffer/common/resource.h
@@ -39,8 +39,8 @@
 #include <algorithm>
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
-#include "command_buffer/common/cross/types.h"
-#include "command_buffer/common/cross/logging.h"
+#include "command_buffer/common/types.h"
+#include "command_buffer/common/logging.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/common/cross/types.h b/o3d/command_buffer/common/types.h
index daa01cb..daa01cb 100644
--- a/o3d/command_buffer/common/cross/types.h
+++ b/o3d/command_buffer/common/types.h
diff --git a/o3d/command_buffer/service/linux/big_test_main.cc b/o3d/command_buffer/service/big_test_main.cc
index 656f908..656f908 100644
--- a/o3d/command_buffer/service/linux/big_test_main.cc
+++ b/o3d/command_buffer/service/big_test_main.cc
diff --git a/o3d/command_buffer/service/cross/cmd_buffer_engine.h b/o3d/command_buffer/service/cmd_buffer_engine.h
index 74ad649..74ad649 100644
--- a/o3d/command_buffer/service/cross/cmd_buffer_engine.h
+++ b/o3d/command_buffer/service/cmd_buffer_engine.h
diff --git a/o3d/command_buffer/service/cross/cmd_parser.cc b/o3d/command_buffer/service/cmd_parser.cc
index d8bf830..0108953 100644
--- a/o3d/command_buffer/service/cross/cmd_parser.cc
+++ b/o3d/command_buffer/service/cmd_parser.cc
@@ -32,9 +32,9 @@
 
 // This file contains the implementation of the command parser.
 
-#include "command_buffer/service/cross/cmd_parser.h"
+#include "command_buffer/service/cmd_parser.h"
 // TODO(gman): remove this so we can use this code for different formats.
-#include "command_buffer/common/cross/o3d_cmd_format.h"
+#include "command_buffer/common/o3d_cmd_format.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/service/cross/cmd_parser.h b/o3d/command_buffer/service/cmd_parser.h
index 7cd3713..4147c78 100644
--- a/o3d/command_buffer/service/cross/cmd_parser.h
+++ b/o3d/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/cross/constants.h"
-#include "command_buffer/common/cross/cmd_buffer_common.h"
+#include "command_buffer/common/constants.h"
+#include "command_buffer/common/cmd_buffer_common.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/service/cross/cmd_parser_test.cc b/o3d/command_buffer/service/cmd_parser_test.cc
index dbcb054..153c20a 100644
--- a/o3d/command_buffer/service/cross/cmd_parser_test.cc
+++ b/o3d/command_buffer/service/cmd_parser_test.cc
@@ -33,8 +33,8 @@
 // Tests for the command parser.
 
 #include "tests/common/win/testing_common.h"
-#include "command_buffer/service/cross/cmd_parser.h"
-#include "command_buffer/service/cross/mocks.h"
+#include "command_buffer/service/cmd_parser.h"
+#include "command_buffer/service/mocks.h"
 #include "base/scoped_ptr.h"
 
 namespace command_buffer {
diff --git a/o3d/command_buffer/service/cross/common_decoder.cc b/o3d/command_buffer/service/common_decoder.cc
index 04f2662..3d53c1f 100644
--- a/o3d/command_buffer/service/cross/common_decoder.cc
+++ b/o3d/command_buffer/service/common_decoder.cc
@@ -29,8 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "command_buffer/service/cross/common_decoder.h"
-#include "command_buffer/service/cross/cmd_buffer_engine.h"
+#include "command_buffer/service/common_decoder.h"
+#include "command_buffer/service/cmd_buffer_engine.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/service/cross/common_decoder.h b/o3d/command_buffer/service/common_decoder.h
index 1de8cee..9b77e77 100644
--- a/o3d/command_buffer/service/cross/common_decoder.h
+++ b/o3d/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/cross/cmd_parser.h"
+#include "command_buffer/service/cmd_parser.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/service/win/d3d9/d3d9_utils.h b/o3d/command_buffer/service/d3d9_utils.h
index 48b4808..714be3f 100644
--- a/o3d/command_buffer/service/win/d3d9/d3d9_utils.h
+++ b/o3d/command_buffer/service/d3d9_utils.h
@@ -45,7 +45,7 @@
 #include <d3dx9.h>
 #include <dxerr.h>
 #include <algorithm>
-#include "command_buffer/common/cross/gapi_interface.h"
+#include "command_buffer/common/gapi_interface.h"
 
 #if defined (_DEBUG)
 
diff --git a/o3d/command_buffer/service/win/d3d9/effect_d3d9.cc b/o3d/command_buffer/service/effect_d3d9.cc
index 974906e..6ed3bc4 100644
--- a/o3d/command_buffer/service/win/d3d9/effect_d3d9.cc
+++ b/o3d/command_buffer/service/effect_d3d9.cc
@@ -35,12 +35,12 @@
 // This file also contains the related GAPID3D9 function implementations.
 
 #include <algorithm>
-#include "command_buffer/service/win/d3d9/d3d9_utils.h"
-#include "command_buffer/service/win/d3d9/geometry_d3d9.h"
-#include "command_buffer/service/win/d3d9/gapi_d3d9.h"
-#include "command_buffer/service/win/d3d9/effect_d3d9.h"
-#include "command_buffer/service/win/d3d9/sampler_d3d9.h"
-#include "command_buffer/service/cross/effect_utils.h"
+#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"
 
 // TODO: remove link-dependency on D3DX.
 
diff --git a/o3d/command_buffer/service/win/d3d9/effect_d3d9.h b/o3d/command_buffer/service/effect_d3d9.h
index 9bf09db..cbe32a3 100644
--- a/o3d/command_buffer/service/win/d3d9/effect_d3d9.h
+++ b/o3d/command_buffer/service/effect_d3d9.h
@@ -37,9 +37,9 @@
 #define GPU_COMMAND_BUFFER_SERVICE_WIN_D3D9_EFFECT_D3D9_H_
 
 #include <vector>
-#include "command_buffer/common/cross/gapi_interface.h"
-#include "command_buffer/service/win/d3d9/d3d9_utils.h"
-#include "command_buffer/service/cross/resource.h"
+#include "command_buffer/common/gapi_interface.h"
+#include "command_buffer/service/d3d9_utils.h"
+#include "command_buffer/service/resource.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/cross/gl/effect_gl.cc b/o3d/command_buffer/service/effect_gl.cc
index 182019e..881f6b7 100644
--- a/o3d/command_buffer/service/cross/gl/effect_gl.cc
+++ b/o3d/command_buffer/service/effect_gl.cc
@@ -36,9 +36,9 @@
 #include <map>
 
 #include "base/cross/std_functional.h"
-#include "command_buffer/service/cross/gl/effect_gl.h"
-#include "command_buffer/service/cross/gl/gapi_gl.h"
-#include "command_buffer/service/cross/effect_utils.h"
+#include "command_buffer/service/effect_gl.h"
+#include "command_buffer/service/gapi_gl.h"
+#include "command_buffer/service/effect_utils.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/cross/gl/effect_gl.h b/o3d/command_buffer/service/effect_gl.h
index bc45e04..b639489 100644
--- a/o3d/command_buffer/service/cross/gl/effect_gl.h
+++ b/o3d/command_buffer/service/effect_gl.h
@@ -37,9 +37,9 @@
 
 #include <vector>
 
-#include "command_buffer/common/cross/gapi_interface.h"
-#include "command_buffer/service/cross/resource.h"
-#include "command_buffer/service/cross/gl/gl_utils.h"
+#include "command_buffer/common/gapi_interface.h"
+#include "command_buffer/service/resource.h"
+#include "command_buffer/service/gl_utils.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/cross/effect_utils.cc b/o3d/command_buffer/service/effect_utils.cc
index 96fca41..203aa1b 100644
--- a/o3d/command_buffer/service/cross/effect_utils.cc
+++ b/o3d/command_buffer/service/effect_utils.cc
@@ -32,7 +32,7 @@
 
 // This file implements effect related utilities.
 
-#include "command_buffer/service/cross/effect_utils.h"
+#include "command_buffer/service/effect_utils.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/service/cross/effect_utils.h b/o3d/command_buffer/service/effect_utils.h
index cf96b84..dcfe718 100644
--- a/o3d/command_buffer/service/cross/effect_utils.h
+++ b/o3d/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/cross/types.h"
+#include "command_buffer/common/types.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/service/cross/effect_utils_test.cc b/o3d/command_buffer/service/effect_utils_test.cc
index d37db9d..d37db9d 100644
--- a/o3d/command_buffer/service/cross/effect_utils_test.cc
+++ b/o3d/command_buffer/service/effect_utils_test.cc
diff --git a/o3d/command_buffer/service/win/d3d9/gapi_d3d9.cc b/o3d/command_buffer/service/gapi_d3d9.cc
index 8700b78..1d840eb 100644
--- a/o3d/command_buffer/service/win/d3d9/gapi_d3d9.cc
+++ b/o3d/command_buffer/service/gapi_d3d9.cc
@@ -32,7 +32,7 @@
 
 // This file contains the implementation of the GAPID3D9 class.
 
-#include "command_buffer/service/win/d3d9/gapi_d3d9.h"
+#include "command_buffer/service/gapi_d3d9.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/win/d3d9/gapi_d3d9.h b/o3d/command_buffer/service/gapi_d3d9.h
index 552f929..bac33a8 100644
--- a/o3d/command_buffer/service/win/d3d9/gapi_d3d9.h
+++ b/o3d/command_buffer/service/gapi_d3d9.h
@@ -36,13 +36,13 @@
 #ifndef GPU_COMMAND_BUFFER_SERVICE_WIN_D3D9_GAPI_D3D9_H_
 #define GPU_COMMAND_BUFFER_SERVICE_WIN_D3D9_GAPI_D3D9_H_
 
-#include "command_buffer/common/cross/gapi_interface.h"
-#include "command_buffer/service/win/d3d9/d3d9_utils.h"
-#include "command_buffer/service/win/d3d9/geometry_d3d9.h"
-#include "command_buffer/service/win/d3d9/effect_d3d9.h"
-#include "command_buffer/service/win/d3d9/texture_d3d9.h"
-#include "command_buffer/service/win/d3d9/sampler_d3d9.h"
-#include "command_buffer/service/win/d3d9/render_surface_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"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/cross/gapi_decoder.cc b/o3d/command_buffer/service/gapi_decoder.cc
index c274426..ec079f9 100644
--- a/o3d/command_buffer/service/cross/gapi_decoder.cc
+++ b/o3d/command_buffer/service/gapi_decoder.cc
@@ -34,8 +34,8 @@
 // GAPI commands into calls to a GAPIInterface class.
 
 #include "base/cross/bits.h"
-#include "command_buffer/common/cross/gapi_interface.h"
-#include "command_buffer/service/cross/gapi_decoder.h"
+#include "command_buffer/common/gapi_interface.h"
+#include "command_buffer/service/gapi_decoder.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/cross/gapi_decoder.h b/o3d/command_buffer/service/gapi_decoder.h
index 2db043f..5641311 100644
--- a/o3d/command_buffer/service/cross/gapi_decoder.h
+++ b/o3d/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/cross/common_decoder.h"
-#include "command_buffer/common/cross/o3d_cmd_format.h"
+#include "command_buffer/service/common_decoder.h"
+#include "command_buffer/common/o3d_cmd_format.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/cross/gl/gapi_gl.cc b/o3d/command_buffer/service/gapi_gl.cc
index 322a3c1..5bc587d 100644
--- a/o3d/command_buffer/service/cross/gl/gapi_gl.cc
+++ b/o3d/command_buffer/service/gapi_gl.cc
@@ -33,7 +33,7 @@
 // This file implements the GAPIGL class.
 
 #include <build/build_config.h>
-#include "command_buffer/service/cross/gl/gapi_gl.h"
+#include "command_buffer/service/gapi_gl.h"
 
 #ifdef OS_LINUX
 #include "command_buffer/service/linux/x_utils.h"
diff --git a/o3d/command_buffer/service/cross/gl/gapi_gl.h b/o3d/command_buffer/service/gapi_gl.h
index ab8beb9..e46bd7f 100644
--- a/o3d/command_buffer/service/cross/gl/gapi_gl.h
+++ b/o3d/command_buffer/service/gapi_gl.h
@@ -40,13 +40,13 @@
 #include <GL/glew.h>
 #include <Cg/cg.h>
 #include <Cg/cgGL.h>
-#include "command_buffer/common/cross/gapi_interface.h"
-#include "command_buffer/service/cross/gl/gl_utils.h"
-#include "command_buffer/service/cross/gl/effect_gl.h"
-#include "command_buffer/service/cross/gl/geometry_gl.h"
-#include "command_buffer/service/cross/gl/render_surface_gl.h"
-#include "command_buffer/service/cross/gl/sampler_gl.h"
-#include "command_buffer/service/cross/gl/texture_gl.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"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/win/d3d9/geometry_d3d9.cc b/o3d/command_buffer/service/geometry_d3d9.cc
index 707de92..8fb3f35 100644
--- a/o3d/command_buffer/service/win/d3d9/geometry_d3d9.cc
+++ b/o3d/command_buffer/service/geometry_d3d9.cc
@@ -35,9 +35,9 @@
 // This file also contains the related GAPID3D9 function implementations.
 
 #include <algorithm>
-#include "command_buffer/service/win/d3d9/d3d9_utils.h"
-#include "command_buffer/service/win/d3d9/geometry_d3d9.h"
-#include "command_buffer/service/win/d3d9/gapi_d3d9.h"
+#include "command_buffer/service/d3d9_utils.h"
+#include "command_buffer/service/geometry_d3d9.h"
+#include "command_buffer/service/gapi_d3d9.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/win/d3d9/geometry_d3d9.h b/o3d/command_buffer/service/geometry_d3d9.h
index c392639..201a69e 100644
--- a/o3d/command_buffer/service/win/d3d9/geometry_d3d9.h
+++ b/o3d/command_buffer/service/geometry_d3d9.h
@@ -38,9 +38,9 @@
 
 #include <vector>
 #include <utility>
-#include "command_buffer/common/cross/gapi_interface.h"
-#include "command_buffer/service/win/d3d9/d3d9_utils.h"
-#include "command_buffer/service/cross/resource.h"
+#include "command_buffer/common/gapi_interface.h"
+#include "command_buffer/service/d3d9_utils.h"
+#include "command_buffer/service/resource.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/cross/gl/geometry_gl.cc b/o3d/command_buffer/service/geometry_gl.cc
index f4aa7f2..f6194a2 100644
--- a/o3d/command_buffer/service/cross/gl/geometry_gl.cc
+++ b/o3d/command_buffer/service/geometry_gl.cc
@@ -33,8 +33,8 @@
 // This file contains the implementation of the VertexBufferGL, IndexBufferGL
 // and VertexStructGL classes, as well as the geometry-related GAPI functions.
 
-#include "command_buffer/service/cross/gl/gapi_gl.h"
-#include "command_buffer/service/cross/gl/geometry_gl.h"
+#include "command_buffer/service/gapi_gl.h"
+#include "command_buffer/service/geometry_gl.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/cross/gl/geometry_gl.h b/o3d/command_buffer/service/geometry_gl.h
index b71c4e0..4849330 100644
--- a/o3d/command_buffer/service/cross/gl/geometry_gl.h
+++ b/o3d/command_buffer/service/geometry_gl.h
@@ -36,9 +36,9 @@
 #ifndef GPU_COMMAND_BUFFER_SERVICE_CROSS_GL_GEOMETRY_GL_H_
 #define GPU_COMMAND_BUFFER_SERVICE_CROSS_GL_GEOMETRY_GL_H_
 
-#include "command_buffer/common/cross/gapi_interface.h"
-#include "command_buffer/service/cross/resource.h"
-#include "command_buffer/service/cross/gl/gl_utils.h"
+#include "command_buffer/common/gapi_interface.h"
+#include "command_buffer/service/resource.h"
+#include "command_buffer/service/gl_utils.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/cross/gl/gl_utils.h b/o3d/command_buffer/service/gl_utils.h
index 2034260..2034260 100644
--- a/o3d/command_buffer/service/cross/gl/gl_utils.h
+++ b/o3d/command_buffer/service/gl_utils.h
diff --git a/o3d/command_buffer/service/cross/mocks.h b/o3d/command_buffer/service/mocks.h
index 6ad4bee..9cbfe67 100644
--- a/o3d/command_buffer/service/cross/mocks.h
+++ b/o3d/command_buffer/service/mocks.h
@@ -41,8 +41,8 @@
 
 #include <vector>
 #include "gmock/gmock.h"
-#include "command_buffer/service/cross/cmd_parser.h"
-#include "command_buffer/service/cross/cmd_buffer_engine.h"
+#include "command_buffer/service/cmd_parser.h"
+#include "command_buffer/service/cmd_buffer_engine.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/service/cross/precompile.cc b/o3d/command_buffer/service/precompile.cc
index d95a72b..62eb0f4 100644
--- a/o3d/command_buffer/service/cross/precompile.cc
+++ b/o3d/command_buffer/service/precompile.cc
@@ -30,4 +30,4 @@
  */
 
 
-#include "command_buffer/service/cross/precompile.h"
+#include "command_buffer/service/precompile.h"
diff --git a/o3d/command_buffer/service/cross/precompile.h b/o3d/command_buffer/service/precompile.h
index 55d2b21..55d2b21 100644
--- a/o3d/command_buffer/service/cross/precompile.h
+++ b/o3d/command_buffer/service/precompile.h
diff --git a/o3d/command_buffer/service/win/d3d9/render_surface_d3d9.cc b/o3d/command_buffer/service/render_surface_d3d9.cc
index cffa51f..daa5ee2 100644
--- a/o3d/command_buffer/service/win/d3d9/render_surface_d3d9.cc
+++ b/o3d/command_buffer/service/render_surface_d3d9.cc
@@ -33,9 +33,9 @@
 // This file implements the D3D9 versions of the render surface resources,
 // as well as the related GAPID3D9 function implementations.
 
-#include "command_buffer/service/win/d3d9/render_surface_d3d9.h"
-#include "command_buffer/service/win/d3d9/gapi_d3d9.h"
-#include "command_buffer/service/win/d3d9/texture_d3d9.h"
+#include "command_buffer/service/render_surface_d3d9.h"
+#include "command_buffer/service/gapi_d3d9.h"
+#include "command_buffer/service/texture_d3d9.h"
 
 
 namespace command_buffer {
diff --git a/o3d/command_buffer/service/win/d3d9/render_surface_d3d9.h b/o3d/command_buffer/service/render_surface_d3d9.h
index 2f84fa1..1094a5b 100644
--- a/o3d/command_buffer/service/win/d3d9/render_surface_d3d9.h
+++ b/o3d/command_buffer/service/render_surface_d3d9.h
@@ -38,10 +38,10 @@
 
 #include <d3d9.h>
 #include "base/scoped_ptr.h"
-#include "command_buffer/common/cross/gapi_interface.h"
-#include "command_buffer/service/cross/resource.h"
-#include "command_buffer/service/win/d3d9/d3d9_utils.h"
-#include "command_buffer/service/win/d3d9/texture_d3d9.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"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/cross/gl/render_surface_gl.cc b/o3d/command_buffer/service/render_surface_gl.cc
index acc40f8..1c06131 100644
--- a/o3d/command_buffer/service/cross/gl/render_surface_gl.cc
+++ b/o3d/command_buffer/service/render_surface_gl.cc
@@ -33,8 +33,8 @@
 // This file implements the OpenGL versions of the render surface resources,
 // as well as the related GAPIGL function implementations.
 
-#include "command_buffer/service/cross/gl/gapi_gl.h"
-#include "command_buffer/service/cross/gl/render_surface_gl.h"
+#include "command_buffer/service/gapi_gl.h"
+#include "command_buffer/service/render_surface_gl.h"
 
 
 namespace command_buffer {
diff --git a/o3d/command_buffer/service/cross/gl/render_surface_gl.h b/o3d/command_buffer/service/render_surface_gl.h
index ceeae5b..db6860d 100644
--- a/o3d/command_buffer/service/cross/gl/render_surface_gl.h
+++ b/o3d/command_buffer/service/render_surface_gl.h
@@ -36,8 +36,8 @@
 // This file contains the definition of the OpenGL versions of
 // render surface-related resource classes.
 
-#include "command_buffer/service/cross/gl/texture_gl.h"
-#include "command_buffer/service/cross/resource.h"
+#include "command_buffer/service/texture_gl.h"
+#include "command_buffer/service/resource.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/cross/resource.cc b/o3d/command_buffer/service/resource.cc
index 8479355..c09b450 100644
--- a/o3d/command_buffer/service/cross/resource.cc
+++ b/o3d/command_buffer/service/resource.cc
@@ -32,7 +32,7 @@
 
 // This file contains the implementation of ResourceMapBase.
 
-#include "command_buffer/service/cross/resource.h"
+#include "command_buffer/service/resource.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/service/cross/resource.h b/o3d/command_buffer/service/resource.h
index 2571caa..6a2c2e2 100644
--- a/o3d/command_buffer/service/cross/resource.h
+++ b/o3d/command_buffer/service/resource.h
@@ -37,7 +37,7 @@
 
 #include <vector>
 #include "base/scoped_ptr.h"
-#include "command_buffer/common/cross/resource.h"
+#include "command_buffer/common/resource.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/service/cross/resource_test.cc b/o3d/command_buffer/service/resource_test.cc
index 65b89af..ed6154a 100644
--- a/o3d/command_buffer/service/cross/resource_test.cc
+++ b/o3d/command_buffer/service/resource_test.cc
@@ -33,7 +33,7 @@
 // Tests for the ResourceMap.
 
 #include "tests/common/win/testing_common.h"
-#include "command_buffer/service/cross/resource.h"
+#include "command_buffer/service/resource.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/service/win/d3d9/sampler_d3d9.cc b/o3d/command_buffer/service/sampler_d3d9.cc
index 6f6789b..1436d26 100644
--- a/o3d/command_buffer/service/win/d3d9/sampler_d3d9.cc
+++ b/o3d/command_buffer/service/sampler_d3d9.cc
@@ -32,9 +32,9 @@
 
 // This file contains the implementation of the SamplerD3D9 class.
 
-#include "command_buffer/service/win/d3d9/gapi_d3d9.h"
-#include "command_buffer/service/win/d3d9/sampler_d3d9.h"
-#include "command_buffer/service/win/d3d9/texture_d3d9.h"
+#include "command_buffer/service/gapi_d3d9.h"
+#include "command_buffer/service/sampler_d3d9.h"
+#include "command_buffer/service/texture_d3d9.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/win/d3d9/sampler_d3d9.h b/o3d/command_buffer/service/sampler_d3d9.h
index 6026183..2f1c31b 100644
--- a/o3d/command_buffer/service/win/d3d9/sampler_d3d9.h
+++ b/o3d/command_buffer/service/sampler_d3d9.h
@@ -36,9 +36,9 @@
 #ifndef GPU_COMMAND_BUFFER_SERVICE_WIN_D3D9_SAMPLER_D3D9_H_
 #define GPU_COMMAND_BUFFER_SERVICE_WIN_D3D9_SAMPLER_D3D9_H_
 
-#include "command_buffer/common/cross/gapi_interface.h"
-#include "command_buffer/service/win/d3d9/d3d9_utils.h"
-#include "command_buffer/service/cross/resource.h"
+#include "command_buffer/common/gapi_interface.h"
+#include "command_buffer/service/d3d9_utils.h"
+#include "command_buffer/service/resource.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/cross/gl/sampler_gl.cc b/o3d/command_buffer/service/sampler_gl.cc
index 00902d9..2c6622e 100644
--- a/o3d/command_buffer/service/cross/gl/sampler_gl.cc
+++ b/o3d/command_buffer/service/sampler_gl.cc
@@ -32,8 +32,8 @@
 
 // This file implements the sampler-related GAPI functions on GL.
 
-#include "command_buffer/service/cross/gl/gapi_gl.h"
-#include "command_buffer/service/cross/gl/sampler_gl.h"
+#include "command_buffer/service/gapi_gl.h"
+#include "command_buffer/service/sampler_gl.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/cross/gl/sampler_gl.h b/o3d/command_buffer/service/sampler_gl.h
index adb0c63..eae8f2c 100644
--- a/o3d/command_buffer/service/cross/gl/sampler_gl.h
+++ b/o3d/command_buffer/service/sampler_gl.h
@@ -35,9 +35,9 @@
 #ifndef GPU_COMMAND_BUFFER_SERVICE_CROSS_GL_SAMPLER_GL_H_
 #define GPU_COMMAND_BUFFER_SERVICE_CROSS_GL_SAMPLER_GL_H_
 
-#include "command_buffer/common/cross/gapi_interface.h"
-#include "command_buffer/service/cross/gl/gl_utils.h"
-#include "command_buffer/service/cross/resource.h"
+#include "command_buffer/common/gapi_interface.h"
+#include "command_buffer/service/gl_utils.h"
+#include "command_buffer/service/resource.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/win/d3d9/states_d3d9.cc b/o3d/command_buffer/service/states_d3d9.cc
index 317a15b..8252e28 100644
--- a/o3d/command_buffer/service/win/d3d9/states_d3d9.cc
+++ b/o3d/command_buffer/service/states_d3d9.cc
@@ -34,8 +34,8 @@
 // functions.
 
 #include <algorithm>
-#include "command_buffer/common/cross/o3d_cmd_format.h"
-#include "command_buffer/service/win/d3d9/gapi_d3d9.h"
+#include "command_buffer/common/o3d_cmd_format.h"
+#include "command_buffer/service/gapi_d3d9.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/cross/gl/states_gl.cc b/o3d/command_buffer/service/states_gl.cc
index bf87d2e..49859ec 100644
--- a/o3d/command_buffer/service/cross/gl/states_gl.cc
+++ b/o3d/command_buffer/service/states_gl.cc
@@ -32,8 +32,8 @@
 
 // This file implements the render state-related GAPI functions on GL.
 
-#include "command_buffer/common/cross/o3d_cmd_format.h"
-#include "command_buffer/service/cross/gl/gapi_gl.h"
+#include "command_buffer/common/o3d_cmd_format.h"
+#include "command_buffer/service/gapi_gl.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/win/d3d9/texture_d3d9.cc b/o3d/command_buffer/service/texture_d3d9.cc
index 3113e93..ec55850 100644
--- a/o3d/command_buffer/service/win/d3d9/texture_d3d9.cc
+++ b/o3d/command_buffer/service/texture_d3d9.cc
@@ -33,8 +33,8 @@
 // This file implements the D3D9 versions of the texture resources, as well as
 // the related GAPID3D9 function implementations.
 
-#include "command_buffer/service/win/d3d9/gapi_d3d9.h"
-#include "command_buffer/service/win/d3d9/texture_d3d9.h"
+#include "command_buffer/service/gapi_d3d9.h"
+#include "command_buffer/service/texture_d3d9.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/win/d3d9/texture_d3d9.h b/o3d/command_buffer/service/texture_d3d9.h
index e3e389b..5171d04 100644
--- a/o3d/command_buffer/service/win/d3d9/texture_d3d9.h
+++ b/o3d/command_buffer/service/texture_d3d9.h
@@ -37,10 +37,10 @@
 // resource classes.
 #include <atlbase.h>
 
-#include "command_buffer/common/cross/gapi_interface.h"
-#include "command_buffer/service/win/d3d9/d3d9_utils.h"
-#include "command_buffer/service/cross/resource.h"
-#include "command_buffer/service/cross/texture_utils.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"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/cross/gl/texture_gl.cc b/o3d/command_buffer/service/texture_gl.cc
index 4054914..954a007 100644
--- a/o3d/command_buffer/service/cross/gl/texture_gl.cc
+++ b/o3d/command_buffer/service/texture_gl.cc
@@ -32,8 +32,8 @@
 
 // This file implements the texture-related GAPI functions on GL.
 
-#include "command_buffer/service/cross/gl/gapi_gl.h"
-#include "command_buffer/service/cross/gl/texture_gl.h"
+#include "command_buffer/service/gapi_gl.h"
+#include "command_buffer/service/texture_gl.h"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/cross/gl/texture_gl.h b/o3d/command_buffer/service/texture_gl.h
index b0e6769..9037eb7 100644
--- a/o3d/command_buffer/service/cross/gl/texture_gl.h
+++ b/o3d/command_buffer/service/texture_gl.h
@@ -36,10 +36,10 @@
 #ifndef GPU_COMMAND_BUFFER_SERVICE_CROSS_GL_TEXTURE_GL_H_
 #define GPU_COMMAND_BUFFER_SERVICE_CROSS_GL_TEXTURE_GL_H_
 
-#include "command_buffer/common/cross/gapi_interface.h"
-#include "command_buffer/service/cross/gl/gl_utils.h"
-#include "command_buffer/service/cross/resource.h"
-#include "command_buffer/service/cross/texture_utils.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"
 
 namespace command_buffer {
 namespace o3d {
diff --git a/o3d/command_buffer/service/cross/texture_utils.cc b/o3d/command_buffer/service/texture_utils.cc
index c3d464c..d1d26dd 100644
--- a/o3d/command_buffer/service/cross/texture_utils.cc
+++ b/o3d/command_buffer/service/texture_utils.cc
@@ -33,7 +33,7 @@
 // This file contains the implementation of some utilities for textures.
 
 #include <stdlib.h>
-#include "command_buffer/service/cross/texture_utils.h"
+#include "command_buffer/service/texture_utils.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/service/cross/texture_utils.h b/o3d/command_buffer/service/texture_utils.h
index b6e8c00..427e06c 100644
--- a/o3d/command_buffer/service/cross/texture_utils.h
+++ b/o3d/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/cross/logging.h"
-#include "command_buffer/common/cross/resource.h"
+#include "command_buffer/common/logging.h"
+#include "command_buffer/common/resource.h"
 
 namespace command_buffer {
 
diff --git a/o3d/command_buffer/service/linux/x_utils.cc b/o3d/command_buffer/service/x_utils.cc
index 96e62db..96e62db 100644
--- a/o3d/command_buffer/service/linux/x_utils.cc
+++ b/o3d/command_buffer/service/x_utils.cc
diff --git a/o3d/command_buffer/service/linux/x_utils.h b/o3d/command_buffer/service/x_utils.h
index a05cc35..a05cc35 100644
--- a/o3d/command_buffer/service/linux/x_utils.h
+++ b/o3d/command_buffer/service/x_utils.h
diff --git a/o3d/core/cross/command_buffer/buffer_cb.cc b/o3d/core/cross/command_buffer/buffer_cb.cc
index 2d8d890..d2ee8dc 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/cross/o3d_cmd_helper.h"
-#include "command_buffer/client/cross/fenced_allocator.h"
+#include "command_buffer/client/o3d_cmd_helper.h"
+#include "command_buffer/client/fenced_allocator.h"
 
 namespace o3d {
 using command_buffer::CommandBufferEntry;
diff --git a/o3d/core/cross/command_buffer/effect_cb.cc b/o3d/core/cross/command_buffer/effect_cb.cc
index a8ceb54..a3b5e66 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/cross/constants.h"
-#include "command_buffer/common/cross/o3d_cmd_format.h"
-#include "command_buffer/client/cross/fenced_allocator.h"
-#include "command_buffer/client/cross/o3d_cmd_helper.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"
 
 namespace o3d {
 
diff --git a/o3d/core/cross/command_buffer/effect_cb.h b/o3d/core/cross/command_buffer/effect_cb.h
index 1b511fd..d193b55 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/cross/effect_helper.h"
+#include "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 05d7924..b850ffb 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/cross/o3d_cmd_format.h"
-#include "command_buffer/client/cross/o3d_cmd_helper.h"
+#include "command_buffer/common/o3d_cmd_format.h"
+#include "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 86051bd..68d5bbc 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/cross/gapi_interface.h"
-#include "command_buffer/client/cross/o3d_cmd_helper.h"
+#include "command_buffer/common/gapi_interface.h"
+#include "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 a8a9a04..3484a1d 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/cross/resource.h"
+#include "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 2b66d98..773f07c 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/cross/o3d_cmd_helper.h"
+#include "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 ee22e3b..81dccb8 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/cross/resource.h"

+#include "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 e964672..f4bb89d 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/cross/o3d_cmd_helper.h"
-#include "command_buffer/client/cross/fenced_allocator.h"
-#include "command_buffer/common/cross/gapi_interface.h"
+#include "command_buffer/client/o3d_cmd_helper.h"
+#include "command_buffer/client/fenced_allocator.h"
+#include "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"
diff --git a/o3d/core/cross/command_buffer/renderer_cb.h b/o3d/core/cross/command_buffer/renderer_cb.h
index e58a2bc..a424922 100644
--- a/o3d/core/cross/command_buffer/renderer_cb.h
+++ b/o3d/core/cross/command_buffer/renderer_cb.h
@@ -39,10 +39,10 @@
 #include "core/cross/precompile.h"
 #include <vector>
 #include "core/cross/renderer.h"
-#include "command_buffer/common/cross/constants.h"
-#include "command_buffer/common/cross/resource.h"
-#include "command_buffer/client/cross/fenced_allocator.h"
-#include "command_buffer/client/cross/id_allocator.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"
 
diff --git a/o3d/core/cross/command_buffer/sampler_cb.cc b/o3d/core/cross/command_buffer/sampler_cb.cc
index 8ceaa7d..32bccba 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/cross/o3d_cmd_format.h"
-#include "command_buffer/client/cross/o3d_cmd_helper.h"
+#include "command_buffer/common/o3d_cmd_format.h"
+#include "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 103c595..3543436 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/cross/resource.h"
+#include "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 c437290..6903107 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/cross/gapi_interface.h"
+#include "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 e2a1905..0b8e1cf 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/cross/o3d_cmd_format.h"
-#include "command_buffer/client/cross/cmd_buffer_helper.h"
+#include "command_buffer/common/o3d_cmd_format.h"
+#include "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 11bb06f..c10e256 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/cross/gapi_interface.h"
-#include "command_buffer/client/cross/o3d_cmd_helper.h"
+#include "command_buffer/common/gapi_interface.h"
+#include "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 015ff2d..bef497e 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/cross/resource.h"
+#include "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 f0e45fa..31c1c15 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/cross/o3d_cmd_format.h"
-#include "command_buffer/common/cross/resource.h"
-#include "command_buffer/client/cross/o3d_cmd_helper.h"
-#include "command_buffer/client/cross/fenced_allocator.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"
 
 namespace o3d {
 
diff --git a/o3d/core/cross/command_buffer/texture_cb.h b/o3d/core/cross/command_buffer/texture_cb.h
index 3c710fa..6fd21da 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/cross/resource.h"
+#include "command_buffer/common/resource.h"
 #include "core/cross/command_buffer/render_surface_cb.h"
 
 namespace o3d {
diff --git a/o3d/gpu_plugin/gpu_processor.h b/o3d/gpu_plugin/gpu_processor.h
index 6907d8a..49c6eea 100644
--- a/o3d/gpu_plugin/gpu_processor.h
+++ b/o3d/gpu_plugin/gpu_processor.h
@@ -8,16 +8,16 @@
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/shared_memory.h"
-#include "o3d/command_buffer/service/cross/cmd_buffer_engine.h"
-#include "o3d/command_buffer/service/cross/cmd_parser.h"
-#include "o3d/command_buffer/service/cross/gapi_decoder.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"
 
 #if defined(CB_SERVICE_D3D9)
-#include "o3d/command_buffer/service/win/d3d9/gapi_d3d9.h"
+#include "o3d/command_buffer/service/gapi_d3d9.h"
 #elif defined(CB_SERVICE_GL)
-#include "o3d/command_buffer/service/cross/gl/gapi_gl.h"
+#include "o3d/command_buffer/service/gapi_gl.h"
 #else
 #error command buffer service not defined
 #endif
diff --git a/o3d/gpu_plugin/gpu_processor_unittest.cc b/o3d/gpu_plugin/gpu_processor_unittest.cc
index 2a518c2..74c593c 100644
--- a/o3d/gpu_plugin/gpu_processor_unittest.cc
+++ b/o3d/gpu_plugin/gpu_processor_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "base/at_exit.h"
 #include "base/message_loop.h"
-#include "o3d/command_buffer/service/cross/mocks.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"