diff --git a/cpp/src/phonenumberutil_test.cc b/cpp/src/phonenumberutil_test.cc
index 470f0ea2a..6451e7148 100644
--- a/cpp/src/phonenumberutil_test.cc
+++ b/cpp/src/phonenumberutil_test.cc
@@ -215,7 +215,7 @@ TEST_F(PhoneNumberUtilTest, GetSupportedRegions) {
   set<string> regions;
 
   GetSupportedRegions(&regions);
-  EXPECT_GT(regions.size(), 0);
+  EXPECT_GT(regions.size(), 0U);
 }
 
 TEST_F(PhoneNumberUtilTest, GetInstanceLoadUSMetadata) {
diff --git a/cpp/src/stringutil.h b/cpp/src/stringutil.h
index f524bd028..bca35647a 100644
--- a/cpp/src/stringutil.h
+++ b/cpp/src/stringutil.h
@@ -20,7 +20,7 @@
 #include <cstddef>
 #include <string>
 
-#include <base/basictypes.h>
+#include "base/basictypes.h"
 
 namespace i18n {
 namespace phonenumbers {