diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 8476be0cf..f7624ac25 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -175,8 +175,8 @@ endif ()
 
 set (
   SOURCES
-  "src/base/strings/string_piece.cc"
   "src/phonenumbers/asyoutypeformatter.cc"
+  "src/phonenumbers/base/strings/string_piece.cc"
   "src/phonenumbers/default_logger.cc"
   "src/phonenumbers/logger.cc"
   "src/phonenumbers/phonemetadata.pb.cc" # Generated by Protocol Buffers.
@@ -500,16 +500,19 @@ if (${BUILD_GEOCODER} STREQUAL "ON")
   )
 endif ()
 
-install (FILES "src/base/basictypes.h" DESTINATION include/base/)
+install (
+  FILES "src/phonenumbers/base/basictypes.h"
+  DESTINATION include/phonenumbers/base/
+)
 
 install (FILES
-  "src/base/memory/scoped_ptr.h"
-  "src/base/memory/singleton.h"
-  DESTINATION include/base/memory/
+  "src/phonenumbers/base/memory/scoped_ptr.h"
+  "src/phonenumbers/base/memory/singleton.h"
+  DESTINATION include/phonenumbers/base/memory/
 )
 
-install (FILES "src/base/synchronization/lock.h"
-         DESTINATION include/base/synchronization/)
+install (FILES "src/phonenumbers/base/synchronization/lock.h"
+         DESTINATION include/phonenumbers/base/synchronization/)
 
 install (TARGETS phonenumber LIBRARY DESTINATION lib/ ARCHIVE DESTINATION lib/)
 
diff --git a/cpp/src/phonenumbers/asyoutypeformatter.cc b/cpp/src/phonenumbers/asyoutypeformatter.cc
index beef03b29..e80a04ef3 100644
--- a/cpp/src/phonenumbers/asyoutypeformatter.cc
+++ b/cpp/src/phonenumbers/asyoutypeformatter.cc
@@ -20,8 +20,8 @@
 
 #include <google/protobuf/message_lite.h>
 
-#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
+#include "phonenumbers/base/logging.h"
+#include "phonenumbers/base/memory/scoped_ptr.h"
 #include "phonenumbers/phonemetadata.pb.h"
 #include "phonenumbers/phonenumberutil.h"
 #include "phonenumbers/regexp_cache.h"
diff --git a/cpp/src/phonenumbers/asyoutypeformatter.h b/cpp/src/phonenumbers/asyoutypeformatter.h
index 690bb9c63..e1f850b8d 100644
--- a/cpp/src/phonenumbers/asyoutypeformatter.h
+++ b/cpp/src/phonenumbers/asyoutypeformatter.h
@@ -36,8 +36,8 @@
 #include <list>
 #include <string>
 
-#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
+#include "phonenumbers/base/basictypes.h"
+#include "phonenumbers/base/memory/scoped_ptr.h"
 #include "phonenumbers/regexp_adapter.h"
 #include "phonenumbers/regexp_cache.h"
 #include "phonenumbers/phonemetadata.pb.h"
diff --git a/cpp/src/base/basictypes.h b/cpp/src/phonenumbers/base/basictypes.h
similarity index 98%
rename from cpp/src/base/basictypes.h
rename to cpp/src/phonenumbers/base/basictypes.h
index eec8203ec..4a9d6937a 100644
--- a/cpp/src/base/basictypes.h
+++ b/cpp/src/phonenumbers/base/basictypes.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 BASE_BASICTYPES_H_
-#define BASE_BASICTYPES_H_
+#ifndef I18N_PHONENUMBERS_BASE_BASICTYPES_H_
+#define I18N_PHONENUMBERS_BASE_BASICTYPES_H_
 #pragma once
 
 #include <limits.h>         // So we can set the bounds of our types
@@ -299,4 +299,4 @@ namespace base {
 enum LinkerInitialized { LINKER_INITIALIZED };
 }  // base
 
-#endif  // BASE_BASICTYPES_H_
+#endif  // I18N_PHONENUMBERS_BASE_BASICTYPES_H_
diff --git a/cpp/src/base/logging.h b/cpp/src/phonenumbers/base/logging.h
similarity index 89%
rename from cpp/src/base/logging.h
rename to cpp/src/phonenumbers/base/logging.h
index a8ffa03b7..6cca5c607 100644
--- a/cpp/src/base/logging.h
+++ b/cpp/src/phonenumbers/base/logging.h
@@ -16,8 +16,8 @@
 
 // This file provides a minimalist implementation of common macros.
 
