diff --git a/third_party/chromium/base/basictypes.h b/third_party/chromium/base/basictypes.h
index 154688d..d71abd9 100644
--- a/third_party/chromium/base/basictypes.h
+++ b/third_party/chromium/base/basictypes.h
@@ -16,7 +16,7 @@
 #include <stdint.h>  // For intptr_t.
 
 #include "base/macros.h"
-#include "base/build/build_config.h"
+#include "build/build_config.h"
 
 // DEPRECATED: Please use (u)int{8,16,32,64}_t instead (and include <stdint.h>).
 typedef int8_t int8;
diff --git a/third_party/chromium/base/bind_internal.h b/third_party/chromium/base/bind_internal.h
index 6d500a5..613f7a9 100644
--- a/third_party/chromium/base/bind_internal.h
+++ b/third_party/chromium/base/bind_internal.h
@@ -6,11 +6,11 @@
 #define BASE_BIND_INTERNAL_H_
 
 #include "base/bind_helpers.h"
-#include "base/build/build_config.h"
 #include "base/callback_internal.h"
 #include "base/memory/weak_ptr.h"
 #include "base/template_util.h"
 #include "base/tuple.h"
+#include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include "base/bind_internal_win.h"
diff --git a/third_party/chromium/base/compiler_specific.h b/third_party/chromium/base/compiler_specific.h
index 8c2ba34..63297dc 100644
--- a/third_party/chromium/base/compiler_specific.h
+++ b/third_party/chromium/base/compiler_specific.h
@@ -5,7 +5,7 @@
 #ifndef BASE_COMPILER_SPECIFIC_H_
 #define BASE_COMPILER_SPECIFIC_H_
 
-#include "base/build/build_config.h"
+#include "build/build_config.h"
 
 #if defined(COMPILER_MSVC)
 
diff --git a/third_party/chromium/base/guid.h b/third_party/chromium/base/guid.h
index a43a223..11fd812 100644
--- a/third_party/chromium/base/guid.h
+++ b/third_party/chromium/base/guid.h
@@ -9,7 +9,7 @@
 
 #include "base/base_export.h"
 #include "base/basictypes.h"
-#include "base/build/build_config.h"
+#include "build/build_config.h"
 
 namespace base {
 
diff --git a/third_party/chromium/base/json/json_reader_unittest.cc b/third_party/chromium/base/json/json_reader_unittest.cc
index a5f2530..35becef 100644
--- a/third_party/chromium/base/json/json_reader_unittest.cc
+++ b/third_party/chromium/base/json/json_reader_unittest.cc
@@ -6,12 +6,12 @@
 
 #include <gtest/gtest.h>
 
-#include "base/build/build_config.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversion_utils.h"
 #include "base/values.h"
+#include "build/build_config.h"
 
 namespace base {
 
diff --git a/third_party/chromium/base/location.cc b/third_party/chromium/base/location.cc
index 4b57912..98f874a 100644
--- a/third_party/chromium/base/location.cc
+++ b/third_party/chromium/base/location.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 "base/build/build_config.h"
+#include "build/build_config.h"
 
 #if defined(COMPILER_MSVC)
 #include <intrin.h>
diff --git a/third_party/chromium/base/logging.h b/third_party/chromium/base/logging.h
index 61e9f9d..339f8a6 100644
--- a/third_party/chromium/base/logging.h
+++ b/third_party/chromium/base/logging.h
@@ -12,7 +12,7 @@
 
 #include "base/base_export.h"
 #include "base/basictypes.h"
-#include "base/build/build_config.h"
+#include "build/build_config.h"
 
 //
 // Optional message capabilities
diff --git a/third_party/chromium/base/memory/ref_counted.h b/third_party/chromium/base/memory/ref_counted.h
index 23b9038..52e8f00 100644
--- a/third_party/chromium/base/memory/ref_counted.h
+++ b/third_party/chromium/base/memory/ref_counted.h
@@ -10,10 +10,10 @@
 #include <iosfwd>
 
 #include "base/base_export.h"
-#include "base/build/build_config.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/move.h"
+#include "build/build_config.h"
 
 namespace base {
 
diff --git a/third_party/chromium/base/posix/eintr_wrapper.h b/third_party/chromium/base/posix/eintr_wrapper.h
index 27de8fc..5a5dc75 100644
--- a/third_party/chromium/base/posix/eintr_wrapper.h
+++ b/third_party/chromium/base/posix/eintr_wrapper.h
@@ -16,7 +16,7 @@
 #ifndef BASE_POSIX_EINTR_WRAPPER_H_
 #define BASE_POSIX_EINTR_WRAPPER_H_
 
-#include "base/build/build_config.h"
+#include "build/build_config.h"
 
 #if defined(OS_POSIX)
 
diff --git a/third_party/chromium/base/template_util.h b/third_party/chromium/base/template_util.h
index f8f507b..4b1c808 100644
--- a/third_party/chromium/base/template_util.h
+++ b/third_party/chromium/base/template_util.h
@@ -8,7 +8,7 @@
 #include <cstddef>  // For size_t.
 #include <type_traits>
 
-#include "base/build/build_config.h"
+#include "build/build_config.h"
 
 namespace base {
 
diff --git a/third_party/chromium/base/time/time.h b/third_party/chromium/base/time/time.h
index f421539..1fe1b85 100644
--- a/third_party/chromium/base/time/time.h
+++ b/third_party/chromium/base/time/time.h
@@ -61,8 +61,8 @@
 
 #include "base/base_export.h"
 #include "base/basictypes.h"
-#include "base/build/build_config.h"
 #include "base/numerics/safe_math.h"
+#include "build/build_config.h"
 
 #if defined(OS_MACOSX)
 #include <CoreFoundation/CoreFoundation.h>
diff --git a/third_party/chromium/base/time/time_posix.cc b/third_party/chromium/base/time/time_posix.cc
index 2825ce5..e8e56c2 100644
--- a/third_party/chromium/base/time/time_posix.cc
+++ b/third_party/chromium/base/time/time_posix.cc
@@ -16,8 +16,8 @@
 #include <ostream>
 
 #include "base/basictypes.h"
-#include "base/build/build_config.h"
 #include "base/logging.h"
+#include "build/build_config.h"
 
 namespace {
 
diff --git a/third_party/chromium/base/time/time_unittest.cc b/third_party/chromium/base/time/time_unittest.cc
index 508244a..737796c 100644
--- a/third_party/chromium/base/time/time_unittest.cc
+++ b/third_party/chromium/base/time/time_unittest.cc
@@ -14,7 +14,7 @@
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
-#include "base/build/build_config.h"
+#include "build/build_config.h"
 
 namespace base {
 
diff --git a/third_party/chromium/base/build/build_config.h b/third_party/chromium/build/build_config.h
similarity index 100%
rename from third_party/chromium/base/build/build_config.h
rename to third_party/chromium/build/build_config.h
diff --git a/third_party/modp_b64/modp_b64.cc b/third_party/modp_b64/modp_b64.cc
index 8db2ed1..6624ec5 100644
--- a/third_party/modp_b64/modp_b64.cc
+++ b/third_party/modp_b64/modp_b64.cc
@@ -45,7 +45,7 @@
 /* public header */
 #include "modp_b64.h"
 
-#include <base/build/build_config.h>
+#include <build/build_config.h>
 
 #undef WORDS_BIGENDIAN
 #if !defined(ARCH_CPU_LITTLE_ENDIAN)