8 files changed, 16 insertions, 16 deletions
diff --git a/sandbox/src/eat_resolver.cc b/sandbox/src/eat_resolver.cc
index d4f6e83..f057006 100644
--- a/sandbox/src/eat_resolver.cc
+++ b/sandbox/src/eat_resolver.cc
@@ -4,7 +4,7 @@
 
 #include "sandbox/src/eat_resolver.h"
 
-#include "base/pe_image.h"
+#include "base/win/pe_image.h"
 #include "sandbox/src/sandbox_nt_util.h"
 
 namespace sandbox {
@@ -64,7 +64,7 @@ NTSTATUS EatResolverThunk::ResolveTarget(const void* module,
   if (!module)
     return STATUS_INVALID_PARAMETER;
 
-  PEImage pe(module);
+  base::win::PEImage pe(module);
   if (!pe.VerifyMagic())
     return STATUS_INVALID_IMAGE_FORMAT;
 
diff --git a/sandbox/src/interception.cc b/sandbox/src/interception.cc
index 28edf2c..003ebd8 100644
--- a/sandbox/src/interception.cc
+++ b/sandbox/src/interception.cc
@@ -10,8 +10,8 @@
 #include "sandbox/src/interception.h"
 
 #include "base/logging.h"
-#include "base/pe_image.h"
 #include "base/scoped_ptr.h"
+#include "base/win/pe_image.h"
 #include "sandbox/src/interception_internal.h"
 #include "sandbox/src/interceptors.h"
 #include "sandbox/src/sandbox.h"
@@ -411,7 +411,7 @@ bool InterceptionManager::PatchClientFunctions(DllInterceptionData* thunks,
   if (!ntdll_base)
     return false;
 
-  PEImage ntdll_image(ntdll_base);
+  base::win::PEImage ntdll_image(ntdll_base);
 
   // Bypass purify's interception.
   wchar_t* loader_get = reinterpret_cast<wchar_t*>(
diff --git a/sandbox/src/policy_broker.cc b/sandbox/src/policy_broker.cc
index ff67667..0a63750 100644
--- a/sandbox/src/policy_broker.cc
+++ b/sandbox/src/policy_broker.cc
@@ -7,7 +7,7 @@
 #include "sandbox/src/policy_broker.h"
 
 #include "base/logging.h"
-#include "base/pe_image.h"
+#include "base/win/pe_image.h"
 #include "base/win/windows_version.h"
 #include "sandbox/src/interception.h"
 #include "sandbox/src/interceptors.h"
@@ -41,7 +41,7 @@ SANDBOX_INTERCEPT NtExports g_nt;
 
 bool SetupNtdllImports(TargetProcess *child) {
   HMODULE ntdll = ::GetModuleHandle(kNtdllName);
-  PEImage ntdll_image(ntdll);
+  base::win::PEImage ntdll_image(ntdll);
 
   // Bypass purify's interception.
   wchar_t* loader_get = reinterpret_cast<wchar_t*>(
diff --git a/sandbox/src/resolver.cc b/sandbox/src/resolver.cc
index 7ed02e4..295bfb2 100644
--- a/sandbox/src/resolver.cc
+++ b/sandbox/src/resolver.cc
@@ -4,7 +4,7 @@
 
 #include "sandbox/src/resolver.h"
 
-#include "base/pe_image.h"
+#include "base/win/pe_image.h"
 #include "sandbox/src/sandbox_nt_util.h"
 
 namespace sandbox {
@@ -47,7 +47,7 @@ NTSTATUS ResolverThunk::ResolveInterceptor(const void* interceptor_module,
   if (!interceptor_module)
     return STATUS_INVALID_PARAMETER;
 
-  PEImage pe(interceptor_module);
+  base::win::PEImage pe(interceptor_module);
   if (!pe.VerifyMagic())
     return STATUS_INVALID_IMAGE_FORMAT;
 
diff --git a/sandbox/src/sandbox_nt_util.cc b/sandbox/src/sandbox_nt_util.cc
index 89da4e0..20035b3 100644
--- a/sandbox/src/sandbox_nt_util.cc
+++ b/sandbox/src/sandbox_nt_util.cc
@@ -4,7 +4,7 @@
 
 #include "sandbox/src/sandbox_nt_util.h"
 
-#include "base/pe_image.h"
+#include "base/win/pe_image.h"
 #include "sandbox/src/sandbox_factory.h"
 #include "sandbox/src/target_services.h"
 
@@ -357,7 +357,7 @@ UNICODE_STRING* GetImageInfoFromModule(HMODULE module, uint32* flags) {
   __try {
     do {
       *flags = 0;
-      PEImage pe(module);
+      base::win::PEImage pe(module);
 
       if (!pe.VerifyMagic())
         break;
diff --git a/sandbox/src/service_resolver.cc b/sandbox/src/service_resolver.cc
index 728555e..79579a0 100644
--- a/sandbox/src/service_resolver.cc
+++ b/sandbox/src/service_resolver.cc
@@ -5,7 +5,7 @@
 #include "sandbox/src/service_resolver.h"
 
 #include "base/logging.h"
-#include "base/pe_image.h"
+#include "base/win/pe_image.h"
 
 namespace sandbox {
 
@@ -28,7 +28,7 @@ NTSTATUS ServiceResolverThunk::ResolveTarget(const void* module,
   if (NULL == module)
     return STATUS_UNSUCCESSFUL;
 
-  PEImage module_image(module);
+  base::win::PEImage module_image(module);
   *address = module_image.GetProcAddress(function_name);
 
   if (NULL == *address) {
diff --git a/sandbox/src/sidestep_resolver.cc b/sandbox/src/sidestep_resolver.cc
index 74409a8..0a2803c 100644
--- a/sandbox/src/sidestep_resolver.cc
+++ b/sandbox/src/sidestep_resolver.cc
@@ -4,7 +4,7 @@
 
 #include "sandbox/src/sidestep_resolver.h"
 
-#include "base/pe_image.h"
+#include "base/win/pe_image.h"
 #include "sandbox/src/sandbox_nt_util.h"
 #include "sandbox/src/sidestep/preamble_patcher.h"
 
@@ -191,7 +191,7 @@ bool SmartSidestepResolverThunk::IsInternalCall(const void* base,
   DCHECK_NT(base);
   DCHECK_NT(return_address);
 
-  PEImage pe(base);
+  base::win::PEImage pe(base);
   if (pe.GetImageSectionFromAddr(return_address))
     return true;
   return false;
diff --git a/sandbox/src/target_process.cc b/sandbox/src/target_process.cc
index a9848c5..1341949 100644
--- a/sandbox/src/target_process.cc
+++ b/sandbox/src/target_process.cc
@@ -5,8 +5,8 @@
 #include "sandbox/src/target_process.h"
 
 #include "base/basictypes.h"
-#include "base/pe_image.h"
 #include "base/scoped_ptr.h"
+#include "base/win/pe_image.h"
 #include "sandbox/src/crosscall_server.h"
 #include "sandbox/src/crosscall_client.h"
 #include "sandbox/src/policy_low_level.h"
@@ -54,7 +54,7 @@ void* GetBaseAddress(const wchar_t* exe_name, void* entry_point) {
   if (NULL == exe)
     return exe;
 
-  PEImage pe(exe);
+  base::win::PEImage pe(exe);
   if (!pe.VerifyMagic()) {
     ::FreeLibrary(exe);
     return exe;