-#ifndef BASE_LOGGING_H_
-#define BASE_LOGGING_H_
+#ifndef I18N_PHONENUMBERS_BASE_LOGGING_H_
+#define I18N_PHONENUMBERS_BASE_LOGGING_H_
 
 #include <cassert>
 
@@ -34,4 +34,4 @@ template <typename T> T* CHECK_NOTNULL(T* ptr) {
   return ptr;
 }
 
-#endif  // BASE_LOGGING_H_
+#endif  // I18N_PHONENUMBERS_BASE_LOGGING_H_
diff --git a/cpp/src/base/memory/scoped_ptr.h b/cpp/src/phonenumbers/base/memory/scoped_ptr.h
similarity index 100%
rename from cpp/src/base/memory/scoped_ptr.h
rename to cpp/src/phonenumbers/base/memory/scoped_ptr.h
diff --git a/cpp/src/base/memory/singleton.h b/cpp/src/phonenumbers/base/memory/singleton.h
similarity index 100%
rename from cpp/src/base/memory/singleton.h
rename to cpp/src/phonenumbers/base/memory/singleton.h
diff --git a/cpp/src/base/strings/string_piece.cc b/cpp/src/phonenumbers/base/strings/string_piece.cc
similarity index 99%
rename from cpp/src/base/strings/string_piece.cc
rename to cpp/src/phonenumbers/base/strings/string_piece.cc
index fed872fce..774c94eef 100644
--- a/cpp/src/base/strings/string_piece.cc
+++ b/cpp/src/phonenumbers/base/strings/string_piece.cc
@@ -6,7 +6,7 @@
 #include <algorithm>
 #include <ostream>
 
