diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index cac9c84ac..8476be0cf 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -175,7 +175,7 @@ endif ()
 
 set (
   SOURCES
-  "src/base/string_piece.cc"
+  "src/base/strings/string_piece.cc"
   "src/phonenumbers/asyoutypeformatter.cc"
   "src/phonenumbers/default_logger.cc"
   "src/phonenumbers/logger.cc"
diff --git a/cpp/src/base/string_piece.cc b/cpp/src/base/strings/string_piece.cc
similarity index 99%
rename from cpp/src/base/string_piece.cc
rename to cpp/src/base/strings/string_piece.cc
index 3ccb4f043..fed872fce 100644
--- a/cpp/src/base/string_piece.cc
+++ b/cpp/src/base/strings/string_piece.cc
@@ -6,7 +6,7 @@
 #include <algorithm>
 #include <ostream>
 
-#include "base/string_piece.h"
+#include "base/strings/string_piece.h"
 
 namespace base {
 
diff --git a/cpp/src/base/string_piece.h b/cpp/src/base/strings/string_piece.h
similarity index 98%
rename from cpp/src/base/string_piece.h
rename to cpp/src/base/strings/string_piece.h
index 64326e165..28c9b9407 100644
--- a/cpp/src/base/string_piece.h
+++ b/cpp/src/base/strings/string_piece.h
@@ -15,8 +15,8 @@
 // conversions from "const char*" to "string" and back again.
 //
 
-#ifndef BASE_STRING_PIECE_H_
-#define BASE_STRING_PIECE_H_
+#ifndef BASE_STRINGS_STRING_PIECE_H_
+#define BASE_STRINGS_STRING_PIECE_H_
 #pragma once
 
 #include <string>
@@ -189,4 +189,4 @@ inline bool operator>=(const StringPiece& x, const StringPiece& y) {
 
 }  // namespace base
 
-#endif  // BASE_STRING_PIECE_H_
+#endif  // BASE_STRINGS_STRING_PIECE_H_
diff --git a/cpp/src/phonenumbers/utf/stringpiece.h b/cpp/src/phonenumbers/utf/stringpiece.h
index 7b567720e..82196b945 100644
--- a/cpp/src/phonenumbers/utf/stringpiece.h
+++ b/cpp/src/phonenumbers/utf/stringpiece.h
@@ -16,8 +16,7 @@
 #ifndef STRINGS_STRINGPIECE_H_
 #define STRINGS_STRINGPIECE_H_
 
-//#include "third_party/chromium/src/base/string_piece.h"
-#include "base/string_piece.h"
+#include "base/strings/string_piece.h"
 
 using base::StringPiece;