diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index ba3fa9026..ef154c5b1 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -309,8 +309,8 @@ install (FILES
 
 install (FILES
   "src/base/basictypes.h"
+  "src/base/memory/singleton.h"
   "src/base/scoped_ptr.h"
-  "src/base/singleton.h"
   DESTINATION include/base/
 )
 install (FILES src/base/synchronization/lock.h
diff --git a/cpp/src/base/singleton.h b/cpp/src/base/memory/singleton.h
similarity index 100%
rename from cpp/src/base/singleton.h
rename to cpp/src/base/memory/singleton.h
diff --git a/cpp/src/phonenumbers/phonenumberutil.cc b/cpp/src/phonenumbers/phonenumberutil.cc
index 68cb9de79..00893d129 100644
--- a/cpp/src/phonenumbers/phonenumberutil.cc
+++ b/cpp/src/phonenumbers/phonenumberutil.cc
@@ -33,7 +33,7 @@
 #include <unicode/utf8.h>
 
 #include "base/logging.h"
-#include "base/singleton.h"
+#include "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 1e07a6846..b23819504 100644
--- a/cpp/src/phonenumbers/phonenumberutil.h
+++ b/cpp/src/phonenumbers/phonenumberutil.h
@@ -28,8 +28,8 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/memory/singleton.h"
 #include "base/scoped_ptr.h"
-#include "base/singleton.h"
 #include "phonenumbers/phonenumber.pb.h"
 
 class TelephoneNumber;