-#include "base/strings/string_piece.h"
+#include "phonenumbers/base/strings/string_piece.h"
 
 namespace base {
 
diff --git a/cpp/src/base/strings/string_piece.h b/cpp/src/phonenumbers/base/strings/string_piece.h
similarity index 96%
rename from cpp/src/base/strings/string_piece.h
rename to cpp/src/phonenumbers/base/strings/string_piece.h
index 28c9b9407..8ff86330d 100644
--- a/cpp/src/base/strings/string_piece.h
+++ b/cpp/src/phonenumbers/base/strings/string_piece.h
@@ -15,13 +15,13 @@
 // conversions from "const char*" to "string" and back again.
 //
 
-#ifndef BASE_STRINGS_STRING_PIECE_H_
-#define BASE_STRINGS_STRING_PIECE_H_
+#ifndef I18N_PHONENUMBERS_BASE_STRINGS_STRING_PIECE_H_
+#define I18N_PHONENUMBERS_BASE_STRINGS_STRING_PIECE_H_
 #pragma once
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "phonenumbers/base/basictypes.h"
 
 namespace base {
 
@@ -189,4 +189,4 @@ inline bool operator>=(const StringPiece& x, const StringPiece& y) {
 
 }  // namespace base
 
-#endif  // BASE_STRINGS_STRING_PIECE_H_
+#endif  // I18N_PHONENUMBERS_BASE_STRINGS_STRING_PIECE_H_
diff --git a/cpp/src/base/synchronization/lock.h b/cpp/src/phonenumbers/base/synchronization/lock.h
similarity index 100%
rename from cpp/src/base/synchronization/lock.h
rename to cpp/src/phonenumbers/base/synchronization/lock.h
diff --git a/cpp/src/phonenumbers/encoding_utils.h b/cpp/src/phonenumbers/encoding_utils.h
index 415ce6230..d42718328 100644
--- a/cpp/src/phonenumbers/encoding_utils.h
+++ b/cpp/src/phonenumbers/encoding_utils.h
@@ -15,7 +15,7 @@
 #ifndef I18N_PHONENUMBERS_ENCODING_UTILS_H_
 #define I18N_PHONENUMBERS_ENCODING_UTILS_H_
 
-#include "base/basictypes.h"
+#include "phonenumbers/base/basictypes.h"
 #include "phonenumbers/utf/unilib.h"
 #include "phonenumbers/utf/utf.h"
 
diff --git a/cpp/src/phonenumbers/geocoding/area_code_map.h b/cpp/src/phonenumbers/geocoding/area_code_map.h
index ea6b34814..c9bd1de24 100644
--- a/cpp/src/phonenumbers/geocoding/area_code_map.h
+++ b/cpp/src/phonenumbers/geocoding/area_code_map.h
@@ -20,8 +20,8 @@
 #include <map>
 #include <string>
 
-#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
+#include "phonenumbers/base/basictypes.h"
+#include "phonenumbers/base/memory/scoped_ptr.h"
 
 namespace i18n {
 namespace phonenumbers {
diff --git a/cpp/src/phonenumbers/geocoding/default_map_storage.cc b/cpp/src/phonenumbers/geocoding/default_map_storage.cc
index 2ea3daa2e..5c4ae4bee 100644
--- a/cpp/src/phonenumbers/geocoding/default_map_storage.cc
+++ b/cpp/src/phonenumbers/geocoding/default_map_storage.cc
@@ -16,8 +16,8 @@
 
 #include "phonenumbers/geocoding/default_map_storage.h"
 
-#include "base/basictypes.h"
-#include "base/logging.h"
+#include "phonenumbers/base/basictypes.h"
+#include "phonenumbers/base/logging.h"
 #include "phonenumbers/geocoding/geocoding_data.h"
 
 namespace i18n {
diff --git a/cpp/src/phonenumbers/geocoding/default_map_storage.h b/cpp/src/phonenumbers/geocoding/default_map_storage.h
index a2a276f5d..750985ca3 100644
--- a/cpp/src/phonenumbers/geocoding/default_map_storage.h
+++ b/cpp/src/phonenumbers/geocoding/default_map_storage.h
@@ -19,7 +19,7 @@
 #ifndef I18N_PHONENUMBERS_DEFAULT_MAP_STORAGE_H_
 #define I18N_PHONENUMBERS_DEFAULT_MAP_STORAGE_H_
 
-#include "base/basictypes.h"
+#include "phonenumbers/base/basictypes.h"
 
 namespace i18n {
 namespace phonenumbers {
diff --git a/cpp/src/phonenumbers/geocoding/geocoding_data.h b/cpp/src/phonenumbers/geocoding/geocoding_data.h
index 90f7956a2..37f1bd653 100644
--- a/cpp/src/phonenumbers/geocoding/geocoding_data.h
+++ b/cpp/src/phonenumbers/geocoding/geocoding_data.h
@@ -17,7 +17,7 @@
 #ifndef I18N_PHONENUMBERS_GEOCODING_DATA
 #define I18N_PHONENUMBERS_GEOCODING_DATA
 
-#include "base/basictypes.h"
+#include "phonenumbers/base/basictypes.h"
 
 namespace i18n {
 namespace phonenumbers {
diff --git a/cpp/src/phonenumbers/geocoding/mapping_file_provider.h b/cpp/src/phonenumbers/geocoding/mapping_file_provider.h
index 1234a5e57..88f282ac7 100644
--- a/cpp/src/phonenumbers/geocoding/mapping_file_provider.h
+++ b/cpp/src/phonenumbers/geocoding/mapping_file_provider.h
@@ -19,7 +19,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "phonenumbers/base/basictypes.h"
 
 namespace i18n {
 namespace phonenumbers {
diff --git a/cpp/src/phonenumbers/geocoding/phonenumber_offline_geocoder.h b/cpp/src/phonenumbers/geocoding/phonenumber_offline_geocoder.h
index e0389b7dd..243404c46 100644
--- a/cpp/src/phonenumbers/geocoding/phonenumber_offline_geocoder.h
+++ b/cpp/src/phonenumbers/geocoding/phonenumber_offline_geocoder.h
@@ -22,8 +22,8 @@
 
 #include <unicode/locid.h>  // NOLINT(build/include_order)
 
-#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
+#include "phonenumbers/base/basictypes.h"
+#include "phonenumbers/base/memory/scoped_ptr.h"
 
 namespace i18n {
 namespace phonenumbers {
diff --git a/cpp/src/phonenumbers/phonenumbermatch.h b/cpp/src/phonenumbers/phonenumbermatch.h
index 5ebfd9d5b..8cc7dc3f2 100644
--- a/cpp/src/phonenumbers/phonenumbermatch.h
+++ b/cpp/src/phonenumbers/phonenumbermatch.h
@@ -53,7 +53,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "phonenumbers/base/basictypes.h"
 #include "phonenumbers/phonenumber.pb.h"
 
 namespace i18n {
diff --git a/cpp/src/phonenumbers/phonenumbermatcher.cc b/cpp/src/phonenumbers/phonenumbermatcher.cc
index b15851586..039ff9048 100644
--- a/cpp/src/phonenumbers/phonenumbermatcher.cc
+++ b/cpp/src/phonenumbers/phonenumbermatcher.cc
@@ -25,9 +25,9 @@
 #endif  // USE_ICU_REGEXP
 
 #include <ctype.h>
-#include <map>
 #include <iostream>
 #include <limits>
+#include <map>
 #include <stddef.h>
 #include <string>
 #include <utility>
@@ -35,10 +35,10 @@
 
 #include <unicode/uchar.h>
 
-#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/memory/singleton.h"
 #include "phonenumbers/alternate_format.h"
+#include "phonenumbers/base/logging.h"
+#include "phonenumbers/base/memory/scoped_ptr.h"
+#include "phonenumbers/base/memory/singleton.h"
 #include "phonenumbers/callback.h"
 #include "phonenumbers/default_logger.h"
 #include "phonenumbers/encoding_utils.h"
diff --git a/cpp/src/phonenumbers/phonenumbermatcher.h b/cpp/src/phonenumbers/phonenumbermatcher.h
index ad061aece..d9ead8d4c 100644
--- a/cpp/src/phonenumbers/phonenumbermatcher.h
+++ b/cpp/src/phonenumbers/phonenumbermatcher.h
@@ -25,8 +25,8 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
+#include "phonenumbers/base/basictypes.h"
+#include "phonenumbers/base/memory/scoped_ptr.h"
 #include "phonenumbers/callback.h"
 #include "phonenumbers/regexp_adapter.h"
 
diff --git a/cpp/src/phonenumbers/phonenumberutil.cc b/cpp/src/phonenumbers/phonenumberutil.cc
index ba07b48ca..a7967a731 100644
--- a/cpp/src/phonenumbers/phonenumberutil.cc
+++ b/cpp/src/phonenumbers/phonenumberutil.cc
@@ -32,10 +32,10 @@
 #include <unicode/uchar.h>
 #include <unicode/utf8.h>
 
-#include "base/basictypes.h"
-#include "base/logging.h"
-#include "base/memory/singleton.h"
 #include "phonenumbers/asyoutypeformatter.h"
+#include "phonenumbers/base/basictypes.h"
+#include "phonenumbers/base/logging.h"
+#include "phonenumbers/base/memory/singleton.h"
 #include "phonenumbers/default_logger.h"
 #include "phonenumbers/encoding_utils.h"
 #include "phonenumbers/metadata.h"
diff --git a/cpp/src/phonenumbers/phonenumberutil.h b/cpp/src/phonenumbers/phonenumberutil.h
index fe3a83d34..1ba4ddf8c 100644
--- a/cpp/src/phonenumbers/phonenumberutil.h
+++ b/cpp/src/phonenumbers/phonenumberutil.h
@@ -28,9 +28,9 @@
 #include <utility>
 #include <vector>
 
-#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/memory/singleton.h"
+#include "phonenumbers/base/basictypes.h"
+#include "phonenumbers/base/memory/scoped_ptr.h"
+#include "phonenumbers/base/memory/singleton.h"
 #include "phonenumbers/phonenumber.pb.h"
 
 class TelephoneNumber;
diff --git a/cpp/src/phonenumbers/regexp_adapter_icu.cc b/cpp/src/phonenumbers/regexp_adapter_icu.cc
index 804d739ba..ba8215cc9 100644
--- a/cpp/src/phonenumbers/regexp_adapter_icu.cc
+++ b/cpp/src/phonenumbers/regexp_adapter_icu.cc
@@ -28,9 +28,9 @@
 #include <unicode/stringpiece.h>
 #include <unicode/unistr.h>
 
-#include "base/basictypes.h"
-#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
+#include "phonenumbers/base/basictypes.h"
+#include "phonenumbers/base/logging.h"
+#include "phonenumbers/base/memory/scoped_ptr.h"
 #include "phonenumbers/default_logger.h"
 #include "phonenumbers/string_byte_sink.h"
 
diff --git a/cpp/src/phonenumbers/regexp_adapter_re2.cc b/cpp/src/phonenumbers/regexp_adapter_re2.cc
index 500a6ca7d..64a58ed7e 100644
--- a/cpp/src/phonenumbers/regexp_adapter_re2.cc
+++ b/cpp/src/phonenumbers/regexp_adapter_re2.cc
@@ -23,8 +23,8 @@
 #include <re2/re2.h>
 #include <re2/stringpiece.h>
 
-#include "base/basictypes.h"
-#include "base/logging.h"
+#include "phonenumbers/base/basictypes.h"
+#include "phonenumbers/base/logging.h"
 #include "phonenumbers/stringutil.h"
 
 namespace i18n {
diff --git a/cpp/src/phonenumbers/regexp_cache.cc b/cpp/src/phonenumbers/regexp_cache.cc
index 50755ed4a..24adc5b54 100644
--- a/cpp/src/phonenumbers/regexp_cache.cc
+++ b/cpp/src/phonenumbers/regexp_cache.cc
@@ -20,7 +20,7 @@
 #include <string>
 #include <utility>
 
-#include "base/synchronization/lock.h"
+#include "phonenumbers/base/synchronization/lock.h"
 #include "phonenumbers/regexp_adapter.h"
 
 using std::string;
diff --git a/cpp/src/phonenumbers/regexp_cache.h b/cpp/src/phonenumbers/regexp_cache.h
index fd01de363..46234c012 100644
--- a/cpp/src/phonenumbers/regexp_cache.h
+++ b/cpp/src/phonenumbers/regexp_cache.h
@@ -30,9 +30,9 @@
 #include <cstddef>
 #include <string>
 
-#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/synchronization/lock.h"
+#include "phonenumbers/base/basictypes.h"
+#include "phonenumbers/base/memory/scoped_ptr.h"
+#include "phonenumbers/base/synchronization/lock.h"
 
 #ifdef USE_TR1_UNORDERED_MAP
 #  include <tr1/unordered_map>
diff --git a/cpp/src/phonenumbers/shortnumberutil.cc b/cpp/src/phonenumbers/shortnumberutil.cc
index 43180b6cc..acd5c828b 100644
--- a/cpp/src/phonenumbers/shortnumberutil.cc
+++ b/cpp/src/phonenumbers/shortnumberutil.cc
@@ -16,7 +16,7 @@
 
 #include "phonenumbers/shortnumberutil.h"
 
-#include "base/memory/scoped_ptr.h"
+#include "phonenumbers/base/memory/scoped_ptr.h"
 #include "phonenumbers/phonemetadata.pb.h"
 #include "phonenumbers/phonenumberutil.h"
 #include "phonenumbers/regexp_adapter.h"
diff --git a/cpp/src/phonenumbers/shortnumberutil.h b/cpp/src/phonenumbers/shortnumberutil.h
index 53758a157..32d9d87b9 100644
--- a/cpp/src/phonenumbers/shortnumberutil.h
+++ b/cpp/src/phonenumbers/shortnumberutil.h
@@ -27,7 +27,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "phonenumbers/base/basictypes.h"
 
 namespace i18n {
 namespace phonenumbers {
diff --git a/cpp/src/phonenumbers/stringutil.h b/cpp/src/phonenumbers/stringutil.h
index 55d7ee493..04f131234 100644
--- a/cpp/src/phonenumbers/stringutil.h
+++ b/cpp/src/phonenumbers/stringutil.h
@@ -21,7 +21,7 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "phonenumbers/base/basictypes.h"
 
 namespace i18n {
 namespace phonenumbers {
diff --git a/cpp/src/phonenumbers/utf/stringpiece.h b/cpp/src/phonenumbers/utf/stringpiece.h
index 82196b945..962b11701 100644
--- a/cpp/src/phonenumbers/utf/stringpiece.h
+++ b/cpp/src/phonenumbers/utf/stringpiece.h
@@ -16,7 +16,7 @@
 #ifndef STRINGS_STRINGPIECE_H_
 #define STRINGS_STRINGPIECE_H_
 
-#include "base/strings/string_piece.h"
+#include "phonenumbers/base/strings/string_piece.h"
 
 using base::StringPiece;
 
diff --git a/cpp/src/phonenumbers/utf/stringprintf.h b/cpp/src/phonenumbers/utf/stringprintf.h
index 208d338f2..e83d2b45c 100644
--- a/cpp/src/phonenumbers/utf/stringprintf.h
+++ b/cpp/src/phonenumbers/utf/stringprintf.h
@@ -17,6 +17,6 @@
 #define STRINGS_STRINGPRINTF_H_
 
 //#include "third_party/chromium/src/base/string_util.h"
-#include "base/string_util.h"
+#include "phonenumbers/base/string_util.h"
 
 #endif  // STRINGS_STRINGPRINTF_H_
diff --git a/cpp/src/phonenumbers/utf/unicodetext.cc b/cpp/src/phonenumbers/utf/unicodetext.cc
index 6d4762ec7..262a12929 100644
--- a/cpp/src/phonenumbers/utf/unicodetext.cc
+++ b/cpp/src/phonenumbers/utf/unicodetext.cc
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "phonenumbers/utf/unicodetext.h"
-//#include "base/logging.h"
+//#include "phonenumbers/base/logging.h"
 #include "phonenumbers/utf/stringpiece.h"
 //#include "utf/stringprintf.h"
 #include "phonenumbers/utf/utf.h"
diff --git a/cpp/src/phonenumbers/utf/unicodetext.h b/cpp/src/phonenumbers/utf/unicodetext.h
index fb37a33cc..990842da1 100644
--- a/cpp/src/phonenumbers/utf/unicodetext.h
+++ b/cpp/src/phonenumbers/utf/unicodetext.h
@@ -20,7 +20,7 @@
 #include <iterator>
 #include <string>
 #include <utility>
-#include "base/basictypes.h"
+#include "phonenumbers/base/basictypes.h"
 //#include "util/utf8/public/config.h"
 
 using std::string;
diff --git a/cpp/src/phonenumbers/utf/unilib.cc b/cpp/src/phonenumbers/utf/unilib.cc
index db03a11cc..064c724aa 100644
--- a/cpp/src/phonenumbers/utf/unilib.cc
+++ b/cpp/src/phonenumbers/utf/unilib.cc
@@ -18,7 +18,7 @@
 
 #include "phonenumbers/utf/unilib.h"
 
-#include "base/basictypes.h"
+#include "phonenumbers/base/basictypes.h"
 #include "phonenumbers/utf/utf.h"
 
 namespace UniLib {
diff --git a/cpp/src/phonenumbers/utf/unilib.h b/cpp/src/phonenumbers/utf/unilib.h
index 4cfc7878f..b70966c68 100644
--- a/cpp/src/phonenumbers/utf/unilib.h
+++ b/cpp/src/phonenumbers/utf/unilib.h
@@ -32,7 +32,7 @@
 #define UTIL_UTF8_UNILIB_H__
 
 #include <string>
-#include "base/basictypes.h"
+#include "phonenumbers/base/basictypes.h"
 
 namespace UniLib {
 
diff --git a/cpp/test/phonenumbers/asyoutypeformatter_test.cc b/cpp/test/phonenumbers/asyoutypeformatter_test.cc
index c9457d0a3..7581f451f 100644
--- a/cpp/test/phonenumbers/asyoutypeformatter_test.cc
+++ b/cpp/test/phonenumbers/asyoutypeformatter_test.cc
@@ -22,8 +22,8 @@
 
 #include <gtest/gtest.h>
 
-#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
+#include "phonenumbers/base/logging.h"
+#include "phonenumbers/base/memory/scoped_ptr.h"
 #include "phonenumbers/phonenumberutil.h"
 #include "phonenumbers/test_util.h"
 
diff --git a/cpp/test/phonenumbers/geocoding/geocoding_data_test.cc b/cpp/test/phonenumbers/geocoding/geocoding_data_test.cc
index bd641d430..a3b7a1968 100644
--- a/cpp/test/phonenumbers/geocoding/geocoding_data_test.cc
+++ b/cpp/test/phonenumbers/geocoding/geocoding_data_test.cc
@@ -20,7 +20,7 @@
 
 #include <gtest/gtest.h>  // NOLINT(build/include_order)
 
-#include "base/basictypes.h"
+#include "phonenumbers/base/basictypes.h"
 #include "phonenumbers/geocoding/geocoding_data.h"
 #include "phonenumbers/geocoding/geocoding_test_data.h"
 #include "phonenumbers/stringutil.h"
diff --git a/cpp/test/phonenumbers/geocoding/geocoding_test_data.h b/cpp/test/phonenumbers/geocoding/geocoding_test_data.h
index 14760a70f..e939aa9fa 100644
--- a/cpp/test/phonenumbers/geocoding/geocoding_test_data.h
+++ b/cpp/test/phonenumbers/geocoding/geocoding_test_data.h
@@ -15,7 +15,7 @@
 #ifndef I18N_PHONENUMBERS_GEOCODING_TEST_DATA
 #define I18N_PHONENUMBERS_GEOCODING_TEST_DATA
 
-#include "base/basictypes.h"
+#include "phonenumbers/base/basictypes.h"
 #include "phonenumbers/geocoding/geocoding_data.h"
 
 namespace i18n {
diff --git a/cpp/test/phonenumbers/logger_test.cc b/cpp/test/phonenumbers/logger_test.cc
index 7d16b19d7..1cdabf2de 100644
--- a/cpp/test/phonenumbers/logger_test.cc
+++ b/cpp/test/phonenumbers/logger_test.cc
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include "base/memory/scoped_ptr.h"
+#include "phonenumbers/base/memory/scoped_ptr.h"
 #include "phonenumbers/default_logger.h"
 
 namespace i18n {
diff --git a/cpp/test/phonenumbers/phonenumbermatcher_test.cc b/cpp/test/phonenumbers/phonenumbermatcher_test.cc
index a57f5de02..5a948e44a 100644
--- a/cpp/test/phonenumbers/phonenumbermatcher_test.cc
+++ b/cpp/test/phonenumbers/phonenumbermatcher_test.cc
@@ -22,9 +22,9 @@
 #include <gtest/gtest.h>
 #include <unicode/unistr.h>
 
-#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/memory/singleton.h"
+#include "phonenumbers/base/basictypes.h"
+#include "phonenumbers/base/memory/scoped_ptr.h"
+#include "phonenumbers/base/memory/singleton.h"
 #include "phonenumbers/phonenumber.h"
 #include "phonenumbers/phonenumber.pb.h"
 #include "phonenumbers/phonenumbermatch.h"
diff --git a/cpp/test/phonenumbers/regexp_adapter_test.cc b/cpp/test/phonenumbers/regexp_adapter_test.cc
index fbf41af47..80abfb59a 100644
--- a/cpp/test/phonenumbers/regexp_adapter_test.cc
+++ b/cpp/test/phonenumbers/regexp_adapter_test.cc
@@ -22,7 +22,7 @@
 
 #include <gtest/gtest.h>
 
-#include "base/memory/scoped_ptr.h"
+#include "phonenumbers/base/memory/scoped_ptr.h"
 #include "phonenumbers/stl_util.h"
 #include "phonenumbers/stringutil.h"
 
diff --git a/tools/cpp/src/cpp-build/generate_geocoding_data.cc b/tools/cpp/src/cpp-build/generate_geocoding_data.cc
index 6bd3c8ba3..ef94ef674 100644
--- a/tools/cpp/src/cpp-build/generate_geocoding_data.cc
+++ b/tools/cpp/src/cpp-build/generate_geocoding_data.cc
@@ -279,7 +279,7 @@ void WriteCppHeader(const string& base_name, FILE* output) {
   fprintf(output, "#include \"phonenumbers/geocoding/%s.h\"\n",
           base_name.c_str());
   fprintf(output, "\n");
-  fprintf(output, "#include \"base/basictypes.h\"\n");
+  fprintf(output, "#include \"phonenumbers/base/basictypes.h\"\n");
   fprintf(output, "\n");
 }